activerecord-import 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d8742c99d2600b0f4e4c425ef0a427f46f5f220
-  data.tar.gz: 2c421e2f980400b03efc42f087bd68179edd5f78
+  metadata.gz: 2d56f03f91020cf45a7991e8dcfcc3501865bc76
+  data.tar.gz: ad90843270868863373e130fe3031eca04212c9f
 SHA512:
-  metadata.gz: 092393e90fe7bebb3eed9a5c51aca467afe5b64d664d5b1888b25cc6b9c5e2cfdcdbd04505c736e22a4e8d40d9be0a5bd26f2c7f709213927d530f575b81d115
-  data.tar.gz: d130c2a565701477b2344599b267f0bc45f0f2e99f0bc88ac81e54f35b152993558d06340888a12a8245db963e51249b9885ba68d7532d01760c3c626e1f662f
+  metadata.gz: 39d17dc94eec248309b4acf6b0a6d0b83aaa350eea90b1177176d0c4b032b5f3be49d23c3c03db6dba706c2d30e28f3bc543e5a44d132431ea8a74f12d14fe5c
+  data.tar.gz: 1370ba68b46d19f12d032a8f4eacefaddb9dbd7850ce1661504ffa7c95baabba32c1f0d363a281f2c1dfeba07d932076035403e37241e2acd86f3dbffd666226

data/.travis.yml

@@ -0,0 +1,20 @@
+language: ruby
+cache: bundler
+rvm:
+  - 2.0.0
+
+gemfile:
+  - Gemfile
+
+bundler_args: -j2
+
+before_script:
+  - mysql -e 'create database activerecord_import_test;'
+  - psql -c 'create database activerecord_import_test;' -U postgres
+  - psql -U postgres -c "create extension postgis"
+  - cp test/travis/database.yml test/database.yml
+# https://github.com/discourse/discourse/blob/master/.travis.yml
+  - export RUBY_GC_MALLOC_LIMIT=50000000
+
+script:
+  - test/travis/build.sh

data/Gemfile

@@ -23,13 +23,12 @@ gem "factory_girl", "~> 4.2.0"
 gem "delorean",     "~> 0.2.0"
 
 # Debugging
-platforms :mri_18 do
-  gem "ruby-debug", "= 0.10.4"
-end
-
 platforms :jruby do
   gem "ruby-debug-base", "= 0.10.4"
-  gem "ruby-debug",      "= 0.10.4"
+end
+
+platforms :jruby, :mri_18 do
+  gem "ruby-debug", "= 0.10.4"
 end
 
 platforms :mri_19 do

data/lib/activerecord-import/import.rb

@@ -348,8 +348,8 @@ class ActiveRecord::Base
         if self.column_names.include?(key)
           value = blk.call
           if index=column_names.index(key)
-             # replace every instance of the array of attributes with our value
-             array_of_attributes.each{ |arr| arr[index] = value }
+            # replace every instance of the array of attributes with our value
+            array_of_attributes.each{ |arr| arr[index] = value if arr[index].nil? }
           else
             column_names << key
             array_of_attributes.each { |arr| arr << value }

data/lib/activerecord-import/version.rb

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

data/test/import_test.rb

@@ -236,29 +236,38 @@ describe "#import" do
   context "ActiveRecord timestamps" do
     context "when the timestamps columns are present" 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
-          assert_difference "Book.count", +1 do
-            result = Book.import [:title, :author_name, :publisher], [["LDAP", "Big Bird", "Del Rey"]]
+          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
         end
-        @book = Book.last
+        @new_book, @existing_book = Book.last 2
       end
 
       it "should set the created_at column 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"), @new_book.created_at.strftime("%H:%M")
       end
 
       it "should set the created_on column for new records" do
-        assert_equal 5.minutes.ago.utc.strftime("%H:%M"), @book.created_on.strftime("%H:%M")
+        assert_equal 5.minutes.ago.utc.strftime("%H:%M"), @new_book.created_on.strftime("%H:%M")
+      end
+
+      it "should not set the created_at column for existing records"  do
+        assert_equal 2.years.ago.utc.strftime("%Y:%d"), @existing_book.created_at.strftime("%Y:%d")
+      end
+
+      it "should not set the created_on column for existing records" do
+        assert_equal 2.years.ago.utc.strftime("%Y:%d"), @existing_book.created_on.strftime("%Y:%d")
       end
 
       it "should set the updated_at column 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"), @new_book.updated_at.strftime("%H:%M")
       end
 
       it "should set the updated_on column for new records" do
-        assert_equal 5.minutes.ago.utc.strftime("%H:%M"), @book.updated_on.strftime("%H:%M")
+        assert_equal 5.minutes.ago.utc.strftime("%H:%M"), @new_book.updated_on.strftime("%H:%M")
       end
     end
 

data/test/travis/build.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+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
+
+#jruby
+#bundle exec rake test:jdbcmysql               # Run tests for jdbcmysql
+#bundle exec rake test:jdbcpostgresql          # Run tests for jdbcpostgresql

data/test/travis/database.yml

@@ -0,0 +1,57 @@
+common: &common
+  username: root
+  password:
+  encoding: utf8
+  host:     localhost
+  database: activerecord_import_test
+
+mysql: &mysql
+  <<: *common
+  adapter: mysql
+
+mysql2: &mysql2
+  <<: *common
+  adapter: mysql2
+
+mysqlspatial:
+  <<: *mysql
+
+mysql2spatial:
+  <<: *mysql2
+
+em_mysql2:
+  <<: *common
+  adapter: em_mysql2
+  pool: 5
+
+seamless_database_pool:
+  <<: *common
+  adapter: seamless_database_pool
+  pool_adapter: mysql2
+  master:
+    host: localhost
+
+postgresql: &postgresql
+  <<: *common
+  username: postgres
+  adapter: postgresql
+  min_messages: warning
+
+postgis:
+  <<: *postgresql
+
+oracle:
+  <<: *common
+  adapter: oracle
+  min_messages: debug
+
+sqlite:
+  adapter: sqlite
+  dbfile: test.db
+
+sqlite3: &sqlite3
+  adapter: sqlite3
+  database: ":memory:"
+
+spatialite:
+  <<: *sqlite3

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Extraction of the ActiveRecord::Base#import functionality from ar-extensions
@@ -46,7 +46,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Brewfile
 - Gemfile
 - LICENSE
@@ -134,6 +135,8 @@ files:
 - test/support/postgresql/import_examples.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
+- test/travis/build.sh
+- test/travis/database.yml
 - test/value_sets_bytes_parser_test.rb
 - test/value_sets_records_parser_test.rb
 homepage: http://github.com/zdennis/activerecord-import
@@ -146,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Bulk-loading extension for ActiveRecord
@@ -200,6 +203,8 @@ test_files:
 - test/support/postgresql/import_examples.rb
 - test/synchronize_test.rb
 - test/test_helper.rb
+- test/travis/build.sh
+- test/travis/database.yml
 - test/value_sets_bytes_parser_test.rb
 - test/value_sets_records_parser_test.rb
 has_rdoc: