authoreyes 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aa29842232cabee5e1657ec96b6b9a691073e7b
-  data.tar.gz: 9ed619116c26b67aa9f3c9dd3d1e4d7480e82b7c
+  metadata.gz: 7be13cd0becb63d94264c6dfb29cbe2dd27aef29
+  data.tar.gz: d01d1328cf588685dbd013b12a2479988d21eb88
 SHA512:
-  metadata.gz: e6191f4c46865ff31009ecdad20232240700e79a51be00f1ad73346b4f96415e404297ccae1a519cb5619a3f041d819294e43e85b41341ce93069bb154187a24
-  data.tar.gz: 3580773d5184bcd805586440c15b48082dd9795c778d252d26e58b0ccf5e7ba3e5e1022117403a00386c00b905579ec18ea400e1c3d46b5c4ff4321335048d06
+  metadata.gz: f8deb67b53bfe0082cb034b72d02a8319b6903c901eed415f1c9eab5effad1b0e4618ba9e347f1aad0dd1098114cd0921df9977732de1ce73ea4f7977340da16
+  data.tar.gz: ad6eef6945afbf09c4efc5822184d7fff1b5d009ba875beb6988999497ee5bb74a581d46428fc124235f09bab19040b9fbccd6843dd113f30a2a524c44a0f76e

data/.gitignore

@@ -10,3 +10,4 @@
 /test/dummy/tmp/
 /test/dummy/log/
 *.gem
+*.log

data/.travis.yml

@@ -3,3 +3,5 @@ language: ruby
 rvm:
   - 2.3.0
 before_install: gem install bundler -v 1.12.5
+after_success:
+  - bundle exec codeclimate-test-reporter

data/Gemfile

@@ -5,7 +5,8 @@ gemspec
 gem 'rails', '~> 5.0'
 
 group :test do
-  gem "codeclimate-test-reporter", require: nil
+  gem 'codeclimate-test-reporter', '~> 1.0.0'
+  gem 'simplecov'
   gem 'minitest-spec-rails'
   gem 'minitest-rails-capybara'
   gem 'capybara_minitest_spec'

data/Rakefile

@@ -14,11 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
-
-
 require 'bundler/gem_tasks'
 
 require 'rake/testtask'
@@ -30,5 +25,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/authoreyes.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://www.github.com/tektite-software/authoreyes'
   spec.license       = 'MIT'
 
-
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -33,5 +32,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'devise'
   spec.add_development_dependency 'byebug'
-
 end

data/authorization_rules.dist.rb

@@ -1,20 +1,20 @@
 authorization do
   role :guest do
     # add permissions for guests here, e.g.
-    #has_permission_on :conferences, :to => :read
+    # has_permission_on :conferences, :to => :read
   end
 
   # permissions on other roles, such as
-  #role :admin do
+  # role :admin do
   #  has_permission_on :conferences, :to => :manage
-  #end
+  # end
 end
 
 privileges do
   # default privilege hierarchies to facilitate RESTful Rails apps
-  privilege :manage, :includes => [:create, :read, :update, :delete]
-  privilege :read, :includes => [:index, :show]
-  privilege :create, :includes => :new
-  privilege :update, :includes => :edit
-  privilege :delete, :includes => :destroy
+  privilege :manage, includes: [:create, :read, :update, :delete]
+  privilege :read, includes: [:index, :show]
+  privilege :create, includes: :new
+  privilege :update, includes: :edit
+  privilege :delete, includes: :destroy
 end

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "authoreyes"
+require 'bundler/setup'
+require 'authoreyes'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "authoreyes"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/bin/test

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$: << File.expand_path(File.expand_path('../../test', __FILE__))
+$LOAD_PATH << File.expand_path(File.expand_path('../../test', __FILE__))
 
 require 'bundler/setup'
 require 'rails/test_unit/minitest_plugin'

data/lib/authoreyes/authorization/anonymous_user.rb

@@ -3,7 +3,7 @@ module Authoreyes
     # Represents a pseudo-user to facilitate anonymous users in applications
     class AnonymousUser
       attr_reader :role_symbols
-      def initialize (roles = [Authorization.default_role])
+      def initialize(roles = [Authorization.default_role])
         @role_symbols = roles
       end
     end

data/lib/authoreyes/authorization/attribute.rb

@@ -4,20 +4,20 @@ module Authoreyes
       # attr_conditions_hash of form
       # { :object_attribute => [operator, value_block], ... }
       # { :object_attribute => { :attr => ... } }
-      def initialize (conditions_hash)
+      def initialize(conditions_hash)
         @conditions_hash = conditions_hash
       end
 
-      def initialize_copy (from)
+      def initialize_copy(_from)
         @conditions_hash = deep_hash_clone(@conditions_hash)
       end
 
-      def validate? (attr_validator, object = nil, hash = nil)
+      def validate?(attr_validator, object = nil, hash = nil)
         object ||= attr_validator.object
         return false unless object
 
-        if ( Authorization.is_a_association_proxy?(object) &&
-             object.respond_to?(:empty?) )
+        if Authorization.is_a_association_proxy?(object) &&
+           object.respond_to?(:empty?)
           return false if object.empty?
           object.each do |member|
             return true if validate?(attr_validator, member, hash)
@@ -32,12 +32,12 @@ module Authoreyes
               attr_value.any? do |inner_value|
                 validate?(attr_validator, inner_value, value)
               end
-            elsif attr_value == nil
+            elsif attr_value.nil?
               raise NilAttributeValueError, "Attribute #{attr.inspect} is nil in #{object.inspect}."
             else
               validate?(attr_validator, attr_value, value)
             end
-          elsif value.is_a?(Array) and value.length == 2 and value.first.is_a?(Symbol)
+          elsif value.is_a?(Array) && value.length == 2 && value.first.is_a?(Symbol)
             evaluated = if value[1].is_a?(Proc)
                           attr_validator.evaluate(value[1])
                         else
@@ -52,41 +52,41 @@ module Authoreyes
               begin
                 attr_value.include?(evaluated)
               rescue NoMethodError => e
-                raise AuthorizationUsageError, "Operator contains requires a " +
-                    "subclass of Enumerable as attribute value, got: #{attr_value.inspect} " +
-                    "contains #{evaluated.inspect}: #{e}"
+                raise AuthorizationUsageError, 'Operator contains requires a ' \
+                                               "subclass of Enumerable as attribute value, got: #{attr_value.inspect} " \
+                                               "contains #{evaluated.inspect}: #{e}"
               end
             when :does_not_contain
               begin
                 !attr_value.include?(evaluated)
               rescue NoMethodError => e
-                raise AuthorizationUsageError, "Operator does_not_contain requires a " +
-                    "subclass of Enumerable as attribute value, got: #{attr_value.inspect} " +
-                    "does_not_contain #{evaluated.inspect}: #{e}"
+                raise AuthorizationUsageError, 'Operator does_not_contain requires a ' \
+                                               "subclass of Enumerable as attribute value, got: #{attr_value.inspect} " \
+                                               "does_not_contain #{evaluated.inspect}: #{e}"
               end
             when :intersects_with
               begin
                 !(evaluated.to_set & attr_value.to_set).empty?
               rescue NoMethodError => e
-                raise AuthorizationUsageError, "Operator intersects_with requires " +
-                    "subclasses of Enumerable, got: #{attr_value.inspect} " +
-                    "intersects_with #{evaluated.inspect}: #{e}"
+                raise AuthorizationUsageError, 'Operator intersects_with requires ' \
+                                               "subclasses of Enumerable, got: #{attr_value.inspect} " \
+                                               "intersects_with #{evaluated.inspect}: #{e}"
               end
             when :is_in
               begin
                 evaluated.include?(attr_value)
               rescue NoMethodError => e
-                raise AuthorizationUsageError, "Operator is_in requires a " +
-                    "subclass of Enumerable as value, got: #{attr_value.inspect} " +
-                    "is_in #{evaluated.inspect}: #{e}"
+                raise AuthorizationUsageError, 'Operator is_in requires a ' \
+                                               "subclass of Enumerable as value, got: #{attr_value.inspect} " \
+                                               "is_in #{evaluated.inspect}: #{e}"
               end
             when :is_not_in
               begin
                 !evaluated.include?(attr_value)
               rescue NoMethodError => e
-                raise AuthorizationUsageError, "Operator is_not_in requires a " +
-                    "subclass of Enumerable as value, got: #{attr_value.inspect} " +
-                    "is_not_in #{evaluated.inspect}: #{e}"
+                raise AuthorizationUsageError, 'Operator is_not_in requires a ' \
+                                               "subclass of Enumerable as value, got: #{attr_value.inspect} " \
+                                               "is_not_in #{evaluated.inspect}: #{e}"
               end
             when :lt
               attr_value && attr_value < evaluated
@@ -100,32 +100,32 @@ module Authoreyes
               raise AuthorizationError, "Unknown operator #{value[0]}"
             end
           else
-            raise AuthorizationError, "Wrong conditions hash format"
+            raise AuthorizationError, 'Wrong conditions hash format'
           end
         end
       end
 
       # resolves all the values in condition_hash
-      def obligation (attr_validator, hash = nil)
+      def obligation(attr_validator, hash = nil)
         hash = (hash || @conditions_hash).clone
         hash.each do |attr, value|
           if value.is_a?(Hash)
             hash[attr] = obligation(attr_validator, value)
-          elsif value.is_a?(Array) and value.length == 2
+          elsif value.is_a?(Array) && value.length == 2
             hash[attr] = [value[0], attr_validator.evaluate(value[1])]
           else
-            raise AuthorizationError, "Wrong conditions hash format"
+            raise AuthorizationError, 'Wrong conditions hash format'
           end
         end
         hash
       end
 
-      def to_long_s (hash = nil)
+      def to_long_s(hash = nil)
         if hash
           hash.inject({}) do |memo, key_val|
             key, val = key_val
             memo[key] = case val
-                        when Array then "#{val[0]} { #{val[1].respond_to?(:to_ruby) ? val[1].to_ruby.gsub(/^proc \{\n?(.*)\n?\}$/m, '\1') : "..."} }"
+                        when Array then "#{val[0]} { #{val[1].respond_to?(:to_ruby) ? val[1].to_ruby.gsub(/^proc \{\n?(.*)\n?\}$/m, '\1') : '...'} }"
                         when Hash then to_long_s(val)
                         end
             memo
@@ -136,17 +136,16 @@ module Authoreyes
       end
 
       protected
-      def object_attribute_value (object, attr)
-        begin
-          object.send(attr)
-        rescue ArgumentError, NoMethodError => e
-          raise AuthorizationUsageError, "Error occurred while validating attribute ##{attr} on #{object.inspect}: #{e}.\n" +
-            "Please check your authorization rules and ensure the attribute is correctly spelled and \n" +
-            "corresponds to a method on the model you are authorizing for."
-        end
+
+      def object_attribute_value(object, attr)
+        object.send(attr)
+      rescue ArgumentError, NoMethodError => e
+        raise AuthorizationUsageError, "Error occurred while validating attribute ##{attr} on #{object.inspect}: #{e}.\n" \
+                                       "Please check your authorization rules and ensure the attribute is correctly spelled and \n" \
+                                       'corresponds to a method on the model you are authorizing for.'
       end
 
-      def deep_hash_clone (hash)
+      def deep_hash_clone(hash)
         hash.inject({}) do |memo, (key, val)|
           memo[key] = case val
                       when Hash

data/lib/authoreyes/authorization/attribute_with_permission.rb

@@ -5,17 +5,17 @@ module Authoreyes
     class AttributeWithPermission < Attribute
       # E.g. privilege :read, attr_or_hash either :attribute or
       # { :attribute => :deeper_attribute }
-      def initialize (privilege, attr_or_hash, context = nil)
+      def initialize(privilege, attr_or_hash, context = nil)
         @privilege = privilege
         @context = context
         @attr_hash = attr_or_hash
       end
 
-      def initialize_copy (from)
+      def initialize_copy(_from)
         @attr_hash = deep_hash_clone(@attr_hash) if @attr_hash.is_a?(Hash)
       end
 
-      def validate? (attr_validator, object = nil, hash_or_attr = nil)
+      def validate?(attr_validator, object = nil, hash_or_attr = nil)
         object ||= attr_validator.object
         hash_or_attr ||= @attr_hash
         return false unless object
@@ -28,15 +28,15 @@ module Authoreyes
             raise NilAttributeValueError, "Attribute #{hash_or_attr.inspect} is nil in #{object.inspect}."
           when Enumerable
             attr_value.any? do |inner_value|
-              attr_validator.engine.permit? @privilege, :object => inner_value, :user => attr_validator.user
+              attr_validator.engine.permit? @privilege, object: inner_value, user: attr_validator.user
             end
           else
-            attr_validator.engine.permit? @privilege, :object => attr_value, :user => attr_validator.user
+            attr_validator.engine.permit? @privilege, object: attr_value, user: attr_validator.user
           end
         when Hash
           hash_or_attr.all? do |attr, sub_hash|
             attr_value = object_attribute_value(object, attr)
-            if attr_value == nil
+            if attr_value.nil?
               raise NilAttributeValueError, "Attribute #{attr.inspect} is nil in #{object.inspect}."
             elsif attr_value.is_a?(Enumerable)
               attr_value.any? do |inner_value|
@@ -47,14 +47,14 @@ module Authoreyes
             end
           end
         when NilClass
-          attr_validator.engine.permit? @privilege, :object => object, :user => attr_validator.user
+          attr_validator.engine.permit? @privilege, object: object, user: attr_validator.user
         else
           raise AuthorizationError, "Wrong conditions hash format: #{hash_or_attr.inspect}"
         end
       end
 
       # may return an array of obligations to be OR'ed
-      def obligation (attr_validator, hash_or_attr = nil, path = [])
+      def obligation(attr_validator, hash_or_attr = nil, path = [])
         hash_or_attr ||= @attr_hash
         case hash_or_attr
         when Symbol
@@ -71,23 +71,23 @@ module Authoreyes
           end
 
           obligations = attr_validator.engine.obligations(@privilege,
-                            :context => @context,
-                            :user    => attr_validator.user)
+                                                          context: @context,
+                                                          user: attr_validator.user)
 
-          obligations.collect {|obl| {hash_or_attr => obl} }
+          obligations.collect { |obl| { hash_or_attr => obl } }
         when Hash
           obligations_array_attrs = []
           obligations =
-              hash_or_attr.inject({}) do |all, pair|
-                attr, sub_hash = pair
-                all[attr] = obligation(attr_validator, sub_hash, path + [attr])
-                if all[attr].length > 1
-                  obligations_array_attrs << attr
-                else
-                  all[attr] = all[attr].first
-                end
-                all
+            hash_or_attr.inject({}) do |all, pair|
+              attr, sub_hash = pair
+              all[attr] = obligation(attr_validator, sub_hash, path + [attr])
+              if all[attr].length > 1
+                obligations_array_attrs << attr
+              else
+                all[attr] = all[attr].first
               end
+              all
+            end
           obligations = [obligations]
           obligations_array_attrs.each do |attr|
             next_array_size = obligations.first[attr].length
@@ -102,8 +102,8 @@ module Authoreyes
           obligations
         when NilClass
           attr_validator.engine.obligations(@privilege,
-              :context => attr_validator.context,
-              :user    => attr_validator.user)
+                                            context: attr_validator.context,
+                                            user: attr_validator.user)
         else
           raise AuthorizationError, "Wrong conditions hash format: #{hash_or_attr.inspect}"
         end
@@ -114,10 +114,11 @@ module Authoreyes
       end
 
       private
-      def self.reflection_for_path (parent_model, path)
+
+      def self.reflection_for_path(parent_model, path)
         reflection = path.empty? ? parent_model : begin
           parent = reflection_for_path(parent_model, path[0..-2])
-          if !parent.respond_to?(:proxy_reflection) and parent.respond_to?(:klass)
+          if !parent.respond_to?(:proxy_reflection) && parent.respond_to?(:klass)
             parent.klass.reflect_on_association(path.last)
           else
             parent.reflect_on_association(path.last)

data/lib/authoreyes/authorization/authorization_rule.rb

@@ -2,10 +2,10 @@ module Authoreyes
   module Authorization
     class AuthorizationRule
       attr_reader :attributes, :contexts, :role, :privileges, :join_operator,
-          :source_file, :source_line
+                  :source_file, :source_line
 
-      def initialize (role, privileges = [], contexts = nil, join_operator = :or,
-            options = {})
+      def initialize(role, privileges = [], contexts = nil, join_operator = :or,
+                     options = {})
         @role = role
         @privileges = Set.new(privileges)
         @contexts = Set.new((contexts && !contexts.is_a?(Array) ? [contexts] : contexts))
@@ -15,28 +15,28 @@ module Authoreyes
         @source_line = options[:source_line]
       end
 
-      def initialize_copy (from)
+      def initialize_copy(_from)
         @privileges = @privileges.clone
         @contexts = @contexts.clone
-        @attributes = @attributes.collect {|attribute| attribute.clone }
+        @attributes = @attributes.collect(&:clone)
       end
 
-      def append_privileges (privs)
+      def append_privileges(privs)
         @privileges.merge(privs)
       end
 
-      def append_attribute (attribute)
+      def append_attribute(attribute)
         @attributes << attribute
       end
 
-      def matches? (roles, privs, context = nil)
+      def matches?(roles, privs, context = nil)
         roles = [roles] unless roles.is_a?(Array)
-        @contexts.include?(context) and roles.include?(@role) and
-          not (@privileges & privs).empty?
+        @contexts.include?(context) && roles.include?(@role) &&
+          !(@privileges & privs).empty?
       end
 
-      def validate? (attr_validator, skip_attribute = false)
-        skip_attribute or @attributes.empty? or
+      def validate?(attr_validator, skip_attribute = false)
+        skip_attribute || @attributes.empty? ||
           @attributes.send(@join_operator == :and ? :all? : :any?) do |attr|
             begin
               attr.validate?(attr_validator)
@@ -46,7 +46,7 @@ module Authoreyes
           end
       end
 
-      def obligations (attr_validator)
+      def obligations(attr_validator)
         exceptions = []
         obligations = @attributes.collect do |attr|
           begin
@@ -57,13 +57,13 @@ module Authoreyes
           end
         end
 
-        if exceptions.length > 0 and (@join_operator == :and or exceptions.length == @attributes.length)
-          raise NotAuthorized, "Missing authorization in collecting obligations: #{exceptions.map(&:to_s) * ", "}"
+        if !exceptions.empty? && (@join_operator == :and || exceptions.length == @attributes.length)
+          raise NotAuthorized, "Missing authorization in collecting obligations: #{exceptions.map(&:to_s) * ', '}"
         end
 
-        if @join_operator == :and and !obligations.empty?
+        if @join_operator == :and && !obligations.empty?
           # cross product of OR'ed obligations in arrays
-          arrayed_obligations = obligations.map {|obligation| obligation.is_a?(Hash) ? [obligation] : obligation}
+          arrayed_obligations = obligations.map { |obligation| obligation.is_a?(Hash) ? [obligation] : obligation }
           merged_obligations = arrayed_obligations.first
           arrayed_obligations[1..-1].each do |inner_obligations|
             previous_merged_obligations = merged_obligations
@@ -81,9 +81,8 @@ module Authoreyes
       end
 
       def to_long_s
-        attributes.collect {|attr| attr.to_long_s } * "; "
+        attributes.collect(&:to_long_s) * '; '
       end
     end
-
   end
 end

data/lib/authoreyes/authorization/authorization_rule_set.rb

@@ -10,8 +10,8 @@ module Authoreyes
         reset!
       end
 
-      def initialize_copy(source)
-        @rules = @rules.collect {|rule| rule.clone}
+      def initialize_copy(_source)
+        @rules = @rules.collect(&:clone)
         reset!
       end
 
@@ -28,7 +28,7 @@ module Authoreyes
         reset!
       end
 
-      def << rule
+      def <<(rule)
         @rules << rule
         reset!
       end
@@ -38,8 +38,9 @@ module Authoreyes
       end
 
       private
+
       def reset!
-        @cached_auth_rules =nil
+        @cached_auth_rules = nil
       end
 
       def cached_auth_rules

data/lib/authoreyes/authorization/engine.rb

@@ -18,7 +18,7 @@ module Authoreyes
         options = {
           reader: nil
         }.merge(options)
-        #@auth_rules = AuthorizationRuleSet.new reader.auth_rules_reader.auth_rules
+        # @auth_rules = AuthorizationRuleSet.new reader.auth_rules_reader.auth_rules
         @reader = ::Authoreyes::Parser::DSLParser.factory(options[:reader] || AUTH_DSL_FILES)
       end
 
@@ -75,18 +75,18 @@ module Authoreyes
       #   Should NotAuthorized exceptions be raised
       #   Defaults to true.
       #
-      def permit! (privilege, options = {})
+      def permit!(privilege, options = {})
         return true if Authorization.ignore_access_control
         options = {
-          :object => nil,
-          :skip_attribute_test => false,
-          :context => nil,
-          :bang => true
+          object: nil,
+          skip_attribute_test: false,
+          context: nil,
+          bang: true
         }.merge(options)
 
         # Make sure we're handling all privileges as symbols.
-        privilege = privilege.is_a?( Array ) ?
-                    privilege.flatten.collect { |priv| priv.to_sym } :
+        privilege = privilege.is_a?(Array) ?
+                    privilege.flatten.collect(&:to_sym) :
                     privilege.to_sym
 
         # Convert context to symbol as well
@@ -102,18 +102,22 @@ module Authoreyes
         # Example: permit!( :edit, :object => user.posts )
         #
         if Authorization.is_a_association_proxy?(options[:object]) && options[:object].respond_to?(:new)
-          options[:object] = (Rails.version < "3.0" ? options[:object] : options[:object].where(nil)).new
+          options[:object] = (Rails.version < '3.0' ? options[:object] : options[:object].where(nil)).new
         end
 
-        options[:context] ||= options[:object] && (
-          options[:object].class.respond_to?(:decl_auth_context) ?
-              options[:object].class.decl_auth_context :
-              options[:object].class.name.tableize.to_sym
-        ) rescue NoMethodError
+        begin
+          options[:context] ||= options[:object] && (
+                    options[:object].class.respond_to?(:decl_auth_context) ?
+                        options[:object].class.decl_auth_context :
+                        options[:object].class.name.tableize.to_sym
+          )
+        rescue
+          NoMethodError
+        end
 
         user, roles, privileges = user_roles_privleges_from_options(privilege, options)
 
-        return true if roles.is_a?(Array) and not (roles & omnipotent_roles).empty?
+        return true if roles.is_a?(Array) && !(roles & omnipotent_roles).empty?
 
         # find a authorization rule that matches for at least one of the roles and
         # at least one of the given privileges
@@ -127,9 +131,9 @@ module Authoreyes
 
         if options[:bang]
           if rules.empty?
-            raise NotAuthorized, "No matching rules found for #{privilege} for #{user.inspect} " +
-              "(roles #{roles.inspect}, privileges #{privileges.inspect}, " +
-              "context #{options[:context].inspect})."
+            raise NotAuthorized, "No matching rules found for #{privilege} for #{user.inspect} " \
+                                 "(roles #{roles.inspect}, privileges #{privileges.inspect}, " \
+                                 "context #{options[:context].inspect})."
           else
             raise AttributeAuthorizationError, "#{privilege} not allowed for #{user.inspect} on #{(options[:object] || options[:context]).inspect}."
           end
@@ -140,8 +144,8 @@ module Authoreyes
 
       # Calls permit! but doesn't raise authorization errors. If no exception is
       # raised, permit? returns true and yields  to the optional block.
-      def permit? (privilege, options = {}) # :yields:
-        if permit!(privilege, options.merge(:bang=> false))
+      def permit?(privilege, options = {}) # :yields:
+        if permit!(privilege, options.merge(bang: false))
           yield if block_given?
           true
         else
@@ -165,13 +169,13 @@ module Authoreyes
       # [:+context+]  See permit!
       # [:+user+]  See permit!
       #
-      def obligations (privilege, options = {})
-        options = {:context => nil}.merge(options)
+      def obligations(privilege, options = {})
+        options = { context: nil }.merge(options)
         user, roles, privileges = user_roles_privleges_from_options(privilege, options)
 
-        permit!(privilege, :skip_attribute_test => true, :user => user, :context => options[:context])
+        permit!(privilege, skip_attribute_test: true, user: user, context: options[:context])
 
-        return [] if roles.is_a?(Array) and not (roles & omnipotent_roles).empty?
+        return [] if roles.is_a?(Array) && !(roles & omnipotent_roles).empty?
 
         attr_validator = AttributeValidator.new(self, user, nil, privilege, options[:context])
         matching_auth_rules(roles, privileges, options[:context]).collect do |rule|
@@ -182,31 +186,31 @@ module Authoreyes
       # Returns the description for the given role.  The description may be
       # specified with the authorization rules.  Returns +nil+ if none was
       # given.
-      def description_for (role)
+      def description_for(role)
         role_descriptions[role]
       end
 
       # Returns the title for the given role.  The title may be
       # specified with the authorization rules.  Returns +nil+ if none was
       # given.
-      def title_for (role)
+      def title_for(role)
         role_titles[role]
       end
 
       # Returns the role symbols of the given user.
-      def roles_for (user)
+      def roles_for(user)
         user ||= Authorization.current_user
         raise AuthorizationUsageError, "User object doesn't respond to roles (#{user.inspect})" \
-          if !user.respond_to?(:role_symbols) and !user.respond_to?(:roles)
+          if !user.respond_to?(:role_symbols) && !user.respond_to?(:roles)
 
-        Rails.logger.info("The use of user.roles is deprecated.  Please add a method " +
-            "role_symbols to your User model.") if defined?(Rails) and Rails.respond_to?(:logger) and !user.respond_to?(:role_symbols)
+        Rails.logger.info('The use of user.roles is deprecated.  Please add a method ' \
+            'role_symbols to your User model.') if defined?(Rails) && Rails.respond_to?(:logger) && !user.respond_to?(:role_symbols)
 
         roles = user.respond_to?(:role_symbols) ? user.role_symbols : user.roles
 
-        raise AuthorizationUsageError, "User.#{user.respond_to?(:role_symbols) ? 'role_symbols' : 'roles'} " +
-          "doesn't return an Array of Symbols (#{roles.inspect})" \
-              if !roles.is_a?(Array) or (!roles.empty? and !roles[0].is_a?(Symbol))
+        raise AuthorizationUsageError, "User.#{user.respond_to?(:role_symbols) ? 'role_symbols' : 'roles'} " \
+                                       "doesn't return an Array of Symbols (#{roles.inspect})" \
+              if !roles.is_a?(Array) || (!roles.empty? && !roles[0].is_a?(Symbol))
 
         (roles.empty? ? [Authorization.default_role] : roles)
       end
@@ -218,7 +222,13 @@ module Authoreyes
 
       def self.development_reload?
         if Rails.env.development?
-          mod_time = AUTH_DSL_FILES.map { |m| File.mtime(m) rescue Time.at(0) }.flatten.max
+          mod_time = AUTH_DSL_FILES.map do |m|
+            begin
+                                     File.mtime(m)
+                                   rescue
+                                     Time.at(0)
+                                   end
+          end.flatten.max
           @@auth_dsl_last_modified ||= mod_time
           if mod_time > @@auth_dsl_last_modified
             @@auth_dsl_last_modified = mod_time
@@ -230,8 +240,8 @@ module Authoreyes
       # Returns an instance of Engine, which is created if there isn't one
       # yet.  If +dsl_file+ is given, it is passed on to Engine.new and
       # a new instance is always created.
-      def self.instance (dsl_file = nil)
-        if dsl_file or development_reload?
+      def self.instance(dsl_file = nil)
+        if dsl_file || development_reload?
           @@instance = new(dsl_file)
         else
           @@instance ||= new
@@ -240,7 +250,7 @@ module Authoreyes
 
       class AttributeValidator # :nodoc:
         attr_reader :user, :object, :engine, :context, :privilege
-        def initialize (engine, user, object = nil, privilege = nil, context = nil)
+        def initialize(engine, user, object = nil, privilege = nil, context = nil)
           @engine = engine
           @user = user
           @object = object
@@ -248,33 +258,34 @@ module Authoreyes
           @context = context
         end
 
-        def evaluate (value_block)
-          # TODO cache?
+        def evaluate(value_block)
+          # TODO: cache?
           instance_eval(&value_block)
         end
       end
 
       private
+
       def user_roles_privleges_from_options(privilege, options)
         options = {
-          :user => nil,
-          :context => nil,
-          :user_roles => nil
+          user: nil,
+          context: nil,
+          user_roles: nil
         }.merge(options)
         user = options[:user] || Authorization.current_user
         privileges = privilege.is_a?(Array) ? privilege : [privilege]
 
-        raise AuthorizationUsageError, "No user object given (#{user.inspect}) or " +
-          "set through Authorization.current_user" unless user
+        raise AuthorizationUsageError, "No user object given (#{user.inspect}) or " \
+                                       'set through Authorization.current_user' unless user
 
         roles = options[:user_roles] || flatten_roles(roles_for(user))
         privileges = flatten_privileges privileges, options[:context]
         [user, roles, privileges]
       end
 
-      def flatten_roles (roles, flattened_roles = Set.new)
-        # TODO caching?
-        roles.reject {|role| flattened_roles.include?(role)}.each do |role|
+      def flatten_roles(roles, flattened_roles = Set.new)
+        # TODO: caching?
+        roles.reject { |role| flattened_roles.include?(role) }.each do |role|
           flattened_roles << role
           flatten_roles(role_hierarchy[role], flattened_roles) if role_hierarchy[role]
         end
@@ -282,10 +293,10 @@ module Authoreyes
       end
 
       # Returns the privilege hierarchy flattened for given privileges in context.
-      def flatten_privileges (privileges, context = nil, flattened_privileges = Set.new)
-        # TODO caching?
-        raise AuthorizationUsageError, "No context given or inferable from object" unless context
-        privileges.reject {|priv| flattened_privileges.include?(priv)}.each do |priv|
+      def flatten_privileges(privileges, context = nil, flattened_privileges = Set.new)
+        # TODO: caching?
+        raise AuthorizationUsageError, 'No context given or inferable from object' unless context
+        privileges.reject { |priv| flattened_privileges.include?(priv) }.each do |priv|
           flattened_privileges << priv
           flatten_privileges(rev_priv_hierarchy[[priv, nil]], context, flattened_privileges) if rev_priv_hierarchy[[priv, nil]]
           flatten_privileges(rev_priv_hierarchy[[priv, context]], context, flattened_privileges) if rev_priv_hierarchy[[priv, context]]
@@ -293,7 +304,7 @@ module Authoreyes
         flattened_privileges.to_a
       end
 
-      def matching_auth_rules (roles, privileges, context)
+      def matching_auth_rules(roles, privileges, context)
         auth_rules.matching(roles, privileges, context)
       end
     end

data/lib/authoreyes/helpers.rb

@@ -1,6 +1,5 @@
 module Authoreyes
   # This module contains all helpers for views, controllers, and models
   module Helpers
-
   end
 end

data/lib/authoreyes/helpers/in_controller.rb

@@ -14,7 +14,6 @@ module Authoreyes
 
       # TODO: Implement this!
       def filter_resource_access(options = {})
-
       end
 
       ActionController::Base.send(:define_method, :redirect_if_unauthorized) do
@@ -36,16 +35,24 @@ module Authoreyes
         end
       end
 
+      ActionController::Metal.send(:define_method, :authorization_object) do
+        if params[:id].present?
+          begin
+            controller_name.singularize.capitalize.constantize.find(params[:id])
+          rescue NameError
+            logger.warn '[Authoreyes] Could not interpolate object!'
+          end
+        end
+      end
+
       ActionController::API.send(:define_method, :render_unauthorized) do
         begin
-          permitted_to! action_name
+          permitted_to! action_name, authorization_object
         rescue Authoreyes::Authorization::NotAuthorized => e
-          puts e
-          response_object = ActiveModelSerializers::Model.new()
-          response_object.attributes.merge!({
-            action: action_name,
-            controller: controller_name
-          })
+          logger.warn "[Authoreyes] #{e}"
+          response_object = ActiveModelSerializers::Model.new
+          response_object.attributes.merge!(action: action_name,
+                                            controller: controller_name)
           response_object.errors.add :action, e
           # Assumes ActiveModel::Serializers is used.
           # If not used, you will have to override `render_unauthorized`
@@ -94,22 +101,21 @@ module Authoreyes
         context = object = nil
         if object_or_sym.nil?
           context = controller_name.to_sym
-        elsif !Authorization.is_a_association_proxy?(object_or_sym) and object_or_sym.is_a?(Symbol)
+        elsif !Authorization.is_a_association_proxy?(object_or_sym) && object_or_sym.is_a?(Symbol)
           context = object_or_sym
         else
           object = object_or_sym
         end
 
-        result = {:object => object,
-          :context => context,
-          :skip_attribute_test => object.nil?,
-          :bang => bang}.merge(options)
+        result = { object: object,
+                   context: context,
+                   # :skip_attribute_test => object.nil?,
+                   bang: bang }.merge(options)
         result[:user] = current_user unless result.key?(:user)
         result
       end
 
       class_methods do
-
       end
     end
   end

data/lib/authoreyes/parser.rb

@@ -9,9 +9,9 @@ module Authoreyes
   # constructs a data model of its contents.
   module Parser
     # Signals that the specified file to load was not found.
-    class DSLFileNotFoundError < Exception; end
+    class DSLFileNotFoundError < RuntimeError; end
     # Signals errors that occur while reading and parsing an authorization DSL
-    class DSLError < Exception; end
+    class DSLError < RuntimeError; end
     # Signals errors in the syntax of an authorization DSL.
     class DSLSyntaxError < DSLError; end
   end

data/lib/authoreyes/parser/authorization_rules_parser.rb

@@ -34,7 +34,7 @@ module Authoreyes
     #
     class AuthorizationRulesParser
       attr_reader :roles, :role_hierarchy, :auth_rules,
-        :role_descriptions, :role_titles, :omnipotent_roles # :nodoc:
+                  :role_descriptions, :role_titles, :omnipotent_roles # :nodoc:
 
       def initialize # :nodoc:
         @current_role = nil
@@ -48,7 +48,7 @@ module Authoreyes
         @auth_rules = ::Authoreyes::Authorization::AuthorizationRuleSet.new
       end
 
-      def initialize_copy (from) # :nodoc:
+      def initialize_copy(from) # :nodoc:
         [
           :roles,
           :role_hierarchy,
@@ -61,7 +61,7 @@ module Authoreyes
         end
       end
 
-      def append_role (role, options = {}) # :nodoc:
+      def append_role(role, options = {}) # :nodoc:
         @roles << role unless @roles.include? role
         @role_titles[role] = options[:title] if options[:title]
         @role_descriptions[role] =
@@ -74,7 +74,7 @@ module Authoreyes
       #     has_permissions_on ...
       #   end
       #
-      def role (role, options = {}, &block)
+      def role(role, options = {})
         append_role role, options
         @current_role = role
         yield
@@ -92,8 +92,8 @@ module Authoreyes
       #     has_permission_on :employees, :to => :read
       #   end
       #
-      def includes (*roles)
-        raise DSLError, "includes only in role blocks" if @current_role.nil?
+      def includes(*roles)
+        raise DSLError, 'includes only in role blocks' if @current_role.nil?
         @role_hierarchy[@current_role] ||= []
         @role_hierarchy[@current_role] += roles.flatten
       end
@@ -127,27 +127,27 @@ module Authoreyes
       #   of the has_permission_on block.  May be :+and+ or :+or+.
       #   Defaults to :+or+.
       #
-      def has_permission_on (*args, &block)
+      def has_permission_on(*args)
         options = args.extract_options!
         context = args.flatten
 
-        raise DSLError, "has_permission_on only allowed in role blocks" if @current_role.nil?
-        options = {:to => [], :join_by => :or}.merge(options)
+        raise DSLError, 'has_permission_on only allowed in role blocks' if @current_role.nil?
+        options = { to: [], join_by: :or }.merge(options)
 
         privs = options[:to]
         privs = [privs] unless privs.is_a?(Array)
-        raise DSLError, "has_permission_on either needs a block or :to option" if !block_given? and privs.empty?
+        raise DSLError, 'has_permission_on either needs a block or :to option' if !block_given? && privs.empty?
 
         file, line = file_and_line_number_from_call_stack
         rule = ::Authoreyes::Authorization::AuthorizationRule.new(@current_role, privs, context, options[:join_by],
-                   :source_file => file, :source_line => line)
+                                                                  source_file: file, source_line: line)
         @auth_rules << rule
         if block_given?
           @current_rule = rule
           yield
           raise DSLError, "has_permission_on block
             content specifies no privileges" if rule.privileges.empty?
-          # TODO ensure?
+          # TODO: ensure?
           @current_rule = nil
         end
       end
@@ -157,7 +157,7 @@ module Authoreyes
       #     has_omnipotence
       #   end
       def has_omnipotence
-        raise DSLError, "has_omnipotence only allowed in role blocks" if @current_role.nil?
+        raise DSLError, 'has_omnipotence only allowed in role blocks' if @current_role.nil?
         @omnipotent_roles << @current_role
       end
 
@@ -166,8 +166,8 @@ module Authoreyes
       #     description "To be assigned to administrative personnel"
       #     has_permission_on ...
       #   end
-      def description (text)
-        raise DSLError, "description only allowed in role blocks" if @current_role.nil?
+      def description(text)
+        raise DSLError, 'description only allowed in role blocks' if @current_role.nil?
         role_descriptions[@current_role] = text
       end
 
@@ -176,8 +176,8 @@ module Authoreyes
       #     title "Administrator"
       #     has_permission_on ...
       #   end
-      def title (text)
-        raise DSLError, "title only allowed in role blocks" if @current_role.nil?
+      def title(text)
+        raise DSLError, 'title only allowed in role blocks' if @current_role.nil?
         role_titles[@current_role] = text
       end
 
@@ -189,8 +189,8 @@ module Authoreyes
       #       to :create, :read, :update, :delete
       #     end
       #   end
-      def to (*privs)
-        raise DSLError, "to only allowed in has_permission_on blocks" if @current_rule.nil?
+      def to(*privs)
+        raise DSLError, 'to only allowed in has_permission_on blocks' if @current_rule.nil?
         @current_rule.append_privileges(privs.flatten)
       end
 
@@ -248,8 +248,8 @@ module Authoreyes
       #   if_attribute :type => "special"
       #   if_attribute :id   => [1,2]
       #
-      def if_attribute (attr_conditions_hash)
-        raise DSLError, "if_attribute only in has_permission blocks" if @current_rule.nil?
+      def if_attribute(attr_conditions_hash)
+        raise DSLError, 'if_attribute only in has_permission blocks' if @current_rule.nil?
         parse_attribute_conditions_hash!(attr_conditions_hash)
         @current_rule.append_attribute ::Authoreyes::Authorization::Attribute.new(attr_conditions_hash)
       end
@@ -300,37 +300,37 @@ module Authoreyes
       #     if_permitted_to :read, :home_branch, :context => :branches
       #     if_permitted_to :read, :branch => :main_company, :context => :companies
       #
-      def if_permitted_to (privilege, attr_or_hash = nil, options = {})
-        raise DSLError, "if_permitted_to only in has_permission blocks" if @current_rule.nil?
+      def if_permitted_to(privilege, attr_or_hash = nil, options = {})
+        raise DSLError, 'if_permitted_to only in has_permission blocks' if @current_rule.nil?
         options[:context] ||= attr_or_hash.delete(:context) if attr_or_hash.is_a?(Hash)
         # only :context option in attr_or_hash:
-        attr_or_hash = nil if attr_or_hash.is_a?(Hash) and attr_or_hash.empty?
+        attr_or_hash = nil if attr_or_hash.is_a?(Hash) && attr_or_hash.empty?
         @current_rule.append_attribute ::Authoreyes::Authorization::AttributeWithPermission.new(privilege,
-            attr_or_hash, options[:context])
+                                                                                                attr_or_hash, options[:context])
       end
 
       # In an if_attribute statement, is says that the value has to be
       # met exactly by the if_attribute attribute.  For information on the block
       # argument, see if_attribute.
-      def is (&block)
+      def is(&block)
         [:is, block]
       end
 
       # The negation of is.
-      def is_not (&block)
+      def is_not(&block)
         [:is_not, block]
       end
 
       # In an if_attribute statement, contains says that the value has to be
       # part of the collection specified by the if_attribute attribute.
       # For information on the block argument, see if_attribute.
-      def contains (&block)
+      def contains(&block)
         [:contains, block]
       end
 
       # The negation of contains.  Currently, query rewriting is disabled
       # for does_not_contain.
-      def does_not_contain (&block)
+      def does_not_contain(&block)
         [:does_not_contain, block]
       end
 
@@ -338,51 +338,52 @@ module Authoreyes
       # one of the values has to be part of the collection specified by the
       # if_attribute attribute.  The value block needs to evaluate to an
       # Enumerable.  For information on the block argument, see if_attribute.
-      def intersects_with (&block)
+      def intersects_with(&block)
         [:intersects_with, block]
       end
 
       # In an if_attribute statement, is_in says that the value has to
       # contain the attribute value.
       # For information on the block argument, see if_attribute.
-      def is_in (&block)
+      def is_in(&block)
         [:is_in, block]
       end
 
       # The negation of is_in.
-      def is_not_in (&block)
+      def is_not_in(&block)
         [:is_not_in, block]
       end
 
       # Less than
-      def lt (&block)
+      def lt(&block)
         [:lt, block]
       end
 
       # Less than or equal to
-      def lte (&block)
+      def lte(&block)
         [:lte, block]
       end
 
       # Greater than
-      def gt (&block)
+      def gt(&block)
         [:gt, block]
       end
 
       # Greater than or equal to
-      def gte (&block)
+      def gte(&block)
         [:gte, block]
       end
 
       private
-      def parse_attribute_conditions_hash! (hash)
+
+      def parse_attribute_conditions_hash!(hash)
         merge_hash = {}
         hash.each do |key, value|
           if value.is_a?(Hash)
             parse_attribute_conditions_hash!(value)
           elsif !value.is_a?(Array)
             merge_hash[key] = [:is, proc { value }]
-          elsif value.is_a?(Array) and !value[0].is_a?(Symbol)
+          elsif value.is_a?(Array) && !value[0].is_a?(Symbol)
             merge_hash[key] = [:is_in, proc { value }]
           end
         end
@@ -391,8 +392,8 @@ module Authoreyes
 
       def file_and_line_number_from_call_stack
         caller_parts = caller(2).first.split(':')
-        [caller_parts[0] == "(eval)" ? nil : caller_parts[0],
-          caller_parts[1] && caller_parts[1].to_i]
+        [caller_parts[0] == '(eval)' ? nil : caller_parts[0],
+         caller_parts[1] && caller_parts[1].to_i]
       end
     end
   end

data/lib/authoreyes/parser/dsl_parser.rb

@@ -13,7 +13,7 @@ module Authoreyes
         @auth_rules_reader = AuthorizationRulesParser.new
       end
 
-      def initialize_copy (from) # :nodoc:
+      def initialize_copy(from) # :nodoc:
         @privileges_reader = from.privileges_reader.clone
         @auth_rules_reader = from.auth_rules_reader.clone
       end
@@ -40,8 +40,8 @@ module Authoreyes
         else
           DSLMethods.new(self).instance_eval(dsl_data)
         end
-        rescue SyntaxError, NoMethodError, NameError => e
-          raise DSLSyntaxError, "Illegal DSL syntax: #{e}"
+      rescue SyntaxError, NoMethodError, NameError => e
+        raise DSLSyntaxError, "Illegal DSL syntax: #{e}"
       end
 
       # Load and parse a DSL from the given file name.
@@ -59,7 +59,7 @@ module Authoreyes
 
       # Loads and parses DSL files and returns a new reader
       def self.load(dsl_files)
-        # TODO cache reader in production mode?
+        # TODO: cache reader in production mode?
         reader = new
         dsl_files = [dsl_files].flatten
         dsl_files.each do |file|

data/lib/authoreyes/parser/priveleges_reader.rb

@@ -3,7 +3,7 @@ module Authoreyes
     # The PrivilegeReader handles the part of the authorization DSL in
     # a +privileges+ block.  Here, privilege hierarchies are defined.
     class PrivilegesReader
-      # TODO handle privileges with separated context
+      # TODO: handle privileges with separated context
       attr_reader :privileges, :privilege_hierarchy # :nodoc:
 
       def initialize # :nodoc:
@@ -47,7 +47,7 @@ module Authoreyes
       # be used inside a privilege block.
       def includes(*privileges)
         raise DSLError,
-          "includes only in privilege block" if @current_privelege.nil?
+              'includes only in privilege block' if @current_privelege.nil?
         privileges.each do |priv|
           append_privilege priv
           @privilege_hierarchy[@current_privelege] ||= []

data/lib/authoreyes/railtie.rb

@@ -10,7 +10,7 @@ module Authoreyes
     # +auth_rules_file+ is the path of the authorization rules file.
     config.authoreyes = ActiveSupport::OrderedOptions.new
 
-    initializer 'authoreyes.setup', before: 'authoreyes.engine' do |app|
+    initializer 'authoreyes.setup', before: 'authoreyes.engine' do |_app|
       # Set default Authoreyes options
       default_options = ActiveSupport::OrderedOptions.new
       default_options.auth_rules_file =
@@ -20,7 +20,7 @@ module Authoreyes
       # Validates options
       unless [nil, :whitelist, :blacklist].include? config.authoreyes.mode
         raise InvalidConfigurationOption,
-          "Unrecognized mode.  Valid options are :whitelist and :blacklist"
+              'Unrecognized mode.  Valid options are :whitelist and :blacklist'
       end
 
       # Merge user options with defaults
@@ -28,7 +28,7 @@ module Authoreyes
     end
 
     # Controller integration
-    initializer 'authoreyes.in_controller' do |app|
+    initializer 'authoreyes.in_controller' do |_app|
       ActiveSupport.on_load :action_controller do
         if Rails.application.config.api_only
           before_action :render_unauthorized

data/lib/authoreyes/version.rb

@@ -1,3 +1,3 @@
 module Authoreyes
-  VERSION = "0.2.1"
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authoreyes
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tektite Software
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails