flexible_accessibility 0.3.7 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac50d41b922cf00aec741014a9e7c0f03db55a64
-  data.tar.gz: 52422cb39013ba81cb78180d8550fa7750490cf8
+  metadata.gz: 091ff0a106f65dc17c65d44936339a4515e49fc4
+  data.tar.gz: d1382522645bff705556af8f6eb2e50457c67419
 SHA512:
-  metadata.gz: 7709cb56418905082c53873f47cb587c624f9a2568d85337a4240c93e3041136f5364028b58b7eca9375d534f0df2378a9fda689d2d5c057dc8c6c5d8b51fde9
-  data.tar.gz: 68fbf3dd786d7a8f182b83414363e7671e705c3632c5b7609110f6c25be7478fd589e07a640bd54ab5128dea6e1fb3c5533d95cb1203bcf4fbdc6b2342b6b9f6
+  metadata.gz: 4df52bdf2540ca2dab17fe892d482c2c9046cf523a7228bba1f79de76557c2fae58cf261ffe3f50419fd64bcf804840500b3af7ef456ffeab2e18472c2a1b77f
+  data.tar.gz: 922db8d98a6ea243bf2cd7e9e91dfff6965f005214c99e593b4dafe23eb19692fbd91dde78786bf81cfd2d0be03605e36728c78140f28266c2eaa36899c0c41c

data/flexible_accessibility.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name = 'flexible_accessibility'
-  s.version = '0.3.7'
+  s.version = '0.3.16'
   s.authors = ['Sergey Avanesov']
-  s.date = '2014-05-27'
+  s.date = '2014-07-08'
   s.summary = 'Flexible access control system'
   s.description = 'Flexible access control system for your rails application. Based on analysis of controller actions'
   s.email = 'sergey.awanesov@gmail.com'

data/lib/flexible_accessibility.rb

@@ -4,6 +4,6 @@ require 'flexible_accessibility/exceptions.rb'
 require 'flexible_accessibility/permission.rb'
 require 'flexible_accessibility/filters.rb'
 require 'flexible_accessibility/resource.rb'
-require 'flexible_accessibility/utils.rb'
+require 'flexible_accessibility/route_provider.rb'
 require 'flexible_accessibility/access_provider.rb'
 require 'flexible_accessibility/access_rule.rb'

data/lib/flexible_accessibility/controller_methods.rb

@@ -7,26 +7,18 @@ module FlexibleAccessibility
         authorize :skip => :all
       end
 
-      # Macro for define actions with authorization
+      # Macro for define routes table with authorization
   	  def authorize(args={})
         arguments = parse_arguments(args)
-        validate_arguments(arguments)
-        available_routes = Utils.new.app_routes[self.to_s.gsub(/Controller/, '')]
-        # available_routes = self.action_methods if available_routes.nil?
-        raise NoWayToDetectAvailableRoutesException if available_routes.nil?
-        
-        self.instance_variable_set(:@_verifiable_routes, available_routes) if arguments[:all]
-        self.instance_variable_set(:@_verifiable_routes, arguments[:only]) unless arguments[:only].nil?
-        self.instance_variable_set(:@_verifiable_routes, available_routes - arguments[:except]) unless arguments[:except].nil?
         
-        unless arguments[:skip].nil?
-          non_verifiable_routes = arguments[:skip].first == 'all' ? available_routes : arguments[:skip]
-          self.instance_variable_set(:@_non_verifiable_routes, non_verifiable_routes)
-        end
+        validate_arguments(arguments)
+
+        self.instance_variable_set(:@_routes_table, arguments)        
   	  end
 
       private
-      # Parse arguments from macro calls
+      
+      # Parse arguments from macro call
       def parse_arguments(args={})
         result = {}
         (result[:all] = ['all'].to_set) and return result if args.to_s == 'all'
@@ -40,6 +32,7 @@ module FlexibleAccessibility
         result
       end
 
+      # Validate arguments from macro call
       def validate_arguments(args={})
         return if args.count == 1 && args.keys.include?(:all)
         only_options = args[:only] || Set.new
@@ -54,18 +47,18 @@ module FlexibleAccessibility
         end
       end
     end
+
+    # Check the url for each link in view to show it
+    def has_access?(permission, user)
+      raise UnknownUserException if user.nil?
+      AccessProvider.is_action_permitted_for_user?(permission, user)
+    end
  
     # Callback is needed for include methods and define helper method
     def self.included(base)
       base.extend(ClassMethods)
       base.helper_method(:has_access?)
     end
-    
-    # Check the url for each link in view to show it
-    def has_access?(permission, user)
-      raise UnknownUserException if user.nil?
-      AccessProvider.is_action_permitted_for_user?(permission, user)
-    end
   end
 end
 

data/lib/flexible_accessibility/filters.rb

@@ -31,16 +31,14 @@ module FlexibleAccessibility
 
   	# Check access to route and we expected the existing of current_user helper
   	def check_permission_to_route
-      self.class.instance_variable_set(:@_verifiable_routes, []) if self.class.instance_variable_get(:@_verifiable_routes).nil?
-      self.class.instance_variable_set(:@_non_verifiable_routes, []) if self.class.instance_variable_get(:@_non_verifiable_routes).nil?
-
-      if self.class.instance_variable_get(:@_verifiable_routes).include?(current_action)
+      route_provider = RouteProvider.new(self.class)
+      if route_provider.verifiable_routes_list.include?(current_action)
         raise UserNotLoggedInException.new(current_route, nil) if logged_user.nil?
-        self.class.instance_variable_set(:@_route_permitted, AccessProvider.is_action_permitted_for_user?(current_route, logged_user))
-      elsif self.class.instance_variable_get(:@_non_verifiable_routes).include? current_action
-        self.class.instance_variable_set(:@_route_permitted, true)
+        AccessProvider.is_action_permitted_for_user?(current_route, logged_user) ? allow_route : deny_route
+      elsif route_provider.non_verifiable_routes_list.include?(current_action)
+        allow_route
       else
-        self.class.instance_variable_set(:@_route_permitted, false)
+        deny_route
       end
     end
 
@@ -52,7 +50,7 @@ module FlexibleAccessibility
       self.class.instance_variable_set(:@_route_permitted, false)
     end
 
-  	# Check the @authorized variable state
+  	# Check the @_route_permitted variable state
   	def check_if_route_is_permitted
   	  raise AccessDeniedException.new(current_route, nil) unless self.class.instance_variable_get(:@_route_permitted)
 	  end

data/lib/flexible_accessibility/permission.rb

@@ -20,11 +20,12 @@ module FlexibleAccessibility
     class << self
   	  def all
   			permissions = []
-  			Utils.new.app_controllers.each do |scope|
+  			RouteProvider.new.app_controllers.each do |scope|
   				namespace = scope.first.to_s
   			  scope.last.each do |resource|
   			  	resource = "#{namespace}/#{resource}" unless namespace == 'default'
-  			  	permissions << Permission.new(:resource => resource.gsub(/_controller/, ''), :actions => ApplicationResource.new(resource).klass.instance_variable_get(:@_verifiable_routes))
+  			  	permissions << Permission.new(:resource => resource.gsub(/_controller/, ''), 
+                                          :actions => RouteProvider.new(ApplicationResource.new(resource).klass).verifiable_routes_list)
   			  end
   			end
   			permissions

data/lib/flexible_accessibility/{utils.rb → route_provider.rb}

@@ -1,10 +1,11 @@
 module FlexibleAccessibility
-  class Utils
+  class RouteProvider
     @@routes ||= {}
 
-    def initialize
+    def initialize(controller=nil)
       @path = "#{::Rails.root}/app/controllers/"
       @controllers = {}
+      @current_controller = controller
     end
 
     def app_controllers
@@ -13,10 +14,42 @@ module FlexibleAccessibility
 
     def app_routes
       app_routes_as_hash if @@routes.empty?
-      @@routes.to_set
+      @@routes
+    end
+
+    def verifiable_routes_list
+      routes_table, list = @current_controller.instance_variable_get(:@_routes_table), []
+        
+      unless routes_table.nil?
+        list = available_routes_list if routes_table[:all]
+        list = routes_table[:only] unless routes_table[:only].nil?
+        list = available_routes_list - routes_table[:except] unless routes_table[:except].nil?
+      end
+
+      list
+    end
+
+    def non_verifiable_routes_list
+      routes_table, list = @current_controller.instance_variable_get(:@_routes_table), []
+
+      unless routes_table.nil?
+        unless routes_table[:skip].nil?
+          list = routes_table[:skip].first == 'all' ? available_routes_list : routes_table[:skip]
+        end
+      end
+
+      list
     end
 
     private
+
+    def available_routes_list
+      available_routes = self.app_routes[@current_controller.to_s.gsub(/Controller/, '')]
+      # available_routes = self.action_methods if available_routes.nil?
+      raise NoWayToDetectAvailableRoutesException if available_routes.nil?
+      available_routes.to_set
+    end
+
     # All controller classes placed in :default scope
     def app_controllers_recursive(path)
       invalid_entries = ['..', '.', 'concerns']
@@ -37,7 +70,6 @@ module FlexibleAccessibility
 
     # Routes from routes.rb
     def app_routes_as_hash
-      Rails.application.reload_routes!
       Rails.application.routes.routes.each do |route|
         controller = route.defaults[:controller]
         unless controller.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexible_accessibility
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.16
 platform: ruby
 authors:
 - Sergey Avanesov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -90,7 +90,7 @@ files:
 - lib/flexible_accessibility/filters.rb
 - lib/flexible_accessibility/permission.rb
 - lib/flexible_accessibility/resource.rb
-- lib/flexible_accessibility/utils.rb
+- lib/flexible_accessibility/route_provider.rb
 - lib/generators/flexible_accessibility/install/install_generator.rb
 - lib/generators/flexible_accessibility/install/templates/create_access_rules.rb
 - test/helper.rb