regulator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3db854196ef6578280ed448fe9fdf888c91742a
-  data.tar.gz: 88a9856bac4ae6d00216011a05e7ed543fafc17e
+  metadata.gz: debaf2d2834f1f40dfb69f5d16f20a8b0f887d7e
+  data.tar.gz: a894788600e922d6fca85ae7897a08f76d7fdbcd
 SHA512:
-  metadata.gz: 2b588448c03f5b60d767b6b0b790968a6cccad90be5274a687dc84a6f79de96ecaafce62338655768c8d97ebbceece0abf6d2dd94de5274479d71121527ddd3c
-  data.tar.gz: 96770fb5bb9a7639eea0bfe695a3c98d109e2f904fc51fde933f9d36f535c5d024a3761a518ffed57715e9d73e51aa3b34718b0507bc799d2bcac99ac8244cf4
+  metadata.gz: 10a08ae8dc44b46b4a3bde10f5802ea32543b3f9ae55668ceae101439dc594dd0ef11f25a548706a44e07e8928527198a7a5369f6f4742c4db80dde8e00c1178
+  data.tar.gz: fe9af60ae01fd42e0ce9ad509c4feff5c696d244bf57318603844f3908a35955f7760b7449a48fb17ce552fdc21715869d8bd0d77eca22461f8bac302de405b0

data/.travis.yml

@@ -1,11 +1,10 @@
 language: ruby
 before_install: gem install bundler -v 1.10.5
 rvm:
+  - 2.2.0
   - 2.0.0
   - 2.1.5
-  - 2.2.0
   - jruby-19mode
-  - rbx-2
 env:
   - RSPEC_VERSION="<2.99"
   - RSPEC_VERSION="~>3.0

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Regulator
 
+## 0.1.1 (2015-07-23)
+- Regulator.authorize support for controller namespacing
+- Regulator can accept a controller instance or an explicity modules name
+  - Regulator.policy!(user,resource, my_controller_instance)
+  - Regulator.policy!(user,resource, Api::V2)
+  
 ## 0.1.0 (2015-07-23)
 - initial release
 - pundit compatible
 - controller based policy namespacing
+ActiveAdmin.application.regulator_policy_namespace

data/README.md

@@ -16,7 +16,9 @@ Why not contribute to pundit? [It's](https://github.com/elabs/pundit/issues/12)
 ## TODOs
   * [ ] generators
     * [ ] activeadmin-regulator-adapter gem or generator
-  * [ ] documentation (Usage section below, mock pundits)
+  * [ ] documentation
+    * [ ] Usage section below, mock pundit's
+    * [ ] yard doc
     * [ ] Lotus examples
     * [ ] Grape examples
     * [ ] ROM examples

data/lib/regulator/policy_finder.rb

@@ -2,10 +2,17 @@ module Regulator
   class PolicyFinder
     attr_reader :object
     attr_reader :controller
+    attr_reader :namespace
 
-    def initialize(object, controller = nil)
+    def initialize(object, controller_or_namespace = nil)
       @object = object
-      @controller = controller
+
+      if controller_or_namespace.is_a?(Module)
+        @namespace = controller_or_namespace
+      elsif controller_or_namespace
+        @controller = controller_or_namespace
+        @namespace  = @controller.policy_namespace
+      end
     end
 
     def scope
@@ -64,11 +71,7 @@ module Regulator
 
         policy_name = "#{klass}#{SUFFIX}"
 
-        if controller
-          "#{controller.policy_namespace}::#{policy_name}"
-        else
-          policy_name
-        end
+        namespace ? "#{namespace}::#{policy_name}" : policy_name
       end
     end
 

data/lib/regulator/version.rb

@@ -1,3 +1,3 @@
 module Regulator
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/regulator.rb

@@ -20,6 +20,7 @@ module Regulator
         @query  = options[:query]
         @record = options[:record]
         @policy = options[:policy]
+        @controller_or_namespace = options[:controller_or_namespace]
 
         message = options.fetch(:message) { "not allowed to #{query} this #{record.inspect}" }
       end
@@ -34,32 +35,32 @@ module Regulator
   extend ActiveSupport::Concern
 
   class << self
-    def authorize(user, record, query)
-      policy = policy!(user, record)
+    def authorize(user, record, query, controller_or_namespace = nil)
+      policy = policy!(user, record, controller_or_namespace)
 
       unless policy.public_send(query)
-        raise NotAuthorizedError.new(query: query, record: record, policy: policy)
+        raise NotAuthorizedError.new(query: query, record: record, policy: policy, controller_or_namespace: controller_or_namespace)
       end
 
       true
     end
 
-    def policy_scope(user, scope, controller = nil)
-      policy_scope = PolicyFinder.new(scope,controller).scope
+    def policy_scope(user, scope, controller_or_namespace = nil)
+      policy_scope = PolicyFinder.new(scope,controller_or_namespace).scope
       policy_scope.new(user, scope).resolve if policy_scope
     end
 
-    def policy_scope!(user, scope, controller = nil)
-      PolicyFinder.new(scope,controller).scope!.new(user, scope).resolve
+    def policy_scope!(user, scope, controller_or_namespace = nil)
+      PolicyFinder.new(scope,controller_or_namespace).scope!.new(user, scope).resolve
     end
 
-    def policy(user, record, controller = nil)
-      policy = PolicyFinder.new(record,controller).policy
+    def policy(user, record, controller_or_namespace = nil)
+      policy = PolicyFinder.new(record,controller_or_namespace).policy
       policy.new(user, record) if policy
     end
 
-    def policy!(user, record, controller = nil)
-      PolicyFinder.new(record,controller).policy!.new(user, record)
+    def policy!(user, record, controller_or_namespace = nil)
+      PolicyFinder.new(record,controller_or_namespace).policy!.new(user, record)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regulator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Cory O'Daniel