flexible_accessibility 0.1.3.pre → 0.1.6.pre

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "flexible_accessibility"
-  gem.version = "0.1.3.pre"
+  gem.version = "0.1.6.pre"
   gem.homepage = "http://github.com/mochnatiy/flexible_accessibility"
   gem.license = "MIT"
   gem.summary = %Q{Flexible access control system}

data/flexible_accessibility.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "flexible_accessibility"
-  s.version = "0.1.3.pre"
+  s.version = "0.1.6.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergey Awanesov"]

data/lib/flexible_accessibility/controller_methods.rb

@@ -5,20 +5,23 @@ module FlexibleAccessibility
       # Macro for skip authorization
       def skip_authorization_here
         self.instance_variable_set :@route_permitted, true
+        self.instance_variable_set :@checkable_routes, []
         self.send :before_filter, :check_if_route_permitted
       end
 
       # Macro for define authorization
   	  def authorize args={}
+        self.instance_variable_set :@route_permitted, false
   	  	self.send :before_filter, :check_permission_to_route
         self.send :before_filter, :check_if_route_permitted
-        set_actions_to_authorize *args
+        set_actions_to_authorize args
   	  end
       
       private
       #
       def set_actions_to_authorize args={}
         self.instance_variable_set :@checkable_routes, args[:only] unless args[:only].nil?
+        # TODO: understand and fix it
         self.instance_variable_set :@checkable_routes, self.action_methods - args[:except] unless args[:except].nil?  
       end
 
@@ -41,13 +44,13 @@ module FlexibleAccessibility
         raise FlexibleAccessibility::AccessDeniedException unless self.instance_variable_get :@route_permitted
       end
     end
-
+ 
     # Callback needs for include methods and define helper method
     def self.included base
-    	base.extend ClassMethods
-    	base.helper_method has_access?
+      base.extend ClassMethods
+      base.helper_method :has_access?
     end
-
+    
     # We checks url for each link in view to show it
     def has_access? controller, action
       Permissions.is_action_permitted_for_user? "#{controller}##{action}", current_user
@@ -56,8 +59,8 @@ module FlexibleAccessibility
 end
 
 #
-if defined? ActionController
-	ActionController.class_eval do
+if defined? ActionController::Base
+	ActionController::Base.class_eval do
 	  include FlexibleAccessibility::ControllerMethods	
 	end
 end

data/lib/flexible_accessibility/exceptions.rb

@@ -1,5 +1,5 @@
 module FlexibleAccessibilty
-	class AccessDeniedException < Error
+	class AccessDeniedException < StandardError
 		attr_reader :action, :subject
     attr_writer :default_message
 

data/lib/flexible_accessibility/permissions.rb

@@ -4,7 +4,7 @@ module FlexibleAccessibility
 	  def get_permissions
 		permissions = {}
 		ApplicationController.subclasses.each do |klass|
-		  permissions[klass.to_s.tableize.singularize.to_sym] = klass.constantize.new.instance_variable_get(:@checkable_routes).collect{ |a| a.to_s }.join(', ')
+		  permissions[klass.to_s.tableize.singularize.to_sym] = klass.instance_variable_get(:@checkable_routes).collect{ |a| a.to_s }.join(', ')
 		end
 		permissions
 	  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: flexible_accessibility
 version: !ruby/object:Gem::Version 
-  hash: 961915968
+  hash: 961915988
   prerelease: 6
   segments: 
   - 0
   - 1
-  - 3
+  - 6
   - pre
-  version: 0.1.3.pre
+  version: 0.1.6.pre
 platform: ruby
 authors: 
 - Sergey Awanesov