credentials 2.4.2 → 2.4.3

data/HISTORY

@@ -1,3 +1,11 @@
+=== 2.4.3 / 2010-01-25
+
+* Ruby 1.9 compatibility issue in ActionController extension.
+
+=== 2.4.2 / 2010-01-25
+
+* Bug where class/subclass wasn't recognised as a match.
+
 === 2.4.1 / 2010-01-25
 
 * Minor patch to Rulebook fo metaclass support.

data/VERSION

@@ -1 +1 @@
-2.4.2
+2.4.3

data/credentials.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{credentials}
-  s.version = "2.4.2"
+  s.version = "2.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Powell"]
-  s.date = %q{2010-01-25}
+  s.date = %q{2010-01-30}
   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 = [

data/lib/credentials.rb

@@ -11,3 +11,31 @@ Object.send :include, Credentials::Extensions::Object
 if defined?(ActionController)
   ActionController::Base.send :include, Credentials::Extensions::ActionController
 end
+
+unless defined?(ActiveSupport)
+  class String
+    if Module.method(:const_get).arity == 1
+      def constantize
+        names = split('::')
+        names.shift if names.empty? || names.first.empty?
+
+        constant = Object
+        names.each do |name|
+          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+        end
+        constant
+      end
+    else
+      def constantize
+        names = split('::')
+        names.shift if names.empty? || names.first.empty?
+
+        constant = Object
+        names.each do |name|
+          constant = constant.const_get(name, false) || constant.const_missing(name)
+        end
+        constant
+      end
+    end
+  end
+end

data/lib/credentials/extensions/action_controller.rb

@@ -83,7 +83,11 @@ module Credentials
           
           raise Credentials::Errors::NotLoggedInError unless current_user
           evaluated = args.map do |arg|
-            (arg.is_a?(Symbol) && respond_to?(arg) && !public_methods.include?(arg.to_s)) ? send(arg) : arg
+            if arg.is_a?(Symbol) && respond_to?(arg) && !action_named?(arg)
+              send(arg)
+            else
+              arg
+            end
           end
           
           opts = returning({}) do |hash|
@@ -99,6 +103,11 @@ module Credentials
         end
       end
       
+      def action_named?(method)
+        method_name = (RUBY_VERSION.to_f >= 1.9) ? method.to_sym : method.to_s
+        public_methods.include?(method_name)
+      end
+      
       def self.included(receiver) #:nodoc:
         receiver.extend Credentials::Extensions::Configuration
         receiver.extend ClassMethods

data/spec/controllers/test_controller_spec.rb

@@ -11,6 +11,7 @@ if defined?(ActionController)
     def public; end
     def dangerous; end
     def create; end
+    def view; end
   
     def rescue_action(e)
       raise e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: credentials
 version: !ruby/object:Gem::Version 
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors: 
 - Matt Powell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 +13:00
+date: 2010-01-30 00:00:00 +13:00
 default_executable: 
 dependencies: []