picky_guard 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85e21fc9a0ae52614b7d70dbebb39ab9019f3f11
-  data.tar.gz: 3e38e07bda2744f1e375211f58f116e1aa90260f
+  metadata.gz: 05770d49279b304879e3c1b03fa2fee62dd6dcb4
+  data.tar.gz: c42d2fa5d6c4f032107b78bdfa606373daf46881
 SHA512:
-  metadata.gz: 6aae898c5bc7ad35b4df8f927015c0501ca7ad7944d137564f41dc357473fe555496f14b604fc8316522ff271bb65eb51773306e58be62997052b72bb87eb79c
-  data.tar.gz: 99a83a8bab4bb4f568011a70a406564441c3b3338b74640e4142826f51a0de08b619da4b46da7e5ee47c5a3de3845234db9242fdb42ff40b6507428de781ec4d
+  metadata.gz: 445dde3b61dfa42968a1a0a1b18a9e67acbe0bb306dd2e7c36b19a75f1ac6190ed175e9d08c9e535a24487a35b2fb666fd438bb4d6596b0e5775cde2ad0966d4
+  data.tar.gz: 50b0aac7c2b3e5a3d4a159dd220ced3742175c49fb1486125af83c4b68956a938bb48cfe33f50b2c90e8e75646abec2ed50d3e4b1d7f9a062dc9ce6bafd862cc

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
 
+## 0.1.5
+Evaluate conditions proc in context of policy instance
+
 ## 0.1.0
 Initial deployment.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    picky_guard (0.1.3)
+    picky_guard (0.1.5)
       activerecord (>= 4.2)
       cancancan (>= 2.0)
 

data/README.md

@@ -282,6 +282,16 @@ Ability.new(user, Campaign).can? :read, Campaign.first
 
 This will load only relevant policies.
 
+## Troubleshooting
+
+### If your application has problems with loading classes,
+
+put the following code into your `application.rb`:
+```
+config.autoload_paths += %W[#{config.root}/app/picky_guard]
+config.autoload_paths += %W[#{config.root}/app/picky_guard/policies]
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/generators/picky_guard/templates/ability.rb

@@ -4,6 +4,7 @@ require 'picky_guard/loader'
 
 class Ability < PickyGuard::Loader
   def initialize(user)
+    super(user)
     adjust(user, UserRoleChecker, ResourceActions, RolePolicies)
   end
 end

data/lib/picky_guard/loader.rb

@@ -8,6 +8,7 @@ module PickyGuard
 
     def initialize(_user, *resources_whitelist)
       @resources_whitelist = resources_whitelist
+      @statement_policy_map = {}
     end
 
     def adjust(user, user_role_checker_class, resource_actions_class, role_policies_class)
@@ -53,12 +54,18 @@ module PickyGuard
 
     def eval_conditions_if_needed(statement)
       if statement.conditions.is_a? Proc
-        statement.conditions.call
+        eval_statement_conditions(statement)
       else
         statement.conditions
       end
     end
 
+    def eval_statement_conditions(statement)
+      policy = @statement_policy_map[statement]
+      proc = statement.conditions
+      policy.instance_eval(&proc)
+    end
+
     def positive?(effect)
       effect == Statement::EFFECT_ALLOW
     end
@@ -71,18 +78,26 @@ module PickyGuard
     end
 
     def gather_statements(user, policies, resource_actions)
-      policies.map { |policy_class| policy_class.new(user) }
-              .map do |policy|
-                statements = policy.statements(@resources_whitelist)
-                validate_statements!(resource_actions, statements)
-              end.flatten
+      actual_policy_instances(policies, user).map do |policy|
+        statements = policy.statements(@resources_whitelist)
+        validate_statements!(resource_actions, statements)
+        map_policy_statements(policy, statements)
+      end.flatten
+    end
+
+    def actual_policy_instances(policy_classes, user)
+      policy_classes.map { |policy_class| policy_class.new(user) }
+    end
+
+    def map_policy_statements(policy, statements)
+      statements.each { |statement| @statement_policy_map[statement] = policy }
+      statements
     end
 
     def validate_statements!(resource_actions, statements)
       statements.each do |statement|
         validate_statement!(resource_actions, statement)
       end
-      statements
     end
 
     def validate_statement!(resource_actions, statement)

data/lib/picky_guard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PickyGuard
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky_guard
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Eunjae Lee