allowy 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a57eaeb7cde5ce2812a99438b3f1db2341c2fdac
-  data.tar.gz: 7f9f72f90ca54a18c64cbda8ac15e957ed14040a
+  metadata.gz: e1c422bf392e430d0537f4f0e85fd44c8f9532da
+  data.tar.gz: 516feb6b05a44db332a06d30c221e3efdf06bb98
 SHA512:
-  metadata.gz: 2e79765e66f531df1471f472f8dcaa50d9e6350e09680ae006d2884ba70665dcac854e893298394d64e28cb8d9f9116f3ff785ad66a9c88d3ea012acada4b54c
-  data.tar.gz: 6cbb86ae3ed61d41bdc501a5fe828f31d2469ac15abbf0078ff15a68d9c0714c432c3203b19a38287170e75b9f6748c046bcf004987bd639ad18868c20ed2d92
+  metadata.gz: e58da6aa81b41db56da237d79c59637e1ffa9df4fbed1cb7a50ed027cd3f0e17eef3bdda4e1173fac5381ac6c02e7bc91c1c2691c968e69e1ca386ee10116649
+  data.tar.gz: ebfe0f8b21bd6c6e57e5fcf5944b4372e7261195b5a4ffe04191cfe3d89b3e4a0089d9ee62aabbd0ca113c1f7b7bc26f6c86d58e07cead4565db332e8584fa49

data/README.md

@@ -109,7 +109,7 @@ end
 The "access" class, by convention, will be determined by the class of the original object plus the "Access" suffix.
 It may be a problem if you decorate the class using `draper` gem or using similar approach where the actual class name is different.
 
-The version `0.3` of has built-in support for the `draper` gem and it should "just work".
+The version `0.3` has built-in support for the `draper` gem and it should "just work".
 
 But additionally it provides a customisation option for you if you need that.
 
@@ -130,6 +130,19 @@ end
 
 ```
 
+If you simply don't like the `Access` suffix, you can override it by passing the `access_suffix` option to the `Registry` class.
+For example, in a typical Rails app you will need to override the `current_allowy` method on the `ApplicationController` like so:
+
+```ruby
+class ApplicationController < ActionController::Base
+  def current_allowy
+    @current_allowy ||= ::Allowy::Registry.new(allowy_context, access_suffix: 'Permission')
+  end
+end
+```
+
+The above will allow using `UserPermission` class name instead of `UserAccess`.
+
 # Early termination
 
 If you have a pre-condition for any permission checks you can abort more complex logic by
@@ -330,4 +343,4 @@ bundle install
 bundle exec rspec spec/
 ```
 
-Pull requests are very welcome, but please include the specs.
+Pull requests are very welcome, but please include the specs.

data/lib/allowy.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/core_ext'
 require 'active_support/concern'
 require 'active_support/inflector'

data/lib/allowy/matchers.rb

@@ -2,8 +2,8 @@ module Allowy
   module Matchers
 
     class AbleToMatcher
-      def initialize(action, subject=nil)
-        @action, @subject = action, subject
+      def initialize(action, subject=nil, *params)
+        @action, @subject, @params = action, subject, params
       end
 
       def say msg
@@ -11,7 +11,7 @@ module Allowy
       end
 
       def matches?(access_control)
-        access_control.can?(@action, @subject)
+        access_control.can?(@action, @subject, *@params)
       end
 
       def description

data/lib/allowy/registry.rb

@@ -1,8 +1,10 @@
 module Allowy
   class Registry
-    def initialize(ctx)
+    def initialize(ctx, options={})
+      options.assert_valid_keys(:access_suffix)
       @context = ctx
       @registry = {}
+      @options = options
     end
 
     def access_control_for!(subject)
@@ -13,21 +15,27 @@ module Allowy
 
     def access_control_for(subject)
       # Try subject as decorated object
-      clazz = class_for "#{subject.class.source_class.name}Access" if subject.class.respond_to?(:source_class)
+      clazz = class_for subject.class.source_class.name if subject.class.respond_to?(:source_class)
 
       # Try subject as an object
-      clazz = class_for "#{subject.class.name}Access" unless clazz
+      clazz = class_for subject.class.name unless clazz
 
       # Try subject as a class
-      clazz = class_for "#{subject.name}Access" if !clazz && subject.is_a?(Class)
+      clazz = class_for subject.name if !clazz && subject.is_a?(Class)
 
       return unless clazz # No luck this time
       # create a new instance or return existing
       @registry[clazz] ||= clazz.new(@context)
     end
 
+    private
+
     def class_for(name)
-      name.safe_constantize
+      "#{name}#{access_suffix}".safe_constantize
+    end
+
+    def access_suffix
+      @options.fetch(:access_suffix) { 'Access' }
     end
 
   end

data/lib/allowy/version.rb

@@ -1,3 +1,3 @@
 module Allowy
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/spec/access_control_spec.rb

@@ -19,6 +19,10 @@ module Allowy
     it { should be_able_to :read, 'allow' }
     it { should_not be_able_to :read, 'deny' }
 
+    it "should pass extra parameters" do
+      access.should be_able_to :extra_params, 'same', bar: 'same'
+    end
+
     it "should deny with early termination" do
       access.should_not be_able_to :early_deny, 'foo'
       access.can?(:early_deny, 'xx').should == false

data/spec/registry_spec.rb

@@ -11,6 +11,15 @@ module Allowy
         subject.access_control_for!(Sample.new).should be_a SampleAccess
       end
 
+      it "should find AC by appending custom suffix to the subject" do
+        registry = Registry.new(context, access_suffix: 'Permission')
+        registry.access_control_for!(Sample.new).should be_a SamplePermission
+      end
+
+      it "raises on invalid option" do
+        expect { Registry.new(context, foo: 'incorrect option') }.to raise_error /unknown key/i
+      end
+
       it "should find AC when the subject is a class" do
         subject.access_control_for!(Sample).should be_a SampleAccess
       end

data/spec/spec_helper.rb

@@ -21,11 +21,19 @@ class SampleAccess
     deny! "early terminate: #{str}"
   end
 
+  def extra_params?(foo, *opts)
+    foo == opts.last[:bar]
+  end
+
   def context_is_123?(*whatever)
     context === 123
   end
 end
 
+class SamplePermission
+  include Allowy::AccessControl
+end
+
 class Sample
   attr_accessor :name
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allowy
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Dmytrii Nagirniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: allowy
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Authorization with simplicity and explicitness in mind