subroutine 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1bc6198e47ce610c393d061ea8d657d9fbaed30
-  data.tar.gz: d51c78f5328d91119eb2ec1c252383645d8e9485
+  metadata.gz: 51dd4d01f29eee0ec20fedb8cd5fc0de95ce73db
+  data.tar.gz: 8dad3a9f2520e5512c2132a56ed75867f9c4b4fa
 SHA512:
-  metadata.gz: 265862ad55b33f9c16ab8665666d870480d7297c095dcd9a387e86d8c4a7ff81b512cae2a2cfbaea57eda3ffff134c4a943b6bf1835a2508a59be11661fd4e0c
-  data.tar.gz: e4b8325a9f266f14bf1915ca05080e74d3e7361a759433997e4f4d602df8ed5a63707933e0e636b741868bbd9d1443cfea004a1080176faf4f5ca69b4883a40e
+  metadata.gz: bedcc9b19e8e29542920bfb858a2022440d99486b85da42f9d7aed895487e24fc249bfc379301f5e07f7348af769a0e3dced6873746c030bd51b117d3c2b4e23
+  data.tar.gz: 49c40b9764b62942b64623b1891fb1626e6c6756d627b99c3fa10f62f8d1f7c792a55286fbcedf4ee5ad3d969387e67303fcfb982fe0519f077bdf6d0c76026d

data/lib/subroutine/auth.rb

@@ -58,11 +58,32 @@ module Subroutine
       end
 
       # policy :can_update_user
+      # policy :can_update_user, unless: :dont_do_it
+      # policy :can_update_user, if: :do_it
       # policy :can_do_whatever, policy: :foo_policy
       def policy(*meths)
         opts = meths.extract_options!
         policy_name = opts[:policy] || :policy
+
+        if_conditionals = Array(opts[:if])
+        unless_conditionals = Array( opts[:unless])
+
         validate unless: :skip_auth_checks? do
+          run_it = true
+          # http://guides.rubyonrails.org/active_record_validations.html#combining-validation-conditions
+
+          # The validation only runs when all the :if conditions
+          if if_conditionals.present?
+            run_it &&= if_conditionals.all? { |i| send(i) }
+          end
+
+          # and none of the :unless conditions are evaluated to true.
+          if unless_conditionals.present?
+            run_it &&= unless_conditionals.none? { |u| send(u) }
+          end
+
+          next unless run_it
+
           p = self.send(policy_name)
           if !p || meths.any?{|m| !(p.respond_to?("#{m}?") ? p.send("#{m}?") : p.send(m)) }
             unauthorized! opts[:error]

data/lib/subroutine/version.rb

@@ -2,7 +2,7 @@ module Subroutine
 
   MAJOR = 0
   MINOR = 5
-  PATCH = 2
+  PATCH = 3
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/subroutine/auth_test.rb

@@ -65,5 +65,26 @@ module Subroutine
       op.submit!
     end
 
+    def test_it_runs_policies_with_conditionals
+       # if: false
+      op = IfConditionalPolicyOp.new(user, check_policy: false)
+      assert op.submit!
+       # unless: true
+      op = UnlessConditionalPolicyOp.new(user, unless_check_policy: true)
+      assert op.submit!
+
+      # if: true
+      op = IfConditionalPolicyOp.new(user, check_policy: true)
+      assert_raises ::Subroutine::Auth::NotAuthorizedError do
+        op.submit!
+      end
+
+      # unless: false
+      op = UnlessConditionalPolicyOp.new(user, unless_check_policy: false)
+      assert_raises ::Subroutine::Auth::NotAuthorizedError do
+        op.submit!
+      end
+    end
+
   end
 end

data/test/support/ops.rb

@@ -174,6 +174,42 @@ class PolicyOp < OpWithAuth
   end
 end
 
+class IfConditionalPolicyOp < OpWithAuth
+
+  class FakePolicy
+    def user_can_access?
+      false
+    end
+  end
+
+  require_user!
+  boolean :check_policy
+  validates :check_policy, inclusion: { in: [true,false] }
+  policy :user_can_access?, if: :check_policy
+
+  def policy
+    @policy ||= FakePolicy.new
+  end
+end
+
+class UnlessConditionalPolicyOp < OpWithAuth
+
+  class FakePolicy
+    def user_can_access?
+      false
+    end
+  end
+
+  require_user!
+  boolean :unless_check_policy
+  validates :unless_check_policy, inclusion: { in: [true,false] }
+  policy :user_can_access?, unless: :unless_check_policy
+
+  def policy
+    @policy ||= FakePolicy.new
+  end
+end
+
 
 class OpWithAssociation < ::Subroutine::Op
   include ::Subroutine::Association

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel