active_git 0.0.7 → 0.0.8

data/lib/active_git/active_record_extension.rb

@@ -3,7 +3,16 @@ module ActiveGit
 
     module ClassMethods
 
-      def git_versioned
+      def git_versioned(options={})
+
+        @options = options.merge root: false
+
+        def git_options
+          @options
+        end
+
+        include InstanceMethods
+
         ActiveGit.models << self
 
         after_save do |record|
@@ -14,22 +23,17 @@ module ActiveGit
           ActiveGit.synchronize FileDelete.new(record)
         end
 
-        def from_json(json)
-          record = self.new
-          hash = json.is_a?(Hash) ? json : JSON.parse(json)
-          hash.each do |attr, value|
-            if record.respond_to? "#{attr}="
-              if self.columns_hash[attr].type == :datetime
-                record.send("#{attr}=", Time.parse(value).utc)
-              else
-                record.send("#{attr}=", value)
-              end
-            end
-          end
-          record
-        end
       end
 
     end
+
+    module InstanceMethods
+
+      def git_dump
+        JSON.pretty_generate(as_json(self.class.git_options))
+      end
+
+    end
+
   end
 end

data/lib/active_git/commands.rb

@@ -84,7 +84,7 @@ module ActiveGit
 
         model = File.dirname(file_name).split(/\/|\\/).pop.classify.constantize
 
-        FileSave.new(model.from_json(merge))
+        FileSave.new(ModelParser.from_json(model, merge))
       end
 
       Synchronizer.synchronize events

data/lib/active_git/events/db_event.rb

@@ -6,10 +6,6 @@ module ActiveGit
       @working_path = working_path || ActiveGit.configuration.working_path
     end
 
-    def synchronize(synchronizer)
-      raise 'Must implement in subclass'
-    end
-
     private
 
     def model
@@ -20,13 +16,11 @@ module ActiveGit
       Inflector.model_id @file_name
     end
 
-    def data
-      json = File.open(@file_name, 'r') { |f| f.read }
-      model.from_json(json)
-    end
-
     def create(synchronizer)
-      synchronizer.bulk_insert data
+      json = File.read(@file_name)
+      ModelParser.instances(model, json).each do |instance|
+        synchronizer.bulk_insert instance
+      end
     end
 
     def delete(synchronizer)

data/lib/active_git/events/file_event.rb

@@ -1,32 +1,18 @@
 module ActiveGit
   class FileEvent
 
+    attr_reader :data
+
     def initialize(data, working_path=nil)
       @data = data
       @working_path = working_path || ActiveGit.configuration.working_path
     end
 
-    def synchronize(synchronizer)
-      raise 'Must implement in subclass'
-    end
-
     protected
 
-    def model
-      @data.class
-    end
-
-    def model_path
-      Inflector.dirname(model, @working_path)
-    end
-
     def file_name
       Inflector.filename(@data, @working_path)
     end
 
-    def json
-      JSON.pretty_generate(@data.attributes)
-    end
-
   end
 end

data/lib/active_git/events/file_save.rb

@@ -5,7 +5,7 @@ module ActiveGit
       synchronizer.define_job do
         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 }
+        File.open(file_name, 'w') { |f| f.puts data.git_dump }
       end
 
     end

data/lib/active_git/model_parser.rb

@@ -0,0 +1,36 @@
+module ActiveGit
+  class ModelParser
+
+    def self.instances(model, json)
+      list = [from_json(model, json)]
+      attributes = json.is_a?(Hash) ? json : JSON.parse(json)
+      attributes.each do |attr, value|
+        if model.reflections.has_key?(attr.to_sym)
+          attr_model = attr.to_s.classify.constantize
+          if value.is_a? Array
+            value.each {|json| list = list + instances(attr_model, json)}
+          else
+            list = list + instances(attr_model, value)
+          end
+        end
+      end
+      list
+    end
+
+    def self.from_json(model, json)
+      record = model.new
+      attributes = json.is_a?(Hash) ? json : JSON.parse(json)
+      attributes.each do |attr, value|
+        if model.column_names.include?(attr.to_s)
+          if model.columns_hash[attr.to_s].type == :datetime && value.is_a?(String)
+            record.send("#{attr}=", Time.parse(value).utc)
+          else
+            record.send("#{attr}=", value)
+          end
+        end
+      end
+      record
+    end
+
+  end
+end

