active_git 0.0.2 → 0.0.3

data/lib/active_git.rb

@@ -20,8 +20,6 @@ require 'active_git/active_record_extension'
 require 'active_git/configuration'
 require 'active_git/commands'
 
-GitWrapper.logger = ActiveRecord::Base.logger
-
 module ActiveGit
   extend Commands
 

data/lib/active_git/commands.rb

@@ -7,22 +7,23 @@ module ActiveGit
       end
     end
 
-    def dump_db
-      events = [FolderRemove.new(ActiveGit.configuration.working_path)]
+    def dump_db(*models)
+      events = (Dir["#{ActiveGit.configuration.working_path}/*"] - ActiveGit.models.map(&:git_folder)).map do |folder|
+        FolderRemove.new(folder)
+      end
 
-      ActiveGit.models.each do |model|
-        model.all.each do |record|
-          events << FileSave.new(record)
-        end
+      (models.any? ? models : ActiveGit.models).each do |model|
+        events << FolderRemove.new(model.git_folder)
+        events = events + model.all.map { |r| FileSave.new r }
       end
 
       Synchronizer.synchronize events
     end
 
-    def load_files
+    def load_files(*models)
       events = []
 
-      ActiveGit.models.each do |model|
+      (models.any? ? models : ActiveGit.models).each do |model|
         events << DbDeleteAll.new(model)
         Dir.glob("#{model.git_folder}/*.json").each do |file_name|
           events << DbCreate.new(file_name)
@@ -56,7 +57,7 @@ module ActiveGit
       begin
         synchronize_diffs diffs
       rescue => e
-        ::ActiveRecord::Base.logger.error "[ActiveGit] #{e}"
+        ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
         reset last_log.commit_hash
         return false
       end
@@ -96,7 +97,7 @@ module ActiveGit
         begin
           synchronize_diffs diffs
         rescue SynchronizationError => e
-          ::ActiveRecord::Base.logger.error "[ActiveGit] #{e}"
+          ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
           repository.checkout current
           return false
         end
@@ -112,7 +113,7 @@ module ActiveGit
         begin
           synchronize_diffs diffs
         rescue SynchronizationError => e
-          ::ActiveRecord::Base.logger.error "[ActiveGit] #{e}"
+          ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
           #TODO: Rollback reset
           return false
         end

data/lib/active_git/configuration.rb

@@ -15,7 +15,15 @@ module ActiveGit
 
     def bare_path=(path)
       @bare_path = path
-    end    
+    end
+
+    def logger
+      GitWrapper.logger
+    end
+
+    def logger=(logger)
+      GitWrapper.logger = logger
+    end
 
   end
 end

data/lib/active_git/events/db_delete.rb

@@ -3,7 +3,7 @@ module ActiveGit
 
     def synchronize(synchronizer)
       synchronizer.define_job do
-        ::ActiveRecord::Base.logger.debug "[ActiveGit] Deleting #{model.model_name} #{model_id}"
+        ActiveGit.configuration.logger.debug "[ActiveGit] Deleting #{model.model_name} #{model_id}"
         record = model.find_by_id(model_id)
         record.delete if record
       end

data/lib/active_git/events/db_delete_all.rb

@@ -7,7 +7,7 @@ module ActiveGit
 
     def synchronize(synchronizer)
       synchronizer.define_job do
-        ::ActiveRecord::Base.logger.debug "[ActiveGit] Deleting all #{@model.model_name} models"
+        ActiveGit.configuration.logger.debug "[ActiveGit] Deleting all #{@model.model_name} models"
         @model.delete_all
       end
     end

data/lib/active_git/events/db_update.rb

@@ -5,7 +5,7 @@ module ActiveGit
       synchronizer.bulk_insert data
 
       synchronizer.define_job do
-        ::ActiveRecord::Base.logger.debug "[ActiveGit] Deleting #{data.class.model_name} #{data.id}"
+        ActiveGit.configuration.logger.debug "[ActiveGit] Deleting #{data.class.model_name} #{data.id}"
         record = data.class.find_by_id(data.id)
         record.delete if record
       end

data/lib/active_git/events/file_delete.rb

@@ -3,7 +3,7 @@ module ActiveGit
 
     def synchronize(synchronizer)
       synchronizer.define_job do
-        ::ActiveRecord::Base.logger.debug "[ActiveGit] Deleting file #{file_name}"
+        ActiveGit.configuration.logger.debug "[ActiveGit] Deleting file #{file_name}"
         File.delete(file_name) if File.exist?(file_name)
       end
     end

data/lib/active_git/events/file_save.rb

@@ -3,7 +3,7 @@ module ActiveGit
 
     def synchronize(synchronizer)
       synchronizer.define_job do
-        ::ActiveRecord::Base.logger.debug "[ActiveGit] Writing file #{file_name}"
+        ActiveGit.configuration.logger.debug "[ActiveGit] Writing file #{file_name}"
         FileUtils.mkpath(File.dirname(file_name)) unless Dir.exist?(File.dirname(file_name))
         File.open(file_name, 'w') { |f| f.puts json }
       end

data/lib/active_git/events/folder_remove.rb

