soup 1.0.1 → 1.0.2

data/Rakefile

@@ -21,7 +21,7 @@ spec = Gem::Specification.new do |s|
   
   # Change these as appropriate
   s.name              = "soup"
-  s.version           = "1.0.1"
+  s.version           = "1.0.2"
   s.summary           = "A super-simple data store"
   s.author            = "James Adam"
   s.email             = "james@lazyatom.com"
@@ -60,8 +60,8 @@ end
 
 task :package => :gemspec
 
-desc 'Release the gem to gemcutter and tag the repo'
-task :release => [:gemspec, :package] do
+desc 'Tag the repository in git with gem version number'
+task :tag => [:gemspec, :package] do
   if `git diff --cached`.empty?
     if `git tag`.split("\n").include?("v#{spec.version}")
       raise "Version #{spec.version} has already been released"
@@ -69,12 +69,18 @@ task :release => [:gemspec, :package] do
     `git add #{File.expand_path("../#{spec.name}.gemspec", __FILE__)}`
     `git commit -m "Released version #{spec.version}"`
     `git tag v#{spec.version}`
-    `gem push pkg/#{spec.name}-#{spec.version}.gem`
+    `git push --tags`
+    `git push`
   else
     raise "Unstaged changes still waiting to be committed"
   end
 end
 
+desc 'Release the gem to gemcutter and tag the repo'
+task :release => [:tag] do
+  `gem push pkg/#{spec.name}-#{spec.version}.gem`
+end
+
 # Generate documentation
 Rake::RDocTask.new do |rd|
   rd.main = "README"

data/lib/soup/backends/file_backend.rb

@@ -21,10 +21,11 @@ class Soup
           default_attributes = {:name => name, :updated_at => file.mtime, :created_at => file.mtime}
           if attribute_start = data.index("\n:")
             content = data[0, attribute_start].strip
-            attributes = default_attributes.merge(YAML.load(data[attribute_start, data.length]).merge(:content => content))
+            attributes = default_attributes.merge(YAML.load(data[attribute_start, data.length]))
           else
-            attributes = default_attributes.merge(:content => data)
+            attributes = default_attributes
           end
+          attributes.update(:content => content) if content && content.length > 0
           Snip.new(attributes, self)
         else
           nil

data/lib/soup/backends/yaml_backend.rb

@@ -21,10 +21,11 @@ class Soup
           file = File.read(path)
           if attribute_start = file.index(ATTRIBUTE_TOKEN)
             content = file.slice(0...attribute_start)
-            attributes = {:name => name}.merge(YAML.load(file.slice(attribute_start..-1)).merge(:content => content))
+            attributes = {:name => name}.merge(YAML.load(file.slice(attribute_start..-1)))
           else
             attributes = {:content => file, :name => name}
           end
+          attributes.update(:content => content) if content && content.length > 0
           Snip.new(attributes, self)
         else
           nil

data/lib/soup/empty_class.rb

@@ -1,6 +1,6 @@
 # Based on Builder's BlankSlate object
 class Soup
   class EmptyClass
-    instance_methods.each { |m| undef_method(m) unless m =~ /^(__|object_id|instance_eval|respond_to\?)/ }
+    instance_methods.each { |m| undef_method(m) unless m =~ /^(is_a\?|__|object_id|instance_eval|respond_to\?)/ }
   end
 end

data/lib/soup/snip.rb

@@ -19,8 +19,15 @@ class Soup
       self
     end
 
+    def ==(other)
+      other.is_a?(Snip) && matching_attributes(other)
+    end
+
     def inspect
-      "<Snip name:#{self.name}>"
+      keys = @attributes.keys.dup
+      keys.delete(:name)
+      attrs = keys.inject([[:name, self.name]]) { |a, key| a + [[key, @attributes[key]]] }
+      "<Snip #{attrs.map { |(key,value)| "#{key}:#{value.inspect}"}.join(" ")}>"
     end
 
     def respond_to?(method)
@@ -35,5 +42,17 @@ class Soup
         @attributes[method]
       end
     end
+
+    private
+
+    def matching_attributes(other)
+      my_attributes = self.attributes.dup
+      their_attributes = other.attributes.dup
+      [:created_at, :updated_at].each do |attribute_to_ignore|
+        my_attributes.delete(attribute_to_ignore)
+        their_attributes.delete(attribute_to_ignore)
+      end
+      my_attributes == their_attributes
+    end
   end
 end

data/test/snip_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class SnipTest < Test::Unit::TestCase
+  context "A snip" do
+    setup do
+      @snip = Soup::Snip.new({:name => "james", :content => "is awesome"}, nil)
+    end
+
+    should "be equal to another snip with the same attributes" do
+      other_snip = Soup::Snip.new({:name => "james", :content => "is awesome"}, nil)
+      assert other_snip == @snip
+    end
+
+    should "not be equal to another snip with differing attributes" do
+      other_snip = Soup::Snip.new({:name => "james", :content => "is really awesome"}, nil)
+      assert other_snip != @snip
+    end
+
+    should "be comparable in arrays" do
+      other_snip = Soup::Snip.new({:name => "james", :content => "is awesome"}, nil)
+      assert [@snip] == [other_snip]
+    end
+
+    context "loaded from the soup" do
+      setup do
+        @base_path = File.join(File.dirname(__FILE__), *%w[.. tmp soup])
+        backend = Soup::Backends::FileBackend.new(@base_path)
+        @soup = Soup.new(backend)
+      end
+
+      teardown do
+        FileUtils.rm_rf(@base_path)
+      end
+
+      should "ignore empty content when comparing" do
+        @soup << {:name => 'test'}
+        assert_equal Soup::Snip.new({:name => 'test'}, nil), @soup['test']
+      end
+    end
+  end
+end

data/test/soup_test.rb

@@ -17,12 +17,12 @@ class SoupTest < Test::Unit::TestCase
         teardown do
           FileUtils.rm_rf(base_path)
         end
-        yield backend
+        yield
       end
     end
   end
 
-  each_backend do |backend|
+  each_backend do
     should "be able to store content" do
       @soup << {:name => 'test', :content => "I like stuff, and things"}
       assert_equal "I like stuff, and things", @soup['test'].content
@@ -48,7 +48,7 @@ class SoupTest < Test::Unit::TestCase
       end
 
       should "match using all parameters" do
-        assert_equal @james, @soup[:powers => 'yes', :colour => 'red']
+        assert_equal [@murray], @soup[:powers => 'yes', :colour => 'red']
       end
 
       should "return an array if more than one snip matches" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soup
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - James Adam
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +00:00
+date: 2010-11-30 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,7 @@ files:
 - README
 - test/file_backend_test.rb
 - test/multi_soup_backend_test.rb
+- test/snip_test.rb
 - test/soup_test.rb
 - test/test_helper.rb
 - lib/soup/backends/base.rb