active_git 0.0.5 → 0.0.6

data/active_git.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activerecord', '>= 3.0.0'
+  s.add_dependency 'activerecord', '~> 3.2'
   s.add_dependency 'git_wrapper', '~> 1.1'
   s.add_dependency 'activerecord-import'
   s.add_dependency 'easy_diff'

data/lib/active_git.rb

@@ -3,6 +3,7 @@ require 'git_wrapper'
 require 'activerecord-import'
 require 'json'
 require 'easy_diff'
+require 'set'
 
 require 'active_git/version'
 require 'active_git/synchronizer'
@@ -25,15 +26,15 @@ module ActiveGit
   extend Commands
 
   def self.configuration
-    @@configuration ||= Configuration.new
+    @configuration ||= Configuration.new
   end
 
   def self.configure
-    yield(configuration)
+    yield configuration
   end
 
   def self.models
-    @@models ||= []
+    @models ||= Set.new
   end
 
   def self.repository
@@ -41,7 +42,31 @@ module ActiveGit
     @repository
   end
 
-end
+  def self.synchronize(*events)
+    if @batch_mode
+      enqueue events
+    else
+      Synchronizer.synchronize events
+    end
+  end
+
+  def self.batch(&block)
+    @batch_mode = true
+    begin
+      yield
+      Synchronizer.synchronize @events
+    ensure
+      @batch_mode = false
+      @events.clear
+    end
+  end
 
-ActiveRecord::Base.send :extend, ActiveGit::ActiveRecord::ClassMethods
+  private
+
+  def self.enqueue(*events)
+    @events = (@events || []) + events
+  end
+
+end
 
+ActiveRecord::Base.send :extend, ActiveGit::ActiveRecord::ClassMethods

data/lib/active_git/active_record_extension.rb

@@ -7,11 +7,11 @@ module ActiveGit
         ActiveGit.models << self
 
         after_save do |record|
-          Synchronizer.synchronize FileSave.new(record)
+          ActiveGit.synchronize FileSave.new(record)
         end
 
         after_destroy do |record|
-          Synchronizer.synchronize FileDelete.new(record)
+          ActiveGit.synchronize FileDelete.new(record)
         end
 
         def from_json(json)

data/lib/active_git/synchronizer.rb

@@ -12,7 +12,7 @@ module ActiveGit
     end
 
     def run
-      unless bulk_inserts.empty?
+      if bulk_inserts.any?
         define_job do
           bulk_inserts.each do |model, records|
             ActiveGit.configuration.logger.debug "[ActiveGit] Inserting #{model.model_name} models"
@@ -23,10 +23,9 @@ module ActiveGit
       end
 
       ::ActiveRecord::Base.transaction do
-        jobs.each do |job|
-          job.call
-        end
+        jobs.each(&:call)
       end
+
       ActiveGit.add_all
     end
 

data/lib/active_git/version.rb

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

data/spec/active_record_extension_spec.rb

@@ -18,7 +18,7 @@ describe ActiveGit::ActiveRecord do
   it 'Create' do
     language = Language.create! name: 'Spanish'
 
-    File.exist?(git_filename(language)).should be_true
+    File.exist?(git_filename(language)).should be true
 
     json = JSON.parse(@file_helper.read_file(git_filename(language)))
 
@@ -41,11 +41,11 @@ describe ActiveGit::ActiveRecord do
   it 'Destroy' do
     language = Language.create! name: 'Spanish'
 
-    File.exist?(git_filename(language)).should be_true
+    File.exist?(git_filename(language)).should be true
 
     language.destroy
 
-    File.exist?(git_filename(language)).should be_false
+    File.exist?(git_filename(language)).should be false
   end
 
   it 'Load from json' do

data/spec/batch_synchronization_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+
+describe ActiveGit do
+
+  before :each do
+    @file_helper = FileHelper.new
+  end
+
+  after :each do
+    @file_helper.remove_temp_folders
+  end
+
+  context 'Manual synchornization' do
+
+    it 'Single model' do
+      argentina = Country.create! name: 'Argentina'
+      brasil = Country.create! name: 'Brasil'
+
+      working_path = @file_helper.create_temp_folder
+
+      File.exist?("#{working_path}/countries/#{argentina.id}.json").should be false
+      File.exist?("#{working_path}/countries/#{brasil.id}.json").should be false
+
+      ActiveGit.synchronize ActiveGit::FileSave.new(argentina, working_path)
+
+      File.exist?("#{working_path}/countries/#{argentina.id}.json").should be true
+      File.exist?("#{working_path}/countries/#{brasil.id}.json").should be false
+
+      ActiveGit.synchronize ActiveGit::FileSave.new(brasil, working_path)
+
+      File.exist?("#{working_path}/countries/#{argentina.id}.json").should be true
+      File.exist?("#{working_path}/countries/#{brasil.id}.json").should be true
+    end
+
+    it 'Batch mode' do
+      argentina = Country.create! name: 'Argentina'
+      brasil = Country.create! name: 'Brasil'
+
+      working_path = @file_helper.create_temp_folder
+
+      File.exist?("#{working_path}/countries/#{argentina.id}.json").should be false
+      File.exist?("#{working_path}/countries/#{brasil.id}.json").should be false
+
+      ActiveGit.batch do
+        ActiveGit.synchronize ActiveGit::FileSave.new(argentina, working_path)
+        ActiveGit.synchronize ActiveGit::FileSave.new(brasil, working_path)
+
+        File.exist?("#{working_path}/countries/#{argentina.id}.json").should be false
+        File.exist?("#{working_path}/countries/#{brasil.id}.json").should be false
+      end
+
+      File.exist?("#{working_path}/countries/#{argentina.id}.json").should be true
+      File.exist?("#{working_path}/countries/#{brasil.id}.json").should be true
+    end
+
+    it 'Handle exceptions' do
+      argentina = Country.create! name: 'Argentina'
+      brasil = Country.create! name: 'Brasil'
+
+      working_path = @file_helper.create_temp_folder
+
+      File.exist?("#{working_path}/countries/#{argentina.id}.json").should be false
+      File.exist?("#{working_path}/countries/#{brasil.id}.json").should be false
+
+      expect do
+        ActiveGit.batch do
+          ActiveGit.synchronize ActiveGit::FileSave.new(argentina, working_path)
+          ActiveGit.synchronize ActiveGit::FileSave.new(brasil, working_path)
+          raise 'Force error'
+        end
+      end.to raise_error
+
+      File.exist?("#{working_path}/countries/#{argentina.id}.json").should be false
+      File.exist?("#{working_path}/countries/#{brasil.id}.json").should be false
+
+      uruguay = Country.create! name: 'Uruguay'
+      ActiveGit.batch do
+        ActiveGit.synchronize ActiveGit::FileSave.new(uruguay, working_path)
+      end
+
+      File.exist?("#{working_path}/countries/#{argentina.id}.json").should be false
+      File.exist?("#{working_path}/countries/#{brasil.id}.json").should be false
+      File.exist?("#{working_path}/countries/#{uruguay.id}.json").should be true
+    end
+    
+  end
+
+  context 'ActiveRecord synchornization' do
+
+    before :each do
+      ActiveGit.configuration.working_path = @file_helper.create_temp_folder
+    end
+    
+    it 'Single model' do
+      language = Language.create! name: 'Spanish'
+
+      File.exist?(git_filename(language)).should be true
+    end
+
+    it 'Batch mode' do
+      spanish = nil
+      english = nil
+
+      ActiveGit.batch do
+        spanish = Language.create! name: 'Spanish'
+        english = Language.create! name: 'English'
+
+        File.exist?(git_filename(spanish)).should be false
+        File.exist?(git_filename(english)).should be false
+      end
+
+      File.exist?(git_filename(spanish)).should be true
+      File.exist?(git_filename(english)).should be true
+    end
+
+    it 'Handle exceptions' do
+      spanish = nil
+      english = nil
+      portuguese = nil      
+
+      expect do
+        ActiveGit.batch do
+          spanish = Language.create! name: 'Spanish'
+          english = Language.create! name: 'English'
+
+          raise 'Force error'
+        end
+      end.to raise_error
+
+      ActiveGit.batch do
+        portuguese = Language.create! name: 'Portuguese'
+      end
+
+      File.exist?(git_filename(spanish)).should be false
+      File.exist?(git_filename(english)).should be false
+      File.exist?(git_filename(portuguese)).should be true
+    end
+
+  end
+
+end

data/spec/commands_spec.rb

@@ -25,12 +25,12 @@ describe ActiveGit::Commands do
 
       ActiveGit.dump_db
 
-      File.exist?("#{ActiveGit.configuration.working_path}/test.txt").should be_false
+      File.exist?("#{ActiveGit.configuration.working_path}/test.txt").should be false
 
       Dir.glob("#{git_dirname(Language)}/*.json").should have(2).items
 
       languages.each do |language|
-        File.exist?(git_filename(language)).should be_true
+        File.exist?(git_filename(language)).should be true
         json = JSON.parse(@file_helper.read_file(git_filename(language)))
         json['id'].should eq language.id
         json['name'].should eq language.name
@@ -43,17 +43,17 @@ describe ActiveGit::Commands do
 
       Dir["#{ActiveGit.configuration.working_path}/*"].each { |f| FileUtils.rm_rf f }
 
-      Dir.exists?("#{ActiveGit.configuration.working_path}/languages").should be_false
-      File.exists?("#{ActiveGit.configuration.working_path}/languages/#{language.id}.json").should be_false
-      Dir.exists?("#{ActiveGit.configuration.working_path}/countries").should be_false
-      File.exists?("#{ActiveGit.configuration.working_path}/countries/#{country.id}.json").should be_false
+      Dir.exists?("#{ActiveGit.configuration.working_path}/languages").should be false
+      File.exists?("#{ActiveGit.configuration.working_path}/languages/#{language.id}.json").should be false
+      Dir.exists?("#{ActiveGit.configuration.working_path}/countries").should be false
+      File.exists?("#{ActiveGit.configuration.working_path}/countries/#{country.id}.json").should be false
 
       ActiveGit.dump_db Language
 
-      Dir.exists?("#{ActiveGit.configuration.working_path}/languages").should be_true
-      File.exists?("#{ActiveGit.configuration.working_path}/languages/#{language.id}.json").should be_true
-      Dir.exists?("#{ActiveGit.configuration.working_path}/countries").should be_false
-      File.exists?("#{ActiveGit.configuration.working_path}/countries/#{country.id}.json").should be_false
+      Dir.exists?("#{ActiveGit.configuration.working_path}/languages").should be true
+      File.exists?("#{ActiveGit.configuration.working_path}/languages/#{language.id}.json").should be true
+      Dir.exists?("#{ActiveGit.configuration.working_path}/countries").should be false
+      File.exists?("#{ActiveGit.configuration.working_path}/countries/#{country.id}.json").should be false
     end
 
     it 'Load all files to db' do
@@ -65,7 +65,7 @@ describe ActiveGit::Commands do
       Language.first.delete
 
       languages.each do |language|
-        File.exist?(git_filename(language)).should be_true
+        File.exist?(git_filename(language)).should be true
       end
 
       ActiveGit.load_files
@@ -81,8 +81,8 @@ describe ActiveGit::Commands do
       language = Language.create! name: 'Spanish'
       brand = Brand.create! name: 'Coca Cola'
 
-      File.exists?(git_filename(language)).should be_true
-      File.exists?(git_filename(brand)).should be_true
+      File.exists?(git_filename(language)).should be true
+      File.exists?(git_filename(brand)).should be true
 
       language.delete
       brand.delete
@@ -138,12 +138,12 @@ describe ActiveGit::Commands do
 
       Language.count.should eq 2
 
-      ActiveGit.pull('bare').should be_true
+      ActiveGit.pull('bare').should be true
 
       ActiveGit.log.first.subject.should eq 'Remote commit'
       Language.count.should eq 3
       ['Spanish 2', 'Portuguese', 'French'].each do |lang_name|
-        File.exist?(git_filename(Language.find_by_name(lang_name))).should be_true
+        File.exist?(git_filename(Language.find_by_name(lang_name))).should be true
       end
     end
 
@@ -177,14 +177,14 @@ describe ActiveGit::Commands do
       ActiveGit.commit_all 'Commit 1'
 
       Language.count.should eq 2
-      File.exist?(git_filename(spanish)).should be_true
-      File.exist?(git_filename(english)).should be_true
+      File.exist?(git_filename(spanish)).should be true
+      File.exist?(git_filename(english)).should be true
 
       ActiveGit.reset ActiveGit.log.last.commit_hash
 
       Language.count.should eq 1
-      File.exist?(git_filename(spanish)).should be_true
-      File.exist?(git_filename(english)).should be_false
+      File.exist?(git_filename(spanish)).should be true
+      File.exist?(git_filename(english)).should be false
     end
 
     it 'Reset to HEAD' do
@@ -194,14 +194,14 @@ describe ActiveGit::Commands do
       english = Language.create! name: 'English'
 
       Language.count.should eq 2
-      File.exist?(git_filename(spanish)).should be_true
-      File.exist?(git_filename(english)).should be_true
+      File.exist?(git_filename(spanish)).should be true
+      File.exist?(git_filename(english)).should be true
 
       ActiveGit.reset
 
       Language.count.should eq 1
-      File.exist?(git_filename(spanish)).should be_true
-      File.exist?(git_filename(english)).should be_false
+      File.exist?(git_filename(spanish)).should be true
+      File.exist?(git_filename(english)).should be false
     end
 
     it 'Resolve version conflicts' do

data/spec/synchronization_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'ActiveGit::Synchronizers' do
+describe ActiveGit::Synchronizer do
 
   before :each do
     @file_helper = FileHelper.new
@@ -17,11 +17,11 @@ describe 'ActiveGit::Synchronizers' do
 
       working_path = @file_helper.create_temp_folder
 
-      File.exist?("#{working_path}/countries/#{country.id}.json").should be_false
+      File.exist?("#{working_path}/countries/#{country.id}.json").should be false
 
       ActiveGit::Synchronizer.synchronize ActiveGit::FileSave.new(country, working_path)
 
-      File.exist?("#{working_path}/countries/#{country.id}.json").should be_true
+      File.exist?("#{working_path}/countries/#{country.id}.json").should be true
     end
 
     it 'Update' do
@@ -51,7 +51,7 @@ describe 'ActiveGit::Synchronizers' do
 
       ActiveGit::Synchronizer.synchronize ActiveGit::FileDelete.new(country, working_path)
 
-      File.exist?("#{working_path}/countries/#{country.id}.json").should be_false
+      File.exist?("#{working_path}/countries/#{country.id}.json").should be false
     end
 
   end

metadata

@@ -1,190 +1,176 @@
 --- !ruby/object:Gem::Specification
 name: active_git
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.5
+  version: 0.0.6
+  prerelease: 
 platform: ruby
 authors:
 - Gabriel Naiman
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: git_wrapper
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: activerecord-import
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: easy_diff
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: activerecord-jdbcsqlite3-adapter
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: activerecord-jdbcpostgresql-adapter
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: DB and GIT synchronization via ActiveRecord and GitWrapper
 email:
 - gabynaiman@gmail.com
@@ -218,6 +204,7 @@ files:
 - lib/active_git/synchronizer.rb
 - lib/active_git/version.rb
 - spec/active_record_extension_spec.rb
+- spec/batch_synchronization_spec.rb
 - spec/commands_spec.rb
 - spec/coverage_helper.rb
 - spec/inflector_spec.rb
@@ -234,38 +221,37 @@ files:
 - spec/synchronization_spec.rb
 homepage: https://github.com/gabynaiman/active_git
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      hash: -181325600156632224
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      hash: -181325600156632224
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.25
+signing_key: 
 specification_version: 3
 summary: DB and GIT synchronization via ActiveRecord and GitWrapper
 test_files:
 - spec/active_record_extension_spec.rb
+- spec/batch_synchronization_spec.rb
 - spec/commands_spec.rb
 - spec/coverage_helper.rb
 - spec/inflector_spec.rb