activerecord-import 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d56f03f91020cf45a7991e8dcfcc3501865bc76
-  data.tar.gz: ad90843270868863373e130fe3031eca04212c9f
+  metadata.gz: 7aec7bd524a95df0244ff6fd857ca4b534fffe7e
+  data.tar.gz: 3680f99953ff777985422c2a349eacd88b7df0d5
 SHA512:
-  metadata.gz: 39d17dc94eec248309b4acf6b0a6d0b83aaa350eea90b1177176d0c4b032b5f3be49d23c3c03db6dba706c2d30e28f3bc543e5a44d132431ea8a74f12d14fe5c
-  data.tar.gz: 1370ba68b46d19f12d032a8f4eacefaddb9dbd7850ce1661504ffa7c95baabba32c1f0d363a281f2c1dfeba07d932076035403e37241e2acd86f3dbffd666226
+  metadata.gz: 302282ad1f0db1ce53f9961a46de68dea66b6f332e25742b35cf086ce16a458c40c502aa8c3b3a93a220b3fc4307c5ee33e731d786c2365f82a294dac214c17b
+  data.tar.gz: edbc30d0d1e4ecdeeabacfed9042b02ae89c79ea644d8683dd6a9048847ee1f40f6bea357fe702628bbe8f694a20e2d76db20d1ea7102b2dfe31e3068e7930bc

data/Gemfile

@@ -20,7 +20,9 @@ end
 
 # Support libs
 gem "factory_girl", "~> 4.2.0"
-gem "delorean",     "~> 0.2.0"
+gem "timecop"
+gem "chronic"
+
 
 # Debugging
 platforms :jruby do
@@ -37,4 +39,8 @@ end
 
 version = ENV['AR_VERSION'] || "3.2"
 
+if version > "4.0"
+  gem "minitest"
+end
+
 eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)

data/gemfiles/4.1.gemfile

@@ -0,0 +1,4 @@
+platforms :ruby do
+  gem 'mysql',        '~> 2.9'
+  gem 'activerecord', '~> 4.1'
+end

data/gemfiles/4.2.gemfile

@@ -0,0 +1,4 @@
+platforms :ruby do
+  gem 'mysql',        '~> 2.9'
+  gem 'activerecord', '~> 4.2'
+end

data/lib/activerecord-import/import.rb

@@ -25,6 +25,71 @@ module ActiveRecord::Import #:nodoc:
   end
 end
 
+class ActiveRecord::Associations::CollectionProxy
+  def import(*args, &block)
+    @association.import(*args, &block)
+  end
+end
+
+class ActiveRecord::Associations::CollectionAssociation
+  def import(*args, &block)
+    unless owner.persisted?
+      raise ActiveRecord::RecordNotSaved, "You cannot call import unless the parent is saved"
+    end
+
+    options = args.last.is_a?(Hash) ? args.pop : {}
+
+    model_klass = self.reflection.klass
+    symbolized_foreign_key = self.reflection.foreign_key.to_sym
+    symbolized_column_names = model_klass.column_names.map(&:to_sym)
+
+    owner_primary_key = self.owner.class.primary_key
+    owner_primary_key_value = self.owner.send(owner_primary_key)
+
+    # assume array of model objects
+    if args.last.is_a?( Array ) and args.last.first.is_a? ActiveRecord::Base
+      if args.length == 2
+        models = args.last
+        column_names = args.first
+      else
+        models = args.first
+        column_names = symbolized_column_names
+      end
+
+      if !symbolized_column_names.include?(symbolized_foreign_key)
+        column_names << symbolized_foreign_key
+      end
+
+      models.each do |m|
+        m.send "#{symbolized_foreign_key}=", owner_primary_key_value
+      end
+
+      return model_klass.import column_names, models, options
+
+    # supports empty array
+    elsif args.last.is_a?( Array ) and args.last.empty?
+      return ActiveRecord::Import::Result.new([], 0) if args.last.empty?
+
+    # supports 2-element array and array
+    elsif args.size == 2 and args.first.is_a?( Array ) and args.last.is_a?( Array )
+      column_names, array_of_attributes = args
+      symbolized_column_names = column_names.map(&:to_s)
+
+      if !symbolized_column_names.include?(symbolized_foreign_key)
+        column_names << symbolized_foreign_key
+        array_of_attributes.each { |attrs| attrs << owner_primary_key_value }
+      else
+        index = symbolized_column_names.index(symbolized_foreign_key)
+        array_of_attributes.each { |attrs| attrs[index] = owner_primary_key_value }
+      end
+
+      return model_klass.import column_names, array_of_attributes, options
+    else
+      raise ArgumentError.new( "Invalid arguments!" )
+    end
+  end
+end
+
 class ActiveRecord::Base
   class << self
 
