adeia 0.11.9 → 0.11.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f2005da7ce2db6dd77b22eabdd6fe3effba9f89
-  data.tar.gz: f1965eb93af81bb87ad476cb69ac3bc1d1ff5615
+  metadata.gz: b9d6c07a2891abd5fe509cbb2ab094e427f3d2f4
+  data.tar.gz: 39a5ad4657f7ed1a05f1861a024c5ea390d21564
 SHA512:
-  metadata.gz: b8b8e8434c798764bab4ce34c54bf4c706c4b4fcdcf01bd62869b5d2ecb504accb9da804c52c244209a14d1ce42c4fb06b8b5c5c53637abc5e9a2aafb3de0cd4
-  data.tar.gz: 0a736d2021a5fd294a9c2fde0be5e4e9f6957489317f9fd6c06946ded8d4d0ac175d6853416e886b89e348dc719540be3d3619f7ba1873055ceabf9c9126f7d3
+  metadata.gz: 56b7857cc2e5e1e0f7ec8fe5a9d061af122b8f1c035ec19ad71b6d3351c50bfeeaf85c05ea9e1b64c53e90c55ebc300ca0c7a06019dea8a12a4991c40db3ce23
+  data.tar.gz: 5deb50e8d94e2489a0fa81e1117fd4d216fb551f32dd3cd75710864388fb4b01be81199f0097c0bcbafedfe225b7242d2d4287787c92ae790a8b80008b771ac8

data/lib/adeia/controller_methods.rb

@@ -52,11 +52,13 @@ module Adeia
     end
 
     def can?(action, element, resource=nil)
-      ControllerResource.new(self, action: action).authorized?(:can?, element, resource)
+      controller, resource = ControllerResource.get_controller_and_resource(element, resource)
+      ControllerResource.new(self, action: action, controller: controller, resource: resource).authorized?(:can?)
     end
 
     def rights?(action, element, resource=nil)
-      ControllerResource.new(self, action: action).authorized?(:rights?, element, resource)
+      controller, resource = ControllerResource.get_controller_and_resource(element, resource)
+      ControllerResource.new(self, action: action, controller: controller, resource: resource).authorized?(:rights?)
     end
 
     # Redirect the user to the stored url or the default one provided

data/lib/adeia/controller_resource.rb

@@ -26,6 +26,17 @@ module Adeia
       controller.require_login!
     end
 
+    def self.get_controller_and_resource(element, resource)
+      if element.is_a? String
+        return element, resource
+      elsif element.is_a? ActiveRecord::Base
+        return controller_name(element), element
+      elsif element.is_a? Array
+        resource = element.second
+        return "#{element.first}/#{controller_name(resource)}", resource
+      end
+    end
+
     def initialize(controller, **args)
       @controller = controller
       @action_name = args.fetch(:action, @controller.action_name)
@@ -74,9 +85,8 @@ module Adeia
       authorization.check_permissions!
     end
 
-    def authorized?(method, element, resource)
-      @controller_name, @resource = get_controller_and_resource(element, resource)
-      instance_variable_get_or_set(method)
+    def authorized?(method)
+      @controller.instance_variable_get(var_name(method)) || @controller.instance_variable_set(var_name(method), authorization.send(method))
     end
 
     private
@@ -97,29 +107,14 @@ module Adeia
       @model.model_name.element
     end
 
-    def controller_name(resource)
-      resource.model_name.collection
-    end
-
     def var_name(method)
       [method, @controller_name, @action_name, @resource.try(:model_name).try(:human), @resource.try(:id)].compact.map do |s|
         s.to_s.gsub("/", "_").delete("?")
       end.join("_").prepend("@")
     end
 
-    def instance_variable_get_or_set(method)
-      @controller.instance_variable_get(var_name(method)) || @controller.instance_variable_set(var_name(method), authorization.send(method))
-    end
-
-    def get_controller_and_resource(element, resource)
-      if element.is_a? String
-        return element, resource
-      elsif element.is_a? ActiveRecord::Base
-        return controller_name(element), element
-      elsif element.is_a? Array
-        resource = element.second
-        return "#{element.first}/#{controller_name(resource)}", resource
-      end
+    def self.controller_name(resource)
+      resource.model_name.collection
     end
 
   end

data/lib/adeia/version.rb

@@ -1,3 +1,3 @@
 module Adeia
-  VERSION = "0.11.9"
+  VERSION = "0.11.10"
 end