soup 1.0.9 → 1.0.10

data/Rakefile

@@ -1,6 +1,6 @@
 require "rubygems"
-require "rake/gempackagetask"
-require "rake/rdoctask"
+require "rubygems/package_task"
+require "rdoc/task"
 
 task :default => :test
 
@@ -18,10 +18,10 @@ end
 #   http://rubygems.org/read/chapter/20
 #
 spec = Gem::Specification.new do |s|
-  
+
   # Change these as appropriate
   s.name              = "soup"
-  s.version           = "1.0.9"
+  s.version           = "1.0.10"
   s.summary           = "A super-simple data store"
   s.author            = "James Adam"
   s.email             = "james@lazyatom.com"
@@ -33,15 +33,15 @@ spec = Gem::Specification.new do |s|
 
   # Add any extra files to include in the gem
   s.files             = %w(Manifest Rakefile README) + Dir.glob("{test,lib}/**/*")
-   
+
   s.require_paths     = ["lib"]
-  
+
   # If you want to depend on other gems, add them here, along with any
   # relevant versions
   # s.add_dependency("some_other_gem", "~> 0.1.0")
-  
+
   # If your tests use any gems, include them here
-  s.add_development_dependency("kintama", ">= 0.1.8")
+  s.add_development_dependency("kintama", ">= 0.1.11")
   s.add_development_dependency("rake")
 end
 
@@ -49,7 +49,7 @@ end
 # .gemspec file, which is useful if something (i.e. GitHub) will
 # be automatically building a gem for this project. If you're not
 # using GitHub, edit as appropriate.
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
@@ -61,6 +61,18 @@ end
 
 task :package => :gemspec
 
+# Generate documentation
+Rake::RDocTask.new do |rd|
+  rd.main = "README"
+  rd.rdoc_files.include("README", "lib/**/*.rb")
+  rd.rdoc_dir = "rdoc"
+end
+
+desc 'Clear out RDoc and generated packages'
+task :clean => [:clobber_rdoc, :clobber_package] do
+  rm "#{spec.name}.gemspec"
+end
+
 desc 'Tag the repository in git with gem version number'
 task :tag => [:gemspec, :package] do
   if `git diff --cached`.empty?
@@ -77,19 +89,7 @@ task :tag => [:gemspec, :package] do
   end
 end
 
-desc 'Release the gem to gemcutter and tag the repo'
-task :release => [:tag] do
+desc "Tag and publish the gem to rubygems.org"
+task :publish => :tag do
   `gem push pkg/#{spec.name}-#{spec.version}.gem`
 end
-
-# Generate documentation
-Rake::RDocTask.new do |rd|
-  rd.main = "README"
-  rd.rdoc_files.include("README", "lib/**/*.rb")
-  rd.rdoc_dir = "rdoc"
-end
-
-desc 'Clear out RDoc and generated packages'
-task :clean => [:clobber_rdoc, :clobber_package] do
-  rm "#{spec.name}.gemspec"
-end

data/lib/soup/backends/file_backend.rb

@@ -26,7 +26,7 @@ class Soup
         File.open(path_for(attributes[:name], attributes[:extension]), 'w') do |f|
           attributes_without_content = attributes.dup
           f.write attributes_without_content.delete(:content)
-          f.write attributes_without_content.to_yaml.gsub(/^---\s/, "\n") if attributes_without_content.any?
+          f.write attributes_without_content.to_yaml.gsub(/^---\s/, "\n\n") if attributes_without_content.any?
         end
         Snip.new(attributes, self)
       end
@@ -81,4 +81,4 @@ class Soup
       end
     end
   end
-end
+end

data/lib/soup/backends/multi_soup.rb

@@ -11,7 +11,7 @@ class Soup
 
       def method_missing(*args)
         @backends.each do |backend|
-          if result = backend.respond_to?(args.first) ? backend.__send__(*args) : nil
+          if result = (backend.respond_to?(args.first) ? backend.__send__(*args) : nil)
             return result
           end
         end
@@ -27,4 +27,4 @@ class Soup
       end
     end
   end
-end
+end

data/lib/soup/backends/yaml_backend.rb

@@ -36,7 +36,7 @@ class Soup
         File.open(path_for(attributes[:name]), 'w') do |f|
           attributes_without_content = attributes.dup
           f.write attributes_without_content.delete(:content)
-          f.write attributes_without_content.to_yaml.gsub(/^---\s/, ATTRIBUTE_TOKEN) if attributes_without_content.any?
+          f.write attributes_without_content.to_yaml.gsub(/^---\s/, ATTRIBUTE_TOKEN + "\n") if attributes_without_content.any?
         end
         Snip.new(attributes, self)
       end
@@ -64,4 +64,4 @@ class Soup
       end
     end
   end
-end
+end

data/lib/soup/snip.rb

@@ -27,6 +27,10 @@ class Soup
       self == other
     end
 
+    def !=(other)
+      !eql?(other)
+    end
+
     def inspect
       keys = @attributes.keys.dup
       keys.delete(:name)

data/test/file_backend_test.rb

@@ -1,5 +1,5 @@
 require "test_helper"
-require "ftools"
+require "fileutils"
 require "time"
 
 context "The file-based backend" do
@@ -83,4 +83,4 @@ of the snip
   def write_snip(name, content)
     File.open(path_for(name), "w") { |f| f.write content.strip }
   end
-end
+end

data/test/multi_soup_backend_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 context "A Soup with multiple backends" do
   setup do
-    @basic_soup_backend_one = Soup::Backends::YAMLBackend.new(File.join(@base_path, "soup_one"))
+    @basic_soup_backend_one = Soup::Backends::Memory.new
     @basic_soup_backend_two = Soup::Backends::FileBackend.new(File.join(@base_path, "soup_two"))
     @soup_one = Soup.new(@basic_soup_backend_one)
     @soup_two = Soup.new(@basic_soup_backend_two)
@@ -77,4 +77,4 @@ context "A Soup with multiple backends" do
     assert_equal 2, @soup.all_snips.length
     assert_equal %w(alpha beta), @soup.all_snips.map { |s| s.name }
   end
-end
+end

data/test/soup_test.rb

@@ -29,7 +29,7 @@ def each_backend(&block)
   backends = [
     yaml_backend = Soup::Backends::YAMLBackend.new(base_path),
     file_backend = Soup::Backends::FileBackend.new(base_path),
-    Soup::Backends::MultiSoup.new(yaml_backend),
+    Soup::Backends::MultiSoup.new(file_backend),
     Soup::Backends::Memory.new
   ]
   backends.each do |backend|
@@ -90,4 +90,4 @@ each_backend do
     @soup['test'].destroy
     assert @soup['test'].nil?
   end
-end
+end

data/test/test_helper.rb

@@ -1,5 +1,5 @@
-# require 'rubygems'
-$LOAD_PATH.unshift "/Users/james/Code/lazyatom/jtest/lib"
+require 'rubygems'
+require 'bundler/setup'
 require 'kintama'
 require 'soup'
 

metadata

@@ -1,62 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: soup
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 1.0.10
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 9
-  version: 1.0.9
 platform: ruby
-authors: 
+authors:
 - James Adam
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-29 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-11-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: kintama
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 1
-        - 8
-        version: 0.1.8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.11
   type: :development
   prerelease: false
-  requirement: *id001
-  name: kintama
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.11
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: *id002
-  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: james@lazyatom.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - Manifest
 - Rakefile
 - README
@@ -77,40 +70,36 @@ files:
 - lib/soup/snip.rb
 - lib/soup/test_helper.rb
 - lib/soup.rb
-has_rdoc: true
 homepage: http://lazyatom.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2212562329042645875
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2212562329042645875
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A super-simple data store
 test_files: []
-