Commit Graph

10300 Commits

Author SHA1 Message Date
José Valim
cd28dcb5a4 Cache source root in a rails specific variable. 2009-07-13 13:39:48 +02:00
José Valim
3075ae0611 Solving merge conflicts. 2009-07-12 16:29:15 +02:00
Joshua Peek
c863388039 Add observing hooks to ARes 2009-07-11 16:59:11 -05:00
Joshua Peek
e83a05af07 Integrate AMo XML serializer into AR 2009-07-11 16:20:58 -05:00
Joshua Peek
01d92021e6 Switch scaffolding templates to HTML 5 doctype 2009-07-10 11:34:39 -05:00
José Valim
cca16a015d Do not clean up frameworks on generators environment, otherwise initializers, gems and plugins might not be loaded properly. 2009-07-09 10:04:59 +02:00
Sam Goldstein
d60d7edce4 Make it so AR attributes which conflict with object-private methods (e.g. system) don't 'randomly' cause NoMethodErrors
Previously if you called this attribute before others, you'd get exceptions.  But if it was the second-or-subsequent attribute you retrieved you'd get the correct behaviour.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2808 state:committed]
2009-07-09 16:44:30 +12:00
José Valim
09c288f0c5 Add the new generators environment and update commands. 2009-07-08 12:55:50 +02:00
José Valim
c9ea21717e Generators are configured on initialization if RAILS_ENV=generators. 2009-07-08 12:53:45 +02:00
José Valim
2699e9c2dd Added config.generators with tests. 2009-07-08 12:53:45 +02:00
José Valim
c07746cbdf Merge branch 'master' of git://github.com/rails/rails 2009-07-08 12:53:13 +02:00
Lawrence Pit
579250ea46 Use the i18n gem if present instead of vendor code. [#2871 state:resolved]
Signed-off-by: Yehuda Katz <wycats@gmail.com>
2009-07-07 18:36:42 -07:00
Lawrence Pit
da635394c1 Ruby 1.9 style String interpolation support for lower ruby versions. Thanks to code from Masao Mutoh's GetText gem. [#2870 state:resolved]
Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
2009-07-07 16:21:57 -07:00
Hongli Lai (Phusion)
187d90f752 Add support for dumping non-standard primary keys when using the SQLite3 adapter. Fix unit tests so that this feature is tested for all adapters. [#2868 state:resolved]
Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
2009-07-07 16:17:25 -07:00
Emilio Tagua
1e2d722960 Adds a audio_tag helper for the HTML5 audio tag. Fixed video_path docs. HTML attributes values should be true or false not attribute's name. [#2864 state:resolved]
Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
2009-07-07 15:56:27 -07:00
Yehuda Katz + Carl Lerche
61604feec0 Get Initializer tests running without requiring parts of Rails being loaded first 2009-07-06 12:25:34 -07:00
Yehuda Katz + Carl Lerche
9a42e06dd8 Reapply Rails::Application::Path tweaks
Reapplies: a4bdc00fec
             3c1dab7225
2009-07-06 10:22:42 -07:00
José Valim
dd7ee082be Use active_support/mini since we just need inflections. 2009-07-06 18:38:27 +02:00
José Valim
66d1b968d1 Make specs pass on Ruby 1.9. 2009-07-06 18:31:28 +02:00
José Valim
eeb6a0786a Load generators from user home and show a error message if they can't be loaded. 2009-07-04 20:17:32 +02:00
José Valim
b277cf28e8 Allow scaffold controller to load action_orm files on demand. 2009-07-04 20:17:32 +02:00
José Valim
35925a8995 Ensure that rails templates methods are invoked with the proper extensions [#2531 status:resolved] 2009-07-04 20:17:32 +02:00
José Valim
8ff214e0db Use the proper shebang when using Ruby 1.9 or jruby or windows. 2009-07-04 20:17:32 +02:00
José Valim
da09d46ed4 Make generators test pass with latest Thor version 2009-07-04 20:17:32 +02:00
José Valim
cd388e075c Search for generators on vendorized plugins and gems. 2009-07-04 20:17:31 +02:00
José Valim
37ba0047a9 Removed invoke_if and allow hook_for to accept boolean options. 2009-07-04 20:17:31 +02:00
José Valim
9e36dd4e1c Remove update_js from Rakefile and the uneeded railsgen. 2009-07-04 20:17:31 +02:00
José Valim
20e2140ce7 Merge branch 'master' of git://github.com/rails/rails 2009-07-04 20:16:36 +02:00
Joshua Peek
783db25e0c Integrate AMo JSON serializer into AR 2009-07-03 23:12:42 -05:00
Joshua Peek
d2b78b3594 Initial extraction of AMo xml serializer 2009-07-03 21:38:14 -05:00
Joshua Peek
e3d6d10e1f Ensure JSON serializer includes model naming 2009-07-03 21:38:13 -05:00
José Valim
44633dc7a5 Add some tests for no_color! behavior. 2009-07-03 15:12:18 +02:00
José Valim
21db04818e More tests for rails generators and lookup. 2009-07-03 14:57:46 +02:00
José Valim
3ca504c966 Removed remaining old generators files. 2009-07-03 14:57:46 +02:00
José Valim
de68cf7e06 Plugin generators now reflect new generators sutrcture. 2009-07-03 14:57:46 +02:00
José Valim
d1c404ee90 Added lookup to generators. 2009-07-03 14:57:46 +02:00
José Valim
3bf45890b3 Merge branch 'master' of git://github.com/rails/rails 2009-07-03 14:56:19 +02:00
Pratik Naik
a4bdc00fec Revert "Compact the way application paths are defined"
This reverts commit 940aad225a.

Reason : The server does not start
2009-07-03 12:35:53 +01:00
Pratik Naik
3c1dab7225 Revert "Modify the Rails::Application::Path object to allow for more concise path definition."
This reverts commit 913bb2f4c2.

Reason : The server does not start
2009-07-03 12:23:57 +01:00
Yehuda Katz + Carl Lerche
378a65a909 Added tests for the :install_gem_spec_stubs initializer 2009-07-02 17:52:46 -07:00
Yehuda Katz + Carl Lerche
d8406f0c20 Wrote tests for the :check_ruby_version initializer 2009-07-02 16:51:05 -07:00
Yehuda Katz + Carl Lerche
1d280e21a1 Adds support for def self.setup in isolation tests for setup that should be run only once in the parent 2009-07-02 16:03:41 -07:00
Yehuda Katz + Carl Lerche
940aad225a Compact the way application paths are defined 2009-07-02 15:49:35 -07:00
Yehuda Katz + Carl Lerche
913bb2f4c2 Modify the Rails::Application::Path object to allow for more concise path definition. 2009-07-02 15:47:11 -07:00
Jesús García Sáez
fc6077d76e Allow symbols on routes declaration (:controller and :action values) [#2828 state:resolved]
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
2009-07-02 12:18:48 -07:00
Yehuda Katz + Carl Lerche
0fbf458b6c Removed unnecessary calls to image_path and hash lookups [#2827 state:resolved] 2009-07-02 12:14:23 -07:00
Brian Abreu
d036899717 Fixed ActiveSupport::OrderedHash::[] work identically to ::Hash::[] in ruby 1.8.7 [#2832 state:resolved]
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
2009-07-02 12:01:05 -07:00
Jarl Friis
e61afed6f8 My suggestion to fix ticket 2401 [#2401 state:resolved]
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
2009-07-02 11:55:24 -07:00
Aaron Patterson
49bdbebca6 wycats forgot a +1, so I added it [#2749 state:resolved]
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
2009-07-02 11:39:06 -07:00
Levin Alexander
ab2d6abb55 make #inspect if zero length duration return '0 seconds' instead of empty string [#2838 state:resolved]
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
2009-07-02 11:22:25 -07:00