strong_parameters 0.1.5 → 0.1.6

data/README.rdoc

@@ -48,6 +48,12 @@ every model you want protected.
       include ActiveModel::ForbiddenAttributesProtection
     end
 
+If you want to now disable the default whitelisting that occurs in later versions of Rails, change the +config.active_record.whitelist_attributes+ property in your +config/application.rb+:
+
+    config.active_record.whitelist_attributes = false
+
+This will allow you to remove / not have to use +attr_accessible+ and do mass assignment inside your code and tests.
+
 == Compatibility
 
-This plugin is only fully compatible with Rails versions 3.1 and 3.2 but not 4.0+, as it is part of Rails Core in 4.0.
+This plugin is only fully compatible with Rails versions 3.0, 3.1 and 3.2 but not 4.0+, as it is part of Rails Core in 4.0.

data/Rakefile

@@ -1,17 +1,13 @@
 #!/usr/bin/env rake
 begin
   require 'bundler/setup'
+  require 'bundler/gem_tasks'
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
+  raise 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
+require 'rdoc/task'
+
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'StrongParameters'
@@ -20,11 +16,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
-Bundler::GemHelper.install_tasks
-
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
@@ -34,5 +25,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task :default => :test

data/lib/action_controller/parameters.rb

@@ -44,8 +44,10 @@ module ActionController
         case filter
         when Symbol, String then
           params[filter] = self[filter] if has_key?(filter)
-          keys.grep(/\A#{Regexp.escape(filter)}\(\d+[if]?\)\z/).each { |key| params[key] = self[key] }
+          keys.grep(/\A#{Regexp.escape(filter.to_s)}\(\d+[if]?\)\z/).each { |key| params[key] = self[key] }
         when Hash then
+          filter = filter.with_indifferent_access
+
           self.slice(*filter.keys).each do |key, value|
             return unless value
 
@@ -72,16 +74,19 @@ module ActionController
 
     def fetch(key, *args)
       convert_hashes_to_parameters(key, super)
-    rescue KeyError
+    rescue KeyError, IndexError
       raise ActionController::ParameterMissing.new(key)
     end
 
     def slice(*keys)
-      self.class.new(super)
+      self.class.new(super).tap do |new_instance|
+        new_instance.instance_variable_set :@permitted, @permitted
+      end
     end
 
     def dup
-      super.tap do |duplicate|
+      self.class.new(self).tap do |duplicate|
+        duplicate.default = default
         duplicate.instance_variable_set :@permitted, @permitted
       end
     end

data/lib/active_model/forbidden_attributes_protection.rb

@@ -3,7 +3,8 @@ module ActiveModel
   end
 
   module ForbiddenAttributesProtection
-    def sanitize_for_mass_assignment(new_attributes, options = {})
+    def sanitize_for_mass_assignment(*options)
+      new_attributes = options.first
       if !new_attributes.respond_to?(:permitted?) || new_attributes.permitted?
         super
       else

data/lib/generators/rails/strong_parameters_controller_generator.rb

@@ -1,3 +1,4 @@
+require 'rails/version'
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 
 module Rails
@@ -5,6 +6,12 @@ module Rails
     class StrongParametersControllerGenerator < ScaffoldControllerGenerator
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
       source_root File.expand_path("../templates", __FILE__)
+
+      if ::Rails::VERSION::STRING < '3.1'
+        def module_namespacing
+          yield if block_given?
+        end
+      end
     end
   end
 end

data/lib/strong_parameters/version.rb

@@ -1,3 +1,3 @@
 module StrongParameters
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/action_controller_required_params_test.rb

@@ -9,22 +9,22 @@ end
 
 class ActionControllerRequiredParamsTest < ActionController::TestCase
   tests BooksController
-  
+
   test "missing required parameters will raise exception" do
-    post :create, { magazine: { name: "Mjallo!" } }
+    post :create, { :magazine => { :name => "Mjallo!" } }
     assert_response :bad_request
 
-    post :create, { book: { title: "Mjallo!" } }
+    post :create, { :book => { :title => "Mjallo!" } }
     assert_response :bad_request
   end
-  
+
   test "required parameters that are present will not raise" do
-    post :create, { book: { name: "Mjallo!" } }
+    post :create, { :book => { :name => "Mjallo!" } }
     assert_response :ok
   end
-  
+
   test "missing parameters will be mentioned in the return" do
-    post :create, { magazine: { name: "Mjallo!" } }
+    post :create, { :magazine => { :name => "Mjallo!" } }
     assert_equal "Required parameter missing: book", response.body
   end
 end

data/test/action_controller_tainted_params_test.rb

@@ -2,24 +2,24 @@ require 'test_helper'
 
 class PeopleController < ActionController::Base
   def create
-    render text: params[:person].permitted? ? "untainted" : "tainted"
+    render :text => params[:person].permitted? ? "untainted" : "tainted"
   end
-  
+
   def create_with_permit
-    render text: params[:person].permit(:name).permitted? ? "untainted" : "tainted"
+    render :text => params[:person].permit(:name).permitted? ? "untainted" : "tainted"
   end
 end
 
 class ActionControllerTaintedParamsTest < ActionController::TestCase
   tests PeopleController
-  
+
   test "parameters are tainted" do
-    post :create, { person: { name: "Mjallo!" } }
+    post :create, { :person => { :name => "Mjallo!" } }
     assert_equal "tainted", response.body
   end
-  
+
   test "parameters can be permitted and are then not tainted" do
-    post :create_with_permit, { person: { name: "Mjallo!" } }
+    post :create_with_permit, { :person => { :name => "Mjallo!" } }
     assert_equal "untainted", response.body
   end
 end

data/test/active_model_mass_assignment_taint_protection_test.rb

@@ -3,28 +3,28 @@ require 'test_helper'
 class Person
   include ActiveModel::MassAssignmentSecurity
   include ActiveModel::ForbiddenAttributesProtection
-  
+
   public :sanitize_for_mass_assignment
 end
 
 class ActiveModelMassUpdateProtectionTest < ActiveSupport::TestCase
   test "forbidden attributes cannot be used for mass updating" do
     assert_raises(ActiveModel::ForbiddenAttributes) do
-      Person.new.sanitize_for_mass_assignment(ActionController::Parameters.new(a: "b"))
+      Person.new.sanitize_for_mass_assignment(ActionController::Parameters.new(:a => "b"))
     end
   end
 
   test "permitted attributes can be used for mass updating" do
     assert_nothing_raised do
       assert_equal({ "a" => "b" },
-        Person.new.sanitize_for_mass_assignment(ActionController::Parameters.new(a: "b").permit(:a)))
+        Person.new.sanitize_for_mass_assignment(ActionController::Parameters.new(:a => "b").permit(:a)))
     end
   end
-  
+
   test "regular attributes should still be allowed" do
     assert_nothing_raised do
-      assert_equal({ a: "b" },
-        Person.new.sanitize_for_mass_assignment(a: "b"))
+      assert_equal({ :a => "b" },
+        Person.new.sanitize_for_mass_assignment(:a => "b"))
     end
   end
 end

data/test/gemfiles/Gemfile.rails-3.0.x

@@ -0,0 +1,6 @@
+source :rubygems
+gemspec :path => "./../.."
+
+gem "actionpack", "~> 3.0.0"
+gem "railties", "~> 3.0.0"
+gem "activemodel", "~> 3.0.0"

data/test/gemfiles/Gemfile.rails-3.0.x.lock

@@ -0,0 +1,62 @@
+PATH
+  remote: /Users/mgrosser/code/tools/strong_parameters
+  specs:
+    strong_parameters (0.1.6.dev)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+      railties (~> 3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionpack (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.17)
+      activesupport (= 3.0.17)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.17)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    json (1.7.5)
+    metaclass (0.0.1)
+    mocha (0.12.7)
+      metaclass (~> 0.0.1)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    railties (3.0.17)
+      actionpack (= 3.0.17)
+      activesupport (= 3.0.17)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (10.0.1)
+    rdoc (3.12)
+      json (~> 1.4)
+    thor (0.14.6)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 3.0.0)
+  activemodel (~> 3.0.0)
+  mocha (~> 0.12.0)
+  railties (~> 3.0.0)
+  rake
+  strong_parameters!

data/test/gemfiles/Gemfile.rails-3.1.x

@@ -0,0 +1,6 @@
+source :rubygems
+gemspec :path => "./../.."
+
+gem "actionpack", "~> 3.1.0"
+gem "railties", "~> 3.1.0"
+gem "activemodel", "~> 3.1.0"

data/test/gemfiles/Gemfile.rails-3.2.x

@@ -0,0 +1,6 @@
+source :rubygems
+gemspec :path => "./../.."
+
+gem "actionpack", "~> 3.2.0"
+gem "railties", "~> 3.2.0"
+gem "activemodel", "~> 3.2.0"

data/test/multi_parameter_attributes_test.rb

@@ -4,7 +4,7 @@ require 'action_controller/parameters'
 class MultiParameterAttributesTest < ActiveSupport::TestCase
   test "permitted multi-parameter attribute keys" do
     params = ActionController::Parameters.new({
-      book: {
+      :book => {
         "shipped_at(1i)"   => "2012",
         "shipped_at(2i)"   => "3",
         "shipped_at(3i)"   => "25",
@@ -18,7 +18,7 @@ class MultiParameterAttributesTest < ActiveSupport::TestCase
       }
     })
 
-    permitted = params.permit book: [ :shipped_at, :price ]
+    permitted = params.permit :book => [ :shipped_at, :price ]
 
     assert permitted.permitted?
 

data/test/nested_parameters_test.rb

@@ -4,23 +4,23 @@ require 'action_controller/parameters'
 class NestedParametersTest < ActiveSupport::TestCase
   test "permitted nested parameters" do
     params = ActionController::Parameters.new({
-      book: {
-        title: "Romeo and Juliet",
-        authors: [{
-          name: "William Shakespeare",
-          born: "1564-04-26"
+      :book => {
+        :title => "Romeo and Juliet",
+        :authors => [{
+          :name => "William Shakespeare",
+          :born => "1564-04-26"
         }, {
-          name: "Christopher Marlowe"
+          :name => "Christopher Marlowe"
         }],
-        details: {
-          pages: 200,
-          genre: "Tragedy"
+        :details => {
+          :pages => 200,
+          :genre => "Tragedy"
         }
       },
-      magazine: "Mjallo!"
+      :magazine => "Mjallo!"
     })
 
-    permitted = params.permit book: [ :title, { authors: [ :name ] }, { details: :pages } ]
+    permitted = params.permit :book => [ :title, { :authors => [ :name ] }, { :details => :pages } ]
 
     assert permitted.permitted?
     assert_equal "Romeo and Juliet", permitted[:book][:title]
@@ -32,6 +32,31 @@ class NestedParametersTest < ActiveSupport::TestCase
     assert_nil permitted[:magazine]
   end
 
+  test "permitted nested parameters with a string or a symbol as a key" do
+    params = ActionController::Parameters.new({
+      :book => {
+        'authors' => [
+          { :name => "William Shakespeare", :born => "1564-04-26" },
+          { :name => "Christopher Marlowe" }
+        ]
+      }
+    })
+
+    permitted = params.permit :book => [ { 'authors' => [ :name ] } ]
+
+    assert_equal "William Shakespeare", permitted[:book]['authors'][0][:name]
+    assert_equal "William Shakespeare", permitted[:book][:authors][0][:name]
+    assert_equal "Christopher Marlowe", permitted[:book]['authors'][1][:name]
+    assert_equal "Christopher Marlowe", permitted[:book][:authors][1][:name]
+
+    permitted = params.permit :book => [ { :authors => [ :name ] } ]
+
+    assert_equal "William Shakespeare", permitted[:book]['authors'][0][:name]
+    assert_equal "William Shakespeare", permitted[:book][:authors][0][:name]
+    assert_equal "Christopher Marlowe", permitted[:book]['authors'][1][:name]
+    assert_equal "Christopher Marlowe", permitted[:book][:authors][1][:name]
+  end
+
   test "nested arrays with strings" do
     params = ActionController::Parameters.new({
       :book => {
@@ -45,14 +70,14 @@ class NestedParametersTest < ActiveSupport::TestCase
 
   test "permit may specify symbols or strings" do
     params = ActionController::Parameters.new({
-      book: {
-        title: "Romeo and Juliet",
-        author: "William Shakespeare"
+      :book => {
+        :title => "Romeo and Juliet",
+        :author => "William Shakespeare"
       },
-      magazine: "Shakespeare Today"
+      :magazine => "Shakespeare Today"
     })
 
-    permitted = params.permit({ book: ["title", :author] }, "magazine")
+    permitted = params.permit({ :book => ["title", :author] }, "magazine")
     assert_equal "Romeo and Juliet", permitted[:book][:title]
     assert_equal "William Shakespeare", permitted[:book][:author]
     assert_equal "Shakespeare Today", permitted[:magazine]
@@ -60,49 +85,49 @@ class NestedParametersTest < ActiveSupport::TestCase
 
   test "nested array with strings that should be hashes" do
     params = ActionController::Parameters.new({
-      book: {
-        genres: ["Tragedy"]
+      :book => {
+        :genres => ["Tragedy"]
       }
     })
 
-    permitted = params.permit book: { genres: :type }
-    assert_empty permitted[:book][:genres]
+    permitted = params.permit :book => { :genres => :type }
+    assert permitted[:book][:genres].empty?
   end
 
   test "nested array with strings that should be hashes and additional values" do
     params = ActionController::Parameters.new({
-      book: {
-        title: "Romeo and Juliet",
-        genres: ["Tragedy"]
+      :book => {
+        :title => "Romeo and Juliet",
+        :genres => ["Tragedy"]
       }
     })
 
-    permitted = params.permit book: [ :title, { genres: :type } ]
+    permitted = params.permit :book => [ :title, { :genres => :type } ]
     assert_equal "Romeo and Juliet", permitted[:book][:title]
-    assert_empty permitted[:book][:genres]
+    assert permitted[:book][:genres].empty?
   end
 
   test "nested string that should be a hash" do
     params = ActionController::Parameters.new({
-      book: {
-        genre: "Tragedy"
+      :book => {
+        :genre => "Tragedy"
       }
     })
 
-    permitted = params.permit book: { genre: :type }
+    permitted = params.permit :book => { :genre => :type }
     assert_nil permitted[:book][:genre]
   end
 
   test "fields_for_style_nested_params" do
     params = ActionController::Parameters.new({
-      book: {
-        authors_attributes: {
-          :'0' => { name: 'William Shakespeare', age_of_death: '52' },
-          :'1' => { name: 'Unattributed Assistant' }
+      :book => {
+        :authors_attributes => {
+          :'0' => { :name => 'William Shakespeare', :age_of_death => '52' },
+          :'1' => { :name => 'Unattributed Assistant' }
         }
       }
     })
-    permitted = params.permit book: { authors_attributes: [ :name ] }
+    permitted = params.permit :book => { :authors_attributes => [ :name ] }
 
     assert_not_nil permitted[:book][:authors_attributes]['0']
     assert_not_nil permitted[:book][:authors_attributes]['1']
@@ -112,15 +137,15 @@ class NestedParametersTest < ActiveSupport::TestCase
   end
 
   test "fields_for_style_nested_params with negative numbers" do
-    params    = ActionController::Parameters.new({
-      book: {
-        authors_attributes: {
-          :'-1' => {name: 'William Shakespeare', age_of_death: '52'},
-          :'-2' => {name: 'Unattributed Assistant'}
+    params = ActionController::Parameters.new({
+      :book => {
+        :authors_attributes => {
+          :'-1' => { :name => 'William Shakespeare', :age_of_death => '52' },
+          :'-2' => { :name => 'Unattributed Assistant' }
         }
       }
     })
-    permitted = params.permit book: {authors_attributes: [:name]}
+    permitted = params.permit :book => { :authors_attributes => [:name] }
 
     assert_not_nil permitted[:book][:authors_attributes]['-1']
     assert_not_nil permitted[:book][:authors_attributes]['-2']

data/test/parameters_require_test.rb

@@ -4,7 +4,7 @@ require 'action_controller/parameters'
 class ParametersRequireTest < ActiveSupport::TestCase
   test "required parameters must be present not merely not nil" do
     assert_raises(ActionController::ParameterMissing) do
-      ActionController::Parameters.new(person: {}).require(:person)
+      ActionController::Parameters.new(:person => {}).require(:person)
     end
   end
 end

data/test/parameters_taint_test.rb

@@ -3,8 +3,8 @@ require 'action_controller/parameters'
 
 class ParametersTaintTest < ActiveSupport::TestCase
   setup do
-    @params = ActionController::Parameters.new({ person: { 
-      age: "32", name: { first: "David", last: "Heinemeier Hansson" }
+    @params = ActionController::Parameters.new({ :person => {
+      :age => "32", :name => { :first => "David", :last => "Heinemeier Hansson" }
     }})
   end
 
@@ -22,34 +22,59 @@ class ParametersTaintTest < ActiveSupport::TestCase
     end
   end
 
-  test "permitted is sticky on accessors" do
+  test "not permitted is sticky on accessors" do
     assert !@params.slice(:person).permitted?
     assert !@params[:person][:name].permitted?
+    assert !@params[:person].except(:name).permitted?
 
-    @params.each { |key, value| assert(value.permitted?) if key == :person }
+    @params.each { |key, value| assert(!value.permitted?) if key == "person" }
 
     assert !@params.fetch(:person).permitted?
 
     assert !@params.values_at(:person).first.permitted?
   end
 
+  test "permitted is sticky on accessors" do
+    @params.permit!
+    assert @params.slice(:person).permitted?
+    assert @params[:person][:name].permitted?
+    assert @params[:person].except(:name).permitted?
+
+    @params.each { |key, value| assert(value.permitted?) if key == "person" }
+
+    assert @params.fetch(:person).permitted?
+
+    assert @params.values_at(:person).first.permitted?
+  end
+
+  test "not permitted is sticky on mutators" do
+    assert !@params.delete_if { |k, v| k == "person" }.permitted?
+    assert !@params.keep_if { |k, v| k == "person" }.permitted? if @params.respond_to?(:keep_if)
+  end
+
   test "permitted is sticky on mutators" do
-    assert !@params.delete_if { |k| k == :person }.permitted?
-    assert !@params.keep_if { |k,v| k == :person }.permitted?
+    @params.permit!
+    assert @params.delete_if { |k, v| k == "person" }.permitted?
+    assert @params.keep_if { |k, v| k == "person" }.permitted? if @params.respond_to?(:keep_if)
+  end
+
+  test "not permitted is sticky beyond merges" do
+    assert !@params.merge(:a => "b").permitted?
   end
 
   test "permitted is sticky beyond merges" do
-    assert !@params.merge(a: "b").permitted?
+    @params.permit!
+    assert @params.merge(:a => "b").permitted?
   end
 
   test "modifying the parameters" do
     @params[:person][:hometown] = "Chicago"
-    @params[:person][:family] = { brother: "Jonas" }
+    @params[:person][:family] = { :brother => "Jonas" }
 
     assert_equal "Chicago", @params[:person][:hometown]
     assert_equal "Jonas", @params[:person][:family][:brother]
   end
-  
+
   test "permitting parameters that are not there should not include the keys" do
     assert !@params.permit(:person, :funky).has_key?(:funky)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strong_parameters
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 description: 
 email:
 - david@heinemeierhansson.com
@@ -113,6 +113,10 @@ files:
 - test/action_controller_tainted_params_test.rb
 - test/active_model_mass_assignment_taint_protection_test.rb
 - test/controller_generator_test.rb
+- test/gemfiles/Gemfile.rails-3.0.x
+- test/gemfiles/Gemfile.rails-3.0.x.lock
+- test/gemfiles/Gemfile.rails-3.1.x
+- test/gemfiles/Gemfile.rails-3.2.x
 - test/multi_parameter_attributes_test.rb
 - test/nested_parameters_test.rb
 - test/parameters_require_test.rb
@@ -147,6 +151,10 @@ test_files:
 - test/action_controller_tainted_params_test.rb
 - test/active_model_mass_assignment_taint_protection_test.rb
 - test/controller_generator_test.rb
+- test/gemfiles/Gemfile.rails-3.0.x
+- test/gemfiles/Gemfile.rails-3.0.x.lock
+- test/gemfiles/Gemfile.rails-3.1.x
+- test/gemfiles/Gemfile.rails-3.2.x
 - test/multi_parameter_attributes_test.rb
 - test/nested_parameters_test.rb
 - test/parameters_require_test.rb