hammock 0.2.21 → 0.2.22

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.22 2009-05-04
+Set @errorModels on unsucessful saves.
+Updated #undestroy action for is_paranoid compatability instead of acts_as_paranoid.
+
+
 == 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>.

data/Rakefile

@@ -10,7 +10,8 @@ $hoe = Hoe.new('hammock', Hammock::VERSION) do |p|
   p.rubyforge_name  = p.name
   p.extra_deps      = [
     ['rails', '~> 2.2'],
-    ['benhoskings-ambitious-activerecord', '~> 0.1.3.5'],
+    ['benhoskings-ambitious-activerecord', '~> 0.1.3.7'],
+    ['benhoskings-is_paranoid', '~> 0.7.1'],
   ]
   p.extra_dev_deps  = [
     ['newgem', ">= #{::Newgem::VERSION}"]

data/hammock.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.2.21"
+  s.version = "0.2.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-04-26}
+  s.date = %q{2009-05-04}
   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.
 
 
@@ -34,18 +34,21 @@ It makes more sense when you see how it works though, so check out the screencas
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["~> 2.2"])
-      s.add_runtime_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.5"])
+      s.add_runtime_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
+      s.add_runtime_dependency(%q<benhoskings-is_paranoid>, ["~> 0.7.1"])
       s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<rails>, ["~> 2.2"])
-      s.add_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.5"])
+      s.add_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
+      s.add_dependency(%q<benhoskings-is_paranoid>, ["~> 0.7.1"])
       s.add_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<rails>, ["~> 2.2"])
-    s.add_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.5"])
+    s.add_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
+    s.add_dependency(%q<benhoskings-is_paranoid>, ["~> 0.7.1"])
     s.add_dependency(%q<newgem>, [">= 1.3.0"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end

data/lib/hammock/monkey_patches/hash.rb

@@ -29,6 +29,7 @@ module Hammock
         hsh
       end
 
+      # TODO remove in favour of #slice (in ActiveSupport).
       def dragnet *keys
         dup.dragnet! *keys
       end

data/lib/hammock/resource_retrieval.rb

@@ -11,8 +11,8 @@ module Hammock
     module InstanceMethods
       private
 
-      def find_deleted_record
-        find_record :find_with_deleted
+      def find_destroyed_record
+        find_record :find_destroyed_only
       end
 
       def find_record finder = :find

data/lib/hammock/restful_actions.rb

@@ -79,12 +79,12 @@ module Hammock
         end
       end
 
-      # The +undestroy+ action. (POST, unsafe, idempotent)
+      # The +undestroy+ action. (POST, unsafe, non-idempotent)
       #
       # Reverses a previous destroy on the specified record if it is within the current write scope, defined by +write_scope+ and +write_scope_for+ on the current model.
       def undestroy
-        if find_deleted_record
-          result = callback(:before_undestroy) and @record.undestroy and callback(:after_undestroy)
+        if find_destroyed_record
+          result = callback(:before_undestroy) and @record.restore and callback(:after_undestroy)
           render_for_destroy result
         end
       end
@@ -160,6 +160,7 @@ module Hammock
           callback("after_#{verb}") and callback(:after_save)
         else
           log "#{mdl} errors: " + @record.errors.full_messages.join(', ')
+          @errorModels = [@record]
           callback("after_failed_#{verb}") and callback(:after_failed_save) and false
         end
       end

data/lib/hammock.rb

@@ -4,7 +4,7 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.2.21'
+  VERSION = '0.2.22'
 
   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.21
+  version: 0.2.22
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-26 00:00:00 +10:00
+date: 2009-05-04 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,17 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.3.5
+        version: 0.1.3.7
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: benhoskings-is_paranoid
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: newgem