credentials 2.2.1 → 2.2.2

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/credentials.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{credentials}
-  s.version = "2.2.1"
+  s.version = "2.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Powell"]
-  s.date = %q{2009-11-24}
+  s.date = %q{2009-11-25}
   s.description = %q{A generic actor/resource permission framework based on rules, not objects.}
   s.email = %q{fauxparse@gmail.com.com}
   s.extra_rdoc_files = [
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "credentials.gemspec",
-     "init.rb",
      "install.rb",
      "lib/credentials.rb",
      "lib/credentials/allow_rule.rb",
@@ -32,9 +31,11 @@ Gem::Specification.new do |s|
      "lib/credentials/errors.rb",
      "lib/credentials/extensions/action_controller.rb",
      "lib/credentials/extensions/configuration.rb",
+     "lib/credentials/extensions/magic_methods.rb",
      "lib/credentials/extensions/object.rb",
      "lib/credentials/rule.rb",
      "lib/credentials/rulebook.rb",
+     "rails/init.rb",
      "spec/.gitignore",
      "spec/controllers/test_controller_spec.rb",
      "spec/credentials_spec.rb",

data/lib/credentials/extensions/magic_methods.rb

@@ -0,0 +1,28 @@
+module Credentials
+  module Extensions
+    # Allows you to use magic methods to test permissions.
+    # For example:
+    #
+    #     class User
+    #       credentials do |user|
+    #         user.can :edit, :self
+    #       end
+    #     end
+    #     
+    #     user = User.new
+    #     user.can_edit? user #=> true
+    module MagicMethods
+      def self.included(receiver) #:nodoc:
+        receiver.class_eval do
+          def method_missing(sym, *args)
+            if self.class != Object && self.class != Class && sym.to_s =~ /\Acan_(.*)\?\z/
+              can? $1.to_sym, *args
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/credentials/extensions/object.rb

@@ -35,17 +35,19 @@ module Credentials
           @credentials ||= Credentials::Rulebook.new(self)
           if block_given?
             @credentials.options.merge!(options) unless options.nil?
+            
+            # Only include the magic methods for classes where 'credentials' is
+            # explicitly called with a block: otherwise, you get all kinds of 
+            # RailsFails.
+            unless included_modules.include?(Credentials::Extensions::MagicMethods)
+              include Credentials::Extensions::MagicMethods 
+            end
             yield @credentials
           else
             raise ArgumentError, "you can only set options with a block" unless options.nil?
           end
           @credentials
         end
-      
-        def inherited_with_credentials(child_class) #:nodoc:
-          inherited_without_credentials(child_class) if child_class.respond_to? :inherited_without_credentials
-          child_class.instance_variable_set("@credentials", Rulebook.for(child_class))
-        end
       end
     
       # Returns true if the receiver has access to the specified resource or action.
@@ -54,35 +56,8 @@ module Credentials
       end
       alias_method :able_to?, :can?
 
-      # Allows you to use magic methods to test permissions.
-      # For example:
-      #
-      #     class User
-      #       credentials do |user|
-      #         user.can :edit, :self
-      #       end
-      #     end
-      #     
-      #     user = User.new
-      #     user.can_edit? user #=> true
-      def method_missing_with_credentials(sym, *args)
-        if sym.to_s =~ /\Acan_(.*)\?\z/
-          can? $1.to_sym, *args
-        else
-          method_missing_without_credentials sym, *args
-        end
-      end
-    
       def self.included(receiver) #:nodoc:
         receiver.extend ClassMethods
-
-        receiver.send :alias_method, :method_missing_without_credentials, :method_missing
-        receiver.send :alias_method, :method_missing, :method_missing_with_credentials
-      
-        class << receiver
-          alias_method :inherited_without_credentials, :inherited if respond_to? :inherited
-          alias_method :inherited, :inherited_with_credentials
-        end
       end
     end
   end

data/lib/credentials/rulebook.rb

@@ -18,7 +18,11 @@ module Credentials
     
     def initialize(klass)
       self.klass = klass
-      @rules = []
+      @rules = if klass.superclass.respond_to?(:credentials) && !klass.superclass.credentials.empty?
+        klass.superclass.credentials.rules.dup
+      else
+        []
+      end
       @options = {}
     end
 

data/lib/credentials.rb

@@ -1,5 +1,6 @@
 require "credentials/rulebook"
 require "credentials/extensions/object"
+require "credentials/extensions/magic_methods"
 
 Object.send :include, Credentials::Extensions::Object
 

data/spec/credentials_spec.rb

@@ -50,6 +50,10 @@ describe Carnivore do
     it "should not be able to eat another animal" do
       @lion.should_not be_able_to :eat, @antelope
     end
+    
+    it "should be able to clean itself" do
+      @lion.should be_able_to :clean, @lion
+    end
   end
   
   describe "(hungry)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: credentials
 version: !ruby/object:Gem::Version 
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors: 
 - Matt Powell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +13:00
+date: 2009-11-25 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ files:
 - Rakefile
 - VERSION
 - credentials.gemspec
-- init.rb
 - install.rb
 - lib/credentials.rb
 - lib/credentials/allow_rule.rb
@@ -38,9 +37,11 @@ files:
 - lib/credentials/errors.rb
 - lib/credentials/extensions/action_controller.rb
 - lib/credentials/extensions/configuration.rb
+- lib/credentials/extensions/magic_methods.rb
 - lib/credentials/extensions/object.rb
 - lib/credentials/rule.rb
 - lib/credentials/rulebook.rb
+- rails/init.rb
 - spec/.gitignore
 - spec/controllers/test_controller_spec.rb
 - spec/credentials_spec.rb