pg_data_encoder 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6934d6ca62f34e3ca38a53bdef9eb4300d616687
-  data.tar.gz: 04e0ec2af98f46d67072c6f2e662db470a851953
+  metadata.gz: 431bdd87361eddc821f92a2f930ea9164d6d5520
+  data.tar.gz: e4ed69cc46abb4ac4ce20096e66cd5f9356361f0
 SHA512:
-  metadata.gz: 310e919ea938f3897d16ec8e7f46fc04844a31ad00b4fa0078a102eae60517be8e948cd99e213bd5f86d9ed62720ba653117b569215cafd92d06d877f3fb8067
-  data.tar.gz: 4cc2f6d4cf47bc15e60dddbddcd90af5bc08528d33947d236e95f8b2121d8089f7206341df923141f49ef8b99d8a6e51fac78c75f366ef9b89949ef20cbdfef6
+  metadata.gz: f30bc9742ae41a779ba406eb29451cdbf0abbdef4aa678044c2b2fab923de2014097f8ab14e3ed5314255b73e62f1677643ffe9884af26335cb6645b57bace09
+  data.tar.gz: 1f435434aa8517f0114d66d47d92cb1229946a954fc21319dbff0b820c6183387c4d100a04a5337d7b9fea0eec79dd6fcf12a23be114b1234d23a858a836c527

data/lib/pg_data_encoder/decoder.rb

@@ -161,7 +161,7 @@ module PgDataEncoder
             value = nil
           else
             value = io.read(value_size)
-            value = value.force_encoding("UTF-8") if value.present?
+            value = value.force_encoding("UTF-8") if !value.nil?
           end
           h[key] = value
           #p h

data/lib/pg_data_encoder/encode_for_copy.rb

@@ -106,78 +106,90 @@ module PgDataEncoder
           io.write(buf)
         end
       when Array
-        array_io = TempBuffer.new
-        field.compact!
-        completed = false
-        case field[0]
-        when String
-          if @options[:column_types][index] == :uuid
-            array_io.write([1].pack("N"))  # unknown
-            array_io.write([0].pack("N"))  # unknown
+        if @options[:column_types] && @options[:column_types][index] == :json
+          buf = field.to_json.encode("UTF-8")
+          io.write([buf.bytesize].pack("N"))
+          io.write(buf)
+        else
+          array_io = TempBuffer.new
+          field.compact!
+          completed = false
+          case field[0]
+          when String
+            if @options[:column_types][index] == :uuid
+              array_io.write([1].pack("N"))  # unknown
+              array_io.write([0].pack("N"))  # unknown
 
-            array_io.write([2950].pack("N"))  # I think is used to determine string data type
-            array_io.write([field.size].pack("N"))
-            array_io.write([1].pack("N"))   # forcing single dimension array for now
-            
-            field.each_with_index {|val, index|
-              array_io.write([16].pack("N"))
-              c = [val.gsub(/-/, "")].pack('H*')
-              array_io.write(c)
+              array_io.write([2950].pack("N"))  # I think is used to determine string data type
+              array_io.write([field.size].pack("N"))
+              array_io.write([1].pack("N"))   # forcing single dimension array for now
               
-            }
-          else
+              field.each_with_index {|val, index|
+                array_io.write([16].pack("N"))
+                c = [val.gsub(/-/, "")].pack('H*')
+                array_io.write(c)
+                
+              }
+            else
+              array_io.write([1].pack("N"))  # unknown
+              array_io.write([0].pack("N"))  # unknown
+
+              array_io.write([1043].pack("N"))  # I think is used to determine string data type
+              array_io.write([field.size].pack("N"))
+              array_io.write([1].pack("N"))   # forcing single dimension array for now
+              
+              field.each_with_index {|val, index|
+                buf = val.to_s.encode("UTF-8")
+                array_io.write([buf.bytesize].pack("N"))
+                array_io.write(buf)
+                
+              }
+            end
+          when Integer
             array_io.write([1].pack("N"))  # unknown
             array_io.write([0].pack("N"))  # unknown
 
-            array_io.write([1043].pack("N"))  # I think is used to determine string data type
+            array_io.write([23].pack("N"))  # I think is used to detemine int data type
             array_io.write([field.size].pack("N"))
             array_io.write([1].pack("N"))   # forcing single dimension array for now
             
             field.each_with_index {|val, index|
-              buf = val.to_s.encode("UTF-8")
+              buf = [val.to_i].pack("N")
               array_io.write([buf.bytesize].pack("N"))
               array_io.write(buf)
               
             }
+          when nil
+            io.write([-1].pack("N"))
+            completed = true
+          else
+            raise Exception.new("Arrays support int or string only")
           end
-        when Integer
-          array_io.write([1].pack("N"))  # unknown
-          array_io.write([0].pack("N"))  # unknown
 
-          array_io.write([23].pack("N"))  # I think is used to detemine int data type
-          array_io.write([field.size].pack("N"))
-          array_io.write([1].pack("N"))   # forcing single dimension array for now
-          
-          field.each_with_index {|val, index|
-            buf = [val.to_i].pack("N")
-            array_io.write([buf.bytesize].pack("N"))
-            array_io.write(buf)
-            
-          }
-        when nil
-          io.write([-1].pack("N"))
-          completed = true
-        else
-          raise Exception.new("Arrays support int or string only")
-        end
-
-        if !completed
-          io.write([array_io.pos].pack("N")) 
-          io.write(array_io.string)
+          if !completed
+            io.write([array_io.pos].pack("N")) 
+            io.write(array_io.string)
+          end
         end
       when Hash
         raise Exception.new("Hash's can't contain hashes") if depth > 0
-        hash_io = TempBuffer.new
-        
-        hash_io.write([field.size].pack("N"))
-        field.each_pair {|key,val|
-          buf = key.to_s.encode("UTF-8")
-          hash_io.write([buf.bytesize].pack("N"))
-          hash_io.write(buf.to_s)
-          encode_field(hash_io, val.nil? ? val : val.to_s, index, depth + 1)
-        }
-        io.write([hash_io.pos].pack("N"))  # size of hstore data
-        io.write(hash_io.string)
+        if @options[:column_types] && @options[:column_types][index] == :json
+          buf = field.to_json.encode("UTF-8")
+          io.write([buf.bytesize].pack("N"))
+          io.write(buf)
+        else
+          hash_io = TempBuffer.new
+          
+          hash_io.write([field.size].pack("N"))
+          field.each_pair {|key,val|
+            buf = key.to_s.encode("UTF-8")
+            hash_io.write([buf.bytesize].pack("N"))
+            hash_io.write(buf.to_s)
+            encode_field(hash_io, val.nil? ? val : val.to_s, index, depth + 1)
+          }
+          io.write([hash_io.pos].pack("N"))  # size of hstore data
+          io.write(hash_io.string)
+        end
       when Time
         buf = [(field.to_f * 1_000_000 - POSTGRES_EPOCH_TIME).to_i].pack("L!>")
         io.write([buf.bytesize].pack("N"))

data/lib/pg_data_encoder/version.rb

@@ -1,3 +1,3 @@
 module PgDataEncoder
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/pg_data_encoder.rb

@@ -3,6 +3,7 @@ require "pg_data_encoder/version"
 require 'pg_data_encoder/temp_buffer'
 require 'pg_data_encoder/encode_for_copy'
 require 'pg_data_encoder/decoder'
+require 'json'
 
 module PgDataEncoder
   # Your code goes here...

data/spec/verify_data_formats_spec.rb

@@ -252,6 +252,32 @@ describe "generating data" do
     str.should == existing_data
   end
 
+  it 'should encode json hash correctly' do
+    encoder = PgDataEncoder::EncodeForCopy.new(column_types: {0 => :json})
+    encoder.add [{}]
+    encoder.close
+    io = encoder.get_io
+    existing_data = filedata("json.dat")
+    str = io.read
+    io.class.name.should == "StringIO"
+    str.force_encoding("ASCII-8BIT")
+    #File.open("spec/fixtures/output.dat", "w:ASCII-8BIT") {|out| out.write(str) }
+    str.should == existing_data
+  end
+
+  it 'should encode json array correctly' do
+    encoder = PgDataEncoder::EncodeForCopy.new(column_types: {0 => :json})
+    encoder.add [[]]
+    encoder.close
+    io = encoder.get_io
+    existing_data = filedata("json_array.dat")
+    str = io.read
+    io.class.name.should == "StringIO"
+    str.force_encoding("ASCII-8BIT")
+    #File.open("spec/fixtures/output.dat", "w:ASCII-8BIT") {|out| out.write(str) }
+    str.should == existing_data
+  end
+
   it 'should encode float correctly from tempfile' do
     encoder = PgDataEncoder::EncodeForCopy.new(:use_tempfile => true)
     encoder.add [Time.parse("2013-06-11 15:03:54.62605 UTC")]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_data_encoder
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Pete Brumm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,6 +80,8 @@ files:
 - spec/fixtures/float.dat
 - spec/fixtures/hstore_utf8.dat
 - spec/fixtures/intarray.dat
+- spec/fixtures/json.dat
+- spec/fixtures/json_array.dat
 - spec/fixtures/just_an_array.dat
 - spec/fixtures/just_an_array2.dat
 - spec/fixtures/multiline_hstore.dat
@@ -115,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: for faster input of data into postgres you can use this to generate the binary
@@ -143,6 +145,8 @@ test_files:
 - spec/fixtures/float.dat
 - spec/fixtures/hstore_utf8.dat
 - spec/fixtures/intarray.dat
+- spec/fixtures/json.dat
+- spec/fixtures/json_array.dat
 - spec/fixtures/just_an_array.dat
 - spec/fixtures/just_an_array2.dat
 - spec/fixtures/multiline_hstore.dat