postgres_upsert 3.0.0 → 4.0.0

data/spec/spec_helper.rb

@@ -1,47 +1,15 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+require File.expand_path("../../config/environment", __FILE__)
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'fixtures/test_model'
 require 'fixtures/three_column'
 require 'fixtures/reserved_word_model'
 require 'rspec'
+require 'rspec/rails'
 require 'rspec/autorun'
 
 RSpec.configure do |config|
-  config.before(:suite) do
-    # we create a test database if it does not exist
-    # I do not use database users or password for the tests, using ident authentication instead
-    begin
-      ActiveRecord::Base.establish_connection(
-        :adapter  => "postgresql",
-        :host     => "localhost",
-        :username => "postgres",
-        :password => "postgres",
-        :port     => 5432,
-        :database => "ar_pg_copy_test"
-      )
-      ActiveRecord::Base.connection.execute %{
-        SET client_min_messages TO warning;
-        DROP TABLE IF EXISTS test_models;
-        DROP TABLE IF EXISTS three_columns;
-        DROP TABLE IF EXISTS reserved_word_models;
-        CREATE TABLE test_models (id serial PRIMARY KEY, data text, created_at timestamp with time zone, updated_at timestamp with time zone );
-        CREATE TABLE three_columns (id serial PRIMARY KEY, data text, extra text, created_at timestamp with time zone, updated_at timestamp with time zone );
-        CREATE TABLE reserved_word_models (id serial PRIMARY KEY, "select" text, "group" text);
-      }
-    rescue Exception => e
-      puts "Exception: #{e}"
-      ActiveRecord::Base.establish_connection(
-        :adapter  => "postgresql",
-        :host     => "localhost",
-        :username => "postgres",
-        :password => "postgres",
-        :port     => 5432,
-        :database => "postgres"
-      )
-      ActiveRecord::Base.connection.execute "DROP DATABASE IF EXISTS ar_pg_copy_test"
-      ActiveRecord::Base.connection.execute "CREATE DATABASE ar_pg_copy_test;"
-      retry
-    end
-  end
-
+  #config.use_transactional_fixtures = false
+  config.expose_current_running_example_as :example
+  config.infer_spec_type_from_file_location!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postgres_upsert
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Steve Mitchell
@@ -28,86 +28,86 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   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'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: pry-rails
   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'
 - !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.0'
 description: Uses Postgres's powerful COPY command to upsert large sets of data into
   ActiveRecord tables
 email: thestevemitchell@gmail.com
@@ -116,17 +116,36 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - VERSION
+- bin/bundle
+- bin/rails
+- bin/rake
+- bin/setup
+- config.ru
+- config/application.rb
+- config/boot.rb
+- config/database.yml
+- config/environment.rb
+- config/environments/development.rb
+- config/environments/production.rb
+- config/environments/test.rb
+- config/locales/en.yml
+- config/routes.rb
+- config/secrets.yml
+- db/migrate/20150214192135_create_test_tables.rb
+- db/schema.rb
+- db/seeds.rb
 - lib/postgres_upsert.rb
-- lib/postgres_upsert/active_record.rb
+- lib/postgres_upsert/result.rb
+- lib/postgres_upsert/table_writer.rb
 - lib/postgres_upsert/writer.rb
 - postgres_upsert.gemspec
-- spec/fixtures/2_col_binary_data.dat
 - spec/fixtures/comma_with_header.csv
 - spec/fixtures/comma_with_header_and_comma_values.csv
 - spec/fixtures/comma_with_header_and_unquoted_comma.csv
@@ -144,9 +163,7 @@ files:
 - spec/fixtures/tab_with_two_lines.csv
 - spec/fixtures/test_model.rb
 - spec/fixtures/three_column.rb
-- spec/pg_upsert_binary_spec.rb
 - spec/pg_upsert_csv_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 homepage: https://github.com/theSteveMitchell/postgres_upsert
 licenses: []
@@ -157,23 +174,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A rubygem that integrates with ActiveRecord to insert/update large data sets
   into the database efficiently
 test_files:
-- spec/fixtures/2_col_binary_data.dat
 - spec/fixtures/comma_with_header.csv
 - spec/fixtures/comma_with_header_and_comma_values.csv
 - spec/fixtures/comma_with_header_and_unquoted_comma.csv
@@ -191,7 +207,5 @@ test_files:
 - spec/fixtures/tab_with_two_lines.csv
 - spec/fixtures/test_model.rb
 - spec/fixtures/three_column.rb
-- spec/pg_upsert_binary_spec.rb
 - spec/pg_upsert_csv_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb

data/lib/postgres_upsert/active_record.rb

@@ -1,13 +0,0 @@
-module ActiveRecord
-  class Base
-    # Copy data to a file passed as a string (the file path) or to lines that are passed to a block
-
-    # Copy data from a CSV that can be passed as a string (the file path) or as an IO object.
-    # * You can change the default delimiter passing delimiter: '' in the options hash
-    # * You can map fields from the file to different fields in the table using a map in the options hash
-    # * For further details on usage take a look at the README.md
-    def self.pg_upsert path_or_io, options = {}
-      PostgresUpsert::Writer.new(table_name, path_or_io, options).write
-    end
-  end
-end

data/spec/pg_upsert_binary_spec.rb

@@ -1,35 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "pg_upsert from file with binary data" do
-  before(:each) do
-    ActiveRecord::Base.connection.execute %{
-      TRUNCATE TABLE test_models;
-      SELECT setval('test_models_id_seq', 1, false);
-    }
-  end
-
-  before do
-    DateTime.stub(:now).and_return (DateTime.parse("2012-01-01").utc)
-  end
-
-  def timestamp
-    DateTime.now.utc.to_s
-  end
-
-  it "imports from file if path is passed without field_map" do
-    TestModel.pg_upsert File.expand_path('spec/fixtures/2_col_binary_data.dat'), :format => :binary, columns: [:id, :data]
-
-    expect(
-      TestModel.first.attributes
-    ).to include('data' => 'text', 'created_at' => timestamp, 'updated_at' => timestamp)
-  end
-
-  it "throws an error when importing binary file without columns list" do
-    # Since binary data never has a header row, we'll require explicit columns list
-    expect{
-      TestModel.pg_upsert File.expand_path('spec/fixtures/2_col_binary_data.dat'), :format => :binary
-    }.to raise_error "Either the :columns option or :header => true are required"
-  end
-
-end
-

data/spec/spec.opts

@@ -1 +0,0 @@
---color