accessible_for 0.3.0 → 0.3.1

data/README.markdown

@@ -28,14 +28,25 @@ accessible_for API (to avoid name conflicts).
     class TacoShop < Controller
       include AccessibleFor
 
-      # there are no implicit roles and you can declare only one group at a time
-      accessible_for :default => [ :filling, :topping, :rating ]
+      # there are no implicit roles and
+      # you can declare only one role for each set of attributes
+      accessible_for :customer => [ :filling, :topping, :rating ]
       accessible_for :manager => [ :filling, :topping, :price ]
-  
+
+      # you can declare a role multiple times to add attributes,
+      # and specify a single value instead of an array
+      accessible_for :manager => :promotion
+
+      # If that's not DRY enough can compose access lists from other roles
+      # using the class method accessible_attributes
+      accessible_for :common   => [ :filling, :topping ]
+      accessible_for :customer => accessible_attributes(:common) + [ :rating ]
+      accessible_for :manager  => accessible_attributes(:common) + [ :price, :promotion ]
+
       def update
         Taco.find(params[:id]).update_attributes!(taco_params)
       end
-  
+
       protected
   
       def taco_params
@@ -44,11 +55,19 @@ accessible_for API (to avoid name conflicts).
         if current_user.manager?
           sanitize_for :manager, params[:taco]
         else
-          sanitize_for :default, params[:taco]
+          sanitize_for :customer, params[:taco]
         end
       end
     end
 
+
+It's also possible to call sanitize_for with a block to loop over the
+accessible name/value pairs:
+
+    sanitize_for(:default, params[:taco]) do |name, value|
+      puts "#{name}: #{value}"
+    end
+
 ## ActiveModel-workalike API
 
     require 'mass_assignment_backport'

data/lib/accessible_for.rb

@@ -1,7 +1,7 @@
 require 'mass_assignment_backport'
 
 module AccessibleFor
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 
   def self.included(mod)
     mod.extend ClassMethods
@@ -14,11 +14,14 @@ module AccessibleFor
       params.each do |role, attrs|
         self._accessible_attributes ||= {}
         [role].flatten.each do |name|
-          self._accessible_attributes[name] ||= []
-          self._accessible_attributes[name] += [attrs].flatten
+          self._accessible_attributes[name] = accessible_attributes(name) + [attrs].flatten
         end
       end
     end
+
+    def accessible_attributes role
+      _accessible_attributes[role] || []
+    end
   end
 
   def sanitize_for role, values
@@ -26,14 +29,17 @@ module AccessibleFor
     if !self.class._accessible_attributes || self.class._accessible_attributes[role].nil?
       return {}
     end
-    {}.tap do |result|
-      values.each do |k, v|
-        if self.class._accessible_attributes[role].include?(k.to_sym)
-          yield k, v if block_given?
+    result = block_given? ? nil : {}
+    values.each do |k, v|
+      if self.class._accessible_attributes[role].include?(k.to_sym)
+        if block_given?
+          yield k, v
+        else
           result[k] = v
         end
       end
     end
+    result
   end
 end
 

data/lib/mass_assignment_backport.rb

@@ -5,7 +5,6 @@ module MassAssignmentBackport
   end
 
   module ClassMethods
-
     def attr_accessible *args
       options = args.last.kind_of?(Hash) ? args.pop : {}
       role = options[:as] || :default
@@ -13,7 +12,7 @@ module MassAssignmentBackport
     end
 
     def accessible_attributes role=:default
-      _accessible_attributes[role] || []
+      super role
     end
   end
 

data/test/accessible_for_test.rb

@@ -3,7 +3,7 @@ require 'accessible_for'
 class AccessibleForTest < MiniTest::Unit::TestCase
   include AccessibleFor
   accessible_for :default => :topping
-  accessible_for :manager => [:price, :topping]
+  accessible_for :manager => accessible_attributes(:default) + [:price]
 
   def test_nil_params
     assert_nil sanitize_for(:default, nil)
@@ -27,7 +27,7 @@ class AccessibleForTest < MiniTest::Unit::TestCase
 
   def test_accessible_role
     manager = sanitize_for :manager, :topping => 'salsa', :price => 123, :extra => 'foo'
-    assert manager.has_key?(:topping), "role gets accessible key"
+    assert manager.has_key?(:topping), "role gets accessible key by querying another role"
     assert manager.has_key?(:price),   "role gets second accessible key"
     assert !manager.has_key?(:extra),  "role does not get extra key"
   end

data/test/mass_assignment_test.rb

@@ -9,6 +9,14 @@ class MassAssignmentTest < MiniTest::Unit::TestCase
     assert_nil sanitize_for_mass_assignment(nil)
   end
 
+  def test_accessible_attributes_default
+    assert_equal [:topping], self.class.accessible_attributes
+  end
+
+  def test_accessible_attributes_role
+    assert_equal [:topping, :price], self.class.accessible_attributes(:manager)
+  end
+
   def test_block_form
     result = {}
     sanitize_for_mass_assignment(:topping => 'salsa', :price => 123, :extra => 'foo') do |k,v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: accessible_for
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors: