role_authorization 0.5.0 → 0.5.1

data/lib/role_authorization/controller/mapper.rb

@@ -19,8 +19,30 @@ module RoleAuthorization
       output.join("\n")
     end
 
+    def with_options(options, &block)
+      unless block.nil?
+        @with_options = options
+        instance_eval(&block)
+        @with_options = nil
+      end
+    end
+
     def add_to_rules(rule_name, *options, &block)
-      rule = RoleAuthorization::Rules::Rule.new(*options, &block)
+      extracted_options, extracted_role = if options.is_a?(Hash)
+                                            [options, nil]
+                                          elsif options.last.is_a?(Hash)
+                                            [options.pop, options.first]
+                                          else
+                                            [{}, options.first]
+                                          end
+
+      merged_options = if @with_options.nil?
+                         extracted_options
+                       else
+                         @with_options.merge(extracted_options)
+                       end
+
+      rule = RoleAuthorization::Rules::Rule.new(extracted_role, merged_options, &block)
 
       actions = ([rule.options[:only] || [:all]]).flatten.map(&:to_sym)
 

data/lib/role_authorization/rules/rule.rb

@@ -7,15 +7,10 @@ module RoleAuthorization
       # for calls to authorized?
       attr_accessor :controller_instance, :controller, :action, :id
 
-      def initialize(*options, &block)
+      def initialize(role, options, &block)
         @returning = block
-        @options, @role = if options.is_a?(Hash)
-                            [options, nil]
-                          elsif options.last.is_a?(Hash)
-                            [options.pop, options.first]
-                          else
-                            [{}, options.first]
-                          end
+        @role = role
+        @options = options
 
         self
       end

data/lib/role_authorization/version.rb

@@ -1,3 +1,3 @@
 module RoleAuthorization
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: role_authorization
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - John 'asceth' Long