flexible_accessibility 0.2.0.pre → 0.2.1.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.2.0.pre"
+  gem.version = "0.2.1.pre"
   gem.homepage = "http://github.com/mochnatiy/flexible_accessibility"
   gem.license = "MIT"
   gem.summary = %Q{Flexible access control system}

data/flexible_accessibility.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flexible_accessibility"
-  s.version = "0.2.0.pre"
+  s.version = "0.2.1.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergey Awanesov"]
-  s.date = "2012-07-25"
+  s.date = "2012-07-26"
   s.description = "Flexible access control system for your rails application. Based on analysis of controller actions"
   s.email = "sergey.awanesov@gmail.com"
   s.extra_rdoc_files = [

data/lib/flexible_accessibility/exceptions.rb

@@ -1,17 +1,46 @@
 module FlexibleAccessibility
-	class AccessDeniedException < StandardError
-		attr_reader :action, :subject
-    attr_writer :default_message
+  class FlexibleAccessibilityException < StandardError
+    attr_reader :action, :subject, :default_message
 
-    def initialize(message = nil, action = nil, subject = nil)
-      @message = message
+    def initialize(action = nil, subject = nil)
       @action = action
       @subject = subject
-      @default_message = I18n.t('flexible_accessibility.errors.access_denied', :action => @action)
     end
 
     def to_s
-      @message || @default_message
+      message || default_message
+    end
+
+    private
+    def message
+      nil
+    end
+
+    def default_message
+      "An exception is occured"
+    end
+  end
+
+
+	class AccessDeniedException < FlexibleAccessibilityException
+    private
+    def message
+      I18n.t 'flexible_accessibility.errors.access_denied', :action => @action
+    end
+
+    def default_message
+		  "The acess for resoure #{@action} is denied"
     end
 	end
+
+  class UserNotLoggedInException < FlexibleAccessibilityException
+    private
+    def message
+      I18n.t 'flexible_accessibility.errors.user_is_not_logged_in'
+    end
+
+    def default_message
+      "Current user is not logged in"
+    end
+  end
 end

data/lib/flexible_accessibility/filters.rb

@@ -7,7 +7,7 @@ module FlexibleAccessibility
   	  append_before_filter :check_if_route_permitted
   	end
 	  
-	private
+	  private
     # Detect current controller and action and return a permission
     def current_resource
       # ActionController::Routing::Routes.recognize_path request.env["PATH_INFO"][:controller]
@@ -22,18 +22,21 @@ module FlexibleAccessibility
     def current_route
       "#{current_resource}##{current_action}"
     end
-	# We checks access to route
-	# And we expected the existing of current_user helper
-	def check_permission_to_route
-	  if self.class.instance_variable_get(:@_checkable_routes).include? current_action.to_sym
-	    self.class.instance_variable_set :@_route_permitted, Permission.is_action_permitted_for_user?(current_route, current_user)
-	  end
-	end
+  	# We checks access to route
+  	# And we expected the existing of current_user helper
+  	def check_permission_to_route
+      if self.class.instance_variable_get(:@_checkable_routes).include? current_action.to_sym
+        raise UserNotLoggedInException.new(current_route, nil) if current_user.nil?
+  	    self.class.instance_variable_set :@_route_permitted, Permission.is_action_permitted_for_user?(current_route, current_user)
+      else
+        self.class.instance_variable_set :@_route_permitted, true
+  	  end
+  	end
 
-	# We checks @authorized variable state
-	def check_if_route_permitted
-	  raise AccessDeniedException.new(nil, current_route, nil) unless self.class.instance_variable_get :@_route_permitted
-	end
+  	# We checks @authorized variable state
+  	def check_if_route_permitted
+  	  raise AccessDeniedException.new(current_route, nil) unless self.class.instance_variable_get :@_route_permitted
+	  end
   end
 
   ActiveSupport.on_load(:action_controller) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: flexible_accessibility
 version: !ruby/object:Gem::Version 
-  hash: 961915988
+  hash: 961915984
   prerelease: 6
   segments: 
   - 0
   - 2
-  - 0
+  - 1
   - pre
-  version: 0.2.0.pre
+  version: 0.2.1.pre
 platform: ruby
 authors: 
 - Sergey Awanesov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-25 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development