postgres-copy 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9baf34eb526edbec803e3efd7b27dddc3a777a9a
-  data.tar.gz: 00d5930fb6eb7508e8010c2f0ff6adf4c35995b6
+  metadata.gz: 06fb58609cde69655a230014265b1617d26e6b4a
+  data.tar.gz: 925c7d2f5b4d0ac68c8ff579dbaacfd0ece9823d
 SHA512:
-  metadata.gz: 7abaef90e2d60dc003439a1a8cf3fa2ba2f437f97733d58706ef6bec5cf0a5f08749748b835db18743d1f89939ac44d3fc4ab84082d50ab2c1e414db76e48bec
-  data.tar.gz: ca0b07437f6181958958db3f1997d37c243505063ee109105a4ab29138bb5bbf564f8ddb27db5446e38d8ecb3f445f3ec99b18401d1aff7e6fb177ac4ed7e0a1
+  metadata.gz: 1363641eb2b61078691ad937a0f7dbbc682f8105ea8f7684646e66401ad344658965b1bca5741caecee264b26109e1a7796fce0cb50cdac40880810ca9afb2a8
+  data.tar.gz: 356c74bb431c9b6713054b41a6d51b1d4033477729e96c90f1a4b2d876019d586727140bc92d22752cd02553d48c35821d4d0cf3d6ea1dd215a8312bc668f0e1

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    postgres-copy (0.8.1)
+    postgres-copy (0.9.0)
       activerecord (>= 4.0)
-      pg
+      pg (>= 0.17)
       rails (>= 4.0)
       responders
 

data/lib/postgres-copy/acts_as_copy_target.rb

@@ -19,9 +19,10 @@ module PostgresCopy
           raise "You have to choose between exporting to a file or receiving the lines inside a block" if block_given?
           connection.execute "COPY (#{self.all.to_sql}) TO #{sanitize(path)} WITH #{options_string}"
         else
-          connection.execute "COPY (#{self.all.to_sql}) TO STDOUT WITH #{options_string}"
-          while line = connection.raw_connection.get_copy_data do
-            yield(line) if block_given?
+          connection.raw_connection.copy_data "COPY (#{self.all.to_sql}) TO STDOUT WITH #{options_string}" do
+            while line = connection.raw_connection.get_copy_data do
+              yield(line) if block_given?
+            end
           end
         end
         return self
@@ -67,28 +68,28 @@ module PostgresCopy
 
         columns_list = columns_list.map{|c| options[:map][c.to_s] } if options[:map]
         columns_string = columns_list.size > 0 ? "(\"#{columns_list.join('","')}\")" : ""
-        connection.execute %{COPY #{table} #{columns_string} FROM STDIN #{options_string}}
-        if options[:format] == :binary
-          bytes = 0
-          begin
-            while line = io.readpartial(10240)
-              connection.raw_connection.put_copy_data line
-              bytes += line.bytesize
+        connection.raw_connection.copy_data %{COPY #{table} #{columns_string} FROM STDIN #{options_string}} do
+          if options[:format] == :binary
+            bytes = 0
+            begin
+              while line = io.readpartial(10240)
+                connection.raw_connection.put_copy_data line
+                bytes += line.bytesize
+              end
+            rescue EOFError
             end
-          rescue EOFError
-          end
-        else
-          while line = io.gets do
-            next if line.strip.size == 0
-            if block_given?
-              row = line.strip.split(options[:delimiter])
-              yield(row)
-              line = row.join(options[:delimiter]) + "\n"
+          else
+            while line = io.gets do
+              next if line.strip.size == 0
+              if block_given?
+                row = line.strip.split(options[:delimiter])
+                yield(row)
+                line = row.join(options[:delimiter]) + "\n"
+              end
+              connection.raw_connection.put_copy_data line
             end
-            connection.raw_connection.put_copy_data line
           end
         end
-        connection.raw_connection.put_copy_end
       end
     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 = "0.8.1"
+  s.version = "0.9.0"
 
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version     = ">= 1.9.3"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = "Put COPY command functionality in ActiveRecord's model class"
 
-  s.add_dependency "pg"
+  s.add_dependency "pg", ">= 0.17"
   s.add_dependency "activerecord", '>= 4.0'
   s.add_dependency "rails", '>= 4.0'
   s.add_dependency "responders"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postgres-copy
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Diogo Biazus
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement