activerecord-import 0.12.0 → 0.13.0

data/test/synchronize_test.rb

@@ -1,8 +1,8 @@
 require File.expand_path('../test_helper', __FILE__)
 
 describe ".synchronize" do
-  let(:topics){ Generate(3, :topics) }
-  let(:titles){ %w(one two three) }
+  let(:topics) { Generate(3, :topics) }
+  let(:titles) { %w(one two three) }
 
   setup do
     # update records outside of ActiveRecord knowing about it

data/test/test_helper.rb

@@ -16,7 +16,7 @@ require "active_record"
 require "active_record/fixtures"
 require "active_support/test_case"
 
-if ActiveSupport::VERSION::STRING < "4.1"
+if ActiveSupport::VERSION::STRING < "4.0"
   require 'test/unit'
 else
   require 'active_support/testing/autorun'
@@ -38,24 +38,22 @@ ActiveRecord::Base.default_timezone = :utc
 require "activerecord-import"
 ActiveRecord::Base.establish_connection :test
 
-ActiveSupport::Notifications.subscribe(/active_record.sql/) do |event, _, _, _, hsh|
+ActiveSupport::Notifications.subscribe(/active_record.sql/) do |_, _, _, _, hsh|
   ActiveRecord::Base.logger.info hsh[:sql]
 end
 
 require "factory_girl"
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each{ |file| require file }
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |file| require file }
 
 # Load base/generic schema
 require test_dir.join("schema/version")
 require test_dir.join("schema/generic_schema")
 adapter_schema = test_dir.join("schema/#{adapter}_schema.rb")
-require adapter_schema if File.exists?(adapter_schema)
+require adapter_schema if File.exist?(adapter_schema)
 
-Dir[File.dirname(__FILE__) + "/models/*.rb"].each{ |file| require file }
+Dir[File.dirname(__FILE__) + "/models/*.rb"].each { |file| require file }
 
 # Prevent this deprecation warning from breaking the tests.
 Rake::FileList.send(:remove_method, :import)
 
-if ENV['AR_VERSION'].to_f >= 4.2
-  ActiveSupport::TestCase.test_order = :sorted
-end
+ActiveSupport::TestCase.test_order = :random if ENV['AR_VERSION'].to_f >= 4.2

data/test/value_sets_bytes_parser_test.rb

@@ -4,48 +4,48 @@ require 'activerecord-import/value_sets_parser'
 
 describe ActiveRecord::Import::ValueSetsBytesParser do
   context "#parse - computing insert value sets" do
-    let(:parser){ ActiveRecord::Import::ValueSetsBytesParser }
-    let(:base_sql){ "INSERT INTO atable (a,b,c)" }
-    let(:values){ [ "(1,2,3)", "(2,3,4)", "(3,4,5)" ] }
+    let(:parser) { ActiveRecord::Import::ValueSetsBytesParser }
+    let(:base_sql) { "INSERT INTO atable (a,b,c)" }
+    let(:values) { ["(1,2,3)", "(2,3,4)", "(3,4,5)"] }
 
     context "when the max allowed bytes is 33 and the base SQL is 26 bytes" do
       it "should return 3 value sets when given 3 value sets of 7 bytes a piece" do
-        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 33
+        value_sets = parser.parse values, reserved_bytes: base_sql.size, max_bytes: 33
         assert_equal 3, value_sets.size
       end
     end
 
     context "when the max allowed bytes is 40 and the base SQL is 26 bytes" do
       it "should return 3 value sets when given 3 value sets of 7 bytes a piece" do
-        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 40
+        value_sets = parser.parse values, reserved_bytes: base_sql.size, max_bytes: 40
         assert_equal 3, value_sets.size
       end
     end
 
     context "when the max allowed bytes is 41 and the base SQL is 26 bytes" do
       it "should return 2 value sets when given 2 value sets of 7 bytes a piece" do
-        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 41
+        value_sets = parser.parse values, reserved_bytes: base_sql.size, max_bytes: 41
         assert_equal 2, value_sets.size
       end
     end
 
     context "when the max allowed bytes is 48 and the base SQL is 26 bytes" do
       it "should return 2 value sets when given 2 value sets of 7 bytes a piece" do
-        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 48
+        value_sets = parser.parse values, reserved_bytes: base_sql.size, max_bytes: 48
         assert_equal 2, value_sets.size
       end
     end
 
     context "when the max allowed bytes is 49 and the base SQL is 26 bytes" do
       it "should return 1 value sets when given 1 value sets of 7 bytes a piece" do
-        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 49
+        value_sets = parser.parse values, reserved_bytes: base_sql.size, max_bytes: 49
         assert_equal 1, value_sets.size
       end
     end
 
     context "when the max allowed bytes is 999999 and the base SQL is 26 bytes" do
       it "should return 1 value sets when given 1 value sets of 7 bytes a piece" do
-        value_sets = parser.parse values, :reserved_bytes => base_sql.size, :max_bytes => 999999
+        value_sets = parser.parse values, reserved_bytes: base_sql.size, max_bytes: 999_999
         assert_equal 1, value_sets.size
       end
     end
@@ -54,9 +54,8 @@ describe ActiveRecord::Import::ValueSetsBytesParser do
       values = [
         "('1','2','3')",
         "('4','5','6')",
-        "('7','8','9')" ]
+        "('7','8','9')"]
 
-      values_size_in_bytes = values.sum {|value| value.bytesize }
       base_sql_size_in_bytes = 15
       max_bytes = 30
 
@@ -64,8 +63,9 @@ describe ActiveRecord::Import::ValueSetsBytesParser do
       assert_equal 3, value_sets.size, 'Three value sets were expected!'
 
       # Each element in the value_sets array must be an array
-      value_sets.each_with_index { |e,i|
-        assert_kind_of Array, e, "Element #{i} was expected to be an Array!" }
+      value_sets.each_with_index do |e, i|
+        assert_kind_of Array, e, "Element #{i} was expected to be an Array!"
+      end
 
       # Each element in the values array should have a 1:1 correlation to the elements
       # in the returned value_sets arrays
@@ -79,18 +79,15 @@ describe ActiveRecord::Import::ValueSetsBytesParser do
         # each accented e should be 2 bytes, so each entry is 6 bytes instead of 5
         values = [
           "('é')",
-          "('é')" ]
+          "('é')"]
 
         base_sql_size_in_bytes = 15
         max_bytes = 26
 
-        values_size_in_bytes = values.sum {|value| value.bytesize }
         value_sets = parser.parse values, reserved_bytes: base_sql_size_in_bytes, max_bytes: max_bytes
 
         assert_equal 2, value_sets.size, 'Two value sets were expected!'
       end
     end
   end
-
 end
-

data/test/value_sets_records_parser_test.rb

@@ -4,27 +4,27 @@ require 'activerecord-import/value_sets_parser'
 
 describe "ActiveRecord::Import::ValueSetsRecordsParser" do
   context "#parse - computing insert value sets" do
-    let(:parser){ ActiveRecord::Import::ValueSetsRecordsParser }
-    let(:base_sql){ "INSERT INTO atable (a,b,c)" }
-    let(:values){ [ "(1,2,3)", "(2,3,4)", "(3,4,5)" ] }
+    let(:parser) { ActiveRecord::Import::ValueSetsRecordsParser }
+    let(:base_sql) { "INSERT INTO atable (a,b,c)" }
+    let(:values) { ["(1,2,3)", "(2,3,4)", "(3,4,5)"] }
 
     context "when the max number of records is 1" do
       it "should return 3 value sets when given 3 values sets" do
-        value_sets = parser.parse values, :max_records => 1
+        value_sets = parser.parse values, max_records: 1
         assert_equal 3, value_sets.size
       end
     end
 
     context "when the max number of records is 2" do
       it "should return 2 value sets when given 3 values sets" do
-        value_sets = parser.parse values, :max_records => 2
+        value_sets = parser.parse values, max_records: 2
         assert_equal 2, value_sets.size
       end
     end
 
     context "when the max number of records is 3" do
       it "should return 1 value sets when given 3 values sets" do
-        value_sets = parser.parse values, :max_records => 3
+        value_sets = parser.parse values, max_records: 3
         assert_equal 1, value_sets.size
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -47,6 +47,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Brewfile
 - CHANGELOG.md
@@ -110,6 +112,7 @@ files:
 - test/jdbcpostgresql/import_test.rb
 - test/models/book.rb
 - test/models/chapter.rb
+- test/models/discount.rb
 - test/models/end_note.rb
 - test/models/group.rb
 - test/models/promotion.rb
@@ -134,7 +137,6 @@ files:
 - test/support/shared_examples/on_duplicate_key_update.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
@@ -178,6 +180,7 @@ test_files:
 - test/jdbcpostgresql/import_test.rb
 - test/models/book.rb
 - test/models/chapter.rb
+- test/models/discount.rb
 - test/models/end_note.rb
 - test/models/group.rb
 - test/models/promotion.rb
@@ -202,7 +205,7 @@ test_files:
 - test/support/shared_examples/on_duplicate_key_update.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: 

data/test/travis/build.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-# set -e
-# set +x
-
-function run {
-  statement=$@
-  logfile=$4.log
-  $statement &> $logfile
-  if [ $? != 0 ] ; then
-    printf "AR_VERSION=$AR_VERSION $statement \e[31mFAILED\e[0m\n"
-    cat $logfile
-  else
-    printf "AR_VERSION=$AR_VERSION $statement \e[32mPASSED\e[0m\n"
-  fi
-}
-
-for activerecord_version in "3.1" "3.2" "4.0" "4.1" "4.2" "5.0" ; do
-  export AR_VERSION=$activerecord_version
-
-  bundle update activerecord > /dev/null
-
-  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: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