access_schema 0.1.0 → 0.2.0

data/lib/access_schema/builders/namespace_builder.rb

@@ -1,7 +1,7 @@
 module AccessSchema
   class NamespaceBuilder < BasicBuilder
 
-    def privilege(name, roles, &block)
+    def privilege(name, roles = [], &block)
       element = Element.new(name.to_sym, roles.map(&:to_sym))
       if block_given?
         builder = ElementBuilder.new(element)

data/lib/access_schema/element.rb

@@ -13,9 +13,9 @@ module AccessSchema
       @expectations << expectation
     end
 
-    def allow?(role)
-      @roles.include?(role) || begin
-        checklist = @expectations.select { |exp| exp.for?(role) }
+    def allow?(roles)
+      (@roles & roles).size > 0 || begin
+        checklist = @expectations.select { |exp| exp.for?(roles) }
         checklist.length > 0 && checklist.all? { |exp| yield(exp) }
       end
     end

data/lib/access_schema/expectation.rb

@@ -10,8 +10,8 @@ module AccessSchema
       @options = options
     end
 
-    def for?(role)
-      @roles.include?(role)
+    def for?(roles)
+      (@roles & roles).size > 0
     end
   end
 end

data/lib/access_schema/proxy.rb

@@ -15,25 +15,35 @@ module AccessSchema
     end
 
     def allow?(*args)
+      @schema.allow?(*normalize_args(args))
+    end
+
+    def require!(*args)
+      @schema.require!(*normalize_args(args))
+    end
+
+    def with_options(options)
+      Proxy.new(self, options)
+    end
+
+    private
+
+    def normalize_args(args)
       namespace = args[0]
       feature = args[1]
 
-      role, options = case args[2]
-      when Symbol, String
-        [args[2], args[3]]
+      roles, options = case args[2]
+      when Hash, nil
+        [@options[:role] || @options[:plan], args[2] || {}]
       else
-        [@options[:role] || @options[:plan], args[2]]
+        [args[2], args[3] || {}]
       end
 
-      @schema.allow?(namespace, feature, role, options)
-    end
+      options_to_pass = @options.dup
+      options_to_pass.delete :plan
+      options_to_pass.delete :role
 
-    def require!(*args)
-      @schema.require!(*args)
-    end
-
-    def with_options(options)
-      Proxy.new(@schema, options)
+      [namespace, feature, roles, options_to_pass.merge(options)]
     end
 
   end

data/lib/access_schema/schema.rb

@@ -31,21 +31,34 @@ module AccessSchema
     end
 
     def require!(*args)
+      check!(*normalize_args(args))
+    end
+
+    private
+
+    def normalize_args(args)
+      #Rails.logger.debug("schema normalize args: #{args.inspect}")
+
       options = args.last.is_a?(Hash) ? args.pop : {}
+      roles = args[2]
+      roles = roles.respond_to?(:map) ? roles.map(&:to_sym) : [roles.to_sym]
+      privilege =  args[1].to_sym
+
       case args[0]
       when String, Symbol
-        check!(args[0].to_sym, args[1].to_sym, args[2].to_sym, options)
+        namespace = args[0].to_sym
+        [namespace, privilege, roles, options]
       else
-        check!(args[0].class.name.to_sym, args[1].to_sym, args[2].to_sym, options.merge(:subject => args[0]) )
+        namespace = args[0].class.name.to_sym
+        [namespace, privilege, roles, options.merge(:subject => args[0])]
       end
-    end
 
-    private
-
-    def check!(namespace_name, element_name, role, options)
+    end
 
+    def check!(namespace_name, element_name, roles, options)
+      #Rails.logger.debug [namespace_name, element_name, roles, options].inspect
       allowed = for_element(namespace_name, element_name) do |element|
-        element.allow?(role) do |expectation|
+        element.allow?(roles) do |expectation|
           check_assert(expectation, options)
         end
       end

data/lib/access_schema/version.rb

@@ -1,3 +1,3 @@
 module AccessSchema
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/{assess_schema → access_schema}/proxy_spec.rb

@@ -13,7 +13,7 @@ describe AccessSchema::Proxy do
   describe "#with_options" do
 
     before do
-      @schema = @proxy.with_options(:plan => :flower)
+      @schema = @proxy.with_options(:plan => [:flower], :user_id => 1)
     end
 
     it "allows to not specify plan for schema calls" do
@@ -25,6 +25,11 @@ describe AccessSchema::Proxy do
       @schema.allow?("Review", :mark_featured, :none).should be_false
     end
 
+    it "passes options to schema" do
+      @proxy.should_receive(:allow?).with("Review", :mark_featured, [:flower], {:user_id => 1})
+      @schema.allow?("Review", :mark_featured)
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: access_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies: []
 description: AccessSchema is a tool for ACL or tariff plans schema definition and
   checks
@@ -44,11 +44,11 @@ files:
 - lib/access_schema/proxy.rb
 - lib/access_schema/schema.rb
 - lib/access_schema/version.rb
+- spec/access_schema/config_builder_spec.rb
+- spec/access_schema/proxy_spec.rb
+- spec/access_schema/schema_builder_spec.rb
+- spec/access_schema/schema_spec.rb
 - spec/access_schema_spec.rb
-- spec/assess_schema/config_builder_spec.rb
-- spec/assess_schema/proxy_spec.rb
-- spec/assess_schema/schema_builder_spec.rb
-- spec/assess_schema/schema_spec.rb
 - spec/schema_example.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -76,10 +76,10 @@ signing_key:
 specification_version: 3
 summary: AccessSchema is an ACL tool
 test_files:
+- spec/access_schema/config_builder_spec.rb
+- spec/access_schema/proxy_spec.rb
+- spec/access_schema/schema_builder_spec.rb
+- spec/access_schema/schema_spec.rb
 - spec/access_schema_spec.rb
-- spec/assess_schema/config_builder_spec.rb
-- spec/assess_schema/proxy_spec.rb
-- spec/assess_schema/schema_builder_spec.rb
-- spec/assess_schema/schema_spec.rb
 - spec/schema_example.rb
 - spec/spec_helper.rb