adeia 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c65c38f64183d8e9df1b601003823c36b08929d
-  data.tar.gz: 2308fc47d1bd287de2321f94148f6162d23e4d14
+  metadata.gz: f30f7fa1eed97db1750a87c086adbf844427bfc2
+  data.tar.gz: 0f0805b6158786a85b585c9ef57142abe87944b7
 SHA512:
-  metadata.gz: 600311095b40507f87ea53b460287ff1f9ab580675a2bccef15cee6afe148bc649f4fe6154ba7998823c7dfa0b1bc1f1c91fe4fc005eeee7f133dae32cf4d215
-  data.tar.gz: 59a2d84c1cad767c04abbec5643509e336a5ff1208ec14608accceb53ed60fd0428bba9254d51f9f4589c71a48f7e35623a664372a82cf733abacaa897de8c05
+  metadata.gz: b5f3dc2e53876486e29c471b40178989924d9fd7e2525a2ed63921a25806988569b17fb1085f33f0481217fa5e72c117a2791ccf68efe33b1459a3559a7ed632
+  data.tar.gz: d259aa746873ad3d115fb9f29e62ff305c02f9ad724987438a699901462c85df6cf887920a87b3c7010ebe3cc5e2b8eadfeb92979e52ba69f9a4ad54b3301ef0

data/lib/adeia/controller_methods.rb

@@ -43,14 +43,12 @@ module Adeia
       raise LoginRequired unless signed_in?
     end
 
-    def can?(action, controller=nil, resource=nil)
-      args = { action: action, controller: controller, resource: resource }
-      ControllerResource.new(self, **args).can?
+    def can?(action, element, resource=nil)
+      ControllerResource.new(self, action: action).authorized?(:can?, element, resource)
     end
 
-    def rights?(action, controller=nil, resource=nil)
-      args = { action: action, controller: controller, resource: resource }
-      ControllerResource.new(self, **args).rights?
+    def rights?(action, element, resource=nil)
+      ControllerResource.new(self, action: action).authorized?(:rights?, element, resource)
     end
 
     # Redirect the user to the stored url or the default one provided

data/lib/adeia/controller_resource.rb

@@ -72,12 +72,9 @@ module Adeia
       authorization.check_permissions!
     end
 
-    def can?
-      instance_variable_get_or_set(:can?)
-    end
-
-    def rights?
-      instance_variable_get_or_set(:rights?)
+    def authorized?(method, element, resource)
+      @controller_name, @resource = get_controller_and_resource(element, resource)
+      instance_variable_get_or_set(method)
     end
 
     private
@@ -94,16 +91,30 @@ module Adeia
       resource_class.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)].map do |s|
-        s.to_s.gsub("/", "_").delete("?") if s
-      end.compact.join("_").prepend("@")
+      [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
+    end
 
     # Store the current url in a cookie
     # 

data/lib/adeia/version.rb

@@ -1,3 +1,3 @@
 module Adeia
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

data/spec/adeia/controller_methods_spec.rb

@@ -17,8 +17,7 @@ module Adeia
       end
 
       it "responds successfully when logged in" do
-        @user = create(:user)
-        sign_in @user
+        sign_in_user
         expect{ get :index }.not_to raise_error
       end
 
@@ -39,8 +38,7 @@ module Adeia
       end
 
       it "responds successfully when logged in" do
-        @user = create(:user)
-        sign_in @user
+        sign_in_user
         expect{ get :index }.not_to raise_error
       end
 
@@ -48,29 +46,67 @@ module Adeia
 
     describe "#can?" do
 
-      controller do
-        def index
-          @can = can? :read, "articles"
-          render nothing: true
+      context "with a controller provided" do
+
+        controller do
+          def index
+            @can = can? :read, "articles"
+            render nothing: true
+          end
         end
-      end
 
-      it "returns false when the user is not authorized" do
-        get :index
-        expect(assigns(:can)).to be false
+        it "returns false when the user is not authorized" do
+          get :index
+          expect(assigns(:can)).to be false
+        end
+
+        it "caches the result" do
+          get :index
+          expect(assigns(:can_articles_read)).to be false
+        end
+
+        it "returns true when the user is authorized" do
+          sign_in_user
+          create(:permission, owner: @user, element_name: "articles", read_right: true)
+          get :index
+          expect(assigns(:can)).to be true
+        end
       end
 
-      it "caches the result" do
-        get :index
-        expect(assigns(:can_articles_read)).to be false
+      context "with a resource provided" do
+
+        controller do
+          def index
+            @article = Article.create(title: "Rspec tests", content: "Lorem ipsum", id: 100)
+            @can = can? :read, @article
+            render nothing: true
+          end
+        end
+
+        it "guesses the element from the resource" do
+          sign_in_user
+          create(:permission, owner: @user, element_name: "articles", type_name: "on_entry", resource_id: 100, read_right: true)
+          get :index
+          expect(assigns(:can)).to be true
+        end
       end
 
-      it "returns true when the user is authorized" do
-        @user = create(:user)
-        sign_in @user
-        create(:permission, owner: @user, element_name: "articles", read_right: true)
-        get :index
-        expect(assigns(:can)).to be true
+      context "with a resource and a namespace" do
+
+        controller do
+          def index
+            @article = Article.create(title: "Rspec tests", content: "Lorem ipsum", id: 100)
+            @can = can? :read, [:admin, @article]
+            render nothing: true
+          end
+        end
+
+        it "guesses an namespaced element from the resource" do
+          sign_in_user
+          create(:permission, owner: @user, element_name: "admin/articles", type_name: "on_entry", resource_id: 100, read_right: true)
+          get :index
+          expect(assigns(:can)).to be true
+        end
       end
 
     end
@@ -95,8 +131,7 @@ module Adeia
       end
 
       it "returns true when the user has at least one right" do
-        @user = create(:user)
-        sign_in @user
+        sign_in_user
         create(:permission, owner: @user, element_name: "articles", type_name: "on_ownerships", read_right: true)
         get :index
         expect(assigns(:rights)).to be true

data/spec/support/spec_login_helper.rb

@@ -11,6 +11,11 @@ module SpecLoginHelper
   def current_user=(user)
     @current_user = user
   end
+
+  def sign_in_user
+    @user = create(:user)
+    sign_in @user
+  end
 end
 
 RSpec.configure do |config|