postgres-copy 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a328003e2235ee8109a4bf5dae548d65d5d8b5e
-  data.tar.gz: 0169341e9fe16a65cf44338a5e8bed35f216f311
+  metadata.gz: 3cc595142d45d6053c54bac79e0855c4d8136856
+  data.tar.gz: 548bbff5d3505a7c9721d0d69f20313072770dd3
 SHA512:
-  metadata.gz: debece2dead55d3891b5b671319bdc2bcd394bbc6868a9b6df6a33eda1dbe4b2bf9b04d4a038ff27a010a8a6fd886e766e5e58fa456329d9c08010174627d114
-  data.tar.gz: ca15b8aa0d82b5a38b0320bb04264bb7f3f6bdd6667c2106bac681be7849b0deee63e57527b3c7785267bf059c79e5964a5a5f899a227b052a4617fb575fffe4
+  metadata.gz: e15905d7bcd481f38153decfc9350d0220642c62b35ea7d285293b3ccf2f50fd8cf4e87d1e4bc8c49bcb120e15b6a422b78f05313e3587ca94e0b578561fd28a
+  data.tar.gz: 1da873e2f16c582afb38eef9d4dba009067446df3c6835228ec31c1cf2253a8690dd3e716f162a05032b6f0d0becf0d8defcca575cf29c101755c9f651c88935

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    postgres-copy (1.1.1)
+    postgres-copy (1.1.2)
       activerecord (>= 4.0)
       pg (>= 0.17)
       responders

data/lib/postgres-copy/acts_as_copy_target.rb

@@ -1,3 +1,5 @@
+require 'csv'
+
 module PostgresCopy
   module ActsAsCopyTarget
     extend ActiveSupport::Concern
@@ -84,10 +86,10 @@ module PostgresCopy
             while line = io.gets do
               next if line.strip.size == 0
               if block_given?
-                row = line.strip.split(options[:delimiter],-1)
+                row = CSV.parse_line(line.strip, {:col_sep => options[:delimiter]})
                 yield(row)
                 next if row.all?{|f| f.nil? }
-                line = row.join(options[:delimiter]) + "\n"
+                line = CSV.generate_line(row, {:col_sep => options[:delimiter]})
               end
               connection.raw_connection.put_copy_data line
             end

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.1.1"
+  s.version               = "1.1.2"
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = ">= 1.9.3"
   s.authors               = ["Diogo Biazus"]

data/spec/copy_from_spec.rb

@@ -129,6 +129,18 @@ describe "COPY FROM" do
     TestModel.order(:id).map{|r| r.attributes}.should == [{'id' => 1, 'data' => 'test, again'}]
   end
 
+  it "should import lines with commas inside fields with block given" do
+    File.open(File.expand_path('spec/fixtures/comma_inside_field.csv'), 'r') do |file|
+      TestModel.copy_from(file) do |row|
+        # since our CSV line look like this: {1,"test, again"} we expect only two elements withing row
+        row.size.should == 2
+        row[0].should == '1'
+        row[1].should == 'test, again'
+      end
+    end
+    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}]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres-copy
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Diogo Biazus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg