active_git 0.0.6 → 0.0.7

data/lib/active_git.rb

@@ -53,11 +53,12 @@ module ActiveGit
   def self.batch(&block)
     @batch_mode = true
     begin
-      yield
+      result = yield
       Synchronizer.synchronize @events
+      result
     ensure
       @batch_mode = false
-      @events.clear
+      @events.clear if @events
     end
   end
 

data/lib/active_git/configuration.rb

@@ -1,6 +1,12 @@
 module ActiveGit
   class Configuration
 
+    attr_accessor :sync_batch_size
+
+    def initialize
+      @sync_batch_size = 10000
+    end
+
     def working_path
       @working_path.is_a?(Proc) ? @working_path.call : @working_path
     end

data/lib/active_git/events/db_event.rb

@@ -21,7 +21,7 @@ module ActiveGit
     end
 
     def data
-      json = File.open(@file_name, 'r') { |f| f.readlines.join("\n") }
+      json = File.open(@file_name, 'r') { |f| f.read }
       model.from_json(json)
     end
 
@@ -38,4 +38,4 @@ module ActiveGit
     end
 
   end
-end
+end

data/lib/active_git/synchronizer.rb

@@ -15,9 +15,11 @@ module ActiveGit
       if bulk_inserts.any?
         define_job do
           bulk_inserts.each do |model, records|
-            ActiveGit.configuration.logger.debug "[ActiveGit] Inserting #{model.model_name} models"
-            import_result = model.import records, timestamps: false, validate: false
-            raise SynchronizationError.new(import_result.failed_instances) unless import_result.failed_instances.empty?
+            records.each_slice(ActiveGit.configuration.sync_batch_size) do |batch_records|
+              ActiveGit.configuration.logger.debug "[ActiveGit] Inserting #{model.model_name} models"
+              import_result = model.import batch_records, timestamps: false, validate: false
+              raise SynchronizationError.new(import_result.failed_instances) unless import_result.failed_instances.empty?
+            end
           end
         end
       end
@@ -30,18 +32,17 @@ module ActiveGit
     end
 
     def bulk_insert(data)
-      bulk_inserts[data.class] ||= [] unless bulk_inserts.has_key? data.class
       bulk_inserts[data.class] << data
     end
 
     def define_job(&block)
-      jobs << Proc.new(&block)
+      jobs << block
     end
 
     private
 
     def bulk_inserts
-      @bulk_inserts ||= {}
+      @bulk_inserts ||= Hash.new{|h,k| h[k] = []}
     end
 
     def jobs

data/lib/active_git/version.rb

@@ -1,3 +1,3 @@
 module ActiveGit
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/configuration_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe ActiveGit::Configuration do
+
+  before :each do
+    @working_path = ActiveGit.configuration.working_path
+    @bare_path = ActiveGit.configuration.bare_path
+    @logger = ActiveGit.configuration.logger
+  end
+
+  after :each do
+    ActiveGit.configuration.working_path = @working_path
+    ActiveGit.configuration.bare_path = @bare_path
+    ActiveGit.configuration.logger = @logger
+  end
+  
+  it 'default sync_batch_size' do
+    ActiveGit.configuration.sync_batch_size.should eq 10000
+  end
+
+  it 'set sync_batch_size' do
+    ActiveGit.configuration.sync_batch_size = 100
+    ActiveGit.configuration.sync_batch_size.should eq 100
+  end
+
+  it 'set working_path with string' do
+    ActiveGit.configuration.working_path = "/path_to_test"
+    ActiveGit.configuration.working_path.should eq "/path_to_test"
+  end
+
+  it 'set working_path with block' do
+    ActiveGit.configuration.working_path = lambda do
+      path_home = '/home'
+      "#{path_home}/path_to_test"
+    end
+    ActiveGit.configuration.working_path.should eq "/home/path_to_test"
+  end
+
+  it 'set bare_path with string' do
+    ActiveGit.configuration.bare_path = "/path_to_test"
+    ActiveGit.configuration.bare_path.should eq "/path_to_test"
+  end
+
+  it 'set bare_path with block' do
+    ActiveGit.configuration.bare_path = lambda do
+      path_home = '/home'
+      "#{path_home}/path_to_test"
+    end
+    ActiveGit.configuration.bare_path.should eq "/home/path_to_test"
+  end
+
+  it 'get default logger' do
+    ActiveGit.configuration.logger.should be_a Logger
+  end
+
+  it 'set logger' do
+    logger = Logger.new($stdout)
+    ActiveGit.configuration.logger.should_not eq logger
+    ActiveGit.configuration.logger = logger
+    ActiveGit.configuration.logger.should eq logger
+  end
+    
+end

data/spec/inflector_spec.rb

@@ -35,7 +35,7 @@ describe ActiveGit::Inflector do
     ActiveGit::Inflector.model("#{working_path}/countries/1.json", working_path).should be Country
   end
 
-  it 'Model from filename' do
+  it 'Nested model from filename' do
     ActiveGit::Inflector.model("#{working_path}/crm/customers/1.json", working_path).should be Crm::Customer
   end
 

data/spec/spec_helper.rb

@@ -4,11 +4,14 @@ require 'logger'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-ActiveRecord::Base.logger = Logger.new($stdout)
-ActiveRecord::Base.logger.level = Logger::Severity::ERROR
 ActiveRecord::Migrator.migrations_path = "#{File.dirname(__FILE__)}/migrations"
+ActiveRecord::Migration.verbose = false
 
-ActiveGit.configuration.logger.level = Logger::Severity::ERROR
+logger = Logger.new($stdout)
+logger.level = Logger::Severity::FATAL
+
+ActiveRecord::Base.logger = logger
+ActiveGit.configuration.logger = logger
 
 module InflectorHelper
   def git_dirname(model, working_path=nil)

data/spec/synchronization_spec.rb

@@ -96,6 +96,31 @@ describe ActiveGit::Synchronizer do
       Country.find_by_id(country.id).should be_nil
     end
 
+    it 'Batch size' do
+      ActiveGit.configuration.sync_batch_size = 2
+
+      working_path = @file_helper.create_temp_folder
+
+      countries = 10.times.map do |i|
+        Country.new(name: "Country #{i}") do |country|
+          country.id = i.to_s
+          country.created_at = Time.now
+          country.updated_at = Time.now
+        end
+      end
+      ActiveGit::Synchronizer.synchronize countries.map {|c| ActiveGit::FileSave.new(c, working_path)}
+
+      events = countries.map do |country|
+        ActiveGit::DbCreate.new(ActiveGit::Inflector.filename(country, working_path), working_path)
+      end
+
+      Country.should_receive(:import).
+              exactly(5).times.
+              and_return(double(failed_instances: []))
+
+      ActiveGit::Synchronizer.synchronize events
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_git
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -206,6 +206,7 @@ files:
 - spec/active_record_extension_spec.rb
 - spec/batch_synchronization_spec.rb
 - spec/commands_spec.rb
+- spec/configuration_spec.rb
 - spec/coverage_helper.rb
 - spec/inflector_spec.rb
 - spec/migrations/20121004135939_create_countries.rb
@@ -231,18 +232,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -181325600156632224
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -181325600156632224
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -253,6 +248,7 @@ test_files:
 - spec/active_record_extension_spec.rb
 - spec/batch_synchronization_spec.rb
 - spec/commands_spec.rb
+- spec/configuration_spec.rb
 - spec/coverage_helper.rb
 - spec/inflector_spec.rb
 - spec/migrations/20121004135939_create_countries.rb