attr_accessible_block 0.3.0 → 0.3.1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea/

data/.rspec

@@ -0,0 +1 @@
+--backtrace

data/README.md

@@ -1,4 +1,4 @@
-AttrAccessibleBlock 0.3.0
+AttrAccessibleBlock 0.3.1
 =========================
 
 [![travis-ci status](https://secure.travis-ci.org/dmitry/attr_accessible_block.png)](http://travis-ci.org/dmitry/attr_accessible_block)
@@ -87,10 +87,14 @@ Just add this code to the `config/initializers/plugins.rb` file:
 
     ActiveModel::MassAssignmentSecurity::WhiteListBlock.always_accessible { user.admin? }
 
-NOTICE: when using attr_accessible as a block, then no second parameter is available for the `attributes=` method (guard_protected_attributes = true). Instead use power of blocks! Also do not use attr_protected, because it's bad :)
+It works even with standard `attr_accessible`, look into specs to see behaviour.
+
+> NOTE: if you are getting `stack level too deep` then you have recursive call of the model object in `always_accessible` or `add_variable` blocks. Try to avoid it.
 
 Should be STI compatible, but haven't tested yet. Need's feedback on this feature. Feel free to contact with me if something goes wrong.
 
+And there is more, you always still can use old implementation of the `attr_accessible`, just use `old_attr_accessible` method in your models.
+
 For more answers on your questions you can look into tests and source code.
 
 Used on http://tenerife.by

data/lib/attr_accessible_block.rb

@@ -5,14 +5,11 @@ module ActiveModel::MassAssignmentSecurity
     alias_method :old_attr_accessible, :attr_accessible
 
     def attr_accessible(*attributes, &block)
-      if block_given?
-        class_attribute(:attr_accessible_block)
-        self.attr_accessible_block = block
+      class_attribute(:attr_accessible_block)
 
-        include InstanceMethods
-      else
-        old_attr_accessible(*attributes)
-      end
+      self.attr_accessible_block = (block_given? ? block : proc { add attributes })
+
+      include InstanceMethods
     end
 
     module InstanceMethods

data/lib/attr_accessible_block/version.rb

@@ -1,3 +1,3 @@
 module AttrAccessibleBlock
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/attr_accessible_block_spec.rb

@@ -29,8 +29,10 @@ class User < BaseModel
 
   attr_accessible :email, :password, :date
 
+  @@user = User.new
+
   def self.current
-    User.new
+    @@user
   end
 end
 
@@ -55,6 +57,16 @@ describe AttrAccessibleBlock do
     user.role.should be_nil
   end
 
+  it "should have standard static attr_accessible that always accessible" do
+    u = User.new.tap { |u| u.role = :admin }
+    User.should_receive(:current).twice.and_return(u)
+    user = User.new(:email => 'test@test.com', :password => 'test', 'date(i0)' => '10', :role => 'admin')
+    user.password.should eq 'test'
+    user.email.should eq 'test@test.com'
+    user.date.should eq '10'
+    user.role.should eq 'admin'
+  end
+
   it "should have block attr_accessible" do
     location = Location.new(:name => 'test', :size => 10, :user => 'user', 'point(i2)' => '10')
     location.name.should eq 'test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attr_accessible_block
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &18285840 !ruby/object:Gem::Requirement
+  requirement: &8837640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *18285840
+  version_requirements: *8837640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18284400 !ruby/object:Gem::Requirement
+  requirement: &8836740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18284400
+  version_requirements: *8836740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18282700 !ruby/object:Gem::Requirement
+  requirement: &8834580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18282700
+  version_requirements: *8834580
 description: Set attr_accessible attributes on runtime.
 email:
 - dmitry.polushkin@gmail.com
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - Gemfile.lock