nsync 0.0.3 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/lib/nsync/consumer.rb

@@ -80,6 +80,17 @@ module Nsync
       Nsync.config
     end
 
+    def latest_changes
+      update_repo &&
+      changes(config.version_manager.version,
+              repo.head.commit.id)
+    end
+
+    def changes(a, b)
+      diffs = repo.diff(a,b)
+      changeset_from_diffs(diffs)
+    end
+
     # Translates and applies the changes between commit id 'a' and commit id 'b' to
     # the datastore.  This is used internally by rollback and update. Don't use this
     # unless you absolutely know what you are doing.
@@ -91,6 +102,7 @@ module Nsync
     # @param [String] a current data version commit id
     # @param [String] b new data version commit id
     def apply_changes(a, b)
+      return false if a == b
       config.lock do
         config.log.info("[NSYNC] Moving Nsync::Consumer from '#{a}' to '#{b}'")
         clear_queues
@@ -125,6 +137,19 @@ module Nsync
       end
     end
 
+    # Reprocesses all changes from the start of the repo to the current version
+    # for the class klass, queues will not be cleared, so you can use this to
+    # do powerful data reconstruction.  You can also shoot your foot off. Be
+    # very careful
+    def reprocess_class!(klass)
+      diffs = repo.diff(first_commit, config.version_manager.version)
+      changeset = changeset_from_diffs(diffs)
+
+      changes = changeset[klass]
+      if changes
+        apply_changes_for_class(klass, changes)
+      end
+    end
 
     # @private
     class Change < Struct.new(:id, :diff) 
@@ -199,6 +224,12 @@ module Nsync
         line.split(/\s+/)
       end
     end
+
+    # Gets the first commit id in the repo
+    def first_commit
+      self.repo.git.rev_list({:reverse => true}, "master").split("\n").first
+    end
+
     protected
     def get_or_create_repo
       if config.local? || File.exists?(config.repo_path)
@@ -209,7 +240,7 @@ module Nsync
         git = Grit::Git.new(config.repo_path)
         git.clone({:bare => true}, config.repo_url, config.repo_path)
         self.repo = Grit::Repo.new(config.repo_path)
-        config.version_manager.version = git.rev_list({:reverse => true}, "master").split("\n").first
+        config.version_manager.version = first_commit
         return self.repo
       end
     end

data/lib/nsync/producer.rb

@@ -58,6 +58,19 @@ module Nsync
       config.log.info("[NSYNC] Removed file '#{filename}'")
     end
 
+    def latest_changes
+      diff = repo.git.native('diff', {:full_index => true, :cached => true})
+
+      if diff =~ /diff --git a/
+        diff = diff.sub(/.*?(diff --git a)/m, '\1')
+      else
+        diff = ''
+      end
+
+      diffs = Grit::Diff.list_from_string(repo, diff)
+      changeset_from_diffs(diffs)
+    end
+
     # Commits and pushes the current changeset
     def commit(message="Friendly data update")
       config.lock do

data/nsync.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nsync}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hughes"]
-  s.date = %q{2011-01-05}
+  s.date = %q{2011-01-08}
   s.description = %q{Nsync is designed to allow you to have a separate data
   processing app with its own data processing optimized database and a consumer
   app with its own database, while keeping the data as in sync as you want it.}

data/test/nsync_consumer_test.rb

@@ -87,32 +87,28 @@ class NsyncConsumerTest < Test::Unit::TestCase
         end
       end
 
-      [['local disk', nil], 
-        ['github', 'git://github.com/schleyfox/test_repo.git']].each do |name, url|
+      context "where the origin does exist" do
+        setup do
+          @repo = TestRepo.new
+          FileUtils.rm_rf @repo.bare_consumer_repo_path
 
-        context "where the origin does exist on #{name}" do
-          setup do
-            @repo = TestRepo.new
-            FileUtils.rm_rf @repo.bare_consumer_repo_path
-  
-            Nsync.config.repo_url = url || @repo.repo_path
-            Nsync.config.repo_path = @repo.bare_consumer_repo_path
-  
-            @consumer = Nsync::Consumer.new
-          end
-  
-          should "assign repo to a new bare repo" do
-            assert @consumer.repo.is_a? Grit::Repo
-            assert @consumer.repo.bare
-          end
-  
-          should "set the origin remote" do
-            origin = @consumer.remotes.detect{|r| r[0] == "origin" && r[2] == "(fetch)" }
-            assert origin
-            assert_equal Nsync.config.repo_url, origin[1]
-          end
+          Nsync.config.repo_url = @repo.repo_path
+          Nsync.config.repo_path = @repo.bare_consumer_repo_path
+
+          @consumer = Nsync::Consumer.new
+        end
+
+        should "assign repo to a new bare repo" do
+          assert @consumer.repo.is_a? Grit::Repo
+          assert @consumer.repo.bare
+        end
+
+        should "set the origin remote" do
+          origin = @consumer.remotes.detect{|r| r[0] == "origin" && r[2] == "(fetch)" }
+          assert origin
+          assert_equal Nsync.config.repo_url, origin[1]
         end
-      end  
+      end
     end
   end
 
@@ -301,4 +297,32 @@ class NsyncConsumerTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "Reprocessing all data for a class" do
+    setup do
+      @repo = TestRepo.new
+      Nsync.config.version_manager.stubs(:version => "current version")
+      FileUtils.rm_rf @repo.bare_consumer_repo_path
+
+      Nsync.config.repo_url = @repo.repo_path
+      Nsync.config.repo_path = @repo.bare_consumer_repo_path
+
+      @consumer = Nsync::Consumer.new
+    end
+
+    should "get changes from initial revision to current version and apply only for the class" do
+      changeset = {NsyncTestFoo => ["changes"], NsyncTestBar => ["changes"]}
+  
+      @consumer.expects(:first_commit).returns("first version").once
+  
+      @consumer.repo.expects(:diff).with("first version", "current version").returns(:diffs).once
+      @consumer.expects(:changeset_from_diffs).with(:diffs).returns(changeset).once
+
+      @consumer.expects(:apply_changes_for_class).with(NsyncTestBar, is_a(Array)).never
+      @consumer.expects(:apply_changes_for_class).with(NsyncTestFoo, ["changes"]).once
+
+
+      @consumer.reprocess_class!(NsyncTestFoo)
+    end
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ben Hughes
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 -05:00
+date: 2011-01-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency