access_manager 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff289656f076f55f1e09706bea32a558a3a0e96e
-  data.tar.gz: fc7966d7942807c2377af604172ce9fa7cf8be7b
+  metadata.gz: 8a4dc4ac9e215934f8a2975dbc10e4830efc586e
+  data.tar.gz: 0d7fd03cf0d7f56ad70217bc3b9ab3f8eb151062
 SHA512:
-  metadata.gz: acaa35dd7632981054e0f70a6da047837fd65a18c1848ff4ce0b4ea9f96e0a3e44fb7d197555304f93c473ea3707ad4404188f7685dc056ae18a9a0b31fbdb2f
-  data.tar.gz: 1b38494c63f42a24cfd4fe6dbd103b5f4b8b9591d65ecb26a7b10b40bba0ae7114e35011ee144332993ee6c60bd3bd018a064dd8058f4fb1bad31a80625286d4
+  metadata.gz: 64f5eb58d18cf5dfd774a3f659a924893d5a3e5decf4f0eefa8d62a558016b6077e4e7c9fb4d079b0047111c5593072bf74ebe843f701841ce3ae1b871f7847c
+  data.tar.gz: 26161875a0d145847e622e4fe7088bcd2d245c59dc8b9b313fb952c23becb929d1a9bbbcc2ae55444c3bfc135a97f40c8519b658737f50d1b074b938ec9a9a8a

data/CHANGELOG.md

@@ -29,3 +29,7 @@
 ## v0.1.1
 
 * Bugfixes
+
+## v0.1.2
+
+* Set access grants to instance

data/lib/access_manager/control.rb

@@ -1,63 +1,59 @@
 module AccessManager
   module Control
-    def self.included(base)
-        base.extend(ClassMethods)
-    end
-
     def can_access?(controller, action)
-      action_codes.any? { |user_action| self.class.access_granted?(controller, action, user_action) }
+      action_codes.any? { |user_action| access_granted?(controller, action, user_action) }
     end
 
     def can?(action)
       action_codes.map(&:to_s).include?(action.to_s)
     end
 
-    module ClassMethods
-      attr_accessor :access_tree
-
-      def grant_access_with(user_action, args={})
-        if @access_tree.nil?
-          @access_tree = { }
-        end
+    def access_granted?(controller, action, user_action)
+      if @access_tree.nil?
+        set_grants!
+      end
 
-        args[:to].each do |controller, actions|
-          if @access_tree[controller.to_sym].nil?
-            @access_tree[controller.to_sym] = { }
-          end
+      if @access_tree.nil? || @access_tree.empty?
+        return false
+      end
 
-          if actions == :all
-            if @access_tree[controller.to_sym]['@all'].nil?
-              @access_tree[controller.to_sym]['@all'] = []
-            end
+      controller_grants = @access_tree[controller.to_sym]
 
-            @access_tree[controller.to_sym]['@all'] << user_action
-          else
-            actions.each do |action|
-              if @access_tree[controller.to_sym][action.to_sym].nil?
-                @access_tree[controller.to_sym][action.to_sym] = []
-              end
+      if controller_grants.nil?
+        false
+      elsif controller_grants['@all'] && controller_grants['@all'].include?(user_action.to_sym)
+        true
+      elsif controller_grants[action.to_sym].nil?
+        false
+      else
+        controller_grants[action.to_sym].include?(user_action.to_sym)
+      end
+    end
 
-              @access_tree[controller.to_sym][action.to_sym] << user_action
-            end
-          end
-        end
+    def grant_access_with(user_action, args={})
+      if @access_tree.nil?
+        @access_tree = { }
       end
 
-      def access_granted?(controller, action, user_action)
-        if @access_tree.nil?
-          @access_tree = { }
+      args[:to].each do |controller, actions|
+        if @access_tree[controller.to_sym].nil?
+          @access_tree[controller.to_sym] = { }
         end
 
-        controller_grants = @access_tree[controller.to_sym]
+        if actions == :all
+          if @access_tree[controller.to_sym]['@all'].nil?
+            @access_tree[controller.to_sym]['@all'] = []
+          end
 
-        if controller_grants.nil?
-          false
-        elsif controller_grants['@all'] && controller_grants['@all'].include?(user_action.to_sym)
-          true
-        elsif controller_grants[action.to_sym].nil?
-          false
+          @access_tree[controller.to_sym]['@all'] << user_action
         else
-          controller_grants[action.to_sym].include?(user_action.to_sym)
+          actions.each do |action|
+            if @access_tree[controller.to_sym][action.to_sym].nil?
+              @access_tree[controller.to_sym][action.to_sym] = []
+            end
+
+            @access_tree[controller.to_sym][action.to_sym] << user_action
+          end
         end
       end
     end

data/lib/access_manager/version.rb

@@ -1,3 +1,3 @@
 module AccessManager
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: access_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Matias Hick