nsync 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/nsync/consumer.rb

@@ -152,6 +152,12 @@ module Nsync
     end
 
     class Change < Struct.new(:id, :diff) 
+      def json_data(data)
+        JSON.load(data)
+      rescue
+        {}
+      end
+
       def type
         if diff.deleted_file
           :deleted
@@ -162,22 +168,18 @@ module Nsync
         end
       end
 
-      def a_data
-        JSON.load(diff.a_blob.data)
-      rescue
-        {}
+      def a_data(parse_json=true)
+        val = diff.a_blob ? diff.a_blob.data : ""
+        parse_json ? json_data(val) : val
       end
 
-      def b_data
-        JSON.load(diff.b_blob.data)
-      rescue
-        {}
+      def b_data(parse_json=true)
+        val = diff.b_blob ? diff.b_blob.data : ""
+        parse_json ? json_data(val) : val
       end
 
       def data
-        @data ||= JSON.load(diff.b_blob.data)
-      rescue
-        {}
+        @data ||= b_data
       end
     end
 
@@ -322,14 +324,14 @@ module Nsync
       end
     end
 
-    def changeset_from_diffs(diffs)
+    def changeset_from_diffs(diffs, change_klass=Change)
       diffs.inject({}) do |h, diff|
         next h if diff_path(diff) =~ /\.gitignore$/
 
         classes, id = consumer_classes_and_id_from_path(diff_path(diff))
         classes.each do |klass|
           h[klass] ||= []
-          h[klass] << Change.new(id, diff)
+          h[klass] << change_klass.new(id, diff)
         end
         h
       end

data/lib/nsync/producer.rb

@@ -60,6 +60,17 @@ module Nsync
       config.log.info("[NSYNC] Removed file '#{filename}'")
     end
 
+    class Change < ::Nsync::Consumer::Change
+      def b_data(parse_json=true)
+        if type == :deleted
+          super
+        else
+          val = File.read(File.join(Nsync.config.repo_path, diff.b_path))
+          parse_json ? json_data(val) : val
+        end
+      end
+    end
+        
     def latest_changes
       # TODO: change to using --work-tree in git
       diff = config.cd { repo.git.native('diff', {:full_index => true}) }
@@ -72,7 +83,7 @@ module Nsync
       end
 
       diffs = Grit::Diff.list_from_string(repo, diff)
-      changeset_from_diffs(diffs)
+      changeset_from_diffs(diffs, Change)
     end
 
     # gets untracked files into the diff output

data/nsync.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nsync}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hughes"]

data/test/nsync_producer_test.rb

@@ -198,6 +198,40 @@ class NsyncProducerTest < Test::Unit::TestCase
     end
   end
 
+  context "latest_changes" do
+    setup do
+      @repo = TestRepo.new
+
+      Nsync.config.repo_path = @repo.repo_path
+      @producer = Nsync::Producer.new
+    end
+
+    should "work the same for added/modified/deleted" do
+      filename = "nsync_test_foo/1.json"
+      full_path = File.join(@repo.repo_path, filename)
+      @repo.add_file(filename, 
+                     {:id => 1, :data => "new file"}, false)
+      changes = @producer.latest_changes
+      assert_equal 1, changes[NsyncTestFoo].size
+      assert_equal JSON.load(File.read(full_path)), changes[NsyncTestFoo][0].b_data
+      @producer.commit("added new file")
+      
+      @repo.add_file(filename, 
+                     {:id => 1, :data => "modified file"}, false)
+      changes = @producer.latest_changes
+      assert_equal 1, changes[NsyncTestFoo].size
+      assert_equal JSON.load(File.read(full_path)), changes[NsyncTestFoo][0].b_data
+      old_value = JSON.load(File.read(full_path))
+      @producer.commit("modified file")
+
+      @repo.remove_file(filename)
+      changes = @producer.latest_changes
+      assert_equal 1, changes[NsyncTestFoo].size
+      assert_equal old_value, changes[NsyncTestFoo][0].a_data
+      assert changes[NsyncTestFoo][0].diff.deleted_file
+    end
+  end
+
   context "basic flow" do
     setup do
       @repo_path = TestRepo.repo_path

data/test/repo.rb

@@ -38,7 +38,7 @@ class TestRepo
     "#{repo_path}_producer_push.git"
   end
 
-  def add_file(filename, content)
+  def add_file(filename, content, add=true)
     cd do
       dir = File.dirname(filename)
       if ![".", "/"].include?(dir) && !File.exists?(dir)
@@ -47,7 +47,7 @@ class TestRepo
       File.open(File.join(repo_path, filename), "w") do |f|
         f.write((content.is_a?(Hash))? content.to_json : content)
       end
-      repo.add(File.join(repo_path, filename))
+      repo.add(File.join(repo_path, filename)) if add
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Ben Hughes