@@ -7,7 +7,7 @@ module ActiveGit
 
     def synchronize(synchronizer)
       synchronizer.define_job do
-        ::ActiveRecord::Base.logger.debug "[ActiveGit] Removing working folder #{@path}"
+        ActiveGit.configuration.logger.debug "[ActiveGit] Removing folder #{@path}"
         FileUtils.rm_rf @path
       end
     end

data/lib/active_git/synchronizer.rb

@@ -15,7 +15,7 @@ module ActiveGit
       unless bulk_inserts.empty?
         define_job do
           bulk_inserts.each do |model, records|
-            ::ActiveRecord::Base.logger.debug "[ActiveGit] Inserting #{model.model_name} models"
+            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?
           end

data/lib/active_git/version.rb

@@ -1,3 +1,3 @@
 module ActiveGit
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/commands_spec.rb

@@ -37,6 +37,25 @@ describe ActiveGit::Commands do
       end
     end
 
+    it 'Dump single table to files' do
+      language = Language.create! name: 'Spanish'
+      country = Country.create! name: 'Argentina'
+
+      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
+
+      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
+    end
+
     it 'Load all files to db' do
       languages = [
           Language.create!(name: 'Spanish'),
@@ -58,6 +77,22 @@ describe ActiveGit::Commands do
       end
     end
 
+    it 'Load single model files to db' do
+      language = Language.create! name: 'Spanish'
+      brand = Brand.create! name: 'Coca Cola'
+
+      File.exists?(language.git_file).should be_true
+      File.exists?(brand.git_file).should be_true
+
+      language.delete
+      brand.delete
+
+      ActiveGit.load_files Language
+
+      Language.find_by_id(language.id).should_not be_nil
+      Brand.find_by_id(brand.id).should be_nil
+    end
+
   end
 
   context 'Git synchronization' do
@@ -174,7 +209,7 @@ describe ActiveGit::Commands do
       bare.init_bare
 
       ActiveGit.add_remote 'bare', bare.location
-      
+
       spanish = Language.create! name: 'Spanish'
 
       ActiveGit.commit_all 'Commit v1'

data/spec/migrations/20121004135939_create_countries.rb

@@ -1,7 +1,7 @@
 class CreateCountries < ActiveRecord::Migration
   def change
     create_table :countries do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
 
       t.timestamps
     end

data/spec/migrations/20121004135940_create_languages.rb

@@ -1,7 +1,7 @@
 class CreateLanguages < ActiveRecord::Migration
   def change
     create_table :languages do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
 
       t.timestamps
     end

data/spec/migrations/20121030163114_create_brands.rb

@@ -0,0 +1,9 @@
+class CreateBrands < ActiveRecord::Migration
+  def change
+    create_table :brands do |t|
+      t.string :name, null: false
+
+      t.timestamps
+    end
+  end
+end

data/spec/support/models/brand.rb

@@ -0,0 +1,5 @@
+class Brand < ActiveRecord::Base
+  git_versioned
+
+  attr_accessible :name
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_git
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &28809840 !ruby/object:Gem::Requirement
+  requirement: &25039440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *28809840
+  version_requirements: *25039440
 - !ruby/object:Gem::Dependency
   name: git_wrapper
-  requirement: &28809540 !ruby/object:Gem::Requirement
+  requirement: &25038948 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *28809540
+  version_requirements: *25038948
 - !ruby/object:Gem::Dependency
   name: activerecord-import
-  requirement: &28809312 !ruby/object:Gem::Requirement
+  requirement: &25038588 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28809312
+  version_requirements: *25038588
 - !ruby/object:Gem::Dependency
   name: easy_diff
-  requirement: &28809036 !ruby/object:Gem::Requirement
+  requirement: &25038180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28809036
+  version_requirements: *25038180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &28808784 !ruby/object:Gem::Requirement
+  requirement: &25037856 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28808784
+  version_requirements: *25037856
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &28808532 !ruby/object:Gem::Requirement
+  requirement: &25037460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28808532
+  version_requirements: *25037460
 description: DB and GIT synchronization via ActiveRecord and GitWrapper
 email:
 - gabynaiman@gmail.com
@@ -110,8 +110,10 @@ files:
 - spec/commands_spec.rb
 - spec/migrations/20121004135939_create_countries.rb
 - spec/migrations/20121004135940_create_languages.rb
+- spec/migrations/20121030163114_create_brands.rb
 - spec/spec_helper.rb
 - spec/support/helpers/file_helper.rb
+- spec/support/models/brand.rb
 - spec/support/models/country.rb
 - spec/support/models/language.rb
 - spec/synchronization_spec.rb
@@ -144,8 +146,10 @@ test_files:
 - spec/commands_spec.rb
 - spec/migrations/20121004135939_create_countries.rb
 - spec/migrations/20121004135940_create_languages.rb
+- spec/migrations/20121030163114_create_brands.rb
 - spec/spec_helper.rb
 - spec/support/helpers/file_helper.rb
+- spec/support/models/brand.rb
 - spec/support/models/country.rb
 - spec/support/models/language.rb
 - spec/synchronization_spec.rb