francois-shoulda 2.0.5.2 → 2.0.5.4

data/README.rdoc

@@ -66,7 +66,7 @@ Quick macro tests for your ActiveRecord associations and validations:
     should_allow_values_for :email, "a@b.com", "asdf@asdf.com"
     should_ensure_length_in_range :email, 1..100
     should_ensure_value_in_range :age, 1..100
-    should_protect_attributes :password
+    should_not_allow_mass_assignment_of :password
   end
 
 Makes TDD so much easier.

data/lib/shoulda/active_record/macros.rb

@@ -140,9 +140,9 @@ module ThoughtBot # :nodoc:
 
         # Ensures that the attribute cannot be set on mass update.
         #
-        #   should_protect_attributes :password, :admin_flag
+        #   should_not_allow_mass_assignment_of :password, :admin_flag
         #
-        def should_protect_attributes(*attributes)
+        def should_not_allow_mass_assignment_of(*attributes)
           get_options!(attributes)
           klass = model_class
 
@@ -161,11 +161,16 @@ module ThoughtBot # :nodoc:
           end
         end
 
+        def should_protect_attributes(*attributes)
+          warn "[DEPRECATION] should_protect_attributes is deprecated; use should_not_allow_mass_assignment_of.  Please see http://thoughtbot.lighthouseapp.com/projects/5807/tickets/106-should_allow_attributes for more information."
+          should_not_allow_mass_assignment_of(*attributes)
+        end
+
         # Ensures that the attribute can be set on mass update.
         #
-        #   should_allow_attributes :name, :email
+        #   should_allow_mass_assignment_of :name, :email
         #
-        def should_allow_attributes(*attributes)
+        def should_allow_mass_assignment_of(*attributes)
           get_options!(attributes)
           klass = model_class
 
@@ -184,6 +189,14 @@ module ThoughtBot # :nodoc:
           end
         end
 
+        # <b>DEPRECATED:</b> Please see
+        # http://thoughtbot.lighthouseapp.com/projects/5807/tickets/106-should_allow_attributes for more
+        # information.
+        def should_allow_attributes(*attributes)
+          warn "[DEPRECATION] should_allow_attributes is deprecated; use should_allow_mass_assignment_of.  Please see http://thoughtbot.lighthouseapp.com/projects/5807/tickets/106-should_allow_attributes for more information."
+          should_allow_mass_assignment_of(*attributes)
+        end
+
         # Ensures that the attribute cannot be changed once the record has been created.
         #
         #   should_have_readonly_attributes :password, :admin_flag

data/test/fail_macros.rb

@@ -9,7 +9,7 @@ module Thoughtbot
     #
     #   should_fail do
     #     should_require_attributes :comments
-    #     should_protect_attributes :name
+    #     should_not_allow_mass_assignment_of :name
     #   end
     def should_fail(&block)
       context "should fail when trying to run:" do

data/test/unit/tag_test.rb

@@ -6,10 +6,10 @@ class TagTest < Test::Unit::TestCase
 
   should_ensure_length_at_least :name, 2
 
-  should_protect_attributes :secret
+  should_not_allow_mass_assignment_of :secret
 
   should_fail do
-    should_protect_attributes :name
+    should_not_allow_mass_assignment_of :name
     should_have_valid_fixtures
   end
 end

data/test/unit/user_test.rb

@@ -33,8 +33,8 @@ class UserTest < Test::Unit::TestCase
   should_allow_values_for :email, "a@b.com", "asdf@asdf.com"
   should_ensure_length_in_range :email, 1..100
   should_ensure_value_in_range :age, 1..100
-  should_protect_attributes :password
-  should_allow_attributes :name, :email
+  should_not_allow_mass_assignment_of :password
+  should_allow_mass_assignment_of :name, :email
   should_have_class_methods :find, :destroy
   should_have_instance_methods :email, :age, :email=, :valid?
   should_have_db_columns :name, :email, :age
@@ -50,7 +50,7 @@ class UserTest < Test::Unit::TestCase
   should_have_readonly_attributes :name
 
   should_fail do
-    should_protect_attributes :name, :age
-    should_allow_attributes :password
+    should_not_allow_mass_assignment_of :name, :age
+    should_allow_mass_assignment_of :password
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: francois-shoulda
 version: !ruby/object:Gem::Version 
-  version: 2.0.5.2
+  version: 2.0.5.4
 platform: ruby
 authors: 
 - Tammer Saleh