flexible_accessibility 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flexible_accessibility (0.3.1)
+    flexible_accessibility (0.3.2)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -8,7 +8,7 @@ Installation:
 
   or add to your Gemfile
 
-		gem "flexible_accessibility", "~> 0.3.0"
+		gem 'flexible_accessibility', '0.3.2'
 
   Do
 
@@ -19,6 +19,6 @@ Installation:
 ======================
 
 ## Copyright
-Copyright (c) 2012-2013 Sergey Awanesov and 7 Pikes, Inc.
+Copyright (c) 2012-2013 Sergey Avanesov and 7 Pikes, Inc.
 
 ![7pikes logo](https://github.com/7Pikes/flexible_accessibility/wiki/Logo.png)

data/Rakefile

@@ -7,7 +7,7 @@ begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.puts 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
@@ -21,7 +21,7 @@ end
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.exist?('VERSION') ? File.read('VERSION') : ''
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "flexible_accessibility #{version}"
   rdoc.rdoc_files.include('README*')

data/flexible_accessibility.gemspec

@@ -1,22 +1,22 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
 Gem::Specification.new do |s|
-  s.name = "flexible_accessibility"
-  s.version = "0.3.1"
-  s.authors = ["Sergey Awanesov"]
-  s.date = "2013-09-30"
-  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"
-  s.homepage = "http://github.com/mochnatiy/flexible_accessibility"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
+  s.name = 'flexible_accessibility'
+  s.version = '0.3.2'
+  s.authors = ['Sergey Avanesov']
+  s.date = '2013-09-30'
+  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'
+  s.homepage = 'http://github.com/mochnatiy/flexible_accessibility'
+  s.licenses = ['MIT']
+  s.require_paths = ['lib']
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.rubygems_version = "1.8.24"
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new('> 1.3.1') if s.respond_to? :required_rubygems_version=
 
   s.add_development_dependency 'i18n'
   s.add_development_dependency 'rdoc'

data/lib/flexible_accessibility/access_provider.rb

@@ -3,7 +3,7 @@ module FlexibleAccessibility
     class << self
       def preload_permissions(user)
         if user.instance_variable_get(:@_available_permissions).nil?
-          user.instance_variable_set(:@_available_permissions, AccessRule.where(:owner => user.id).map(&:permission))
+          user.instance_variable_set(:@_available_permissions, AccessRule.where(:owner_id => user.id).map(&:permission))
         end
       end
 

data/lib/flexible_accessibility/controller_methods.rb

@@ -2,11 +2,16 @@ module FlexibleAccessibility
   module ControllerMethods
   	module ClassMethods
 
+      # Compatibility with previous versions
+      def skip_authorization_here
+        not_authorize :all
+      end
+
       # Macro for define actions without authorization
-      def skip_authorization(args={})
+      def not_authorize(args={})
         valid_arguments = parse_and_validate_arguments(args)
         self.instance_variable_set(:@_non_verifiable_routes, self.action_methods) if valid_arguments[:all]
-        self.instance_variable_set(:@_non_verifiable_routes, valid_arguments[:on]) unless valid_arguments[:on].nil?
+        self.instance_variable_set(:@_non_verifiable_routes, valid_arguments[:only]) unless valid_arguments[:only].nil?
         self.instance_variable_set(:@_verifiable_routes, []) if self.instance_variable_get(:@_non_verifiable_routes).nil?
       end
 
@@ -17,15 +22,14 @@ module FlexibleAccessibility
         self.instance_variable_set(:@_verifiable_routes, self.action_methods - valid_arguments[:except]) unless valid_arguments[:except].nil?
         self.instance_variable_set(:@_verifiable_routes, self.action_methods) if valid_arguments[:all]
         self.instance_variable_set(:@_non_verifiable_routes, []) if self.instance_variable_get(:@_non_verifiable_routes).nil?
-        # TODO: get info from routes
   	  end
 
       private
       # Parse arguments from macro calls
       def parse_and_validate_arguments(args={})
         result = {}
-        (result[:all] = true) and return result if args.to_s == "all" || args.to_s == "everywhere"
-        [:on, :only, :except].each do |key|
+        (result[:all] = true) and return result if args.to_s == 'all'
+        [:only, :except].each do |key|
           unless args[key].nil?
             raise ActionsValueException unless args[key].instance_of?(Array)
             result[key] = args[key].map!{ |v| v.to_s }.to_set

data/lib/flexible_accessibility/exceptions.rb

@@ -17,7 +17,7 @@ module FlexibleAccessibility
     end
 
     def default_message
-      "An exception is occured"
+      'An exception is occurred'
     end
   end
 
@@ -28,7 +28,7 @@ module FlexibleAccessibility
     end
 
     def default_message
-		  "The acess for resoure #{@action} is denied"
+		  "The access for resource #{@action} is denied"
     end
 	end
 
@@ -39,7 +39,7 @@ module FlexibleAccessibility
     end
 
     def default_message
-      "Current user is not logged in"
+      'Current user is not logged in'
     end
   end
 
@@ -50,7 +50,7 @@ module FlexibleAccessibility
     end
 
     def default_message
-      "No way to detect a logged user - may you have forgot to define a current_user helper"
+      'No way to detect a logged user - may you have forgot to define a current_user helper'
     end
   end
  
@@ -61,7 +61,7 @@ module FlexibleAccessibility
     end
 
     def default_message
-      "Probably you have forgot to send a user in has_access?"
+      'Probably you have forgot to send a user in has_access?'
     end
   end
 
@@ -72,7 +72,7 @@ module FlexibleAccessibility
     end
 
     def default_message
-      "The value of any 'authorize' macro argument should be declared as Array"
+      'The value of any \'authorize\' macro argument should be declared as Array'
     end
   end
 end

data/lib/flexible_accessibility/filters.rb

@@ -31,7 +31,7 @@ module FlexibleAccessibility
 
   	# Check access to route and we expected the existing of current_user helper
   	def check_permission_to_route
-      if self.class.instance_variable_get(:@_verifiable_routes).include? current_action
+      if self.class.instance_variable_get(:@_verifiable_routes).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
@@ -39,7 +39,15 @@ module FlexibleAccessibility
       else
         self.class.instance_variable_set(:@_route_permitted, false)
   	  end
-  	end
+    end
+
+    def allow_route
+      self.class.instance_variable_set(:@_route_permitted, true)
+    end
+
+    def deny_route
+      self.class.instance_variable_set(:@_route_permitted, false)
+    end
 
   	# Check the @authorized variable state
   	def check_if_route_is_permitted

data/lib/flexible_accessibility/resource.rb

@@ -4,20 +4,20 @@ module FlexibleAccessibility
 		attr_reader :namespace
 
 	  def initialize(resource_string)
-	  	@controller = resource_string.split("/").last
-	  	@namespace = resource_string.split("/").first == @controller ? "default" : resource_string.split("/").first
+	  	@controller = resource_string.split('/').last
+	  	@namespace = resource_string.split('/').first == @controller ? 'default' : resource_string.split('/').first
 	  end
 
 		def klass
 			if self.is_standard_resource?
 				@controller.camelize.constantize 
 			else
-				(@namespace.camelize + "::" + @controller.camelize).constantize
+				(@namespace.camelize + '::' + @controller.camelize).constantize
 			end
 		end
 
 		def is_standard_resource?
-			@namespace == "default"
+			@namespace == 'default'
 		end
   end
 end

data/lib/flexible_accessibility/utils.rb

@@ -9,16 +9,16 @@ module FlexibleAccessibility
       get_controllers_recursive(@path)
     end
 
-    # All controller clases placed in :default scope
+    # All controller classes placed in :default scope
     def get_controllers_recursive(path)
-      (Dir.new(path).entries - ["..", "."]).each do |entry|
+      (Dir.new(path).entries - ['..', '.']).each do |entry|
         if File.directory?(path + entry)
           get_controllers_recursive(path + entry + '/')
         else
           parent_directory = File.dirname(path + entry).split(/\//).last
-          container = parent_directory == "controllers" ? "default" : parent_directory
+          container = parent_directory == 'controllers' ? 'default' : parent_directory
           @controllers[container.to_sym] = [] unless @controllers.has_key? container.to_sym
-          @controllers[container.to_sym] << File.basename(path + entry, ".*") unless File.basename(path + entry, ".*") == "application_controller"
+          @controllers[container.to_sym] << File.basename(path + entry, '.*') unless File.basename(path + entry, '.*') == 'application_controller'
         end
       end
       @controllers

data/lib/generators/flexible_accessibility/install/install_generator.rb

@@ -5,19 +5,19 @@ module FlexibleAccessibility
     class InstallGenerator < ::Rails::Generators::Base
       include Rails::Generators::Migration
       source_root File.expand_path('../templates', __FILE__)
-      desc "Add the migrations"
+      desc 'Add the migrations'
 
       def self.next_migration_number(path)
-        unless @prev_migration_nr
-          @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-        else
+        if @prev_migration_nr
           @prev_migration_nr += 1
+        else
+          @prev_migration_nr = Time.now.utc.strftime('%Y%m%d%H%M%S').to_i
         end
         @prev_migration_nr.to_s
       end
 
       def copy_migrations
-        migration_template "create_access_rules.rb", "db/migrate/create_access_rules.rb"
+        migration_template 'create_access_rules.rb', 'db/migrate/create_access_rules.rb'
       end
     end
   end

data/lib/generators/flexible_accessibility/install/templates/create_access_rules.rb

@@ -2,10 +2,10 @@ class CreateAccessRules < ActiveRecord::Migration
   def self.up
     create_table :access_rules do |t|
       t.string  :permission
-      t.integer :owner    
+      t.integer :owner_id
       t.timestamps
 
-      t.index [:owner], :name => "access_rules_index_on_owner"
+      t.index [:owner_id], :name => 'access_rules_index_on_owner_id'
     end
   end
 

metadata

@@ -2,10 +2,10 @@
 name: flexible_accessibility
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
-- Sergey Awanesov
+- Sergey Avanesov
 autorequire: 
 bindir: bin
 cert_chain: []