hammock 0.2.20 → 0.2.21

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.21 2009-04-26
+Added a rendered_or_redirected? check to the start of the non-XHR logic in #render_or_redirect_after.
+Changed callback description to #identifier, to print the desc or method name instead of a #<Proc>.
+
+
 == 0.2.20 2009-04-24
 Fixed incorrect obj.siblings reference in #ajaxinate that was failing to find .statuses > .success.
 

data/hammock.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.2.20"
+  s.version = "0.2.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-04-24}
+  s.date = %q{2009-04-26}
   s.description = %q{Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner. It does this in lots in lots of different places, but in one manner: it encourages specification in place of implementation.
 
 

data/lib/hammock/callbacks.rb

@@ -72,7 +72,7 @@ module Hammock
         callback_chain_for(kind).all? {|cb|
           # dlog "Calling #{kind} callback #{cb.method}"
           result = cb.call(self, *args) != CallbackFail
-          log "#{self.class}.#{cb.kind} callback '#{cb.method}' failed." unless result
+          log "#{self.class}.#{cb.kind} callback '#{cb.identifier}' failed." unless result
           result
         }
       end

data/lib/hammock/restful_rendering.rb

@@ -16,7 +16,9 @@ module Hammock
         if request.xhr?
           render_for_safe_actions result, :editable => true, :edit => false
         else
-          if postsave_render result
+          if rendered_or_redirected?
+            log "Already rendered or redirected."
+          elsif postsave_render result
             # rendered - no redirect
           elsif result
             render_http_success

data/lib/hammock.rb

@@ -4,7 +4,7 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.2.20'
+  VERSION = '0.2.21'
 
   def self.included base # :nodoc:
     puts "Loading Hammock from #{loaded_from_gem? ? 'gem' : 'plugin'}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.2.20
+  version: 0.2.21
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 +10:00
+date: 2009-04-26 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency