postgres-copy 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6477dfff9506950fc1f3a728138a48ce5f669a0c
-  data.tar.gz: 6a048abf7e41bbec754e4603b6f0fce48c6c3aa7
+SHA256:
+  metadata.gz: ad654ff2a933f1e41f23e6347f0b20daa3e16455caea9a6107ce4d50c39598f8
+  data.tar.gz: e972e684f928c0afdd7fdd096ade3d28d293604ef20f42a959097234f37f7317
 SHA512:
-  metadata.gz: 29f73c848994f32475f6652fe07788180efa8ab3faede9e98bc4d13d1f5afd9a95d165c2c8eb9c077fa9c8780aab876c167b1aa0fef49875b4a27c554785ee61
-  data.tar.gz: dba63f2014d5caad8e5f3623e85abf684f97ed8fd6ccee207f10033a4b090d2fa469d401b61173e1d0967988bc2e370434dee13b33525a863c35f864c0bdb987
+  metadata.gz: e57d3d4d0bd7a0bef175dad625c77013f2616222ef9ef086c449cdcbd8f58e4bbde77625e6f70ab55149683becac6e15d8c2cbf84c09c707f1a39cbef0417b05
+  data.tar.gz: b8768a3cf765aa7d6c01eb5138439e20c1140f6b2e772e96d169635832fe14a2780e438732503f719eba7f0b9bcf0e6cf6da4c7241d3d42e734d4433f65799e6

data/.github/workflows/ruby.yml

@@ -0,0 +1,48 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    services:
+      # Label used to access the service container
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Provide the password for postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    postgres-copy (1.4.1)
+    postgres-copy (1.5.0)
       activerecord (>= 5.1)
       pg (>= 0.17)
       responders
@@ -9,66 +9,65 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activesupport (5.2.2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.4)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.8.0)
-    i18n (1.5.3)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    builder (3.2.4)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.9.0)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nokogiri (1.10.1)
+    minitest (5.14.1)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    pg (1.1.4)
-    rack (2.0.6)
+    pg (1.2.3)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rake (11.2.2)
-    rdoc (5.0.0)
-    responders (2.4.1)
-      actionpack (>= 4.2.0, < 6.0)
-      railties (>= 4.2.0, < 6.0)
+    rdoc (6.2.1)
+    responders (3.0.1)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
@@ -77,10 +76,11 @@ GEM
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.4)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -93,4 +93,4 @@ DEPENDENCIES
   rspec (~> 2.12)
 
 BUNDLED WITH
-   1.16.3
+   2.1.2

data/README.md

@@ -1,4 +1,6 @@
-# postgres-copy [![Build Status](https://travis-ci.org/diogob/postgres-copy.svg?branch=master)](https://travis-ci.org/diogob/postgres-copy) [![Code Climate](https://codeclimate.com/github/diogob/postgres-copy.svg)](https://codeclimate.com/github/diogob/postgres-copy)
+# postgres-copy 
+
+![Ruby](https://github.com/diogob/postgres-copy/workflows/Ruby/badge.svg)
 
 This Gem will enable your AR models to use the PostgreSQL COPY command to import/export data in CSV format.
 If you need to tranfer data between a PostgreSQL database and CSV files, the PostgreSQL native CSV parser
@@ -172,6 +174,11 @@ Match the specified columns' values against the null string, even if it has been
 User.copy_from "/tmp/users.csv", :null => '', :force_null => [:name, :city]
 ```
 
+To copy from tsv file , you can set format `:tsv`
+
+```ruby
+User.copy_from "/tmp/users.tsv", :format => :tsv
+```
 
 To copy a binary formatted data file or IO object you can specify the format as binary
 

data/lib/postgres-copy/acts_as_copy_target.rb

@@ -73,13 +73,15 @@ module PostgresCopy
       # * For further details on usage take a look at the README.md
       def copy_from path_or_io, options = {}
         options = {:delimiter => ",", :format => :csv, :header => true, :quote => '"'}.merge(options)
+        options[:delimiter] = "\t" if options[:format] == :tsv
         options_string = if options[:format] == :binary
                            "BINARY"
                          else
                            quote = options[:quote] == "'" ? "''" : options[:quote]
                            null = options.key?(:null) ? "NULL '#{options[:null]}'" : nil
                            force_null = options.key?(:force_null) ? "FORCE_NULL(#{options[:force_null].join(',')})" : nil
-                           "WITH (" + ["DELIMITER '#{options[:delimiter]}'", "QUOTE '#{quote}'", null, force_null, "FORMAT CSV"].compact.join(', ') + ")"
+                           delimiter = options[:format] == :tsv ? "E'\t'" : "'#{options[:delimiter]}'"
+                           "WITH (" + ["DELIMITER #{delimiter}", "QUOTE '#{quote}'", null, force_null, "FORMAT CSV"].compact.join(', ') + ")"
                          end
         io = path_or_io.instance_of?(String) ? File.open(path_or_io, 'r') : path_or_io
 

data/postgres-copy.gemspec

@@ -5,7 +5,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name                  = "postgres-copy"
-  s.version               = "1.4.1"
+  s.version               = "1.5.0"
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = ">= 1.9.3"
   s.authors               = ["Diogo Biazus"]

data/spec/copy_from_spec.rb

@@ -160,4 +160,17 @@ describe "COPY FROM" do
     TestModel.copy_from File.expand_path('spec/fixtures/comma_with_empty_string.csv'), :null => '', :force_null => [:data]
     TestModel.order(:id).map{|r| r.attributes}.should == [{'id' => 1, 'data' => nil}]
   end
+
+  it "should import tsv from path" do
+    TestModel.copy_from File.expand_path('spec/fixtures/tab_with_header.tsv'), :format => :tsv
+    TestModel.order(:id).map{|r| r.attributes}.should == [{'id' => 1, 'data' => 'test data 1'}]
+  end
+
+  it "should import 2 lines from tsv and allow changes in block" do
+    TestModel.copy_from(File.open(File.expand_path('spec/fixtures/tab_with_two_lines.tsv'), 'r'), :format => :tsv) do |row|
+      row[1] = 'changed this data'
+    end
+    TestModel.order(:id).first.attributes.should == {'id' => 1, 'data' => 'changed this data'}
+    TestModel.count.should == 2
+  end
 end

data/spec/copy_to_binary_spec.rb

@@ -19,15 +19,4 @@ describe "COPY TO BINARY" do
       it{ should == File.open('spec/fixtures/2_col_binary_data.dat', 'r:ASCII-8BIT').read }
     end
   end
-
-  describe "should allow binary output to file" do
-    it "should copy to disk if block is not given and a path is passed" do
-      TestModel.copy_to '/tmp/export.dat', :format => :binary
-      str = File.open('/tmp/export.dat', 'r:ASCII-8BIT').read
-
-      str.should == File.open('spec/fixtures/2_col_binary_data.dat', 'r:ASCII-8BIT').read
-      
-    end
-  end
-
 end

data/spec/copy_to_spec.rb

@@ -64,15 +64,6 @@ describe "COPY TO" do
       end
     end
 
-    it "should copy to disk if block is not given and a path is passed" do
-      TestModel.copy_to '/tmp/export.csv'
-      File.open('spec/fixtures/comma_with_header.csv', 'r') do |fixture|
-        File.open('/tmp/export.csv', 'r') do |result|
-          result.read.should == fixture.read
-        end
-      end
-    end
-
     it "should raise exception if I pass a path and a block simultaneously" do
       lambda do
         TestModel.copy_to('/tmp/bogus_path') do |row|
@@ -81,9 +72,10 @@ describe "COPY TO" do
     end
 
     it "accepts custom sql query to run instead on the current relation" do
-      TestModel.copy_to '/tmp/export.csv', query: 'SELECT count(*) as "Total" FROM test_models'
-      content = File.open('/tmp/export.csv', 'r').read
-      expect(content).to eq("Total\n1\n")
+      TestModel.copy_to(nil, query: 'SELECT count(*) as "Total" FROM test_models') do |row|
+        expect(row).to eq("Total\n")
+        break
+      end
     end
   end
 end

data/spec/fixtures/tab_with_header.tsv

@@ -0,0 +1,2 @@
+id	data
+1	test data 1

data/spec/fixtures/tab_with_two_lines.tsv

@@ -0,0 +1,3 @@
+id	data
+1	test data 1
+2	test data 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres-copy
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Diogo Biazus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -116,9 +116,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -153,8 +153,10 @@ files:
 - spec/fixtures/tab_with_error.csv
 - spec/fixtures/tab_with_extra_line.csv
 - spec/fixtures/tab_with_header.csv
+- spec/fixtures/tab_with_header.tsv
 - spec/fixtures/tab_with_header_multi.csv
 - spec/fixtures/tab_with_two_lines.csv
+- spec/fixtures/tab_with_two_lines.tsv
 - spec/fixtures/test_extended_model.rb
 - spec/fixtures/test_model.rb
 - spec/spec.opts
@@ -177,40 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Put COPY command functionality in ActiveRecord's model class
-test_files:
-- spec/copy_from_binary_spec.rb
-- spec/copy_from_spec.rb
-- spec/copy_to_binary_spec.rb
-- spec/copy_to_spec.rb
-- spec/fixtures/2_col_binary_data.dat
-- spec/fixtures/comma_inside_field.csv
-- spec/fixtures/comma_with_carriage_returns.csv
-- spec/fixtures/comma_with_empty_string.csv
-- spec/fixtures/comma_with_header.csv
-- spec/fixtures/comma_with_header_and_scope.csv
-- spec/fixtures/comma_with_header_empty_values_at_the_end.csv
-- spec/fixtures/comma_with_header_multi.csv
-- spec/fixtures/comma_without_header.csv
-- spec/fixtures/extra_field.rb
-- spec/fixtures/reserved_word_model.rb
-- spec/fixtures/reserved_words.csv
-- spec/fixtures/semicolon_with_different_header.csv
-- spec/fixtures/semicolon_with_header.csv
-- spec/fixtures/semicolon_with_quote.csv
-- spec/fixtures/special_null_with_header.csv
-- spec/fixtures/tab_only_data.csv
-- spec/fixtures/tab_with_different_header.csv
-- spec/fixtures/tab_with_error.csv
-- spec/fixtures/tab_with_extra_line.csv
-- spec/fixtures/tab_with_header.csv
-- spec/fixtures/tab_with_header_multi.csv
-- spec/fixtures/tab_with_two_lines.csv
-- spec/fixtures/test_extended_model.rb
-- spec/fixtures/test_model.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+test_files: []

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.1
-
-services:
-  - postgresql
-
-addons:
-  postgresql: '9.4'
-
-branches:
-  only:
-    - master