Permalink
Commits on Jun 8, 2012
  1. Merge pull request #6668 from pomnikita/master

    drogus committed Jun 8, 2012
    Compact array of values added to PermissionSet instance
  2. Merge pull request #6681 from arunagw/plugin_gen_fix

    rafaelfranca committed Jun 8, 2012
    Plugin gen fix
  3. We should not include engine.rake file into rake

    arunagw committed Jun 8, 2012
    if we are passing -T which is skip_test_unit
    
    See issue #6673 for more details.
    
    I saw that we are not creating dummy app even if
    we do skip_test_unit.
    
    Fixes #6673
Commits on Jun 7, 2012
  1. Merge pull request #6667 from yahonda/skip_polymorphic_index_with_oracle

    rafaelfranca committed Jun 7, 2012
    Skip two tests with polymorphic if current adapter is Oracle Adapter.
  2. Merge pull request #6597 from frodsan/am_include_root_to_false

    rafaelfranca committed Jun 7, 2012
    change AMS::JSON.include_root_in_json default value to false
  3. Skip two tests with polymorphic if current adapter is Oracle Adapter.

    yahonda committed Jun 7, 2012
    because Oracle Adapter does not support foreign keys if :polymorphic => true is used.
Commits on Jun 6, 2012
  1. Merge pull request #6629 from marcandre/destroy

    carlosantoniodasilva committed Jun 6, 2012
    Add ActiveRecord::Base#destroy!
  2. Merge pull request #6645 from amatsuda/reduce_string_instance

    carlosantoniodasilva committed Jun 6, 2012
    Reduce number of String instance
  3. reduce number of Strings

    amatsuda committed Jun 4, 2012
  4. Merge pull request #6647 from amatsuda/192_minitest_method_name

    rafaelfranca committed Jun 6, 2012
    MiniTest::Spec shipped with Ruby >= 1.9.3 always responds_to __name__
  5. stop `to_s`ing method names

    amatsuda committed Jun 4, 2012
    Module#methods are Symbols in Ruby >= 1.9
  6. Merge pull request #6644 from amatsuda/fix_meaningless_test_case

    pixeltrix committed Jun 6, 2012
    fix meaningless test case
  7. fix meaningless test case

    amatsuda committed Jun 4, 2012
    Module#instance_methods returns an Array of Symbols in Ruby >= 1.9
    So this was not actually testing anything
  8. Merge pull request #6643 from fredwu/fix_require_dependency

    josevalim committed Jun 6, 2012
    Fixed the application_controller require_dependency path generated by the app generator
  9. change AMS::JSON.include_root_in_json default value to false

    Francesco Rodriguez committed Jun 6, 2012
    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.
Commits on Jun 5, 2012
  1. Eliminate dependency on Rails::VERSION::STRING

    pixeltrix committed Jun 5, 2012
    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.
  2. Merge pull request #6627 from Vanuan/tests_add_precompile_failure_assert

    josevalim committed Jun 5, 2012
    bundle exec rake assets:precompile shouldn't fail quietly.
  3. Merge pull request #6638 from frodsan/config_accessor

    rafaelfranca committed Jun 5, 2012
    add instance_accessor option to config_accessor
  4. bundle exec rake assets:precompile shouldn't fail quietly.

    Vanuan committed Jun 4, 2012
    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.
  5. add instance_accessor option to ActiveSupport::Configurable#config_ac…

    Francesco Rodriguez committed Jun 5, 2012
    …cessor
    
    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.
  6. Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3

    carlosantoniodasilva committed Jun 5, 2012
    Resolver tests fail if mysql adapter not installed
  7. Merge pull request #6632 from route/one_line_code_for_logger

    josevalim committed Jun 5, 2012
    One-liner code for logger in ActionView::Helpers::ControllerHelper
  8. Merge pull request #6631 from yuki24/use_block_in_button_helper

    josevalim committed Jun 5, 2012
    Accept a block in FormHelper#button
  9. Merge pull request #6628 from fredwu/fix_skip_gemspec

    josevalim committed Jun 5, 2012
    Fixed the Gemfile when gemspec is skipped in the 'rails plugin new' command
  10. Merge pull request #6630 from route/logger_in_metal

    josevalim committed Jun 5, 2012
    Metal controller doesn't have logger method, check it and then delegate