access_schema 0.3.2 → 0.3.3

data/lib/access_schema/exceptions.rb

@@ -1,9 +1,16 @@
 module AccessSchema
 
-  class Error < RuntimeError
-  end
+  class Error < RuntimeError; end
 
-  class NotAlowedError < Error; end
+  class DefinitionError < Error; end
+  class CheckError < Error; end
+  class AccessError < CheckError; end
 
 
+  class NotAlowedError < AccessError; end
+
+  class NoRoleError < CheckError; end
+  class NoResourceError < CheckError; end
+  class NoPrivilegeError < CheckError; end
+
 end

data/lib/access_schema/schema.rb

@@ -39,10 +39,14 @@ module AccessSchema
     def normalize_args(args)
 
       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
 
+      roles = args[2]
+      roles = roles.respond_to?(:map) ? roles.map(&:to_sym) : [roles && roles.to_sym]
+
+      raise NoRoleError.new if (self.roles & roles).empty?
+
+
       case args[0]
       when String, Symbol
         namespace = args[0].to_sym
@@ -56,13 +60,17 @@ module AccessSchema
 
     def check!(namespace_name, element_name, roles, options)
 
+      existent_element = false
 
       allowed = for_element(namespace_name, element_name) do |element|
+        existent_element = true
         element.allow?(roles) do |expectation|
           check_assert(expectation, options)
         end
       end
 
+      raise NoPrivilegeError.new(:privilege => element_name.to_sym) unless existent_element
+
       format_log_payload = lambda {
         [
           "namespace = '#{namespace_name}'",
@@ -88,16 +96,22 @@ module AccessSchema
 
     def for_element(namespace, element)
       ns = namespace.to_sym
-      fn = element.to_sym
-      allowed = elements_for(ns).any? do |element|
-        if element.name == fn
+      en = element.to_sym
+
+      elements_for(ns).any? do |element|
+        if element.name == en
           yield(element)
         end
       end
+
     end
 
     def elements_for(namespace)
-      @namespaces[namespace].elements
+      if @namespaces.has_key?(namespace)
+        @namespaces[namespace].elements
+      else
+        raise NoResourceError.new(:resource => namespace)
+      end
     end
 
     private

data/lib/access_schema/version.rb

@@ -1,3 +1,3 @@
 module AccessSchema
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/access_schema/schema_spec.rb

@@ -28,7 +28,22 @@ describe AccessSchema::Schema, "errors rising" do
 
   describe "#allow?" do
 
-    it "raises exception on invalid namespace"
+    it "raises exception on invalid namespace" do
+      lambda {
+        @schema.allow? "Invalid", :mark_featured, :none
+      }.should raise_error(AccessSchema::NoResourceError)
+    end
+
+    it "raises exception on invalid role" do
+      lambda {
+        @schema.allow? "Review", :mark_featured, :invalid
+      }.should raise_error(AccessSchema::NoRoleError)
+
+      lambda {
+        @schema.allow? "Review", :mark_featured
+      }.should raise_error(AccessSchema::NoRoleError)
+    end
+
     it "raises exception on invalid feature"
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: access_schema
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies: []
 description: AccessSchema is a tool for ACL or tariff plans schema definition and
   checks
@@ -69,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3306335106501165569
+      hash: -3043700016320745078
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3306335106501165569
+      hash: -3043700016320745078
 requirements: []
 rubyforge_project: access_schema
 rubygems_version: 1.8.16