@@ -120,7 +185,7 @@ class ActiveRecord::Base
     #  # Example using column_names and array_of_values
     #  columns = [ :author_name, :title ]
     #  values = [ [ 'zdennis', 'test post' ], [ 'jdoe', 'another test post' ] ]
-    #  BlogPost.import columns, values 
+    #  BlogPost.import columns, values
     #
     #  # Example using column_names, array_of_value and options
     #  columns = [ :author_name, :title ]
@@ -142,7 +207,7 @@ class ActiveRecord::Base
     #
     # == On Duplicate Key Update (MySQL only)
     #
-    # The :on_duplicate_key_update option can be either an Array or a Hash. 
+    # The :on_duplicate_key_update option can be either an Array or a Hash.
     #
     # ==== Using an Array
     #
@@ -170,6 +235,7 @@ class ActiveRecord::Base
       options.merge!( args.pop ) if args.last.is_a? Hash
 
       is_validating = options.delete( :validate )
+      is_validating = true unless options[:validate_with_context].nil?
 
       # assume array of model objects
       if args.last.is_a?( Array ) and args.last.first.is_a? ActiveRecord::Base
@@ -254,7 +320,7 @@ class ActiveRecord::Base
         instance = new do |model|
           hsh.each_pair{ |k,v| model.send("#{k}=", v) }
         end
-        if not instance.valid?
+        if not instance.valid?(options[:validate_with_context])
           array_of_attributes[ i ] = nil
           failed_instances << instance
         end
@@ -331,11 +397,11 @@ class ActiveRecord::Base
           # be sure to query sequence_name *last*, only if cheaper tests fail, because it's costly
           if val.nil? && column.name == primary_key && !sequence_name.blank?
              connection_memo.next_value_for_sequence(sequence_name)
-          else
-            if serialized_attributes.include?(column.name)
-              connection_memo.quote(serialized_attributes[column.name].dump(val), column)
+          elsif column
+            if column.respond_to?(:type_cast_from_user)                         # Rails 4.2 and higher
+              connection_memo.quote(column.type_cast_from_user(val), column)
             else
-              connection_memo.quote(val, column)
+              connection_memo.quote(column.type_cast(val), column)              # Rails 3.1, 3.2, and 4.1
             end
           end
         end
@@ -347,7 +413,7 @@ class ActiveRecord::Base
       AREXT_RAILS_COLUMNS[:create].each_pair do |key, blk|
         if self.column_names.include?(key)
           value = blk.call
-          if index=column_names.index(key)
+          if index=column_names.index(key) || index=column_names.index(key.to_sym)
             # replace every instance of the array of attributes with our value
             array_of_attributes.each{ |arr| arr[index] = value if arr[index].nil? }
           else
@@ -360,7 +426,7 @@ class ActiveRecord::Base
       AREXT_RAILS_COLUMNS[:update].each_pair do |key, blk|
         if self.column_names.include?(key)
           value = blk.call
-          if index=column_names.index(key)
+          if index=column_names.index(key) || index=column_names.index(key.to_sym)
              # replace every instance of the array of attributes with our value
              array_of_attributes.each{ |arr| arr[index] = value }
           else

data/lib/activerecord-import/synchronize.rb

@@ -42,9 +42,14 @@ module ActiveRecord # :nodoc:
         if matched_instance
           instance.clear_aggregation_cache
           instance.clear_association_cache
-          instance.instance_variable_set '@attributes', matched_instance.attributes
-          instance.instance_variable_set '@attributes_cache', {}
-          instance.changed_attributes.clear
+          instance.instance_variable_set :@attributes, matched_instance.instance_variable_get(:@attributes)
+
+          if instance.respond_to?(:clear_changes_information)
+            instance.clear_changes_information                  # Rails 4.1 and higher
+          else
+            instance.changed_attributes.clear                   # Rails 3.1, 3.2
+          end
+
           # Since the instance now accurately reflects the record in
           # the database, ensure that instance.persisted? is true.
           instance.instance_variable_set '@new_record', false

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
   end
 end

data/test/import_test.rb

@@ -19,7 +19,7 @@ describe "#import" do
     end
   end
 
-  describe "with non-default ActiveRecord models" do  
+  describe "with non-default ActiveRecord models" do
     context "that have a non-standard primary key (that is no sequence)" do
       it "should import models successfully" do
         assert_difference "Widget.count", +3 do
@@ -32,6 +32,7 @@ describe "#import" do
   context "with :validation option" do
     let(:columns) { %w(title author_name) }
     let(:valid_values) { [[ "LDAP", "Jerry Carter"], ["Rails Recipes", "Chad Fowler"]] }
+    let(:valid_values_with_context) { [[ 1111, "Jerry Carter"], [2222, "Chad Fowler"]] }
     let(:invalid_values) { [[ "The RSpec Book", ""], ["Agile+UX", ""]] }
 
     context "with validation checks turned off" do
@@ -61,12 +62,24 @@ describe "#import" do
         end
       end
 
+      it "should import valid data with on option" do
+        assert_difference "Topic.count", +2 do
+          result = Topic.import columns, valid_values_with_context, :validate_with_context => :context_test
+        end
+      end
+
       it "should not import invalid data" do
         assert_no_difference "Topic.count" do
           result = Topic.import columns, invalid_values, :validate => true
         end
       end
 
+      it "should import invalid data with on option" do
+        assert_no_difference "Topic.count" do
+          result = Topic.import columns, valid_values, :validate_with_context => :context_test
+        end
+      end
+
       it "should report the failed instances" do
         results = Topic.import columns, invalid_values, :validate => true
         assert_equal invalid_values.size, results.failed_instances.size
@@ -238,7 +251,7 @@ describe "#import" do
       setup do
         @existing_book = Book.create(title: "Fell", author_name: "Curry", publisher: "Bayer", created_at: 2.years.ago.utc, created_on: 2.years.ago.utc)
         ActiveRecord::Base.default_timezone = :utc
-        Delorean.time_travel_to("5 minutes ago") do
+        Timecop.freeze Chronic.parse("5 minutes ago") do
           assert_difference "Book.count", +2 do
             result = Book.import ["title", "author_name", "publisher", "created_at", "created_on"], [["LDAP", "Big Bird", "Del Rey", nil, nil], [@existing_book.title, @existing_book.author_name, @existing_book.publisher, @existing_book.created_at, @existing_book.created_on]]
           end
@@ -272,26 +285,25 @@ describe "#import" do
     end
 
     context "when a custom time zone is set" do
+      let(:time){ Chronic.parse("5 minutes ago")  }
+
       setup do
-        original_timezone = ActiveRecord::Base.default_timezone
-        ActiveRecord::Base.default_timezone = :utc
-        Delorean.time_travel_to("5 minutes ago") do
+        Timecop.freeze(time) do
           assert_difference "Book.count", +1 do
             result = Book.import [:title, :author_name, :publisher], [["LDAP", "Big Bird", "Del Rey"]]
           end
         end
-        ActiveRecord::Base.default_timezone = original_timezone
         @book = Book.last
       end
 
       it "should set the created_at and created_on timestamps for new records"  do
-        assert_equal 5.minutes.ago.utc.strftime("%H:%M"), @book.created_at.strftime("%H:%M")
-        assert_equal 5.minutes.ago.utc.strftime("%H:%M"), @book.created_on.strftime("%H:%M")
+        assert_in_delta time.to_i, @book.created_at.to_i, 1.second
+        assert_in_delta time.to_i, @book.created_on.to_i, 1.second
       end
 
       it "should set the updated_at and updated_on timestamps for new records" do
-        assert_equal 5.minutes.ago.utc.strftime("%H:%M"), @book.updated_at.strftime("%H:%M")
-        assert_equal 5.minutes.ago.utc.strftime("%H:%M"), @book.updated_on.strftime("%H:%M")
+        assert_in_delta time.to_i, @book.updated_at.to_i, 1.second
+        assert_in_delta time.to_i, @book.updated_on.to_i, 1.second
       end
     end
   end
@@ -326,6 +338,31 @@ describe "#import" do
         end
       end
     end
+
+    it "works importing models" do
+      topic = FactoryGirl.create :topic
+      books = [
+        Book.new(:author_name => "Author #1", :title => "Book #1"),
+        Book.new(:author_name => "Author #2", :title => "Book #2"),
+      ]
+      topic.books.import books
+      assert_equal 2, topic.books.count
+      assert topic.books.detect { |b| b.title == "Book #1" && b.author_name == "Author #1" }
+      assert topic.books.detect { |b| b.title == "Book #2" && b.author_name == "Author #2" }
+    end
+
+    it "works importing array of columns and values" do
+      topic = FactoryGirl.create :topic
+      books = [
+        Book.new(:author_name => "Foo", :title => "Baz"),
+        Book.new(:author_name => "Foo2", :title => "Baz2"),
+      ]
+      topic.books.import [:author_name, :title], [["Author #1", "Book #1"], ["Author #2", "Book #2"]]
+      assert_equal 2, topic.books.count
+      assert topic.books.detect { |b| b.title == "Book #1" && b.author_name == "Author #1" }
+      assert topic.books.detect { |b| b.title == "Book #2" && b.author_name == "Author #2" }
+    end
+
   end
 
   describe "importing when model has default_scope" do
@@ -355,5 +392,4 @@ describe "#import" do
       assert_equal({:a => :b}, Widget.find_by_w_id(1).data)
     end
   end
-
 end

data/test/models/topic.rb

@@ -1,7 +1,9 @@
 class Topic < ActiveRecord::Base
   validates_presence_of :author_name
+  validates :title, numericality: { only_integer: true }, on: :context_test
+
   has_many :books
   belongs_to :parent, :class_name => "Topic"
-  
+
   composed_of :description, :mapping => [ %w(title title), %w(author_name author_name)], :allow_nil => true, :class_name => "TopicDescription"
 end

data/test/support/active_support/test_case_extensions.rb

@@ -55,7 +55,7 @@ class ActiveSupport::TestCase
     end
     
     def it(description, &blk)
-      define_method("test: #{name} #{description}", &blk)
+      define_method("test_#{name}_#{description}", &blk)
     end
   end
   

data/test/support/mysql/assertions.rb

@@ -3,29 +3,29 @@ class ActiveSupport::TestCase
     def self.extended(klass)
       klass.instance_eval do
         assertion(:should_not_update_created_at_on_timestamp_columns) do
-          Delorean.time_travel_to("5 minutes from now") do
+          Timecop.freeze Chronic.parse("5 minutes from now") do
             perform_import
-            assert_equal @topic.created_at.to_i, updated_topic.created_at.to_i
-            assert_equal @topic.created_on.to_i, updated_topic.created_on.to_i
+            assert_in_delta @topic.created_at.to_i, updated_topic.created_at.to_i, 1
+            assert_in_delta @topic.created_on.to_i, updated_topic.created_on.to_i, 1
           end
         end
 
         assertion(:should_update_updated_at_on_timestamp_columns) do
           time = Chronic.parse("5 minutes from now")
-          Delorean.time_travel_to(time) do
+          Timecop.freeze time do
             perform_import
-            assert_equal time.to_i, updated_topic.updated_at.to_i
-            assert_equal time.to_i, updated_topic.updated_on.to_i
+            assert_in_delta time.to_i, updated_topic.updated_at.to_i, 1
+            assert_in_delta time.to_i, updated_topic.updated_on.to_i, 1
           end
         end
 
         assertion(:should_not_update_timestamps) do
-          Delorean.time_travel_to("5 minutes from now") do
+          Timecop.freeze Chronic.parse("5 minutes from now") do
             perform_import :timestamps => false
-            assert_equal @topic.created_at.to_i, updated_topic.created_at.to_i
-            assert_equal @topic.created_on.to_i, updated_topic.created_on.to_i
-            assert_equal @topic.updated_at.to_i, updated_topic.updated_at.to_i
-            assert_equal @topic.updated_on.to_i, updated_topic.updated_on.to_i
+            assert_in_delta @topic.created_at.to_i, updated_topic.created_at.to_i, 1
+            assert_in_delta @topic.created_on.to_i, updated_topic.created_on.to_i, 1
+            assert_in_delta @topic.updated_at.to_i, updated_topic.updated_at.to_i, 1
+            assert_in_delta @topic.updated_on.to_i, updated_topic.updated_on.to_i, 1
           end
         end
 
@@ -52,4 +52,4 @@ class ActiveSupport::TestCase
       end
     end
   end
-end
+end

data/test/support/mysql/import_examples.rb

@@ -14,7 +14,7 @@ def should_support_mysql_import_functionality
     end
 
     macro(:perform_import){ raise "supply your own #perform_import in a context below" }
-    macro(:updated_topic){ Topic.find(@topic) }
+    macro(:updated_topic){ Topic.find(@topic.id) }
 
     context "given columns and values with :validation checks turned off" do
       let(:columns){  %w( id title author_name author_email_address parent_id ) }

data/test/test_helper.rb

@@ -10,13 +10,19 @@ ENV["RAILS_ENV"] = "test"
 require "bundler"
 Bundler.setup
 
-require "logger"
-require 'test/unit'
 require "active_record"
 require "active_record/fixtures"
 require "active_support/test_case"
 
-require "delorean"
+if ActiveSupport::VERSION::STRING < "4.1"
+  require 'test/unit'
+else
+  require 'active_support/testing/autorun'
+end
+
+require 'timecop'
+require 'chronic'
+
 require "ruby-debug" if RUBY_VERSION.to_f < 1.9
 
 adapter = ENV["ARE_DB"] || "sqlite3"
@@ -25,6 +31,7 @@ FileUtils.mkdir_p 'log'
 ActiveRecord::Base.logger = Logger.new("log/test.log")
 ActiveRecord::Base.logger.level = Logger::DEBUG
 ActiveRecord::Base.configurations["test"] = YAML.load_file(test_dir.join("database.yml"))[adapter]
+ActiveRecord::Base.default_timezone = :utc
 
 require "activerecord-import"
 ActiveRecord::Base.establish_connection "test"

data/test/travis/build.sh

@@ -1,19 +1,30 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 set +x
 
-bundle exec rake test:em_mysql2               # Run tests for em_mysql2
-bundle exec rake test:mysql                   # Run tests for mysql
-bundle exec rake test:mysql2                  # Run tests for mysql2
-bundle exec rake test:mysql2spatial           # Run tests for mysql2spatial
-bundle exec rake test:mysqlspatial            # Run tests for mysqlspatial
-bundle exec rake test:postgis                 # Run tests for postgis
-bundle exec rake test:postgresql              # Run tests for postgresql
-bundle exec rake test:seamless_database_pool  # Run tests for seamless_database_pool
-bundle exec rake test:spatialite              # Run tests for spatialite
-# so far the version installed in travis seems < 3.7.11 so we cannot test sqlite3 on it
-# bundle exec rake test:sqlite3
+function run {
+  echo "Running: AR_VERSION=$AR_VERSION $@"
+  $@
+}
 
-#jruby
-#bundle exec rake test:jdbcmysql               # Run tests for jdbcmysql
-#bundle exec rake test:jdbcpostgresql          # Run tests for jdbcpostgresql
+for activerecord_version in "3.1" "3.2" "4.1" "4.2" ; do
+  export AR_VERSION=$activerecord_version
+
+  bundle update activerecord
+
+  run run bundle exec rake test:em_mysql2               # Run tests for em_mysql2
+  run bundle exec rake test:mysql                   # Run tests for mysql
+  run bundle exec rake test:mysql2                  # Run tests for mysql2
+  run bundle exec rake test:mysql2spatial           # Run tests for mysql2spatial
+  run bundle exec rake test:mysqlspatial            # Run tests for mysqlspatial
+  run bundle exec rake test:postgis                 # Run tests for postgis
+  run bundle exec rake test:postgresql              # Run tests for postgresql
+  run bundle exec rake test:seamless_database_pool  # Run tests for seamless_database_pool
+  run bundle exec rake test:spatialite              # Run tests for spatialite
+  # so far the version installed in travis seems < 3.7.11 so we cannot test sqlite3 on it
+  # run bundle exec rake test:sqlite3
+
+  #jruby
+  #bundle exec rake test:jdbcmysql               # Run tests for jdbcmysql
+  #bundle exec rake test:jdbcpostgresql          # Run tests for jdbcpostgresql
+done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -70,6 +70,8 @@ files:
 - gemfiles/3.1.gemfile
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/em_mysql2_adapter.rb
@@ -159,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Bulk-loading extension for ActiveRecord
@@ -207,4 +209,3 @@ test_files:
 - test/travis/database.yml
 - test/value_sets_bytes_parser_test.rb
 - test/value_sets_records_parser_test.rb
-has_rdoc: