treet 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cbacd421d190cd2d749327de0ee03aaf373d524
-  data.tar.gz: e41405f31af293569faab6ef0ecc8242a01a645f
+  metadata.gz: 6d862a70ed8be944197ac40fa3dcc0db5d0ca8e2
+  data.tar.gz: f0e34807b7927f12ff73b9b573b13d4f5e65ba44
 SHA512:
-  metadata.gz: f049a44fb96e3b38c7c8c977941bf626715f2029e5499381b946c0414d469ee6457979a95171fe7fd80713333dc8fe9e293ec24d37c97c0412b1c6880599b5ea
-  data.tar.gz: d3a42775c21ee9a641d1b112d94e23056d121957eef76a24889faff5006afac6d98f5b4e216f471e8cebf00ff89b942c3c6fc5895fe0a1a3d68c77f8d3da4289
+  metadata.gz: e1a2a25ec6a3c8ca0fe11ea3ca390b77ebdb5405ed55586b1f7f841605c11a78cd3957d24d132c9eb9479117b84563ba9d4ccf7fb02832c848b197d10d94ec3d
+  data.tar.gz: 6362ff5a21d7814368e2df7496755e64fb34ae3cb12edcd0bff92efef4162005110834bacdcccf9d4bb94f352588f65c8fe2116553721b7d11cccd21ae0735f7

data/lib/treet/repo.rb

@@ -97,13 +97,16 @@ class Treet::Repo
           # remove something
           if fieldname
             # this is a key in a subhash
-            data = JSON.load(File.open(filepath))
-            data.delete(fieldname)
-            if data.empty?
-              # all keys have been removed, clean up the file
-              File.delete(filename)
-            else
-              File.open(filepath, "w") {|f| f << JSON.pretty_generate(data)}
+            if File.exists?(filepath)
+              # if the subhash is missing, there's nothing to remove, so do nothing (for idempotence)
+              data = JSON.load(File.open(filepath))
+              data.delete(fieldname)
+              if data.empty?
+                # all keys have been removed, clean up the file
+                File.delete(filename)
+              else
+                File.open(filepath, "w") {|f| f << JSON.pretty_generate(data)}
+              end
             end
           elsif dirname == "."
             # this is a top-level string

data/lib/treet/version.rb

@@ -1,3 +1,3 @@
 module Treet
-  VERSION = "0.17.1"
+  VERSION = "0.18.0"
 end

data/spec/lib/repo_spec.rb

@@ -198,4 +198,20 @@ describe "Repo" do
       newhash.to_hash['datalist'].should be_include('seven')
     end
   end
+
+  it "should not crash on patch that deletes missing subtree elements" do
+    hash = Treet::Hash.new("#{File.dirname(__FILE__)}/../json/one.json")
+    Dir.mktmpdir do |dir|
+      repo = hash.to_repo(dir)
+      repo.patch([
+                  [
+                   "-",
+                   "missing.thing",
+                   "does not exist"
+                  ]
+                 ])
+      newhash = repo.to_hash
+      newhash['missing'].should be_nil
+    end
+  end
 end

data/treet.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Transform between trees of files and JSON blobs}
   gem.summary       = %q{Transform between trees of files and JSON blobs}
   gem.homepage      = ""
+  gem.license       = "LGPL-3"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: treet
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Jason May
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
@@ -190,7 +190,8 @@ files:
 - spec/test_helper.rb
 - treet.gemspec
 homepage: ''
-licenses: []
+licenses:
+- LGPL-3
 metadata: {}
 post_install_message: 
 rdoc_options: []