pottery 0.1.1 → 0.1.2

data/CHANGELOG

@@ -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

data/Rakefile

@@ -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

data/lib/pottery.rb

@@ -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)

data/pottery.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pottery}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob McKinnon"]
@@ -24,16 +24,16 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<soup>, [">= 0.2.1"])
+      s.add_runtime_dependency(%q<soup>, ["= 0.2.1"])
       s.add_runtime_dependency(%q<morph>, [">= 0.1.5"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<soup>, [">= 0.2.1"])
+      s.add_dependency(%q<soup>, ["= 0.2.1"])
       s.add_dependency(%q<morph>, [">= 0.1.5"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<soup>, [">= 0.2.1"])
+    s.add_dependency(%q<soup>, ["= 0.2.1"])
     s.add_dependency(%q<morph>, [">= 0.1.5"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end

data/spec/pottery_spec.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pottery
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Rob McKinnon
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 0.2.1
     version: