you_shall_not_pass 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ebad4de4047910ba8bc2684832012f9669ad584
-  data.tar.gz: 644514d9430543ac82fc12156b1c788e7742b806
+  metadata.gz: 7e812f579e8e53dd88d7baf6709a796ca5fb5789
+  data.tar.gz: 1afa8fbd75a3860ab0c177dd7b1bcbb02d48e225
 SHA512:
-  metadata.gz: c3f670c878377f76dd39e58971eace445b2f176ffc59160c41d526d2799e6922f95f06b2e8cf14e9e653defc1da346ec31172f41947e9bc352575d63297e9138
-  data.tar.gz: b3a1b8c9c9a550372727581bdafe217c58be3930d2db122a1e1ad1c54267be948cd59a92f913881b2d6a7f523f6dc607077338101802f9ec4e5ea01d4abb3e8d
+  metadata.gz: c57d8fdbc4e21e840b1254c982e281d6eca84cb697a7357002b5048acfce92a99beb13df5ef9ee63b7859db037e01f02d6b4a018a6f6153e9ab24abdc7fff05f
+  data.tar.gz: bf93d4ac763e4d5437a51c70966a5ff78bfb95f4b172d25d99978ef04fc76a934682e5cff24cdf5cd4d900ac0692cc5b9c56ea7266a4a9ffb480d9537ccd2864

data/.travis.yml

@@ -2,4 +2,5 @@ rvm:
   - 2.0.0
   - 2.1.1
   - 2.2.0
+  - 2.3.0
   - ruby-head

data/lib/you_shall_not_pass/authorizator.rb

@@ -13,8 +13,6 @@ module YouShallNotPass
       Array(policies.fetch(permission)).all? do |policy|
         Callable(policy).call(**args) == true
       end
-    rescue KeyError => exception
-      break_down_can(permission, exception, **args)
     end
 
     def can_all?(*permissions, **args)
@@ -25,20 +23,6 @@ module YouShallNotPass
       permissions.any? { |permission| can?(permission, **args)}
     end
 
-    def break_down_can(permission, exception, **args)
-      case permission
-      when /_and_/
-        permission.to_s.split("_and_").all? { |policy| can?(policy.to_sym, **args)}
-      when /_or_/
-        permission.to_s.split("_or_").any? { |policy| can?(policy.to_sym, **args)}
-      when /\Anot_/
-        policy = permission.to_s.gsub(/\Anot_/, "")
-        ! can?(policy.to_sym, **args)
-      else
-        raise exception
-      end
-    end
-
     def perform_if(permission, **args)
       yield if can?(permission, **args)
     end
@@ -68,31 +52,32 @@ module YouShallNotPass
     end
 
     private
+    def self.policy(name, &block)
+      __dsl_policies__[name] = proc { block }
+    end
 
-    def __set_policies__
-      the_policies = methods.grep(/_policies\z/).map {|name| send(name)}.each_with_object({}) do |curr, res|
-        res.merge!(curr)
-      end
-
-      the_policies.merge!( self.class.__dsl_policies__.each_with_object({}) { |policy, h|
-                            block =  policy.last
-                            h[policy.first] = instance_eval(&block)
-                          })
+    def self.attribute(attr)
+      fattr attr
+    end
+    private_class_method :attribute
 
-      the_policies
+    def __set_policies__
+      __method_policies__.merge!(__dsl_policies__)
     end
 
-    def self.__dsl_policies__
-      @__dsl_policies__ ||= {}
+    def __method_policies__
+      methods.grep(/_policies\z/).
+        each_with_object({}) { |name, res| res.merge!(send(name)) }
     end
 
-    def self.policy(name, &block)
-      __dsl_policies__[name] = proc { block }
+    def __dsl_policies__
+      self.class.__dsl_policies__. each_with_object({}) { |(name, value), res|
+        res[name] = instance_eval(&value)
+      }
     end
 
-    def self.attribute(attr)
-      fattr attr
+    def self.__dsl_policies__
+      @__dsl_policies__ ||= {}
     end
-    private_class_method :attribute
   end
 end

data/lib/you_shall_not_pass/version.rb

@@ -1,3 +1,3 @@
 module YouShallNotPass
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/you_shall_not_pass/authorizator_spec.rb

@@ -90,9 +90,13 @@ scope YouShallNotPass::Authorizator do
            can_action:  Action.new(true),
            cant_action: Action.new(false),
 
+           can_true_or_false:   true || false,
+           cant_true_and_false: true && false,
+
            can_true:    true,
            cant_false:  false,
 
+
            can_array:   [ true, proc { true }, true ],
            cant_array:  [ true, false,         true ],
           }
@@ -133,6 +137,18 @@ scope YouShallNotPass::Authorizator do
         ! authorizator.can?(:cant_false)
       end
 
+      spec "reject false" do
+        ! authorizator.can?(:cant_false)
+      end
+
+      spec "allow true or false" do
+        authorizator.can?(:can_true_or_false)
+      end
+
+      spec "reject true and false" do
+        ! authorizator.can?(:cant_true_and_false)
+      end
+
       spec "allow array" do
         authorizator.can?(:can_array)
       end
@@ -323,38 +339,6 @@ scope YouShallNotPass::Authorizator do
 
     let(:authorizator) { NumberAuthorizator.new }
 
-    spec "allow _and_" do
-      authorizator.can?(:one_and_two)
-    end
-
-    spec "reject _and_" do
-      ! authorizator.can?(:one_and_three)
-    end
-
-    spec "allow _or_" do
-      authorizator.can?(:one_or_two)
-    end
-
-    spec "reject _or_" do
-      ! authorizator.can?(:three_or_four)
-    end
-
-    spec "allow not_" do
-      authorizator.can?(:not_three)
-    end
-
-    spec "reject not_" do
-      ! authorizator.can?(:not_one)
-    end
-
-    spec "allow _and_or_" do
-      authorizator.can?(:one_and_two_or_three)
-    end
-
-    spec "reject _and_or_" do
-      ! authorizator.can?(:one_and_three_or_four)
-    end
-
     scope "regular policies vs conditional policies" do
       class ConditionalAuthorizator < YouShallNotPass::Authorizator
         def policies

data/you_shall_not_pass.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "matest", "~> 1.7.2"
+  spec.add_development_dependency "matest", "~> 1.7.4"
   
   spec.add_dependency "callable", "~> 0.0.5"
   spec.add_dependency "fattr", "~> 2.2.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: you_shall_not_pass
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Federico Iachetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.7.4
 - !ruby/object:Gem::Dependency
   name: callable
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Simple authorization library.