hammock 0.5.2 → 0.5.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.5.3 2009-10-30
+On AR::Base.find_or_create_with, only adjust when there are dirty attributes.
+
+
 == 0.5.2 2009-10-29
 Added Time#to_i_msec.
 

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/hammock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2009-10-30}
   s.description = %q{}
   s.email = %q{ben@hoskings.net}
   s.extra_rdoc_files = [

data/lib/hammock.rb

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

data/lib/hammock/monkey_patches/active_record.rb

@@ -92,10 +92,10 @@ module Hammock
         end
       end
 
-      def find_or_create_with(find_attributes, create_attributes = {}, adjust_attributes = false)
+      def find_or_create_with(find_attributes, create_attributes = {}, should_adjust = false)
         if record = find_or_new_with(find_attributes, create_attributes)
           log "Create failed. #{record.errors.inspect}", :skip => 1 if record.new_record? && !record.save
-          log "Adjust failed. #{record.errors.inspect}", :skip => 1 if adjust_attributes && !record.update_attributes(create_attributes)
+          log "Adjust failed. #{record.errors.inspect}", :skip => 1 if should_adjust && !record.adjust_attributes(create_attributes)
           record
         end
       end
@@ -194,6 +194,11 @@ module Hammock
         }
       end
 
+      def adjust_attributes attrs
+        attributes = attrs
+        changed.empty? || update_attributes(attrs)
+      end
+
       # Offset +attribute+ by +offset+ atomically in SQL.
       def offset! attribute, offset
         if new_record?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 +11:00
+date: 2009-10-30 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency