access_schema 0.6.0 → 0.6.1

data/lib/access_schema/schema.rb

@@ -37,27 +37,47 @@ module AccessSchema
 
     def normalize_args(args)
 
-      options = args.last.is_a?(Hash) ? args.pop : {}
       privilege =  args[1].to_s
-      roles = args[2]
+      options = args.last.is_a?(Hash) ? args.pop : {}
 
-      case args[0]
-      when String, Symbol
-        resource = args[0].to_s
-      else
-        resource = args[0].class.name.to_s
-        options.merge!(:subject => args[0])
+      if !subject_by_name?(args[0]) && options[:subject].nil?
+        options.merge! :subject => args[0]
       end
 
-      roles = calculate_roles(roles, options)
+      roles = calculate_roles(args[2], options)
 
       if (self.roles & roles).empty?
         raise InvalidRolesError.new(:roles => roles)
       end
 
-      roles = sort_roles(roles)
+      [
+        resource_name(args[0]),
+        privilege,
+        sort_roles(roles),
+        options
+      ]
+    end
 
-      [resource, privilege, roles, options]
+    def resource_name(obj)
+      if subject_by_name?(obj)
+        obj.to_s
+      else
+        klass = obj.class
+        if klass.respond_to?(:model_name)
+          klass.model_name
+        else
+          klass.name
+        end
+      end
+    end
+
+    def subject_by_name?(obj)
+      case obj
+      when String, Symbol
+        true
+      else
+        false
+      end
     end
 
     def calculate_roles(roles, check_options)
@@ -105,9 +125,14 @@ module AccessSchema
 
       roles_checks = roles.map do |role|
         privilege.allow?([role]) do |expectation|
-          @asserts[expectation.name].check?(expectation.options.merge(options)).tap do |result|
+
+          assert = @asserts[expectation.name]
+          check_options = expectation.options.merge(options)
+
+          assert.check?(check_options).tap do |result|
             failed_asserts[role] << expectation.name unless result
           end
+
         end
       end
 

data/lib/access_schema/version.rb

@@ -1,3 +1,3 @@
 module AccessSchema
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/access_schema/schema_spec.rb

@@ -107,6 +107,21 @@ describe AccessSchema::Schema do
 
     end
 
+    it "uses subject from options hash if present" do
+
+      @passed_options = nil
+      roles_calculator = proc do |options|
+        @passed_options = options
+        [:admin]
+      end
+      subject = Review.new
+      subject_new = Review.new
+      @schema.allow? subject, :update, roles_calculator, :subject => subject_new
+      @passed_options.should be
+      @passed_options[:subject].should == subject_new
+
+    end
+
     it "passes a copy of options hash" do
 
       @passed_options = {:option1 => :value1}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: access_schema
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies: []
 description: AccessSchema is a tool for ACL or tariff plans schema definition and
   checks
@@ -70,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2599107486354606054
+      hash: -3365791648219455708
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2599107486354606054
+      hash: -3365791648219455708
 requirements: []
 rubyforge_project: access_schema
 rubygems_version: 1.8.16