hammock 0.3.10.1 → 0.3.10.2

data/History.txt

@@ -1,3 +1,7 @@
+== 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.
+
+
 == 0.3.10.1 2009-07-20
 Convert verb to_sym in RouteNode#default_verb_for and #safe_for?.
 

data/hammock.gemspec

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

data/lib/hammock/scope.rb

@@ -46,12 +46,20 @@ module Hammock
             dlog "#{requester_name} can#{"'t" unless result == :ok} create a #{record.class} with #{record.attributes.inspect}. #{describe_call_point 4}"
           end
         else
-          returning record.send("#{scope_for_route(route)}?", current_user) ? :ok : :not_found do |result|
+          returning record_in_scope?(route, record) ? :ok : :not_found do |result|
             dlog "#{requester_name} can#{"'t" unless result == :ok} #{verb} #{record.class}<#{record.id}>. #{describe_call_point 4}"
           end
         end
       end
 
+      def record_in_scope? route, record
+        if (route_scope = scope_for_route(route)).nil?
+          # fail
+        else
+          record.send "#{route_scope}?", current_user
+        end
+      end
+
       def current_verb_scope
         if current_user && (scope_name = current_user_scope)
           # dlog "current_user_scope is #{scope_name}."

data/lib/hammock.rb

@@ -4,7 +4,7 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.3.10.1'
+  VERSION = '0.3.10.2'
   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.1
+  version: 0.3.10.2
 platform: ruby
 authors: 
 - Ben Hoskings