declarative_authorization 0.5.6 → 0.5.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+** RELEASE 0.5.7 (Mar 10, 2013)
+
+* Ruby 2.0 compatibility [jhawthorn]
+
 ** RELEASE 0.5.6 (Sep 23, 2012)
 
 * Fix handling of stray object associations [jhawthorn]

data/README.rdoc

@@ -515,7 +515,7 @@ sbartsch at tzi.org
 
 Thanks to John Joseph Bachir, Dennis Blöte, Eike Carls, Damian Caruso, Kai Chen, Erik Dahlstrand,
 Jeroen van Dijk, Alexander Dobriakov, Sebastian Dyck, Ari Epstein, Jeremy Friesen,
-Tim Harper, John Hawthorn, hollownest, Daniel Kristensen, Jeremy Kleindl,
+Tim Harper, John Hawthorn, hollownest, Daniel Kristensen, Jeremy Kleindl, Joel Kociolek,
 Benjamin ter Kuile, Brad Langhorst, Brian Langenfeld,
 Georg Ledermann, Geoff Longman, Olly Lylo, Mark Mansour, Thomas Maurer, Kevin Moore,
 Tyler Pickett, Edward Rudd, Sharagoz,

data/lib/declarative_authorization/in_controller.rb

@@ -127,7 +127,7 @@ module Authorization
         elsif auth_exception
           logger.info "Permission denied: #{auth_exception}"
         end
-        if respond_to?(:permission_denied)
+        if respond_to?(:permission_denied, true)
           # permission_denied needs to render or redirect
           send(:permission_denied)
         else
@@ -176,11 +176,12 @@ module Authorization
         object = object_or_sym
       end
 
-      {:user => current_user,
-        :object => object,
+      result = {:object => object,
         :context => context,
         :skip_attribute_test => object.nil?,
         :bang => bang}.merge(options)
+      result[:user] = current_user unless result.key?(:user)
+      result
     end
 
     module ClassMethods
@@ -315,7 +316,7 @@ module Authorization
       # filter_access_to in child controllers with the same action.
       def all_filter_access_permissions # :nodoc:
         ancestors.inject([]) do |perms, mod|
-          if mod.respond_to?(:filter_access_permissions)
+          if mod.respond_to?(:filter_access_permissions, true)
             perms + 
               mod.filter_access_permissions.collect do |p1| 
                 p1.clone.remove_actions(perms.inject(Set.new) {|actions, p2| actions + p2.actions})
@@ -489,7 +490,7 @@ module Authorization
           load_parent_method = :"load_#{options[:nested_in].to_s.singularize}"
           shallow_exceptions = options[:shallow] ? {:except => members.keys} : {}
           before_filter shallow_exceptions do |controller|
-            if controller.respond_to?(load_parent_method)
+            if controller.respond_to?(load_parent_method, true)
               controller.send(load_parent_method)
             else
               controller.send(:load_parent_controller_object, options[:nested_in])
@@ -499,7 +500,7 @@ module Authorization
           new_for_collection_method = :"new_#{controller_name.singularize}_for_collection"
           before_filter :only => collections.keys do |controller|
             # new_for_collection
-            if controller.respond_to?(new_for_collection_method)
+            if controller.respond_to?(new_for_collection_method, true)
               controller.send(new_for_collection_method)
             else
               controller.send(:new_controller_object_for_collection,
@@ -511,7 +512,7 @@ module Authorization
         new_from_params_method = :"new_#{controller_name.singularize}_from_params"
         before_filter :only => new_actions.keys do |controller|
           # new_from_params
-          if controller.respond_to?(new_from_params_method)
+          if controller.respond_to?(new_from_params_method, true)
             controller.send(new_from_params_method)
           else
             controller.send(:new_controller_object_from_params,
@@ -521,7 +522,7 @@ module Authorization
         load_method = :"load_#{controller_name.singularize}"
         before_filter :only => members.keys do |controller|
           # load controller object
-          if controller.respond_to?(load_method)
+          if controller.respond_to?(load_method, true)
             controller.send(load_method)
           else
             controller.send(:load_controller_object, options[:context] || controller_name)
@@ -558,7 +559,7 @@ module Authorization
       def filter_access_permissions # :nodoc:
         unless filter_access_permissions?
           ancestors[1..-1].reverse.each do |mod|
-            mod.filter_access_permissions if mod.respond_to?(:filter_access_permissions)
+            mod.filter_access_permissions if mod.respond_to?(:filter_access_permissions, true)
           end
         end
         class_variable_set(:@@declarative_authorization_permissions, {}) unless filter_access_permissions?

data/lib/declarative_authorization/obligation_scope.rb

@@ -256,7 +256,7 @@ module Authorization
             else
               attribute_name = model.columns_hash["#{attribute}_id"] && :"#{attribute}_id" ||
                                model.columns_hash[attribute.to_s]    && attribute ||
-                               :id
+                               model.primary_key
               attribute_table_alias = table_alias
               used_paths << path
             end

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: declarative_authorization
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.5.7
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 6
-  version: 0.5.6
 platform: ruby
-authors: 
+authors:
 - Steffen Bartsch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-23 00:00:00 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: sbartsch@tzi.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
-files: 
+files:
 - CHANGELOG
 - MIT-LICENSE
 - README.rdoc
@@ -74,38 +65,27 @@ files:
 - test/authorization_test.rb
 homepage: http://github.com/stffn/declarative_authorization
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: declarative_authorization is a Rails plugin for maintainable authorization based on readable authorization rules.
+summary: declarative_authorization is a Rails plugin for maintainable authorization
+  based on readable authorization rules.
 test_files: []
-