data/lib/active_git/version.rb

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

data/lib/active_git.rb

@@ -21,6 +21,7 @@ require 'active_git/active_record_extension'
 require 'active_git/configuration'
 require 'active_git/commands'
 require 'active_git/inflector'
+require 'active_git/model_parser'
 
 module ActiveGit
   extend Commands
@@ -54,18 +55,22 @@ module ActiveGit
     @batch_mode = true
     begin
       result = yield
-      Synchronizer.synchronize @events
+      Synchronizer.synchronize queued_events
       result
     ensure
       @batch_mode = false
-      @events.clear if @events
+      queued_events.clear
     end
   end
 
   private
 
   def self.enqueue(*events)
-    @events = (@events || []) + events
+    events.each { |e| queued_events << e }
+  end
+
+  def self.queued_events
+    @events ||= []
   end
 
 end

data/spec/active_record_extension_spec.rb

@@ -48,14 +48,34 @@ describe ActiveGit::ActiveRecord do
     File.exist?(git_filename(language)).should be false
   end
 
-  it 'Load from json' do
-    attributes = {id: 1, name: 'Spanish', created_at: Time.now, updated_at: Time.now}
-    language = Language.from_json attributes.to_json
-
-    language.id.should eq attributes[:id]
-    language.name.should eq attributes[:name]
-    language.created_at.to_i.should eq attributes[:created_at].to_i
-    language.updated_at.to_i.should eq attributes[:updated_at].to_i
+  it 'Dump' do
+    Time.zone = 'Buenos Aires'
+
+    brand = Brand.new name: 'Brand 1',
+                      created_at: Time.zone.parse('2012-04-20T11:24:11'),
+                      updated_at: Time.zone.parse('2012-04-20T11:24:11')
+
+    brand.git_dump.should eq File.read("#{File.dirname(__FILE__)}/json/dump.json")
+  end
+
+  it 'Nested dump' do
+    city = City.new name: 'Bs.As.'
+    country = Country.new name: 'Argentina'
+    country.cities << city
+    language = Language.new name: 'Spanish'
+    language.countries << country
+
+    language.git_dump.should eq File.read("#{File.dirname(__FILE__)}/json/nested_dump.json")
+  end
+
+  it 'Parent and child dump' do
+    language = Language.new name: 'Spanish'
+    city = City.new name: 'Bs.As.'
+    country = Country.new name: 'Argentina'
+    country.cities << city
+    country.language = language
+
+    country.git_dump.should eq File.read("#{File.dirname(__FILE__)}/json/parent_child_dump.json")
   end
 
 end

data/spec/batch_synchronization_spec.rb

@@ -113,6 +113,11 @@ describe ActiveGit do
       File.exist?(git_filename(english)).should be true
     end
 
+    it 'Batch process without events' do
+      Language.count.should eq 0
+      ActiveGit.batch {}
+    end
+
     it 'Handle exceptions' do
       spanish = nil
       english = nil

data/spec/configuration_spec.rb

@@ -13,7 +13,7 @@ describe ActiveGit::Configuration do
     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
@@ -59,5 +59,5 @@ describe ActiveGit::Configuration do
     ActiveGit.configuration.logger = logger
     ActiveGit.configuration.logger.should eq logger
   end
-    
+
 end

data/spec/json/dump.json

@@ -0,0 +1,6 @@
+{
+  "created_at": "2012-04-20T11:24:11-03:00",
+  "id": null,
+  "name": "Brand 1",
+  "updated_at": "2012-04-20T11:24:11-03:00"
+}

data/spec/json/nested_dump.json

@@ -0,0 +1,24 @@
+{
+  "created_at": null,
+  "id": null,
+  "name": "Spanish",
+  "updated_at": null,
+  "countries": [
+    {
+      "created_at": null,
+      "id": null,
+      "language_id": null,
+      "name": "Argentina",
+      "updated_at": null,
+      "cities": [
+        {
+          "country_id": null,
+          "created_at": null,
+          "id": null,
+          "name": "Bs.As.",
+          "updated_at": null
+        }
+      ]
+    }
+  ]
+}

data/spec/json/parent_child_dump.json

@@ -0,0 +1,22 @@
+{
+  "created_at": null,
+  "id": null,
+  "language_id": null,
+  "name": "Argentina",
+  "updated_at": null,
+  "language": {
+    "created_at": null,
+    "id": null,
+    "name": "Spanish",
+    "updated_at": null
+  },
+  "cities": [
+    {
+      "country_id": null,
+      "created_at": null,
+      "id": null,
+      "name": "Bs.As.",
+      "updated_at": null
+    }
+  ]
+}

data/spec/migrations/20121004135939_create_countries.rb

@@ -2,6 +2,7 @@ class CreateCountries < ActiveRecord::Migration
   def change
     create_table :countries do |t|
       t.string :name, null: false
+      t.references :language
 
       t.timestamps
     end

data/spec/migrations/20130812112000_create_cities.rb

@@ -0,0 +1,10 @@
+class CreateCities < ActiveRecord::Migration
+  def change
+    create_table :cities do |t|
+      t.string :name, null: false
+      t.references :country
+
+      t.timestamps
+    end
+  end
+end

data/spec/model_parser_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe ActiveGit::ModelParser do
+
+  LANGUAGE = {
+      id: 1,
+      name: 'Spanish',
+      created_at: Time.now,
+      updated_at: Time.now,
+      countries: [
+          {
+              id: 1,
+              name: 'Argentina',
+              LANGUAGE_id: 1,
+              cities: [
+                  {id: 1, name: 'Buenos Aires', country_id: 1},
+                  {id: 2, name: 'Rosario', country_id: 1}
+              ]
+          }
+      ]
+  }
+
+  [LANGUAGE, LANGUAGE.to_json].each do |source|
+    it "Load from #{source.class.to_s.downcase}" do
+      instance = ActiveGit::ModelParser.from_json(Language, source)
+
+      instance.id.should eq LANGUAGE[:id]
+      instance.name.should eq LANGUAGE[:name]
+      instance.created_at.to_i.should eq LANGUAGE[:created_at].to_i
+      instance.updated_at.to_i.should eq LANGUAGE[:updated_at].to_i
+    end
+
+    it "Instances from #{source.class.to_s.downcase}" do
+      instances = ActiveGit::ModelParser.instances(Language, source)
+
+      instances.count.should eq 4
+      instances[0].class.should eq Language
+      instances[0].name.should eq 'Spanish'
+      instances[1].class.should eq Country
+      instances[1].name.should eq 'Argentina'
+      instances[2].class.should eq City
+      instances[2].name.should eq 'Buenos Aires'
+      instances[3].class.should eq City
+      instances[3].name.should eq 'Rosario'
+    end
+  end
+
+  it "instances from a hash with different associations" do
+    country = {
+      id: 1,
+      name: 'Argentina',
+      language: {id: 1, name: 'Spanish'},
+      cities: [
+          {id: 1, name: 'Buenos Aires', country_id: 1},
+          {id: 2, name: 'Rosario', country_id: 1}
+      ]
+    }
+
+    instances = ActiveGit::ModelParser.instances(Country, country)
+    instances.count.should eq 4
+    instances[0].class.should eq Country
+    instances[0].name.should eq 'Argentina'
+    instances[1].class.should eq Language
+    instances[1].name.should eq 'Spanish'
+    instances[2].class.should eq City
+    instances[2].name.should eq 'Buenos Aires'
+    instances[3].class.should eq City
+    instances[3].name.should eq 'Rosario'
+  end
+
+end

data/spec/support/models/city.rb

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

data/spec/support/models/country.rb

@@ -1,2 +1,5 @@
 class Country < ActiveRecord::Base
+  git_versioned include: [:language, :cities]
+  belongs_to :language
+  has_many :cities
 end

data/spec/support/models/language.rb

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

data/spec/synchronization_spec.rb

@@ -62,7 +62,7 @@ describe ActiveGit::Synchronizer do
       working_path = @file_helper.create_temp_folder
 
       file_name = "#{working_path}/countries/1.json"
-      @file_helper.write_file file_name, {id: 1, name: 'Argentina', created_at: '2012-04-20T11:24:11-03:00', updated_at: '2012-04-20T11:24:11-03:00'}.to_json
+      @file_helper.write_file file_name, {id: 1, name: 'Argentina', created_at: Time.now, updated_at: Time.now}.to_json
 
       Country.count.should eq 0
 
@@ -71,6 +71,51 @@ describe ActiveGit::Synchronizer do
       Country.find(1).name.should eq 'Argentina'
     end
 
+    it 'Create multiple models from a file with 3 nested levels' do
+      working_path = @file_helper.create_temp_folder
+
+      city1_json = {id: 1, name: "Buenos Aires", country_id: 1, created_at: Time.now, updated_at: Time.now}
+      city2_json = {id: 2, name: "Rosario", country_id: 1, created_at: Time.now, updated_at: Time.now}
+      country1_json = {id: 1, name: 'Argentina', language_id: 1, created_at: Time.now, updated_at: Time.now, cities:[city1_json,city2_json]}
+
+      city1_json = {id: 3, name: "Montevideo", country_id: 2, created_at: Time.now, updated_at: Time.now}
+      city2_json = {id: 4, name: "Colonia", country_id: 2, created_at: Time.now, updated_at: Time.now}
+      country2_json = {id: 2, name: 'Uruguay', language_id: 1, created_at: Time.now, updated_at: Time.now, cities:[city1_json,city2_json]}
+
+      file_name = "#{working_path}/languages/1.json"
+      @file_helper.write_file file_name, {id: 1, name: 'Spanish', created_at: Time.now, updated_at: Time.now, countries:[country1_json,country2_json] }.to_json
+
+      Language.count.should eq 0
+      Country.count.should eq 0
+      City.count.should eq 0
+
+      ActiveGit::Synchronizer.synchronize ActiveGit::DbCreate.new(file_name, working_path)
+
+      Language.count.should eq 1
+      Country.count.should eq 2
+      City.count.should eq 4
+
+      spanish = Language.find_by_name 'Spanish'
+
+      spanish.countries.count.should eq 2
+      spanish.countries.should include(Country.find_by_name 'Argentina')
+      spanish.countries.should include(Country.find_by_name 'Uruguay')
+
+      argentina = Country.find_by_name 'Argentina'
+
+      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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_git
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -200,6 +200,7 @@ files:
 - lib/active_git/events/file_save.rb
 - lib/active_git/events/folder_remove.rb
 - lib/active_git/inflector.rb
+- lib/active_git/model_parser.rb
 - lib/active_git/synchronization_error.rb
 - lib/active_git/synchronizer.rb
 - lib/active_git/version.rb
@@ -209,13 +210,19 @@ files:
 - spec/configuration_spec.rb
 - spec/coverage_helper.rb
 - spec/inflector_spec.rb
+- spec/json/dump.json
+- spec/json/nested_dump.json
+- spec/json/parent_child_dump.json
 - spec/migrations/20121004135939_create_countries.rb
 - spec/migrations/20121004135940_create_languages.rb
 - spec/migrations/20121030163114_create_brands.rb
 - spec/migrations/20130315192821_create_customers.rb
+- spec/migrations/20130812112000_create_cities.rb
+- spec/model_parser_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers/file_helper.rb
 - spec/support/models/brand.rb
+- spec/support/models/city.rb
 - spec/support/models/country.rb
 - spec/support/models/customer.rb
 - spec/support/models/language.rb
@@ -251,13 +258,19 @@ test_files:
 - spec/configuration_spec.rb
 - spec/coverage_helper.rb
 - spec/inflector_spec.rb
+- spec/json/dump.json
+- spec/json/nested_dump.json
+- spec/json/parent_child_dump.json
 - spec/migrations/20121004135939_create_countries.rb
 - spec/migrations/20121004135940_create_languages.rb
 - spec/migrations/20121030163114_create_brands.rb
 - spec/migrations/20130315192821_create_customers.rb
+- spec/migrations/20130812112000_create_cities.rb
+- spec/model_parser_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers/file_helper.rb
 - spec/support/models/brand.rb
+- spec/support/models/city.rb
 - spec/support/models/country.rb
 - spec/support/models/customer.rb
 - spec/support/models/language.rb