syncer 0.0.1 → 0.0.4

data/lib/syncer.rb

@@ -1,4 +1,5 @@
 require "syncer/version"
+require "syncer/sync_record"
 require "syncer/syncer"
 require "syncer/syncable_record"
 

data/lib/syncer/sync_record.rb

@@ -0,0 +1,6 @@
+require 'active_record'
+
+class SyncRecord < ActiveRecord::Base
+  validates_presence_of :version
+  validates_numericality_of :version 
+end

data/lib/syncer/syncable_record.rb

@@ -46,8 +46,10 @@ class SyncableRecord < ActiveRecord::Base
       # if the key is of the form xxx_tmp_id
       next unless /(?<foreign_key_prefix>.*)_tmp_id$/ =~ key
       # then find the xxx class
+      # TODO assumption here is that model name are single words!!
       next unless model_class = foreign_key_prefix.capitalize.to_class
       # find the class model that matches the tmp_id
+      # TODO note that if it does not find it it will try to assign it and get a "Can't mass-assign protected attributes" error
       next unless model = model_class.find_by_tmp_id(remote_record["#{foreign_key_prefix}_tmp_id"])      
       # save the actual model id 
       remote_record["#{foreign_key_prefix}_id"] = model.id
@@ -63,6 +65,8 @@ class SyncableRecord < ActiveRecord::Base
     # TODO we do not currently check for id's per user
     # TODO check both when creating and when accessing
     # TODO we should at some point delete the tmp_ids
+    
+    state_changed = false
 
     remote_saved = remote_state['saved'] || []
     remote_created = remote_state['created'] || []
@@ -110,6 +114,7 @@ class SyncableRecord < ActiveRecord::Base
         if rec.persisted?
           response = rec.to_rjson
           created << response
+          state_changed = true
         end
       end
     end
@@ -127,7 +132,10 @@ class SyncableRecord < ActiveRecord::Base
           attrs = remote_record.dup
           attrs.delete("id")      # can't update id
           attrs.delete("version") # can't update version
-          updated << rec if rec.update_attributes(attrs)
+          if rec.update_attributes(attrs)
+            updated << rec 
+            state_changed = true
+          end
         end
       end
     end
@@ -143,7 +151,10 @@ class SyncableRecord < ActiveRecord::Base
         # destroy the record only if found and if it has not been updated on the server already
         if rec && !rec.updated?(remote_record)         
           rec.destroy
-          deleted << { :id => remote_record['id'] } if remote_record['id']
+          if remote_record['id']
+            deleted << { :id => remote_record['id'] }
+            state_changed = true
+          end
         end
       end
     end
@@ -152,6 +163,9 @@ class SyncableRecord < ActiveRecord::Base
     response[:create] = created unless created.empty?
     response[:update] = updated unless updated.empty?
     response[:delete] = deleted unless deleted.empty?
+    
+    # mark here if db state was actually changed requiring version increment
+    response[:state_changed] = true if state_changed
 
     response
     

data/lib/syncer/syncer.rb

@@ -1,21 +1,50 @@
 require 'xstring'
 
 class Syncer
+  SYNC_VERSION_KEY = '_sync_version'  
   SYNC_ORDER_KEY = '_sync_order'  
   
   # request keys should be strings and not symbols
   def self.sync(request)
-    request = request.to_rjson
-    response = {};
-    all_sync_request = request
-    sync_order = all_sync_request[SYNC_ORDER_KEY];
+    
+    # TODO probably check the model actually exists and responds to sync
+    # TODO We need to deal with security issues such as User associated models + same for relationships
+        
+    state_changed = false    
+      
+    response = {}
+    all_sync_request = request.to_rjson
+    sync_order = all_sync_request[SYNC_ORDER_KEY]
     # TODO if nil raise an exception
     sync_order.each do |model|
       model_sync_data = all_sync_request[model]
       next unless model_sync_data # it is ok not to have data for each model in the order
       sync_response = model.to_class.sync(model_sync_data)
       response[model] = sync_response
+      state_changed = true if sync_response[:state_changed]
     end
+    
+    # handle version
+    increment_sync_state_version if state_changed
+    response[SYNC_VERSION_KEY] = sync_state.version
+    
     response.to_rjson
   end
+  
+  def self.version    
+    { SYNC_VERSION_KEY => sync_state.version }
+  end
+
+private
+  
+  def self.sync_state
+    # TODO this currently supports only one sync account - add multi user support
+    
+    # return the first sync and create it if doesn't exit
+    SyncRecord.first || SyncRecord.create
+  end
+  
+  def self.increment_sync_state_version
+    sync_state.increment!(:version)
+  end
 end

data/lib/syncer/version.rb

@@ -1,3 +1,3 @@
 class Syncer
-  VERSION = "0.0.1"
+  VERSION = "0.0.4"
 end

data/spec/support/active_record.rb

@@ -42,6 +42,12 @@ ActiveRecord::Migration.create_table "trades", :force => true do |t|
   t.datetime "updated_at"
 end
 
+ActiveRecord::Migration.create_table "sync_records", :force => true do |t|
+  t.integer  "version", :default => 0
+  t.datetime "created_at"
+  t.datetime "updated_at"
+end
+
 #setup transactions
 RSpec.configure do |config|
   config.around do |example|

data/spec/syncable_record_spec.rb

@@ -18,7 +18,7 @@ describe "SyncableRecord" do
         @stock2 = { :market => 'us', :ticker => 'AAPL', :name => 'Apple', :tmp_id => '13' }
       end
       
-      it "it should create the records and return create response for them" do
+      it "it should create the records, return create response for them, and mark state changed" do
         remote_state = { 'created' => [@stock1, @stock2] }
         
         response = Stock.sync(HashWithIndifferentAccess.new(remote_state))
@@ -40,6 +40,8 @@ describe "SyncableRecord" do
         response[:create][1]['tmp_id'].should == @stock2[:tmp_id]
         response[:delete].should be_nil
         response[:update].should be_nil
+        
+        response[:state_changed].should be_true
       end 
     end
   end    
@@ -52,13 +54,15 @@ describe "SyncableRecord" do
 
     describe "and no remote records" do
       
-      it "it should return create for server records" do
+      it "it should return create for server records, and no state change" do
         response = Stock.sync({})
         response[:create].length.should == 2
         response[:create][0].should == @stock1
         response[:create][1].should == @stock2
         response[:delete].should be_nil
         response[:update].should be_nil
+        
+        response[:state_changed].should be_nil
       end
     end
     
@@ -73,13 +77,15 @@ describe "SyncableRecord" do
 
     describe "one of the remote records is deleted" do
       
-      it "it should delete the deleted record and keep the saved record" do
+      it "it should delete the deleted record,keep the saved record, and mark state changed" do
         remote_state = { 'saved' => [@stock1], 'deleted' => [@stock2] }
         response = Stock.sync(remote_state)
         response[:delete].length.should == 1
         response[:delete][0][:id].should == @stock2.id   
         response[:create].should be_nil
         response[:update].should be_nil
+        
+        response[:state_changed].should be_true
       end
     end
   end
@@ -92,7 +98,7 @@ describe "SyncableRecord" do
     
     describe "and some saved records on remote" do
       
-      it "it should return create for new records" do
+      it "it should return create for new records and no state change" do
         remote_state = { 'saved' => [@stock1] }
   
         response = Stock.sync(remote_state)
@@ -100,6 +106,8 @@ describe "SyncableRecord" do
         response[:create][0].should == @new_stock
         response[:delete].should be_nil
         response[:update].should be_nil
+        
+        response[:state_changed].should be_nil        
       end
     end      
 
@@ -109,7 +117,7 @@ describe "SyncableRecord" do
         @stock4 = { :market => 'us', :ticker => 'AAPL', :name => 'Apple', :tmp_id => '13' }
       end
       
-      it "it should create the new and created records and return create response for them" do
+      it "it should create the new and created records and return create response for them and mark state changed" do
         remote_state = { 'saved' => [@stock1], 'created' => [@stock3, @stock4] }
         
         response = Stock.sync(HashWithIndifferentAccess.new(remote_state))
@@ -135,6 +143,8 @@ describe "SyncableRecord" do
         response[:create][2]['tmp_id'].should == @stock4[:tmp_id]
         response[:delete].should be_nil
         response[:update].should be_nil
+        
+        response[:state_changed].should be_true        
       end 
     end
   end
@@ -150,7 +160,7 @@ describe "SyncableRecord" do
     
     describe "and only saved remote records" do   
       
-      it "it should create the new, update the updated and delete the deleted" do
+      it "it should create the new, update the updated and delete the deleted and no state change" do
         remote_state = { 'saved' => [@stock1, @stock2, @updated_stock.to_rjson, @deleted_stock] }
         
         # do server changes: update a stock, delete a stock
@@ -171,13 +181,15 @@ describe "SyncableRecord" do
         @updated_stock[:version].should == 1
         @updated_stock[:name].should == "Apple Computers"
         response[:delete].length.should == 1                  
-        response[:delete][0][:id].should == @deleted_stock.id        
+        response[:delete][0][:id].should == @deleted_stock.id       
+        
+        response[:state_changed].should be_nil         
       end
     end
     
     describe "and saved & deleted remote records" do
          
-      it "it should create the new, delete the deleted and update the updated" do
+      it "it should create the new, delete the deleted and update the updated, and mark state changed" do
         remote_state = { 'saved' => [@stock2, @updated_stock.to_rjson, @deleted_stock], 'deleted' => [@stock1] }
         
         # do server changes: update a stock, delete a stock
@@ -199,12 +211,14 @@ describe "SyncableRecord" do
         response[:delete].length.should == 2               
         response[:delete][0][:id].should == @deleted_stock.id
         response[:delete][1][:id].should == @stock1.id
+        
+        response[:state_changed].should be_true        
       end
     end   
 
     describe "and saved & updated remote records" do
       
-      it "it should create the new, delete the deleted and update the updated" do
+      it "it should create the new, delete the deleted and update the updated and mark state changed" do
         remote_update = @stock1
         remote_update['name'] = 'This is an updated name'
         remote_state = { 'saved' => [@stock1, @stock2, @updated_stock, @deleted_stock], 'updated' => [remote_update] }
@@ -233,13 +247,15 @@ describe "SyncableRecord" do
         response[:update][1]['name'].should == remote_update['name']
         response[:update][1]['version'].should == remote_update['version']
         response[:delete].length.should == 1             
-        response[:delete][0][:id].should == @deleted_stock[:id]               
+        response[:delete][0][:id].should == @deleted_stock[:id]   
+        
+        response[:state_changed].should be_true                    
       end
     end
 
     describe "and saved, created, updated, and deleted remote records" do
       
-      it "it should create the new, delete the deleted and update the updated" do
+      it "it should create the new, delete the deleted and update the updated and mark state changed" do
         remote_update = @stock1
         remote_update['name'] = 'This is an updated name'
         remote_create = { :market => 'il', :ticker => 'Razio', :name => 'Razio Oil', :tmp_id => '19' }
@@ -276,7 +292,9 @@ describe "SyncableRecord" do
         response[:update][1]['version'].should == remote_update['version']
         response[:delete].length.should == 2            
         response[:delete][0][:id].should == @deleted_stock.id
-        response[:delete][1][:id].should == @stock2.id                  
+        response[:delete][1][:id].should == @stock2.id      
+        
+        response[:state_changed].should be_true                    
       end
     end
   end
@@ -286,7 +304,7 @@ describe "SyncableRecord" do
       @stock = FactoryGirl.create(:stock, :market => 'us', :ticker => 'IBM', :name => 'International Business Machines')
     end 
     
-    describe "between server deleted record and remote deleted record" do
+    describe "between server deleted record and remote deleted record and no state change" do
       
       it "it should delete the record" do    
         remote_state = { 'deleted' => [@stock.to_rjson] }               
@@ -305,12 +323,14 @@ describe "SyncableRecord" do
         response[:update].should be_nil          
         response[:delete].length.should == 1            
         response[:delete][0][:id].should == @stock.id
+        
+        response[:state_changed].should be_nil        
       end
     end      
     
     describe "between server deleted record and remote updated record" do
       
-      it "it should delete the record" do
+      it "it should delete the record and no state change" do
         remote_update = @stock.to_rjson
         remote_update['name'] = 'Tabulation company'          
         
@@ -330,12 +350,14 @@ describe "SyncableRecord" do
         response[:update].should be_nil          
         response[:delete].length.should == 1            
         response[:delete][0][:id].should == @stock.id
+        
+        response[:state_changed].should be_nil          
       end
     end
     
     describe "between server updated record and remote deleted record" do
       
-      it "it should create the record as if new" do
+      it "it should create the record as if new and no state change" do
         remote_state = { 'deleted' => [@stock.to_rjson] }           
         
         # do server changes: update the stock
@@ -353,13 +375,15 @@ describe "SyncableRecord" do
         response[:create][0]['id'].should == @stock[:id]
         response[:create][0]['name'].should == @stock[:name]
         response[:update].should be_nil   
-        response[:delete].should be_nil             
+        response[:delete].should be_nil      
+        
+        response[:state_changed].should be_nil                 
       end        
     end  
     
     describe "between server updated record and remote updated record" do
       
-      it "it should update the record with the server version" do
+      it "it should update the record with the server version and no state change" do
         remote_update = @stock.to_rjson
         remote_update['name'] = 'Tabulation company'          
         
@@ -382,7 +406,9 @@ describe "SyncableRecord" do
         response[:update].length.should == 1
         response[:update][0]['id'].should == @stock[:id]
         response[:update][0]['name'].should == @stock[:name]
-        response[:delete].should be_nil             
+        response[:delete].should be_nil     
+        
+        response[:state_changed].should be_nil                  
       end
     end          
   end
@@ -395,6 +421,8 @@ describe "SyncableRecord" do
         response = Stock.sync(123)
         
         response.should == { :error => "can't convert String into Integer" }
+        
+        response[:state_changed].should be_nil          
       end
     end
 
@@ -440,6 +468,7 @@ describe "SyncableRecord" do
 
         response = Stock.sync(remote_state)
         response[:error].should_not be_empty
+        response[:state_changed].should be_nil  
       end
     end      
   end

data/spec/syncer_spec.rb

@@ -1,142 +1,266 @@
 require 'spec_helper.rb'
 
-describe "Sync.sync" do
+describe "Syncer" do
   
+  let(:sync_order_key) { Syncer::SYNC_ORDER_KEY }
+  let(:sync_version_key) { Syncer::SYNC_VERSION_KEY }  
+
   let(:stock) { FactoryGirl.create(:stock) }
-  let(:syncOrder) { [:Account, :Stock, :Trade] }
-  let(:syncOrderKey) { Syncer::SYNC_ORDER_KEY }
-
-  it "should sync a single Model" do
-    updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
-    stocks_sync_data = { :updated => [ updated_stock ] }
-    all_sync_data = { syncOrderKey => syncOrder, :Stock => stocks_sync_data }
-    
-    result = Syncer.sync(all_sync_data)  
-    
-    stock_results = result['Stock']
-    stock_results.should_not be_nil
-    update_stock = stock_results['update'][0]   
-    update_stock['id'].should == stock.id
-    update_stock['version'].should == stock.version + 1
-    update_stock['market'].should == stock.market
-    update_stock['ticker'].should == stock.ticker
-    update_stock['name'].should == updated_stock[:name]
-  end  
+  let(:sync_order) { [:Account, :Stock, :Trade] }
+  
+  describe "sync" do
+    
+    it "should sync a single Model" do
+      updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      all_sync_data = { sync_order_key => sync_order, :Stock => stocks_sync_data }
+    
+      result = Syncer.sync(all_sync_data)  
+    
+      stock_results = result['Stock']
+      stock_results.should_not be_nil
+      update_stock = stock_results['update'][0]   
+      update_stock['id'].should == stock.id
+      update_stock['version'].should == stock.version + 1
+      update_stock['market'].should == stock.market
+      update_stock['ticker'].should == stock.ticker
+      update_stock['name'].should == updated_stock[:name]
+    end  
 
-  it "should sync multiple independent Models" do
-    updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
-    stocks_sync_data = { :updated => [ updated_stock ] }
-    created_account = FactoryGirl.attributes_for(:account)
-    created_account['tmp_id'] = "12345abcde"
-    accounts_sync_data = { :created => [ created_account ] }      
-    all_sync_data = { syncOrderKey => syncOrder, :Stock => stocks_sync_data, :Account => accounts_sync_data }
+    it "should sync multiple independent Models" do
+      updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      created_account = FactoryGirl.attributes_for(:account)
+      created_account['tmp_id'] = "12345abcde"
+      accounts_sync_data = { :created => [ created_account ] }      
+      all_sync_data = { sync_order_key => sync_order, :Stock => stocks_sync_data, :Account => accounts_sync_data }
 
-    result = Syncer.sync(all_sync_data) 
+      result = Syncer.sync(all_sync_data) 
       
-    stock_results = result['Stock']
-    stock_results.should_not be_nil
-    update_stock = stock_results['update'][0]
-    update_stock['id'].should == stock.id
-    update_stock['version'].should == stock.version + 1
-    update_stock['market'].should == stock.market
-    update_stock['ticker'].should == stock.ticker
-    update_stock['name'].should == updated_stock[:name]
-    
-    account_results = result['Account']
-    account_results.should_not be_nil
-    create_account = account_results['create'][0]
-    create_account['id'].should_not be_nil
-    create_account['tmp_id'].should == "12345abcde"
-    create_account['version'].should == 0
-    create_account['name'].should == created_account[:name]      
-  end
+      stock_results = result['Stock']
+      stock_results.should_not be_nil
+      update_stock = stock_results['update'][0]
+      update_stock['id'].should == stock.id
+      update_stock['version'].should == stock.version + 1
+      update_stock['market'].should == stock.market
+      update_stock['ticker'].should == stock.ticker
+      update_stock['name'].should == updated_stock[:name]
+    
+      account_results = result['Account']
+      account_results.should_not be_nil
+      create_account = account_results['create'][0]
+      create_account['id'].should_not be_nil
+      create_account['tmp_id'].should == "12345abcde"
+      create_account['version'].should == 0
+      create_account['name'].should == created_account[:name]      
+    end
   
-  it "should sync dependent Models with new model where dependency exists" do
-    updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
-    stocks_sync_data = { :updated => [ updated_stock ] }
-    created_trade = FactoryGirl.attributes_for(:trade, :stock_id => stock.id)
-    created_trade['tmp_id'] = "12345abcde"
-    trades_sync_data = { :created => [ created_trade ] }      
-    all_sync_data = { syncOrderKey => syncOrder, :Trade => trades_sync_data, :Stock => stocks_sync_data }
-
-    result = Syncer.sync(all_sync_data)
+    it "should sync stock with updated account" do
+      created_account = FactoryGirl.attributes_for(:account)
+      created_account['tmp_id'] = "12345abcde"
+      accounts_sync_data = { :created => [ created_account ] }      
+      updated_stock = stock.to_rjson
+      updated_stock['account_tmp_id'] = created_account['tmp_id']
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      all_sync_data = { sync_order_key => sync_order, :Stock => stocks_sync_data, :Account => accounts_sync_data }
+
+      result = Syncer.sync(all_sync_data) 
+
+      account_results = result['Account']
+      account_results.should_not be_nil
+      create_account = account_results['create'][0]
+      create_account['id'].should_not be_nil
+      create_account['tmp_id'].should == "12345abcde"
+      create_account['version'].should == 0
+      create_account['name'].should == created_account[:name]      
+      
+      stock_results = result['Stock']
+      stock_results.should_not be_nil
+      update_stock = stock_results['update'][0]
+      update_stock['account_id'].should == create_account['id']
+      update_stock['id'].should == stock.id
+      update_stock['version'].should == stock.version + 1
+      update_stock['market'].should == stock.market
+      update_stock['ticker'].should == stock.ticker
+      update_stock['name'].should == stock.name
+    end  
+  
+    it "should sync dependent Models with new model where dependency exists" do
+      updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      created_trade = FactoryGirl.attributes_for(:trade, :stock_id => stock.id)
+      created_trade['tmp_id'] = "12345abcde"
+      trades_sync_data = { :created => [ created_trade ] }      
+      all_sync_data = { sync_order_key => sync_order, :Trade => trades_sync_data, :Stock => stocks_sync_data }
+
+      result = Syncer.sync(all_sync_data)
      
-    stock_results = result['Stock']
-    update_stock = stock_results['update'][0]
-    update_stock['id'].should == stock.id
-    update_stock['version'].should == stock.version + 1
-    update_stock['market'].should == stock.market
-    update_stock['ticker'].should == stock.ticker
-    update_stock['name'].should == updated_stock[:name]
-    
-    trade_results = result['Trade']
-    create_trade = trade_results['create'][0]
-    create_trade['id'].should_not be_nil
-    create_trade['tmp_id'].should == "12345abcde"
-    create_trade['version'].should == 0
-    create_trade['stock_id'].should == stock.id
-    create_trade['amount'].should == created_trade[:amount]      
-    create_trade['buy'].should == created_trade[:buy]      
-    # TODO maybe also test date that seems to return different ...      
-  end
+      stock_results = result['Stock']
+      update_stock = stock_results['update'][0]
+      update_stock['id'].should == stock.id
+      update_stock['version'].should == stock.version + 1
+      update_stock['market'].should == stock.market
+      update_stock['ticker'].should == stock.ticker
+      update_stock['name'].should == updated_stock[:name]
+    
+      trade_results = result['Trade']
+      create_trade = trade_results['create'][0]
+      create_trade['id'].should_not be_nil
+      create_trade['tmp_id'].should == "12345abcde"
+      create_trade['version'].should == 0
+      create_trade['stock_id'].should == stock.id
+      create_trade['amount'].should == created_trade[:amount]      
+      create_trade['buy'].should == created_trade[:buy]      
+      # TODO maybe also test date that seems to return different ...      
+    end
   
-  it "should sync dependent Models when both models are new" do
-    created_stock = FactoryGirl.attributes_for(:stock, :name => 'Teva Pharma')
-    created_stock['tmp_id'] = "abcde12345"
-    stocks_sync_data = { :saved => [ stock ], :created => [ created_stock ] }
-    created_trade = FactoryGirl.attributes_for(:trade)
-    created_trade['tmp_id'] = "12345abcde"
-    created_trade['stock_tmp_id'] = "abcde12345"
-    trades_sync_data = { :created => [ created_trade ] }
-    all_sync_data = { syncOrderKey => syncOrder, :Trade => trades_sync_data, :Stock => stocks_sync_data }
-
-    result = Syncer.sync(all_sync_data)     
-    
-    stock_results = result['Stock']
-    create_stock = stock_results['create'][0]
-    create_stock['id'].should_not be_nil
-    create_stock['tmp_id'].should == "abcde12345"
-    create_stock['version'].should == 0
-    create_stock['market'].should == created_stock[:market]
-    create_stock['ticker'].should == created_stock[:ticker]
-    create_stock['name'].should == created_stock[:name]
-    
-    trade_results = result['Trade']
-    create_trade = trade_results['create'][0]
-    create_trade['id'].should_not be_nil
-    create_trade['tmp_id'].should == "12345abcde"
-    create_trade['stock_id'].should == create_stock['id']
-    create_trade['version'].should == 0
-    create_trade['amount'].should == created_trade[:amount]      
-    create_trade['buy'].should == created_trade[:buy]  
-    # TODO maybe also test date that seems to return different ...      
-  end    
-
-  it "should sync dependent Models with new model where dependent exists and is updated to point to new Model" do
-    updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version, :account_tmp_id => "12345abcde" }
-    stocks_sync_data = { :updated => [ updated_stock ] }
-    created_account = FactoryGirl.attributes_for(:account)
-    created_account['tmp_id'] = "12345abcde"
-    accounts_sync_data = { :created => [ created_account ] }      
-    all_sync_data = { syncOrderKey => syncOrder, :Account => accounts_sync_data, :Stock => stocks_sync_data }
-
-    result = Syncer.sync(all_sync_data)    
-
-    account_results = result['Account']
-    account_results.should_not be_nil
-    create_account = account_results['create'][0]
-    create_account['id'].should_not be_nil
-    create_account['tmp_id'].should == "12345abcde"
-    create_account['version'].should == 0
-    create_account['name'].should == created_account[:name]       
+    it "should sync dependent Models when both models are new" do
+      created_stock = FactoryGirl.attributes_for(:stock, :name => 'Teva Pharma')
+      created_stock['tmp_id'] = "abcde12345"
+      stocks_sync_data = { :saved => [ stock ], :created => [ created_stock ] }
+      created_trade = FactoryGirl.attributes_for(:trade)
+      created_trade['tmp_id'] = "12345abcde"
+      created_trade['stock_tmp_id'] = "abcde12345"
+      trades_sync_data = { :created => [ created_trade ] }
+      all_sync_data = { sync_order_key => sync_order, :Trade => trades_sync_data, :Stock => stocks_sync_data }
+
+      result = Syncer.sync(all_sync_data)     
+    
+      stock_results = result['Stock']
+      create_stock = stock_results['create'][0]
+      create_stock['id'].should_not be_nil
+      create_stock['tmp_id'].should == "abcde12345"
+      create_stock['version'].should == 0
+      create_stock['market'].should == created_stock[:market]
+      create_stock['ticker'].should == created_stock[:ticker]
+      create_stock['name'].should == created_stock[:name]
+    
+      trade_results = result['Trade']
+      create_trade = trade_results['create'][0]
+      create_trade['id'].should_not be_nil
+      create_trade['tmp_id'].should == "12345abcde"
+      create_trade['stock_id'].should == create_stock['id']
+      create_trade['version'].should == 0
+      create_trade['amount'].should == created_trade[:amount]      
+      create_trade['buy'].should == created_trade[:buy]  
+      # TODO maybe also test date that seems to return different ...      
+    end    
+
+    it "should sync dependent Models with new model where dependent exists and is updated to point to new Model" do
+      updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version, :account_tmp_id => "12345abcde" }
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      created_account = FactoryGirl.attributes_for(:account)
+      created_account['tmp_id'] = "12345abcde"
+      accounts_sync_data = { :created => [ created_account ] }      
+      all_sync_data = { sync_order_key => sync_order, :Account => accounts_sync_data, :Stock => stocks_sync_data }
+
+      result = Syncer.sync(all_sync_data)    
+
+      account_results = result['Account']
+      account_results.should_not be_nil
+      create_account = account_results['create'][0]
+      create_account['id'].should_not be_nil
+      create_account['tmp_id'].should == "12345abcde"
+      create_account['version'].should == 0
+      create_account['name'].should == created_account[:name]       
      
-    stock_results = result['Stock']
-    update_stock = stock_results['update'][0]
-    update_stock['id'].should == stock.id
-    update_stock['version'].should == stock.version + 1
-    update_stock['market'].should == stock.market
-    update_stock['ticker'].should == stock.ticker
-    update_stock['name'].should == updated_stock[:name]
-    update_stock['account_id'].should == create_account['id']          
+      stock_results = result['Stock']
+      update_stock = stock_results['update'][0]
+      update_stock['id'].should == stock.id
+      update_stock['version'].should == stock.version + 1
+      update_stock['market'].should == stock.market
+      update_stock['ticker'].should == stock.ticker
+      update_stock['name'].should == updated_stock[:name]
+      update_stock['account_id'].should == create_account['id']          
+    end
+  
+    it "returns a database state version number" do
+      updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      all_sync_data = { sync_order_key => sync_order, :Stock => stocks_sync_data }
+    
+      result = Syncer.sync(all_sync_data)  
+    
+      result[sync_version_key].should_not be_nil
+      result[sync_version_key].should be_kind_of(Integer)
+    end
+  
+    it "increments the database state version on sync" do
+      updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      all_sync_data = { sync_order_key => sync_order, :Stock => stocks_sync_data }
+    
+      result = Syncer.sync(all_sync_data)  
+    
+      db_version = result[sync_version_key]
+
+      updated_stock = { :name => 'Teva Pharma 22', :id => stock.id, :version => stock.version + 1 }
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      all_sync_data = { sync_order_key => sync_order, :Stock => stocks_sync_data }
+    
+      result = Syncer.sync(all_sync_data)  
+
+      result[sync_version_key].should == db_version + 1
+    end
+  
+    it "does NOT increment the database state version if nothing is synced" do
+      updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      all_sync_data = { sync_order_key => sync_order, :Stock => stocks_sync_data }
+    
+      result = Syncer.sync(all_sync_data)  
+    
+      db_version = result[sync_version_key]
+
+      # empty sync
+      all_sync_data = { sync_order_key => sync_order }
+    
+      result = Syncer.sync(all_sync_data)  
+
+      result[sync_version_key].should == db_version
+    end
   end
-end
+  
+  describe "version" do
+    
+    it "returns the database state version" do
+      result = Syncer.version
+      
+      result[sync_version_key].should_not be_nil
+      result[sync_version_key].should be_kind_of(Integer)
+    end 
+    
+    it "returns the same version as the last sync" do
+      updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      all_sync_data = { sync_order_key => sync_order, :Stock => stocks_sync_data }
+    
+      result = Syncer.sync(all_sync_data)  
+    
+      db_version = result[sync_version_key]
+      
+      result = Syncer.version
+      
+      result[sync_version_key].should == db_version      
+    end
+    
+    it "returns an incremented version after a sync" do
+      result = Syncer.version
+
+      db_version = result[sync_version_key]
+      
+      updated_stock = { :name => 'Teva Pharma', :id => stock.id, :version => stock.version }
+      stocks_sync_data = { :updated => [ updated_stock ] }
+      all_sync_data = { sync_order_key => sync_order, :Stock => stocks_sync_data }
+    
+      result = Syncer.sync(all_sync_data)
+      
+      result = Syncer.version
+      
+      result[sync_version_key].should == db_version + 1     
+    end
+  end  
+end
+
+
+

data/syncer.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/syncer/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Harry Hornreich"]
   gem.email         = ["harryhorn@gmail.com"]
-  gem.description   = %q{ActiveRecord syncer}
-  gem.summary       = %q{ActiveRecord syncer}
+  gem.description   = %q{ActiveRecord syncer - prerelease}
+  gem.summary       = %q{ActiveRecord syncer - prerelease}
   gem.homepage      = ""
 
   gem.add_runtime_dependency 'activerecord', '>= 2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syncer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -91,7 +91,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
-description: ActiveRecord syncer
+description: ActiveRecord syncer - prerelease
 email:
 - harryhorn@gmail.com
 executables: []
@@ -106,6 +106,7 @@ files:
 - README.md
 - Rakefile
 - lib/syncer.rb
+- lib/syncer/sync_record.rb
 - lib/syncer/syncable_record.rb
 - lib/syncer/syncer.rb
 - lib/syncer/version.rb
@@ -141,7 +142,7 @@ rubyforge_project:
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: ActiveRecord syncer
+summary: ActiveRecord syncer - prerelease
 test_files:
 - spec/spec_helper.rb
 - spec/support/account.rb