pg_data_encoder 0.0.7 → 0.0.9

data/README.md

@@ -73,6 +73,7 @@ or
   * Timestamp
   * Date
   * Array (integer and string single dimension)
+  * UUID (through passing column_map: {0 => :uuid} to options hash)
 
 ## Contributing
 

data/lib/pg_data_encoder/encode_for_copy.rb

@@ -13,8 +13,8 @@ module PgDataEncoder
     def add(row)
       setup_io if !@io
       @io.write([row.size].pack("n"))
-      row.each {|col|
-        encode_field(@io, col)
+      row.each_with_index {|col, index|
+        encode_field(@io, col, index)
       }
     end
 
@@ -53,7 +53,8 @@ module PgDataEncoder
       @io.write([0,0].pack("NN"))
     end
 
-    def encode_field(io, field, depth=0)
+    def encode_field(io, field, index, depth=0)
+
       case field
       when Integer
         buf = [field].pack("N")
@@ -74,11 +75,19 @@ module PgDataEncoder
       when nil
         io.write([-1].pack("N"))
       when String
-        buf = field.encode("UTF-8")
-        io.write([buf.bytesize].pack("N"))
-        io.write(buf)
+        if @options[:column_types] && @options[:column_types][index] == :uuid
+          io.write([16].pack("N"))
+          c = [field.gsub(/-/, "")].pack('H*')
+          io.write(c)
+        else
+          buf = field.encode("UTF-8")
+          io.write([buf.bytesize].pack("N"))
+          io.write(buf)
+        end
       when Array
         array_io = StringIO.new
+        field.compact!
+        completed = false
         case field[0]
         when String
           array_io.write([1].pack("N"))  # unknown
@@ -108,14 +117,17 @@ module PgDataEncoder
             array_io.write(buf)
             
           }
+        when nil
+          io.write([-1].pack("N"))
+          completed = true
         else
           raise Exception.new("Arrays support int or string only")
         end
 
-        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
       when Hash
         raise Exception.new("Hash's can't contain hashes") if depth > 0
         hash_io = StringIO.new
@@ -125,7 +137,7 @@ module PgDataEncoder
           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, depth + 1)
+          encode_field(hash_io, val.nil? ? val : val.to_s, index, depth + 1)
         }
         io.write([hash_io.pos].pack("N"))  # assumed identifier for hstore column
         io.write(hash_io.string)

data/lib/pg_data_encoder/version.rb

@@ -1,3 +1,3 @@
 module PgDataEncoder
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

data/spec/verify_data_formats_spec.rb

@@ -211,4 +211,17 @@ describe "generating data" do
     str.should == existing_data
   end
 
+  it 'should encode uuid correctly from tempfile' do
+    encoder = PgDataEncoder::EncodeForCopy.new(:use_tempfile => true, column_types: {0 => :uuid})
+    encoder.add ['e876eef5-a116-4a27-b71f-bac4a1dcd20e']
+    encoder.close
+    io = encoder.get_io
+    existing_data = filedata("uuid.dat")
+    str = io.read
+    io.class.name.should == "Tempfile"
+    str.force_encoding("ASCII-8BIT")
+    #File.open("spec/fixtures/output.dat", "w:ASCII-8BIT") {|out| out.write(str) }
+    str.should == existing_data
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_data_encoder
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -81,6 +81,7 @@ files:
 - spec/fixtures/output.dat
 - spec/fixtures/timestamp.dat
 - spec/fixtures/trueclass.dat
+- spec/fixtures/uuid.dat
 - spec/spec_helper.rb
 - spec/verify_data_formats_spec.rb
 homepage: https://github.com/pbrumm/pg_data_encoder
@@ -129,6 +130,7 @@ test_files:
 - spec/fixtures/output.dat
 - spec/fixtures/timestamp.dat
 - spec/fixtures/trueclass.dat
+- spec/fixtures/uuid.dat
 - spec/spec_helper.rb
 - spec/verify_data_formats_spec.rb
 has_rdoc: