@@ -1 +1,5 @@ +v0.1.2. ensure id_names are unique + +v0.1.1. updated to use Soup 0.2.1 + v0.1.0. initial release CHANGELOG @@ -12,7 +12,7 @@ begin m.rubyforge_name = "pottery" m.rdoc_options << '--inline-source' m.rdoc_pattern = ["README", "CHANGELOG", "LICENSE"] - m.dependencies = ["soup >=0.2.1", "morph >=0.1.5"] + m.dependencies = ["soup =0.2.1", "morph >=0.1.5"] end rescue LoadError Rakefile @@ -2,7 +2,7 @@ require 'morph' require 'soup' module Pottery - VERSION = "0.1.1" + VERSION = "0.1.2" def self.included(base) Soup.prepare @@ -20,6 +20,12 @@ module Pottery def restore name snip = Soup[name] if snip && snip != [] + if snip.is_a? Array + last = snip.pop + puts 'deleting duplicates for id: ' + name + snip.each {|x| x.destroy} + snip = last + end instance = self.new attributes = snip.attributes unless attributes.empty? @@ -40,7 +46,18 @@ module Pottery def save if respond_to?('id_name') && !id_name.nil? && !(id_name.to_s.strip.size == 0) - snip = Pottery::PotterySnip.new + existing = Soup[id_name] + if existing && existing != [] + if existing.is_a? Array + last = existing.pop + puts 'deleting duplicates for id: ' + id_name + existing.each {|x| x.destroy} + existing = last + end + snip = Pottery::PotterySnip.new existing.attributes.merge({:__id => existing.id}) + else + snip = Pottery::PotterySnip.new + end morph_attributes.each_pair do |symbol, value| symbol = convert_if_name_or_id_name(symbol) snip.set_value(symbol.to_s, value) lib/pottery.rb @@ -52,6 +52,7 @@ describe Pottery, "when save method is called after id_name has been set" do initialize_pottery_and_snip @pottery.id_name = 'red' @snip.should_receive(:save) + Soup.should_receive('[]'.to_sym).with('red').and_return [] @pottery.save end @@ -61,6 +62,7 @@ describe Pottery, "when save method is called after id_name has been set" do @snip.stub!(:save) @snip.should_receive(:set_value).with('name', 'red') + Soup.should_receive('[]'.to_sym).with('red').and_return [] @pottery.save end end @@ -76,6 +78,7 @@ describe Pottery, "when save method is called after name and id_name has been se @pottery.id_name = 'red' @pottery.name = 'blue' @snip.should_receive(:save) + Soup.should_receive('[]'.to_sym).with('red').and_return [] @pottery.save end @@ -87,6 +90,7 @@ describe Pottery, "when save method is called after name and id_name has been se @snip.stub!(:save) @snip.should_receive(:set_value).with('name', 'red') @snip.should_receive(:set_value).with('name_name', 'blue') + Soup.should_receive('[]'.to_sym).with('red').and_return [] @pottery.save end end spec/pottery_spec.rb 8a02c3d6d1489a39f0e6d67e1e294d7f35df20a0 robmckinnon rob@theyworkforyou.co.nz http://github.com/robmckinnon/pottery/commit/e1346faf85cfbe5f8a2c78f4e4ae3997f8792ff0 e1346faf85cfbe5f8a2c78f4e4ae3997f8792ff0 2009-01-01T06:12:05-08:00 2009-01-01T06:12:05-08:00 ensure id_names are unique; ready for 0.1.2 release 6a9a62e9eee9a2981a613774a5f36f4d7ff3c475 robmckinnon rob@theyworkforyou.co.nz