aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6597 from frodsan/am_include_root_to_falseRafael Mendonça França2012-06-071-4/+4
|\ | | | | change AMS::JSON.include_root_in_json default value to false
| * change AMS::JSON.include_root_in_json default value to falseFrancesco Rodriguez2012-06-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: * Update `include_root_in_json` default value to false for default value to false for `ActiveModel::Serializers::JSON`. * Remove unnecessary change to include_root_in_json option in wrap_parameters template. * Update `as_json` documentation. * Fix JSONSerialization tests. Problem: It's confusing that AM serializers behave differently from AR, even when AR objects include AM serializers module. class User < ActiveRecord::Base; end class Person include ActiveModel::Model include ActiveModel::AttributeMethods include ActiveModel::Serializers::JSON attr_accessor :name, :age def attributes instance_values end end user.as_json => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true} # root is not included person.as_json => {"person"=>{"name"=>"Francesco", "age"=>22}} # root is included ActiveRecord::Base.include_root_in_json => false Person.include_root_in_json => true # different default values for include_root_in_json Proposal: Change the default value of AM serializers to false, update the misleading documentation and remove unnecessary change to false of include_root_in_json option with AR objects. class User < ActiveRecord::Base; end class Person include ActiveModel::Model include ActiveModel::AttributeMethods include ActiveModel::Serializers::JSON attr_accessor :name, :age def attributes instance_values end end user.as_json => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true} # root is not included person.as_json => {"name"=>"Francesco", "age"=>22} # root is not included ActiveRecord::Base.include_root_in_json => false Person.include_root_in_json => false # same behaviour, more consistent Fixes #6578.
* | reduce number of StringsAkira Matsuda2012-06-061-1/+1
| |
* | Make method name consistent with existing methodsAndrew White2012-06-062-4/+4
| |
* | Fixed the application_controller require_dependency path generated by the ↵Fred Wu2012-06-062-5/+6
| | | | | | | | app generator
* | Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' commandFred Wu2012-06-051-0/+15
|/
* remove unneeded blank line from !namespeced? controller generatorsAkira Matsuda2012-06-012-2/+2
|
* Revert "Only include Rake::DSL if it's defined."Akira Matsuda2012-06-011-1/+1
| | | | | | This reverts commit 82c3aca17e78d25f217702e530586673f2a219d7. Reason: Ruby 1.9.3 is shipped with Rake > 0.9
* Rake::DSL should always be availableJeremy Kemper2012-05-311-1/+1
|
* Explicitly require rake so its DSL is availableJeremy Kemper2012-05-311-0/+1
|
* Add code statistics for Javascript andArun Agrawal2012-05-312-2/+10
| | | | | | | CoffeeScript files to `rake stats` task Orignal PR was #2270 Thanks to @nfm
* Changed symbol platform to platforms for the commented out call to gem ↵Martin O'Connor2012-05-301-1/+1
| | | | | | 'therubyracer'. Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
* Remove support for rails server RAILS_ENV=env-nameSam Oliver2012-05-301-5/+0
|
* Fix various bugs with console arguments.Sam Oliver2012-05-303-86/+109
| | | | Allow hyphens in environment names again.
* remove unused route reloading codeschneems2012-05-301-2/+0
| | | Since the environment is initialized each time rake is run, routes don't need to be re-loaded. https://github.com/rails/rails/pull/6461#r869953
* Add support runner hook.kennyj2012-05-294-0/+27
|
* update Gemfile template to 1.9 hash syntaxFrancesco Rodriguez2012-05-291-1/+1
|
* Fix railties_order when application object is passedPiotr Sarnacki2012-05-271-1/+1
| | | | | | | | | | | | | | | railites_order method, introduced in 40b19e0, had a bug that was causing loading application instance twice in initializers if railties_order already included application instance. So for example railties_order = [Foo::Engine, :main_app, Bar::Engine] would result in such railties array: [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine] In order to fix it, we need to check for existence of application in both railties_order and railties arrays.
* do not set the ENGINE_PATH to nilAaron Patterson2012-05-241-1/+1
|
* `name` should be public.Aaron Patterson2012-05-241-12/+12
|
* /rails/info/routes path shows routing informationschneems2012-05-246-8/+70
| | | | Will show similar contents to the output of `$ rake routes` in the browser in development. This speeds the time required to generate routes, since the application is already initialized.
* Fixed backward incompatibility for engines.Philip Arndt2012-05-241-1/+1
| | | | | | | | | | | | - Many engines rely on being able to join directories to the Rails root: Rails.root.join('somedir') - This was now impossible because Rails.root returned a String: NoMethodError: undefined method `join' for "/code/myrailsapp":String - This was broken in 4001835db00ce44cb75bca33ec02cd76b8ccc790
* use File.join rather than depend on PathnameAaron Patterson2012-05-231-1/+1
|
* Revert "require the constants we use. ensure that root always returns a ↵Aaron Patterson2012-05-231-2/+1
| | | | | | Pathname" This reverts commit d77b576c0330d8b1c6189cb94814382ce32baab6.
* require the constants we use. ensure that root always returns a PathnameAaron Patterson2012-05-231-1/+2
|
* removing more pathnameismsAaron Patterson2012-05-232-6/+4
|
* use File.join to decrease dependencies on PathnameAaron Patterson2012-05-231-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-231-2/+1
|\
| * Revert "Remove blank trailing comments"Vijay Dev2012-05-239-0/+22
| | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip]
| * Remove obsolete comment from generator gem methodAlexey Vakhov2012-05-221-2/+1
| | | | | | | | | | This comment about :env option for gem method was actual for rails 2.3 without bundler. Now bundler uses grups for this goal.
| * Remove blank trailing commentsHenrik Hodne2012-05-209-22/+0
| | | | | | | | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
* | I guess we have to return a pathname object. o_OAaron Patterson2012-05-221-1/+1
| |
* | use File.realpath and avoid making Pathname objectsAaron Patterson2012-05-221-2/+1
| |
* | use RUBY_PLATFORM in case of cross compiled rubyAaron Patterson2012-05-221-1/+1
| |
* | initialize instance variablesAaron Patterson2012-05-221-2/+6
| |
* | initialize our instance variablesAaron Patterson2012-05-221-2/+14
| |
* | Move root method at TOP of routes fileGaurish Sharma2012-05-221-3/+4
| | | | | | | | | | | | | | | | Made the change as per the following text in routing guide:- "You should put the root route at the top of the file, because it is the most popular route and should be matched first." However, if root is best left at bottom. We will change to fix that text
* | Use new hash syntax for generators gem methodAlexey Vakhov2012-05-222-2/+2
| | | | | | | | | | | | The Gemfile of new application uses ruby 1.9 hashes. Gem method of generators should use them too. It prevents from mixing two kinds of syntax in one file.
* | Use require_dependency in generated controllersPiotr Sarnacki2012-05-222-2/+2
| | | | | | | | | | | | | | Using require in development mode will prevent required files from reloading, even if they're changed. In order to keep namespaced application_controller reloadable, we need to use require_dependency instead of require.
* | Fix `rails db -h` and cosmetic fixes in usage bannersAlexey Vakhov2012-05-223-3/+8
| | | | | | | | | | | | | | Ruby tries to use '-h' as short version of '--header' by default https://github.com/ruby/ruby/blob/trunk/lib/optparse.rb#L1372-1381. To force `rails db -h` prints an usage message we should add the `-h` options explicitly.
* | Use relative path to sqlite3 db in `rails db` commandAlexey Vakhov2012-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | Rails uses sqlit3 db file with a path relative to the rails root. It allows to execute server not from rails root only. For example you can fire `./spec/dummy/script/rails s` to start dummy application server if you develop some engine gem. Now the `rails db` command uses relative paths also and you can explore your dummy db via `./spec/dummy/script/rails db` command.
* | using __method__ for the command method callsAaron Patterson2012-05-211-5/+5
| |
* | Fix generators to help with ambiguous `ApplicationController` issuePiotr Sarnacki2012-05-203-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In development mode, dependencies are loaded dynamically at runtime, using `const_missing`. Because of that, when one of the constants is already loaded and `const_missing` is not triggered, user can end up with unexpected results. Given such file in an Engine: ```ruby module Blog class PostsController < ApplicationController end end ``` If you load it first, before loading any application files, it will correctly load `Blog::ApplicationController`, because second line will hit `const_missing`. However if you load `ApplicationController` first, the constant will be loaded already, `const_missing` hook will not be fired and in result `PostsController` will inherit from `ApplicationController` instead of `Blog::ApplicationController`. Since it can't be fixed in `AS::Dependencies`, the easiest fix is to just explicitly load application controller. closes #6413
* | Merge pull request #3359 from mrreynolds/datamapper_naming_fixRafael Mendonça França2012-05-192-2/+2
|\ \ | |/ |/| Fixed DataMapper namings in symbols and constants.
| * Fixed DataMapper namings in symbols and constants.Robert Glaser2011-10-182-2/+2
| |
* | Remove delegated methods from generators test caseCarlos Antonio da Silva2012-05-191-1/+0
| | | | | | | | | | | | | | `class_attribute` already generates instance readers/writers by default, so there's no need to add delegation methods. Removes some "method redefined" warnings.
* | Improve `rake routes` output for redirects - closes #6369.Andrew White2012-05-191-1/+1
| |
* | Fix inspecting route redirections, closes #6369Łukasz Strzałkowski2012-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This commit fixes route inspection in `rake routes` Before: foo /foo(.:format) :controller#:action" After: foo /foo(.:format) Redirect (301)
* | Revert changes related to `bundle install` fixes in `rails new`Piotr Sarnacki2012-05-171-10/+1
| | | | | | | | | | | | | | | | | | | | | | Reverted changes: f3482a9 Fix tests in railties 5904295 improve #6318 aed906a prevent using already loaded Gemfile for 'bundle install' In order to fix this, we need a fix in bundler related to GEM_PATH, which will allow to run tests properly. I will get this changes back when it happens.
* | Load all the env files available in config.paths (closes #6335)Piotr Sarnacki2012-05-161-2/+3
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 00:00:57 +0000