postgres-copy 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eeedb4ef6807baf6f855bfe8d82f56133c66be6
-  data.tar.gz: 464932914ca5a675064001c803d18ff1dc9fe53d
+  metadata.gz: 4c90a9808c66a4ba5412683ba55df5b565b9b855
+  data.tar.gz: d3d026898db620ee2544de2f888a73cd6f89a07f
 SHA512:
-  metadata.gz: 014a139cab1e421966b374b7eeeff23da62bea3fd4353501b069b4152d55352e6bf851bb544f33ca250fa1de3ba8068356c6097450c56ed1c991712fee785bc1
-  data.tar.gz: 14e13dc7163ad4c32448d0590278b16b836771da3df6fcec4ee869ded14dcaa62de5667e1274ac6af3e316e3901058c1c432c2b7e5c6ccf2b25ff0e53ca54dfd
+  metadata.gz: f7ad7cfb4e702517760953a184cce7859d023f01065877d05f8aa42a08387ea078b4c7a280d19865f1e7f65d840fb386b3467c33daca0d3c10092c05bd891dfa
+  data.tar.gz: 64b06032c8b94300c8b5727ac2e93852e3a5836e8c9ef5033435e5dc2c03e6dbfb7362b88d22419a845edaa4fcc17204a4d7d6140b50ab537845048b8f4f71f2

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.3.1
 
 branches:
   only:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    postgres-copy (1.0.0)
+    postgres-copy (1.1.0)
       activerecord (>= 4.0)
       pg (>= 0.17)
       rails (>= 4.0)
@@ -10,109 +10,119 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
-      globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
-      arel (~> 6.0)
-    activesupport (4.2.4)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
+    arel (7.1.4)
     builder (3.2.2)
+    concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    json (1.8.1)
+    json (1.8.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
-    minitest (5.8.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    pg (0.18.3)
-    rack (1.6.4)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    nio4r (1.2.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    pg (0.19.0)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      railties (= 5.0.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rdoc (4.1.1)
+    rake (11.2.2)
+    rdoc (4.2.2)
       json (~> 1.4)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.0)
-    rspec-expectations (2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
-    sprockets (3.3.5)
+    rspec-mocks (2.99.4)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
@@ -120,5 +130,9 @@ PLATFORMS
 DEPENDENCIES
   bundler
   postgres-copy!
+  rake (~> 11.2.2)
   rdoc
   rspec (~> 2.12)
+
+BUNDLED WITH
+   1.13.6

data/README.md

@@ -137,6 +137,13 @@ The above extample will always change the value of the first column to "fixed st
 For each iteration of the block row receives an array with the same order as the columns in the CSV file.
 
 
+To specify NULL value you can pass the null option parameter.
+
+```ruby
+User.copy_from "/tmp/users.csv", :null => 'null'
+```
+
+
 To copy a binary formatted data file or IO object you can specify the format as binary
 
 ```ruby

data/lib/postgres-copy/acts_as_copy_target.rb

@@ -48,7 +48,8 @@ module PostgresCopy
                            "BINARY"
                          else
                            quote = options[:quote] == "'" ? "''" : options[:quote]
-                           "DELIMITER '#{options[:delimiter]}' QUOTE '#{quote}' CSV"
+                           null = options.key?(:null) ? "NULL '#{options[:null]}'" : ''
+                           "DELIMITER '#{options[:delimiter]}' QUOTE '#{quote}' #{null} CSV"
                          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.0.0"
+  s.version               = "1.1.0"
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = ">= 1.9.3"
   s.authors               = ["Diogo Biazus"]
@@ -27,5 +27,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "rspec", "~> 2.12"
+  s.add_development_dependency "rake", "~> 11.2.2"
 end
 

data/spec/copy_from_spec.rb

@@ -124,4 +124,18 @@ describe "COPY FROM" do
     TestModel.order(:id).map{|r| r.attributes}.should == [{'id' => 1, 'data' => 'test "data" 1'}]
   end
 
+  it "should import lines with commas inside fields with default options" do
+    TestModel.copy_from(File.open(File.expand_path('spec/fixtures/comma_inside_field.csv'), 'r'))
+    TestModel.order(:id).map{|r| r.attributes}.should == [{'id' => 1, 'data' => 'test, again'}]
+  end
+
+  it "should import with custom null expression from path" do
+    TestModel.copy_from File.expand_path('spec/fixtures/special_null_with_header.csv'), :null => 'NULL'
+    TestModel.order(:id).map{|r| r.attributes}.should == [{'id' => 1, 'data' => nil}]
+  end
+
+  it "should import with custom null expression from IO" do
+    TestModel.copy_from File.open(File.expand_path('spec/fixtures/special_null_with_header.csv'), 'r'), :null => 'NULL'
+    TestModel.order(:id).map{|r| r.attributes}.should == [{'id' => 1, 'data' => nil}]
+  end
 end

data/spec/fixtures/comma_inside_field.csv

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

data/spec/fixtures/special_null_with_header.csv

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres-copy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Diogo Biazus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 11.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 11.2.2
 description: Now you can use the super fast COPY for import/export data directly from
   your AR models.
 email: diogob@gmail.com
@@ -134,6 +148,7 @@ files:
 - 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_header.csv
 - spec/fixtures/comma_with_header_empty_values_at_the_end.csv
 - spec/fixtures/comma_without_header.csv
@@ -143,6 +158,7 @@ files:
 - 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
@@ -172,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Put COPY command functionality in ActiveRecord's model class
@@ -182,6 +198,7 @@ test_files:
 - 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_header.csv
 - spec/fixtures/comma_with_header_empty_values_at_the_end.csv
 - spec/fixtures/comma_without_header.csv
@@ -191,6 +208,7 @@ test_files:
 - 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