flexible_accessibility 0.2.99.pre → 0.3.0

data/.gitignore

@@ -0,0 +1,23 @@
+*.gem
+*.rbc
+.bundle
+.config
+*.sublime-project
+*.sublime-workspace
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.rvmrc
+.DS_Store
+.idea
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/

data/Gemfile

@@ -1,14 +1,3 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+gemspec
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.8.3"
-  gem "rcov", ">= 0"
-end

data/Gemfile.lock

@@ -1,29 +1,31 @@
+PATH
+  remote: .
+  specs:
+    flexible_accessibility (0.3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.3)
-    rake (0.9.2.2)
-    rcov (1.0.0)
-    rdoc (3.12)
+    diff-lcs (1.2.4)
+    i18n (0.6.5)
+    json (1.8.0)
+    rdoc (4.0.1)
       json (~> 1.4)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.8.3)
-  rcov
-  rdoc (~> 3.12)
-  shoulda
+  bundler
+  flexible_accessibility!
+  i18n
+  rdoc
+  rspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Sergey Awanesov
+Copyright (c) 2012-2013 Sergey Awanesov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -9,5 +9,10 @@ Installation:
   or add to your Gemfile
 
 		gem "flexible_accessibility", "~> 0.3.0"
-		
-======================
+
+======================
+
+## Copyright
+Copyright (c) 2012 Sergey Awanesov and 7 Pikes, Inc.
+
+![7pikes logo](https://github.com/7Pikes/flexible_accessibility/wiki/Logo.png)

data/Rakefile

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -11,21 +12,6 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-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.99.pre"
-  gem.homepage = "http://github.com/mochnatiy/flexible_accessibility"
-  gem.license = "MIT"
-  gem.summary = %Q{Flexible access control system}
-  gem.description = %Q{Flexible access control system for your rails application. Based on analysis of controller actions}
-  gem.email = "sergey.awanesov@gmail.com"
-  gem.authors = ["Sergey Awanesov"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -33,16 +19,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
-task :default => :test
-
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
@@ -51,3 +27,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :default => :test

data/flexible_accessibility.gemspec

@@ -1,70 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = "flexible_accessibility"
-  s.version = "0.2.99.pre"
-
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.version = "0.3.0"
   s.authors = ["Sergey Awanesov"]
   s.date = "2012-09-05"
+  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.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".rvmrc",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "README.rdoc",
-    "Rakefile",
-    "flexible_accessibility.gemspec",
-    "init.rb",
-    "lib/flexible_accessibility.rb",
-    "lib/flexible_accessibility/controller_methods.rb",
-    "lib/flexible_accessibility/exceptions.rb",
-    "lib/flexible_accessibility/filters.rb",
-    "lib/flexible_accessibility/permission.rb",
-    "lib/flexible_accessibility/resource.rb",
-    "lib/flexible_accessibility/utils.rb",
-    "test/helper.rb",
-    "test/test_flexible_accessibility.rb"
-  ]
   s.homepage = "http://github.com/mochnatiy/flexible_accessibility"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Flexible access control system"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
-end
+  s.rubygems_version = "1.8.24"
+  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'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'bundler'
+end

data/lib/flexible_accessibility/controller_methods.rb

@@ -2,42 +2,53 @@ module FlexibleAccessibility
   module ControllerMethods
   	module ClassMethods
 
-      # Macro for skip authorization
-      def skip_authorization_here
-        self.instance_variable_set :@_route_permitted, true
-        self.instance_variable_set :@_checkable_routes, []
+      # Macro for define actions without authorization
+      def skip_authorization(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(:@_verifiable_routes, [])
       end
 
-      # Macro for define authorization
-  	  def authorize args={}
-        self.instance_variable_set :@_route_permitted, false
-        set_actions_to_authorize args
+      # Macro for define actions with authorization
+  	  def authorize(args={})
+        valid_arguments = parse_and_validate_arguments(args)
+        self.instance_variable_set(:@_verifiable_routes, valid_arguments[:only]) unless valid_arguments[:only].nil?
+        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, [])
   	  end
       
       private
-      # Set actions for authorize as instance variable
-      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?  
+      # 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|
+          unless args[key].nil?
+            raise ActionsValueException unless args[key].instance_of?(Array)
+            result[key] = args[key].map!{ |v| v.to_s }.to_set
+          end
+        end
+        result
       end
     end
  
-    # Callback needs for include methods and define helper method
-    def self.included base
-      base.extend ClassMethods
-      base.helper_method :has_access?
+    # Callback is needed for include methods and define helper method
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.helper_method(:has_access?)
     end
     
-    # We checks url for each link in view to show it
-    def has_access? permission, user
-      Permission.is_action_permitted_for_user? permission, user
+    # Check the url for each link in view to show it
+    def has_access?(permission, user)
+      Permission.is_action_permitted_for_user?(permission, user)
     end
   end
 end
 
-# We include methods in ActionController::Base
-if defined? ActionController::Base
+# Include methods in ActionController::Base
+if defined?(ActionController::Base)
 	ActionController::Base.class_eval do
 	  include FlexibleAccessibility::ControllerMethods	
 	end

data/lib/flexible_accessibility/exceptions.rb

@@ -43,4 +43,15 @@ module FlexibleAccessibility
       "Current user is not logged in"
     end
   end
-end
+
+  class ActionsValueException < FlexibleAccessibilityException
+    private
+    def message
+      I18n.t('flexible_accessibility.errors.incorrect_value_of_actions')
+    end
+
+    def default_message
+      "The value of any 'authorize' macro argument should be declared as Array"
+    end
+  end
+end

data/lib/flexible_accessibility/filters.rb

@@ -3,8 +3,8 @@ module FlexibleAccessibility
   	extend ActiveSupport::Concern
 
   	included do
-  	  append_before_filter :check_permission_to_route
-  	  append_before_filter :check_if_route_permitted
+  	  append_before_filter(:check_permission_to_route)
+  	  append_before_filter(:check_if_route_is_permitted)
   	end
 	  
 	  private
@@ -22,24 +22,26 @@ module FlexibleAccessibility
     def current_route
       "#{current_resource}##{current_action}"
     end
-  	# We checks access to route
-  	# And we expected the existing of current_user helper
+
+  	# 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
+      if self.class.instance_variable_get(:@_verifiable_routes).include? current_action
         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)
+  	    self.class.instance_variable_set(:@_route_permitted, Permission.is_action_permitted_for_user?(current_route, current_user))
+      elsif self.class.instance_variable_get(:@_non_verifiable_routes).include? current_action
+        self.class.instance_variable_set(:@_route_permitted, true)
       else
-        self.class.instance_variable_set :@_route_permitted, true
+        self.class.instance_variable_set(:@_route_permitted, false)
   	  end
   	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
+  	def check_if_route_is_permitted
+  	  raise AccessDeniedException.new(current_route, nil) unless self.class.instance_variable_get(:@_route_permitted)
 	  end
   end
 
   ActiveSupport.on_load(:action_controller) do
     ActionController::Base.send(:include, Filters)
   end
-end
+end

data/lib/flexible_accessibility/permission.rb

@@ -3,7 +3,7 @@ module FlexibleAccessibility
     attr_reader :resource
     attr_reader :actions
 
-    def initialize args={}
+    def initialize(args={})
       @resource = args[:resource]
       @actions = args[:actions]
     end
@@ -24,14 +24,14 @@ module FlexibleAccessibility
 					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(:@_checkable_routes))
+				  	permissions << Permission.new(:resource => resource.gsub(/_controller/, ""), :actions => ApplicationResource.new(resource).klass.instance_variable_get(:@_verifiable_routes))
 				  end
 				end
 				permissions
 	  	end
 
 		  def is_action_permitted? permission
-		  	self.is_action_permitted_for_user? permission, current_user
+		  	self.is_action_permitted_for_user?(permission, current_user)
 		  end
 
 		  def is_action_permitted_for_user? permission, user

data/lib/flexible_accessibility/resource.rb

@@ -3,7 +3,7 @@ module FlexibleAccessibility
 		attr_reader :controller
 		attr_reader :namespace
 
-	  def initialize resource_string
+	  def initialize(resource_string)
 	  	@controller = resource_string.split("/").last
 	  	@namespace = resource_string.split("/").first == @controller ? "default" : resource_string.split("/").first
 	  end

data/lib/flexible_accessibility/utils.rb

@@ -6,14 +6,14 @@ module FlexibleAccessibility
     end
 
     def get_controllers
-      get_controllers_recursive @path
+      get_controllers_recursive(@path)
     end
 
     # All controller clases placed in :default scope
-    def get_controllers_recursive path
+    def get_controllers_recursive(path)
       (Dir.new(path).entries - ["..", "."]).each do |entry|
-        if File.directory? path + entry
-          get_controllers_recursive path + 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

metadata

@@ -1,115 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flexible_accessibility
-version: !ruby/object:Gem::Version 
-  hash: 323783775
-  prerelease: 7
-  segments: 
-  - 0
-  - 2
-  - 99
-  - pre
-  version: 0.2.99.pre
+version: !ruby/object:Gem::Version
+  prerelease: 
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Sergey Awanesov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
-  name: shoulda
+date: 2012-09-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 3
-        - 12
-        version: "3.12"
-  version_requirements: *id002
-  name: rdoc
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  version_requirements: *id003
-  name: bundler
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: i18n
+- !ruby/object:Gem::Dependency
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
-        version: 1.8.3
-  version_requirements: *id004
-  name: jeweler
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rdoc
+- !ruby/object:Gem::Dependency
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
-  name: rcov
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rspec
+- !ruby/object:Gem::Dependency
   prerelease: false
   type: :development
-description: Flexible access control system for your rails application. Based on analysis of controller actions
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: bundler
+description: Flexible access control system for your rails application. Based on analysis
+  of controller actions
 email: sergey.awanesov@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
-- README.md
-- README.rdoc
-files: 
-- .rvmrc
+extra_rdoc_files: []
+files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
-- README.rdoc
 - Rakefile
 - flexible_accessibility.gemspec
 - init.rb
@@ -123,39 +100,30 @@ files:
 - test/helper.rb
 - test/test_flexible_accessibility.rb
 homepage: http://github.com/mochnatiy/flexible_accessibility
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Flexible access control system
-test_files: []
-
+test_files:
+- test/helper.rb
+- test/test_flexible_accessibility.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.8.7

data/README.rdoc

@@ -1,18 +0,0 @@
-= flexible_accessibility
-
-A simple library for setting access rules, based on analysis of current resources (e.g. controllers (with namespaces) and actions) that exists in application.
-
-== Contributing to flexible_accessibility
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2012 Sergey Awanesov. See LICENSE.txt for further details.
-