authority 2.3.1 → 2.3.2

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode

data/TODO.markdown

@@ -6,10 +6,6 @@
 - Test `ActionController` integration
 - Add tests for the generators
 
-## Code
-
-- Look into using the `Forwardable` module for delegation in various places. (Does it handle passing options if given and nothing if not?)
-
 ## Structural changes
 
 - Consider the huge change from authorizer objects to modules for permissions. This eliminates the awkwardness of "to check a resource instance, let's go instantiate an authorizer and give it this resource instance..." If we make this change, describe a detailed upgrade path.

data/lib/authority.rb

@@ -2,6 +2,7 @@ require 'active_support/concern'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/string/inflections'
+require 'forwardable'
 require 'logger'
 require 'authority/security_violation'
 

data/lib/authority/abilities.rb

@@ -9,6 +9,7 @@ module Authority
 
   module Abilities
     extend ActiveSupport::Concern
+    extend Forwardable
 
     # Assume authorizer is `ApplicationAuthorizer` (but let the user change that)
     included do
@@ -16,19 +17,21 @@ module Authority
       self.authorizer_name = "ApplicationAuthorizer"
     end
 
+    def authorizer
+      self.class.authorizer.new(self) # instantiate on every check, in case model has changed
+    end
+
+    # Send all calls like `editable_by?` to an authorizer instance
+    Authority.adjectives.each do |adjective|
+      def_delegators :authorizer, :"#{adjective}_by?"
+    end
+
     module ClassMethods
+      extend Forwardable
 
+      # Send all calls like `editable_by?` to the authorizer class
       Authority.adjectives.each do |adjective|
-
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{adjective}_by?(user, options = {})
-            if options.empty?
-              authorizer.#{adjective}_by?(user)
-            else
-              authorizer.#{adjective}_by?(user, options)
-            end
-          end
-        RUBY
+        def_delegators :authorizer, :"#{adjective}_by?"
       end
 
       # @return [Class] of the designated authorizer
@@ -39,23 +42,7 @@ module Authority
           "#{authorizer_name} is set as the authorizer for #{self}, but the constant is missing"
         )
       end
-    end
-
-    Authority.adjectives.each do |adjective|
 
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{adjective}_by?(user, options = {})
-          if options.empty?
-            authorizer.#{adjective}_by?(user)
-          else
-            authorizer.#{adjective}_by?(user, options)
-          end
-        end
-
-        def authorizer
-          self.class.authorizer.new(self) # instantiate on every check, in case model has changed
-        end
-      RUBY
     end
 
   end

data/lib/authority/authorizer.rb

@@ -1,5 +1,6 @@
 module Authority
   class Authorizer
+    extend Forwardable
 
     # The base Authorizer class, from which all the authorizers in an app will
     # descend. Provides the authorizer with both class and instance methods
@@ -14,17 +15,14 @@ module Authority
       @resource = resource
     end
 
+    # Whitelisting approach: anything not specified will be forbidden
+    def self.default(adjective, user, options = {})
+      false
+    end
+
     # Each instance method simply calls the corresponding class method
     Authority.adjectives.each do |adjective|
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{adjective}_by?(user, options = {})
-          if options.empty?
-            self.class.#{adjective}_by?(user)
-          else
-            self.class.#{adjective}_by?(user, options)
-          end
-        end
-      RUBY
+      def_delegator :"self.class", :"#{adjective}_by?"
     end
 
     # Each class method simply calls the `default` method
@@ -40,11 +38,6 @@ module Authority
       RUBY
     end
 
-    # Whitelisting approach: anything not specified will be forbidden
-    def self.default(adjective, user, options = {})
-      false
-    end
-
   end
 
   class NoAuthorizerError < StandardError ; end

data/lib/authority/user_abilities.rb

@@ -21,12 +21,13 @@ module Authority
     end
 
     def can?(action, options = {})
+      self_and_maybe_options = [self, (options == {} ? nil : options)].compact # throw out if nil
       begin
-        ApplicationAuthorizer.send("authorizes_to_#{action}?", self, options)
+        ApplicationAuthorizer.send("authorizes_to_#{action}?", *self_and_maybe_options)
       rescue NoMethodError => original_exception
         begin
           # For backwards compatibility
-          response = ApplicationAuthorizer.send("can_#{action}?", self, options)
+          response = ApplicationAuthorizer.send("can_#{action}?", *self_and_maybe_options)
           Authority.logger.warn(
             "DEPRECATION WARNING: Please rename `ApplicationAuthorizer.can_#{action}?` to `authorizes_to_#{action}?`"
           )

data/lib/authority/version.rb

@@ -1,3 +1,3 @@
 module Authority
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end

data/spec/authority/user_abilities_spec.rb

@@ -49,6 +49,16 @@ describe Authority::UserAbilities do
         expect(user.can?(:mimic_lemurs)).to eq('yessir')
       end
 
+      it "passes along options if any were given" do
+        ApplicationAuthorizer.should_receive(:authorizes_to_mimic_lemurs?).with(user, :for => :academic_credit)
+        user.can?(:mimic_lemurs, :for => :academic_credit)
+      end
+
+      it "doesn't pass along options if none were given" do
+        ApplicationAuthorizer.should_receive(:authorizes_to_mimic_lemurs?).with(user)
+        user.can?(:mimic_lemurs)
+      end
+
     end
 
     context "when ApplicationAuthorizer does not respond to a matching `authorizes_to?` call" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authority
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152639540 !ruby/object:Gem::Requirement
+  requirement: &2152546080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152639540
+  version_requirements: *2152546080
 description: Authority helps you authorize actions in your Rails app. It's ORM-neutral
   and has very little fancy syntax; just group your models under one or more Authorizer
   classes and write plain Ruby methods on them.