active_git 0.0.8 → 0.0.9

data/active_git.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.description   = 'DB and GIT synchronization via ActiveRecord and GitWrapper'
   s.summary       = 'DB and GIT synchronization via ActiveRecord and GitWrapper'
   s.homepage      = 'https://github.com/gabynaiman/active_git'
+  s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($\)
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/active_git/active_record_extension.rb

@@ -11,6 +11,26 @@ module ActiveGit
           @options
         end
 
+        def git_included_models
+          git_included_associations.map { |a| reflections[a] ? reflections[a].klass : a.to_s.classify.constantize }
+        end
+
+        def git_included_associations
+          git_deep_included_associations git_options[:include]
+        end
+
+        def git_deep_included_associations(arg)
+          return [] if arg.nil?
+
+          if arg.is_a? Array
+            arg
+          elsif arg.is_a? Hash
+            arg.keys + git_deep_included_associations(arg.map{|k,v| v[:include]})
+          else
+            [arg]
+          end
+        end
+
         include InstanceMethods
 
         ActiveGit.models << self
@@ -25,6 +45,21 @@ module ActiveGit
 
       end
 
+      def git_included_in(model)
+
+        after_save do
+          instance = send model
+          #TODO: Ver si se puede optimizar el reload para que no lo haga siempre
+          ActiveGit.synchronize FileSave.new(instance.reload) if instance
+        end
+
+        after_destroy do
+          instance = send model
+          ActiveGit.synchronize FileSave.new(instance.reload) if instance
+        end
+
+      end
+
     end
 
     module InstanceMethods

data/lib/active_git/events/db_delete_all.rb

@@ -9,6 +9,11 @@ module ActiveGit
       synchronizer.define_job do
         ActiveGit.configuration.logger.debug "[ActiveGit] Deleting all #{@model.model_name} models"
         @model.delete_all
+
+        @model.git_included_models.each do |nested_model|
+          ActiveGit.configuration.logger.debug "[ActiveGit] Deleting all #{nested_model.model_name} models (nested of #{@model.model_name})"
+          nested_model.delete_all
+        end
       end
     end
 

data/lib/active_git/events/db_event.rb

@@ -17,7 +17,7 @@ module ActiveGit
     end
 
     def create(synchronizer)
-      json = File.read(@file_name)
+      json = File.read @file_name
       ModelParser.instances(model, json).each do |instance|
         synchronizer.bulk_insert instance
       end
@@ -25,9 +25,26 @@ module ActiveGit
 
     def delete(synchronizer)
       synchronizer.define_job do
-        ActiveGit.configuration.logger.debug "[ActiveGit] Deleting #{model.model_name} #{model_id}"
-        record = model.find_by_id(model_id)
-        record.delete if record
+        instance = model.find_by_id(model_id)
+        if instance
+          model.git_included_associations.each do |a|
+            if association = instance.reflections[a]
+              if association.collection?
+                instance.send(a).each do |e| 
+                  ActiveGit.configuration.logger.debug "[ActiveGit] Deleting #{e.class.model_name} #{e.id}"
+                  e.delete
+                end
+              else
+                if i = instance.send(a)
+                  ActiveGit.configuration.logger.debug "[ActiveGit] Deleting #{i.class.model_name} #{i.id}"
+                  instance.send(a).delete
+                end
+              end
+            end
+          end
+          ActiveGit.configuration.logger.debug "[ActiveGit] Deleting #{model.model_name} #{model_id}"
+          instance.delete
+        end
       end
     end
 

data/lib/active_git/version.rb

@@ -1,3 +1,3 @@
 module ActiveGit
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/spec/active_record_extension_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe ActiveGit::ActiveRecord do
@@ -26,6 +28,17 @@ describe ActiveGit::ActiveRecord do
     json['name'].should eq language.name
   end
 
+  it 'Create included' do
+    country = Country.create! name: 'Argentina'
+    city = City.create! name: 'Bs.As.', country: country
+
+    JSON.parse(File.read(git_filename(country))).tap do |model|
+      model['cities'].should have(1).items
+      model['cities'][0]['id'].should eq city.id
+      model['cities'][0]['name'].should eq city.name
+    end
+  end
+
   it 'Update' do
     language = Language.create! name: 'Spanish'
 
@@ -38,6 +51,25 @@ describe ActiveGit::ActiveRecord do
     json['name'].should eq 'English'
   end
 
+  it 'Update included' do
+    country = Country.create! name: 'Argentina'
+    city = City.create! name: 'Bs.As.', country: country
+
+    JSON.parse(File.read(git_filename(country))).tap do |model|
+      model['cities'].should have(1).items
+      model['cities'][0]['id'].should eq city.id
+      model['cities'][0]['name'].should eq 'Bs.As.'
+    end
+
+    city.update_attributes name: 'Córdoba'
+
+    JSON.parse(File.read(git_filename(country))).tap do |model|
+      model['cities'].should have(1).items
+      model['cities'][0]['id'].should eq city.id
+      model['cities'][0]['name'].should eq 'Córdoba'
+    end
+  end
+
   it 'Destroy' do
     language = Language.create! name: 'Spanish'
 
@@ -48,6 +80,23 @@ describe ActiveGit::ActiveRecord do
     File.exist?(git_filename(language)).should be false
   end
 
+  it 'Destroy included' do
+    country = Country.create! name: 'Argentina'
+    city = City.create! name: 'Bs.As.', country: country
+
+    JSON.parse(File.read(git_filename(country))).tap do |model|
+      model['cities'].should have(1).items
+      model['cities'][0]['id'].should eq city.id
+      model['cities'][0]['name'].should eq 'Bs.As.'
+    end
+
+    city.destroy
+
+    JSON.parse(File.read(git_filename(country))).tap do |model|
+      model['cities'].should have(:no).items
+    end
+  end
+
   it 'Dump' do
     Time.zone = 'Buenos Aires'
 
@@ -78,4 +127,16 @@ describe ActiveGit::ActiveRecord do
     country.git_dump.should eq File.read("#{File.dirname(__FILE__)}/json/parent_child_dump.json")
   end
 
+  it 'Included associations' do
+    Language.git_included_associations.should eq [:countries, :cities]
+    Country.git_included_associations.should eq [:language, :cities]
+    Brand.git_included_associations.should be_empty
+  end  
+
+  it 'Included models' do
+    Language.git_included_models.should eq [Country, City]
+    Country.git_included_models.should eq [Language, City]
+    Brand.git_included_models.should be_empty
+  end
+
 end

data/spec/batch_synchronization_spec.rb

@@ -4,6 +4,7 @@ describe ActiveGit do
 
   before :each do
     @file_helper = FileHelper.new
+    ActiveGit.configuration.working_path = @file_helper.create_temp_folder
   end
 
   after :each do

data/spec/commands_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe ActiveGit::Commands do
@@ -15,45 +17,48 @@ describe ActiveGit::Commands do
   context 'Dump and load' do
 
     it 'Dump complete db to files' do
-      languages = [
+      models = [
           Language.create!(name: 'Spanish'),
-          Language.create!(name: 'English')
+          Language.create!(name: 'English'),
+          Brand.create!(name: 'Coca Cola')
       ]
 
       @file_helper.write_file "#{ActiveGit.configuration.working_path}/test.txt", 'test'
       @file_helper.write_file "#{git_dirname(Language)}/0.json", 'test'
+      @file_helper.write_file "#{git_dirname(Brand)}/0.json", 'test'
 
       ActiveGit.dump_db
 
       File.exist?("#{ActiveGit.configuration.working_path}/test.txt").should be false
 
       Dir.glob("#{git_dirname(Language)}/*.json").should have(2).items
+      Dir.glob("#{git_dirname(Brand)}/*.json").should have(1).items
 
-      languages.each do |language|
-        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
+      models.each do |model|
+        File.exist?(git_filename(model)).should be true
+        json = JSON.parse(@file_helper.read_file(git_filename(model)))
+        json['id'].should eq model.id
+        json['name'].should eq model.name
       end
     end
 
     it 'Dump single table to files' do
       language = Language.create! name: 'Spanish'
-      country = Country.create! name: 'Argentina'
+      brand = Brand.create! name: 'Coca Cola'
 
       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}/brands").should be false
+      File.exists?("#{ActiveGit.configuration.working_path}/brands/#{brand.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}/brands").should be false
+      File.exists?("#{ActiveGit.configuration.working_path}/brands/#{brand.id}.json").should be false
     end
 
     it 'Load all files to db' do
@@ -93,6 +98,21 @@ describe ActiveGit::Commands do
       Brand.find_by_id(brand.id).should be_nil
     end
 
+    it 'Load nested models' do
+      country = Country.create! name: 'Argentina'
+      country.cities << City.new(name: 'Bs.As.')
+      country.cities << City.new(name: 'Córdoba')
+      country.cities << City.new(name: 'Rosario')
+
+      country.cities[0].delete
+      country.delete
+
+      ActiveGit.load_files Country
+
+      country = Country.find(country.id)
+      country.should have(3).cities
+    end
+
   end
 
   context 'Git synchronization' do

data/spec/inflector_spec.rb

@@ -2,6 +2,15 @@ require 'spec_helper'
 
 describe ActiveGit::Inflector do
 
+  before :each do
+    @file_helper = FileHelper.new
+    ActiveGit.configuration.working_path = @file_helper.create_temp_folder
+  end
+
+  after :each do
+    @file_helper.remove_temp_folders
+  end
+
   let(:working_path) { '/home/git' }
 
   it 'Git path' do

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ ActiveRecord::Migrator.migrations_path = "#{File.dirname(__FILE__)}/migrations"
 ActiveRecord::Migration.verbose = false
 
 logger = Logger.new($stdout)
-logger.level = Logger::Severity::FATAL
+logger.level = Logger::Severity::ERROR
 
 ActiveRecord::Base.logger = logger
 ActiveGit.configuration.logger = logger

data/spec/support/models/city.rb

@@ -1,3 +1,4 @@
 class City < ActiveRecord::Base
+  git_included_in :country
   belongs_to :country
 end

data/spec/support/models/language.rb

@@ -1,4 +1,4 @@
 class Language < ActiveRecord::Base
-  git_versioned(include: {countries: {include: :cities}})
+  git_versioned include: {countries: {include: :cities}}
   has_many :countries
 end

data/spec/synchronization_spec.rb

@@ -4,6 +4,7 @@ describe ActiveGit::Synchronizer do
 
   before :each do
     @file_helper = FileHelper.new
+    ActiveGit.configuration.working_path = @file_helper.create_temp_folder
   end
 
   after :each do
@@ -106,46 +107,53 @@ describe ActiveGit::Synchronizer do
       argentina.cities.count.should eq 2
       argentina.cities.should include(City.find_by_name 'Buenos Aires')
       argentina.cities.should include(City.find_by_name 'Rosario')
-      argentina.cities.should_not include(City.find_by_name 'Montevideo')
 
       uruguay = Country.find_by_name 'Uruguay'
 
       uruguay.cities.count.should eq 2
       uruguay.cities.should include(City.find_by_name 'Montevideo')
       uruguay.cities.should include(City.find_by_name 'Colonia')
-      uruguay.cities.should_not include(City.find_by_name 'Buenos Aires')
     end
 
     it 'Update' do
-      working_path = @file_helper.create_temp_folder
-
       country = Country.create! name: 'Argentina'
 
-      file_name = "#{working_path}/countries/#{country.id}.json"
-      @file_helper.write_file file_name, country.attributes.merge('name' => 'Brasil').to_json
+      @file_helper.write_file git_filename(country), country.attributes.merge('name' => 'Brasil').to_json
 
-      ActiveGit::Synchronizer.synchronize ActiveGit::DbUpdate.new(file_name, working_path)
+      ActiveGit::Synchronizer.synchronize ActiveGit::DbUpdate.new(git_filename(country))
 
       country.reload.name.should eq 'Brasil'
     end
 
     it 'Destroy' do
-      working_path = @file_helper.create_temp_folder
-
       country = Country.create! name: 'Argentina'
 
-      file_name = "#{working_path}/countries/#{country.id}.json"
-
-      ActiveGit::Synchronizer.synchronize ActiveGit::DbDelete.new(file_name, working_path)
+      ActiveGit::Synchronizer.synchronize ActiveGit::DbDelete.new(git_filename(country))
 
       Country.find_by_id(country.id).should be_nil
     end
 
+    it 'Destroy nested models' do
+      country1 = Country.create! name: 'Argentina'
+      country1.cities << City.new(name: 'Bs.As.')
+      country1.cities << City.new(name: 'Rosario')
+
+      country2 = Country.create! name: 'Uruguay'
+      country2.cities << City.new(name: 'Montevideo')
+      country2.cities << City.new(name: 'Colonia')
+
+      Country.count.should eq 2
+      City.count.should eq 4
+
+      ActiveGit::Synchronizer.synchronize ActiveGit::DbDelete.new(git_filename(country1))
+
+      Country.count.should eq 1
+      City.count.should eq 2
+    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
@@ -153,10 +161,10 @@ describe ActiveGit::Synchronizer do
           country.updated_at = Time.now
         end
       end
-      ActiveGit::Synchronizer.synchronize countries.map {|c| ActiveGit::FileSave.new(c, working_path)}
+      ActiveGit::Synchronizer.synchronize countries.map {|c| ActiveGit::FileSave.new(c)}
 
       events = countries.map do |country|
-        ActiveGit::DbCreate.new(ActiveGit::Inflector.filename(country, working_path), working_path)
+        ActiveGit::DbCreate.new(git_filename(country))
       end
 
       Country.should_receive(:import).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_git
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -228,7 +228,8 @@ files:
 - spec/support/models/language.rb
 - spec/synchronization_spec.rb
 homepage: https://github.com/gabynaiman/active_git
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -239,12 +240,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3436893494460006310
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3436893494460006310
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25