arrthorizer 0.2.1 → 0.3.0

data/.travis.yml

@@ -3,7 +3,7 @@ cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
 gemfile:
   - gemfiles/Gemfile.rails.3.2
   - gemfiles/Gemfile.rails.4.0

data/README.md

@@ -11,6 +11,15 @@ Arrthorizer is flexible and allows you to inject much of your own application lo
 
 Arrthorizer is [designed for ease of use and configurability](https://github.com/BUS-OGD/arrthorizer/wiki/Desired-and-required-features). Its Rails version (currently the *only* version) comes bundled with some useful generators and most of the configuration is done using a DSL in your controllers, along with a plain old YAML file.
 
+
+## Features
+
+* Works with Rails 3.2, 4.0 and 4.1
+* Leverages domain logic for authorization without introducing strong coupling
+* Easy-to-use generators get you up-and-running in minutes, not hours
+* Well-tested
+* Generates tests for your roles for your test framework (MiniTest, RSpec and Test::Unit supported)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/arrthorizer/rails/controller_concern.rb

@@ -18,33 +18,39 @@ module Arrthorizer
         # built and provided to all ContextRoles that are configured as having
         # access to the given controller action.
         def arrthorizer_context
-          arrthorizer_context_builder.build_for_action
+          @arrthorizer_context ||= arrthorizer_context_builder.build_for_action
         end
 
         def arrthorizer_defaults
-          arrthorizer_context_builder.build_default
+          @arrthorizer_defaults ||= arrthorizer_context_builder.build_default
         end
 
-        def authorize
-          action = Arrthorizer::Rails::ControllerAction.get_current(self)
-          roles = action.privilege.permitted_roles
-          scope = arrthorizer_scope
+        def arrthorizer_check_role(role, context)
+          begin
+            role.applies_to_user?(arrthorizer_scope, context)
+          rescue StandardError
+            ::Rails.logger.warn("Error occurred while evaluating #{role} for #{current_user}.")
+            return false
+          end
+        end
 
+        def arrthorizer_find_applicable_role(roles)
           roles.any? do |role|
-            begin
-              role.applies_to_user?(scope, arrthorizer_context)
-            rescue StandardError
-              ::Rails.logger.warn("Error occurred while evaluating #{role} for #{current_user}.\nCurrent context: #{arrthorizer_context.inspect}")
-
-              false
-            end
-          end || forbidden
+            arrthorizer_check_role(role, arrthorizer_context)
+          end
         end
 
         def forbidden
           render text: 'Access Denied', status: :forbidden
         end
 
+        def authorize
+          action = Arrthorizer::Rails::ControllerAction.get_current(self)
+          roles = action.privilege.permitted_roles
+
+          arrthorizer_find_applicable_role(roles) || forbidden
+        end
+
         def arrthorizer_context_builder
           @context_builder ||= Arrthorizer::Rails::ControllerContextBuilder.new(self, arrthorizer_configuration)
         end

data/lib/arrthorizer/version.rb

@@ -1,3 +1,3 @@
 module Arrthorizer
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/rails/controller_concern/authorize_spec.rb

@@ -51,6 +51,22 @@ describe Arrthorizer::Rails::ControllerConcern do
           permitted_roles.add(role)
         end
 
+        context "but building the context results in an error" do
+          let(:error) { Class.new(StandardError).new }
+
+          before :each do
+            controller.stub(:arrthorizer_context).and_raise(error)
+            # for testing purposes. We're testing a filter here, so no request exists, causing #status= to fail
+            controller.stub(:forbidden)
+          end
+
+          specify "that error not suppressed" do
+            expect {
+              controller.send(:authorize)
+            }.to raise_error(error)
+          end
+        end
+
         context "and the role applies to the user" do
           before do
             role.stub(:applies_to_user?).with(current_user, context).and_return(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrthorizer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2674923926699794733
+      hash: 2700681613748034197
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2674923926699794733
+      hash: 2700681613748034197
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24