hammock 0.3.10.2 → 0.3.10.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.3.10.3 2009-07-20
+scope_for_route considers user and public scopes when authed now.
+
+
 == 0.3.10.2 2009-07-20
 Refactored scope_for_route checks in can_verb_record? out into record_in_scope?, adding nil scope check.
 

data/hammock.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.3.10.2"
+  s.version = "0.3.10.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]

data/lib/hammock/scope.rb

@@ -111,7 +111,12 @@ module Hammock
       end
 
       def scope_for_route route
-        method_name = current_user.nil? ? :public_scope_for : :user_scope_for
+        (
+          current_user && scope_for_user_and_route(:user_scope_for, route)
+        ) || scope_for_user_and_route(:public_scope_for, route)
+      end
+
+      def scope_for_user_and_route method_name, route
         mdl.send(method_name, route.verb) || mdl.send(method_name, route.default_verb)
       end
 

data/lib/hammock.rb

@@ -4,7 +4,7 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.3.10.2'
+  VERSION = '0.3.10.3'
   IncludeTarget = ActionController::Base
 
   def self.included base # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.3.10.2
+  version: 0.3.10.3
 platform: ruby
 authors: 
 - Ben Hoskings