treet 0.14.1 → 0.15.0

data/lib/treet/gitrepo.rb

@@ -186,7 +186,7 @@ class Treet::Gitrepo < Treet::Repo
       end
     end
 
-    data
+    Treet::Hash.new(data)
   end
 
   def commit_id_for(tagname)

data/lib/treet/hash.rb

@@ -1,11 +1,16 @@
 # encoding: UTF-8
 
+require "map"
 require "json"
 require "digest/sha1"
+require "forwardable"
 
 class Treet::Hash
   attr_reader :data
 
+  extend Forwardable
+  def_delegators :@data, :keys, :values, :hash, :[], :merge, :empty?, :any?
+
   # when loading an Array (at the top level), members are always sorted
   # so that array comparisons will be order-independent
   def initialize(source)
@@ -16,7 +21,11 @@ class Treet::Hash
       # treat as filename
       JSON.load(File.read(source))
     else
-      raise "Invalid source data type #{source.class} for Treet::Hash"
+      if source.respond_to?(:to_hash)
+        initialize(source.to_hash)
+      else
+        raise "Invalid source data type #{source.class} for Treet::Hash"
+      end
     end
 
     @data = normalize(d)
@@ -29,17 +38,39 @@ class Treet::Hash
   end
 
   def to_hash
-    data.to_hash
+    data #.to_hash
   end
 
+  # def normalized_data
+  #   data.each_with_object({}) do |(k,v),h|
+  #     h[k.to_s] = case v
+  #     when Array
+  #       v.sort_by {|x| x.hash}
+  #     else
+  #       v
+  #     end
+  #   end
+  # end
+  # def hash
+  #   data.hash
+  #   # normalized_data.hash
+  # end
+
   def compare(target)
     # HashDiff.diff(data, target.to_hash)
     Treet::Hash.diff(data.to_hash, target.to_hash)
   end
 
+  def ==(target)
+    eql?(target)
+  end
+  def eql?(target)
+    self.hash.eql?(Treet::Hash.new(target).hash)
+  end
   # apply diffs (created via the `#compare` function) to create a new object
   def patch(diffs)
-    newhash = Treet::Hash.patch(self.to_hash, diffs)
+    # newhash = Treet::Hash.patch(self.to_hash, diffs)
+    newhash = Treet::Hash.patch(data, diffs)
     Treet::Hash.new(newhash)
   end
 
@@ -92,17 +123,21 @@ class Treet::Hash
   end
 
   def normalize(hash)
-    hash.each_with_object({}) do |(k,v),h|
+    Map.new(hash).sort_by(&:first).each_with_object(Map.new) do |(k,v),h|
+    # Map.new(hash).each_with_object(Map.new) do |(k,v),h|
+    # hash.each_with_object(Map.new) do |(k,v),h|
       case v
       when Array
-        if v.map(&:class).uniq == Hash
-          # all elements are Hashes
-          h[k] = v.sort do |a,b|
-            a.to_a.sort_by(&:first).flatten <=> b.to_a.sort_by(&:first).flatten
-          end
-        else
-          h[k] =v
-        end
+        h[k] = v.uniq.sort_by(&:hash) if v.any?
+        # if v.map(&:class).uniq == Map
+        #   # all elements are Maps
+        #   h[k] = v.sort_by(&:hash)
+        #   # h[k] = v.sort do |a,b|
+        #   #   a.to_a.sort_by(&:first).flatten <=> b.to_a.sort_by(&:first).flatten
+        #   # end
+        # else
+        #   h[k] = v
+        # end
 
       else
         h[k] = v
@@ -175,7 +210,7 @@ class Treet::Hash
     result = hash.dup
 
     diffs.each do |diff|
-      flag, key, v1, v2 = diff
+      flag, key, v1, _ = diff
       if key =~ /\[/
         keyname, is_array = key.match(/^(.*)(\[\])$/).captures
       elsif key =~ /\./
@@ -197,7 +232,7 @@ class Treet::Hash
       when '+'
         # add something
         if subkey
-          result[keyname] ||= {}
+          result[keyname] ||= Map.new
           result[keyname][subkey] = v1
         elsif is_array
           result[keyname] ||= []
@@ -218,8 +253,11 @@ class Treet::Hash
       end
     end
 
-    result.delete_if {|k,v| v.nil? || v.empty?}
-
+    # result.delete_if {|k,v| v.nil? || v.empty?}
+    # TODO: delete_if started failing when I switched to Map, can't figure out why
+    result.each do |k,v|
+      result.delete(k) if v.nil? || v.empty?
+    end
     result
   end
 end

data/lib/treet/repo.rb

@@ -144,7 +144,8 @@ class Treet::Repo
   end
 
   def expand(path)
-    filenames(path).each_with_object({}) {|f,h| h[f] = expand_json("#{path}/#{f}")}
+    raw = filenames(path).each_with_object({}) {|f,h| h[f] = expand_json("#{path}/#{f}")}
+    Treet::Hash.new(raw)
   end
 
   def filenames(path)

data/lib/treet/version.rb

@@ -1,3 +1,3 @@
 module Treet
-  VERSION = "0.14.1"
+  VERSION = "0.15.0"
 end

data/spec/lib/hash_spec.rb

@@ -1,12 +1,26 @@
 # encoding: UTF-8
 require "spec_helper"
 
-describe "Hash" do
-  it "should inject JSON" do
+describe Treet::Hash do
+  it "should be indifferent about keys" do
+    h1 = Treet::Hash.new({:name => {:full => 'John Smith'}})
+    h2 = Treet::Hash.new({'name' => {'full' => 'John Smith'}})
+    h1.should == h2
+  end
+
+  it "should inject JSON and do indifferent comparison" do
     hash = Treet::Hash.new("#{File.dirname(__FILE__)}/../json/one.json")
     hash.data.should == {
       'name' => {'full' => 'John Bigbooté'}
     }
+    hash.data.should == {
+      :name => {:full => 'John Bigbooté'}
+    }
+  end
+
+  it "should allow no empty fields" do
+    hash = Treet::Hash.new({:empty => []})
+    hash.data.keys.should be_empty
   end
 
   it "should compare hashes to file trees" do
@@ -19,8 +33,10 @@ describe "Hash" do
     hash = Treet::Hash.new("#{File.dirname(__FILE__)}/../json/one.json")
 
     Dir.mktmpdir do |dir|
-      hash.to_repo(dir)
+      repo = hash.to_repo(dir)
       JSON.load(File.open("#{dir}/name")).should == {'full' => 'John Bigbooté'}
+      repo.to_hash.should == hash
+      Treet::Repo.new(dir).to_hash.should == hash
     end
   end
 
@@ -32,6 +48,9 @@ describe "Hash" do
       hash.to_repo(dir)
       JSON.load(File.open("#{dir}/name")).should == {'full' => 'John Bigbooté'}
     end
+
+    hash2 = Treet::Hash.new({'name' => {'full' => 'John Bigbooté'}})
+    hash.eql?(hash2).should == true
   end
 
   it "should convert arrays to subdirs named with digests" do
@@ -57,6 +76,14 @@ describe "Hash" do
     hash1.compare(hash1).should == []
     hash1.compare(hash2).should == []
 
+    hash1.should == hash1
+    hash1.should == hash2
+
+    hash1.eql?(hash1).should == true
+    hash1.eql?(hash2).should == true
+
+    hash1.hash.should == hash2.hash
+
     hash = Treet::Hash.new("#{File.dirname(__FILE__)}/../json/two.json")
     repo = Treet::Repo.new("#{File.dirname(__FILE__)}/../repos/two")
 
@@ -111,22 +138,26 @@ describe "shallow comparison of hashes" do
     h1 = Treet::Hash.new("#{File.dirname(__FILE__)}/../json/bob1.json")
     h2 = Treet::Hash.new("#{File.dirname(__FILE__)}/../json/bob2.json")
     diffs = h1.compare(h2)
-    # diffs.should include(["~", "name.full", "Bob Smith", "Robert Smith"])
-    # diffs.should include(["+", "business.organization", "Acme Inc."])
-    # diffs.should include(["-", "other.notes", "some commentary"])
-    diffs.should == [
-      ["~", "name.full", "Robert Smith", "Bob Smith"],
+    diffs.sort.should == [
+      ["+", "business.organization", "Acme Inc."],
+      ["+", "emails[]", {"label"=>"home", "email"=>"bob@newhome.com"}],
       ["-", "emails[]", {"label"=>"home", "email"=>"bob@home.com"}],
       ["-", "emails[]", {"label"=>"other", "email"=>"bob@vacation.com"}],
-      ["+", "emails[]", {"label"=>"home", "email"=>"bob@newhome.com"}],
       ["-", "other.notes", "some commentary"],
-      ["+", "business.organization", "Acme Inc."]
+      ["~", "name.full", "Robert Smith", "Bob Smith"],
     ]
 
     h3 = h1.patch(diffs)
     h3.compare(h2).should == []
   end
 
+  describe "comparison should ignore order of keys" do
+    h1 = Treet::Hash.new(:name => "foo", :addresses => [{:bar => 'baz'}, {:bar => 'biz'}, {:bar => 'boz'}], :phones => [{:label => 'home', :phone => '123-123-1234'}], :empty => [])
+    h2 = Treet::Hash.new('phones' => [{'label' => 'home', 'phone' => '123-123-1234'}], 'name' => 'foo', 'addresses' =>[{'bar' => 'boz'}, {'bar' => 'biz'}, {'bar' => 'baz'}, {'bar' => 'biz'}])
+    h1.should == h2
+    h1.hash.should == h2.hash
+  end
+
   describe "arrays of strings should build lists of filenames" do
     hash = Treet::Hash.new(
         :name => 'Foo Bar',

data/spec/lib/repo_spec.rb

@@ -7,6 +7,9 @@ describe "Repo" do
     repo.to_hash.should == {
       'name' => {'full' => 'John Bigbooté'}
     }
+    repo.to_hash.should == {
+      :name => {:full => 'John Bigbooté'}
+    }
   end
 
   it "should reload on reset" do

data/spec/lib/test_gitrepo.rb

@@ -67,6 +67,9 @@ class GitrepoTests < MiniTest::Spec
 
     it "should fetch data content" do
       johnb.to_hash.must_equal load_json('one')
+      johnb.to_hash.must_equal(Treet::Hash.new({:name => {:full => "John Bigbooté"}}))
+      jb2 = Treet::Gitrepo.new(johnb.root, :author => {})
+      jb2.to_hash.must_equal(Treet::Hash.new({:name => {:full => "John Bigbooté"}}))
     end
 
     it "should have no tags" do

data/treet.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Treet::VERSION
 
+  gem.add_dependency 'map'
   gem.add_dependency 'thor'
   gem.add_dependency 'rugged', "~> 0.17.0.b6"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treet
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: map
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -842133480250994706
+      hash: 3301508427182722923
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -215,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -842133480250994706
+      hash: 3301508427182722923
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24