epitools 0.5.43 → 0.5.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18aedb7dadd9b9a8cdfe9b619d228dc250ff2c0b
-  data.tar.gz: 41feba1a86b88e3f0790151ef815e5f1c1ebf680
+  metadata.gz: c0522a13977563b564bdb275aeadf28428699aef
+  data.tar.gz: b0cdb112d922ea85c3a08f3ce56c44a58b2bfc12
 SHA512:
-  metadata.gz: abf447f70c70e0b79f3b949a1faca4569f45325244dce43fffd1c139d94ff31c03151aec3368a6b18b8e528dec558572db31bc0385a993589297063fd7f6bf4f
-  data.tar.gz: 55c84b31bb1f3182ea56354649036df86add2c3d72c4a80aba726f8db7ee4ad01692fb523dd80d353fe3a0d10c0652f8b5a941f64f22cc642ead7a567a32e439
+  metadata.gz: de0eff660c20c27c0769628ae29452e04832a3b7a279dfcde50b365984fca0a3057f692f83ce0f7b60e7ff76fcc49c8fbb2bdc88ff170098ddc879b1dc64e02f
+  data.tar.gz: da662e207de10d2f5a6f79492d18423114ec853e7dfd5694048128fa6690e72635f45160b0d4e4746d26830c926e2fa439e780bffe7fc031ae4a89ada4651aed

data/VERSION

@@ -1 +1 @@
-0.5.43
+0.5.44

data/lib/epitools/core_ext/hash.rb

@@ -224,5 +224,69 @@ class Hash
   end
   alias_method :mql, :query
   
+
+  #
+  # Return all the changes necessary to transform `self` into `other`. (Works on nested hashes.) The result is a hash of {:key => [old value, new value]} pairs.
+  #
+  # (NOTE: Since "nil" is used to denote a value was removed, you can't use this method to diff hashes where a value is "nil".)
+  #
+  def diff(other)
+    (self.keys + other.keys).uniq.inject({}) do |memo, key|
+      unless self[key] == other[key]
+        if self[key].kind_of?(Hash) && other[key].kind_of?(Hash)
+          memo[key] = self[key].diff(other[key])
+        else
+          memo[key] = [self[key], other[key]] 
+        end
+      end
+      memo
+    end
+  end
+
+  #
+  # Applies a Hash#diff changeset to this hash.
+  #
+  def apply_diff!(changes)
+    path = [[self, changes]]
+    pos, local_changes = path.pop
+
+    while local_changes
+      local_changes.each_pair do |key, change|
+        if change.kind_of?(Array)
+          if change[1].nil?
+            pos.delete key
+          else
+            pos[key] = change[1]
+          end
+        else
+          path.push([pos[key], change])
+        end
+      end
+
+      pos, local_changes = path.pop
+    end
+
+    self
+  end
+
+  #
+  # Applies a Hash#diff changeset and returns the transformed hash.
+  #
+  def apply_diff(changes)
+    deep_dup.apply_diff!(changes)
+  end
+
+  #
+  # Duplicate this hash, including hashes nested inside of it.
+  #
+  def deep_dup
+    duplicate = self.dup
+    duplicate.each_pair do |k,v|
+      tv = duplicate[k]
+      duplicate[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_dup : v
+    end
+    duplicate
+  end
+
 end
 

data/lib/epitools/core_ext/numbers.rb

@@ -182,7 +182,7 @@ class Numeric
     result = "%0.2d:%0.2d" % [minutes,seconds]
     result = ("%0.2d:" % hours) + result   if hours > 0 or days > 0
     result = ("%0.2d:" % days)  + result   if days > 0
-    result += ("." + frac.round(2).to_s.split(".").last[0..1]) if frac > 0
+    result += ("." + frac.round(2).to_s.split(".").last) if frac > 0
 
     result
   end

data/lib/epitools/path.rb

@@ -492,6 +492,22 @@ class Path
   end
   alias_method :xattrs, :attrs
 
+  #
+  # Set this file's xattrs. (Optimized so that only changed attrs are written to disk.)
+  #
+  def attrs=(new_attrs)
+    changes = attrs.diff(new_attrs)
+
+    changes.each do |key, (old, new)|
+      case new
+      when String, Numeric, Boolean, nil
+        self[key] = new
+      else
+        raise "Error: Can't use a #{new.class} as an xattr value. Try passing a String."
+      end
+    end
+  end
+
   #
   # Retrieve one of this file's xattrs
   #
@@ -507,7 +523,6 @@ class Path
     @attrs = nil
   end
 
-
   ###############################################################################
   # Opening/Reading files
   ###############################################################################

data/spec/core_ext_spec.rb

@@ -412,24 +412,24 @@ end
 
 describe Enumerable do
 
-  it "maps deeply" do
-    [["a\n", "b\n"], ["c\n", "d\n"]].map_recursively(&:strip).should == [ %w[a b], %w[c d] ]
+  # it "maps deeply" do
+  #   [["a\n", "b\n"], ["c\n", "d\n"]].map_recursively(&:strip).should == [ %w[a b], %w[c d] ]
     
-    [[1,2],[3,4]].deep_map {|e| e ** 2}.should == [[1,4],[9,16]] 
-    [1,2,3,4].deep_map {|e| e ** 2}.should == [1,4,9,16] 
-    [[],[],1,2,3,4].deep_map {|e| e ** 2}.should == [[], [], 1, 4, 9, 16] 
+  #   [[1,2],[3,4]].deep_map {|e| e ** 2}.should == [[1,4],[9,16]] 
+  #   [1,2,3,4].deep_map {|e| e ** 2}.should == [1,4,9,16] 
+  #   [[],[],1,2,3,4].deep_map {|e| e ** 2}.should == [[], [], 1, 4, 9, 16] 
 
-    {1=>2, 3=>{4=>5, 6=>7}}.deep_map {|k,v| [k, v**2] }.should == [ [1,4], [3, [[4,25], [6,49]]] ]
-  end
+  #   {1=>2, 3=>{4=>5, 6=>7}}.deep_map {|k,v| [k, v**2] }.should == [ [1,4], [3, [[4,25], [6,49]]] ]
+  # end
   
-  it "selects deeply" do
-    [[1,2],[3,4]].deep_select {|e| e % 2 == 0 }.should == [[2],[4]]
-    puts
+  # it "selects deeply" do
+  #   [[1,2],[3,4]].deep_select {|e| e % 2 == 0 }.should == [[2],[4]]
+  #   puts
 
-    {1=>2, 3=>{4=>5, 6=>7}}.deep_select {|k,v| k == 1 }.should == {1=>2} 
-    #[1,2,3,4].deep_select {|e| e ** 2}.should == [1,4,9,16] 
-    #[[],[],1,2,3,4].deep_select {|e| e ** 2}.should == [[], [], 1, 4, 9, 16] 
-  end
+  #   {1=>2, 3=>{4=>5, 6=>7}}.deep_select {|k,v| k == 1 }.should == {1=>2} 
+  #   #[1,2,3,4].deep_select {|e| e ** 2}.should == [1,4,9,16] 
+  #   #[[],[],1,2,3,4].deep_select {|e| e ** 2}.should == [[], [], 1, 4, 9, 16] 
+  # end
   
   it "splits" do
     [1,2,3,4,5].split_at     {|e| e == 3}.should == [ [1,2], [4,5] ]
@@ -568,6 +568,18 @@ describe Hash do
     @h.key?("key1").should      == true
     @h.includes?("key1").should == true
   end
+
+  it "diffs" do
+    a = {a: {c: 1, b: 2}, b: 2}
+    b = {a: {c: 2, b: 2}}
+
+    changes = a.diff(b)
+    changes.should == {:a=>{:c=>[1, 2]}, :b=>[2, nil]}
+    a.apply_diff(changes).should == b
+    
+    a.apply_diff!(changes)
+    a.should == b
+  end
   
 end
 

data/spec/path_spec.rb

@@ -504,6 +504,7 @@ describe Path do
   end
 
   it "xattrs" do
+
     file = Path["~/test"]
     file.touch
     file["nothing"].should == nil
@@ -518,6 +519,12 @@ describe Path do
     Path.getfattr(file)["user.test"].should == nil
 
     lambda { file["blahblahblah"] = "whee" }.should raise_error
+
+    # Test assigning an entire hash of attributes, using diffing
+    attrs = file.attrs
+    attrs["user.diff_element"] = "newtest"
+    file.attrs = attrs
+    file["user.newtest"].should == "newtest"
   end
 
   it "changes mtime/atime" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.43
+  version: 0.5.44
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec