access_manager 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a44076b88453152b0ff5d98bac2f98d92ac3f3ab
-  data.tar.gz: aeb2a1d0a310e816c540adc119a8f55dadb9075f
+  metadata.gz: ff289656f076f55f1e09706bea32a558a3a0e96e
+  data.tar.gz: fc7966d7942807c2377af604172ce9fa7cf8be7b
 SHA512:
-  metadata.gz: 8e973227a715128a2b1c148df9184373333c2577d4115bf3e051e9d69c4fc97b28af5848487376db66292ef55bd3c0870f0ecf5197923bc80f2b32bb6331c769
-  data.tar.gz: afce5aa7895d25d029f39d848ced9622b9848e09381112c7548a956ff47f5be7e88099e8218bbfd37570049abad72d6e4ce9ef44fe14cc35dd4edde561208d66
+  metadata.gz: acaa35dd7632981054e0f70a6da047837fd65a18c1848ff4ce0b4ea9f96e0a3e44fb7d197555304f93c473ea3707ad4404188f7685dc056ae18a9a0b31fbdb2f
+  data.tar.gz: 1b38494c63f42a24cfd4fe6dbd103b5f4b8b9591d65ecb26a7b10b40bba0ae7114e35011ee144332993ee6c60bd3bd018a064dd8058f4fb1bad31a80625286d4

data/CHANGELOG.md

@@ -25,3 +25,7 @@
 ## v0.1.0
 
 * Added assets and view helpers
+
+## v0.1.1
+
+* Bugfixes

data/lib/access_manager/control.rb

@@ -1,5 +1,9 @@
 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) }
     end
@@ -7,5 +11,55 @@ module AccessManager
     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
+
+        args[:to].each do |controller, actions|
+          if @access_tree[controller.to_sym].nil?
+            @access_tree[controller.to_sym] = { }
+          end
+
+          if actions == :all
+            if @access_tree[controller.to_sym]['@all'].nil?
+              @access_tree[controller.to_sym]['@all'] = []
+            end
+
+            @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
+
+              @access_tree[controller.to_sym][action.to_sym] << user_action
+            end
+          end
+        end
+      end
+
+      def access_granted?(controller, action, user_action)
+        if @access_tree.nil?
+          @access_tree = { }
+        end
+
+        controller_grants = @access_tree[controller.to_sym]
+
+        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
+    end
   end
 end

data/lib/access_manager/version.rb

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

data/lib/access_manager.rb

@@ -1,5 +1,4 @@
 require 'access_manager/control'
-require 'access_manager/rules'
 require 'access_manager/version'
 
 if defined? (Rails)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: access_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matias Hick
@@ -52,7 +52,6 @@ files:
 - lib/access_manager/control.rb
 - lib/access_manager/engine.rb
 - lib/access_manager/railtie.rb
-- lib/access_manager/rules.rb
 - lib/access_manager/version.rb
 - lib/access_manager/view_helpers.rb
 - vendor/assets/javascripts/access_manager.js

data/lib/access_manager/rules.rb

@@ -1,49 +0,0 @@
-module AccessManager
-  module Rules
-    attr_accessor :access_tree
-
-    def grant_access_with(user_action, args={})
-      if @access_tree.nil?
-        @access_tree = { }
-      end
-
-      args[:to].each do |controller, actions|
-        if @access_tree[controller.to_sym].nil?
-          @access_tree[controller.to_sym] = { }
-        end
-
-        if actions == :all
-          if @access_tree[controller.to_sym]['@all'].nil?
-            @access_tree[controller.to_sym]['@all'] = []
-          end
-
-          @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
-
-            @access_tree[controller.to_sym][action.to_sym] << user_action
-          end
-        end
-      end
-    end
-
-    def access_granted?(controller, action, user_action)
-      if @access_tree.nil?
-        @access_tree = { }
-      end
-
-      if @access_tree[controller.to_sym].nil?
-        true
-      elsif ((!@access_tree[controller.to_sym]['@all'].nil?) && @access_tree[controller.to_sym]['@all'].any?)
-        @access_tree[controller.to_sym]['@all'].include?(user_action.to_sym)
-      elsif @access_tree[controller.to_sym][action.to_sym].nil?
-        true
-      else
-        @access_tree[controller.to_sym][action.to_sym].include?(user_action.to_sym)
-      end
-    end
-  end
-end