aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6597 from frodsan/am_include_root_to_falseRafael Mendonça França2012-06-074-98/+115
|\ | | | | change AMS::JSON.include_root_in_json default value to false
| * change AMS::JSON.include_root_in_json default value to falseFrancesco Rodriguez2012-06-064-98/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #6629 from marcandre/destroyCarlos Antonio da Silva2012-06-065-0/+34
|\ \ | | | | | | Add ActiveRecord::Base#destroy!
| * | + ActiveRecord::Base#destroy!Marc-Andre Lafortune2012-06-065-0/+34
| | |
* | | Merge pull request #6645 from amatsuda/reduce_string_instanceCarlos Antonio da Silva2012-06-0613-36/+30
|\ \ \ | | | | | | | | Reduce number of String instance
| * | | reduce number of StringsAkira Matsuda2012-06-062-2/+2
| | | |
| * | | no need to to_s here. Both String and Symbol can be interpolated into StringAkira Matsuda2012-06-061-3/+0
| | | |
| * | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-065-7/+7
| | | |
| * | | stop `to_s`ing method namesAkira Matsuda2012-06-066-24/+21
| | | | | | | | | | | | | | | | Module#methods are Symbols in Ruby >= 1.9
* | | | Merge pull request #6647 from amatsuda/192_minitest_method_nameRafael Mendonça França2012-06-061-2/+1
|\ \ \ \ | |/ / / |/| | | MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__
| * | | MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__Akira Matsuda2012-06-061-2/+1
|/ / /
* | | Merge pull request #6644 from amatsuda/fix_meaningless_test_caseAndrew White2012-06-061-1/+1
|\ \ \ | | | | | | | | fix meaningless test case
| * | | fix meaningless test caseAkira Matsuda2012-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | Module#instance_methods returns an Array of Symbols in Ruby >= 1.9 So this was not actually testing anything
* | | | Make method name consistent with existing methodsAndrew White2012-06-062-4/+4
| | | |
* | | | Merge pull request #6643 from fredwu/fix_require_dependencyJosé Valim2012-06-063-6/+9
|\ \ \ \ | |/ / / |/| | | Fixed the application_controller require_dependency path generated by the app generator
| * | | Fixed the application_controller require_dependency path generated by the ↵Fred Wu2012-06-063-6/+9
|/ / / | | | | | | | | | app generator
* | | Eliminate dependency on Rails::VERSION::STRINGAndrew White2012-06-053-21/+44
| | | | | | | | | | | | | | | | | | To facilitate the use of ActiveSupport::Testing::Performance outside of a Rails application conditionally check for the presence of Rails::VERSION::STRING before including it in the environment string.
* | | Merge pull request #6627 from Vanuan/tests_add_precompile_failure_assertJosé Valim2012-06-051-17/+24
|\ \ \ | | | | | | | | bundle exec rake assets:precompile shouldn't fail quietly.
| * | | bundle exec rake assets:precompile shouldn't fail quietly.John Yani2012-06-051-17/+24
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | If JavaScript runtime is not installed, execjs fails with error quietly, while tests continue to run. This should not happen since it causes tests to fail for unknown reason (#6621). This commit assures that if JavaScript runtime is not installed, an assertion is raised.
* | | Merge pull request #6638 from frodsan/config_accessorRafael Mendonça França2012-06-053-9/+82
|\ \ \ | | | | | | | | add instance_accessor option to config_accessor
| * | | add instance_accessor option to ActiveSupport::Configurable#config_accessorFrancesco Rodriguez2012-06-053-9/+82
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: * Add `instance_accessor` option to opt out of the instance writer and instance reader methods. * Raises a NameError if the name of the attribute is not valid. * Update documentation and tests. * Add CHANGELOG entry in activesupport.
* | | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3Carlos Antonio da Silva2012-06-051-0/+3
|\ \ \ | | | | | | | | Resolver tests fail if mysql adapter not installed
| * | | The resolver tests fail if the mysql gem is not installed; this breaksDavid Paschich2012-06-031-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | being able to run the sqlite3 tests without that gem. This fix ensures the tests will only run if the mysql gem is installed. A better solution might be to move these tests into the per-adapter tests, and test each adapter's resolver.
* | | Merge pull request #6632 from route/one_line_code_for_loggerJosé Valim2012-06-051-5/+1
|\ \ \ | | | | | | | | One-liner code for logger in ActionView::Helpers::ControllerHelper
| * | | One-liner code for logger in ActionView::Helpers::ControllerHelperDmitry Vorotilin2012-06-051-5/+1
|/ / /
* | | Merge pull request #6631 from yuki24/use_block_in_button_helperJosé Valim2012-06-052-3/+18
|\ \ \ | | | | | | | | Accept a block in FormHelper#button
| * | | accept a block in button helper.Yuki Nishijima2012-06-052-3/+18
| | |/ | |/|
* | | Merge pull request #6628 from fredwu/fix_skip_gemspecJosé Valim2012-06-052-0/+41
|\ \ \ | | | | | | | | Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' command
| * | | Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' commandFred Wu2012-06-052-0/+41
| |/ /
* | | Merge pull request #6630 from route/logger_in_metalJosé Valim2012-06-051-2/+8
|\ \ \ | |/ / |/| | Metal controller doesn't have logger method, check it and then delegate
| * | Metal controller doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-051-2/+8
| |/
* | Merge pull request #6619 from kennyj/fix_6591Piotr Sarnacki2012-06-042-1/+13
|\ \ | |/ |/| Fix #6591 Rails 3.2.5 Regression: incorrect _changed? for datetimes
| * Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
| |
| * Add failing test for 3.2.5 datetime attribute regressionEvan Arnold2012-06-041-0/+11
|/
* Merge pull request #6607 from parndt/patch-2Vijay Dev2012-06-031-2/+2
|\ | | | | Updated guide to say Rails 4.0 requires 1.9.3 or higher, not Rails 3.2.
| * Updated guide to say Rails 4.0 requires 1.9.3 or higher, not Rails 3.2.Philip Arndt2012-06-031-2/+2
| |
* | Merge pull request #6605 from amatsuda/ar_merge_association_testJon Leighton2012-06-031-0/+8
|\ \ | |/ |/| a test case that ensures AR::Relation#merge can merge associations
| * a test case that ensures AR::Relation#merge can merge associationsAkira Matsuda2012-06-031-0/+8
|/
* starting with the Rails 4.0 release notesVijay Dev2012-06-021-0/+591
| | | | | | just a consolidation of the changelogs with minimal formatting [ci skip]
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-026-36/+59
|\
| * copy edit AS guide [ci skip]Vijay Dev2012-06-021-7/+5
| |
| * copy edit routing guide [ci skip]Vijay Dev2012-06-021-1/+3
| |
| * fix up the example app for getting started guide [ci skip]Vijay Dev2012-06-026-10/+8
| |
| * better explanations for acts_like?, try and deep_dupHrvoje Šimić2012-06-021-6/+20
| |
| * change welcome_helper.rb to home_helper.rbspyhole2012-06-011-0/+0
| |
| * Update guides/code/getting_started/test/functional/home_controller_test.rbspyhole2012-06-021-1/+1
| |
| * the file name should be changed to home_helper.rbspyhole2012-06-021-1/+1
| |
| * Update guides/code/getting_started/app/controllers/home_controller.rbspyhole2012-06-021-1/+1
| |
| * Update guides/code/getting_started/config/routes.rbspyhole2012-06-021-1/+1
| |
| * routes are viewable in browser (update guides)schneems2012-06-011-2/+2
| | | | | | From the Pull Request #6461
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 13:23:11 +0000