sequel_plus 0.1.0 → 0.1.2

data/lib/extensions/export.rb

@@ -1,13 +1,22 @@
-# The export extension adds Sequel::Dataset#export and the
-# Sequel::Export class for creating plain-text data exports
-
+#
+# The export extension adds Sequel::Dataset#export
+#
+# Export with no options specified will export as tab-delimited w/o any quoting
+#
+# Date, Time, and DateTime are exported as ISO-8601
+# http://en.wikipedia.org/wiki/ISO_8601
+#
+# Non-numerics are encased in given :quote_char (default is none)
+# Columns are delimited by given :delimiter (default is tab character)
+# Headers are emitted by default (suppress with :headers => false)
+#
 module Sequel
   class Dataset
-    # outputs the records in the dataset as plain-text table.
     def export(fd = $stdout, options = {})
-      opts[:delimiter] = options[:delimiter] || "\t"
-      opts[:quote_char] = options[:quote_char] || '"'
-      opts[:headers] = options[:headers] != false
+      opts[:delimiter]  = options[:delimiter] || "\t"
+      opts[:quote_char] = options[:quote_char] || ''
+      opts[:headers]    = options[:headers] != false
+
       Sequel::Export::Writer.new(fd, self, opts).output
     end
   end
@@ -21,15 +30,6 @@ module Sequel
         @options = options
       end
     
-      class ::Date; def to_export(q); ; end; end
-      class ::DateTime; def to_export(q); "#{q}#{iso8601}#{q}"; end; end
-      class ::Time; def to_export(q); "#{q}#{iso8601}#{q}"; end; end
-      class ::Float; def to_export(q); to_f.to_s; end; end
-      class ::BigDecimal; def to_export(q); to_f.to_s; end; end
-      class ::Bignum; def to_export(q); to_i.to_s; end; end
-      class ::Fixnum; def to_export(q); to_i.to_s; end; end
-      class ::Object; def to_export(q); "#{q}#{to_s}#{q}"; end; end
-
       def output 
         quot = @options[:quote_char]
         @columns ||= @dataset.first.keys.sort_by{|x|x.to_s}
@@ -41,10 +41,16 @@ module Sequel
         @dataset.each do |row| 
           data = @columns.map do |col|
             case row[col]
-            when Date, DateTime, Time then "#{quot}#{row[col].iso8601}#{quot}"
-            when Float, BigDecimal then row[col].to_f
-            when BigDecimal, Bignum, Fixnum then row[col].to_i
-            else "#{quot}#{row[col].to_s}#{quot}"
+            when Date then 
+              "#{quot}#{row[col].strftime('%Y-%m-%d')}#{quot}"
+            when DateTime, Time then 
+              "#{quot}#{row[col].localtime.strftime('%Y-%m-%dT%H:%M%Z')}#{quot}"
+            when Float, BigDecimal then 
+              row[col].to_f
+            when BigDecimal, Bignum, Fixnum then 
+              row[col].to_i
+            else 
+              "#{quot}#{row[col].to_s}#{quot}"
             end
           end
           @file.puts data.join(@options[:delimiter])

data/test/test_export.rb

@@ -50,11 +50,32 @@ module ExportTest
       DB[:nodes].all.size.should == 12
     end
 
-    it "should export everything" do 
+    it "should export everything tab delimited w/o quotes" do 
       mem_stream = StringIO.new("", "w+")
       DB[:nodes].export(mem_stream)
       mem_stream.pos = 0
       mem_stream.read.should == <<-TEXT
+id	name	parent_id	position
+1	one		1
+2	two		2
+3	three		3
+4	two.one	2	1
+5	two.two	2	2
+6	two.two.one	5	1
+7	one.two	1	2
+8	one.one	1	1
+9	five		5
+10	four		4
+11	five.one	9	1
+12	two.three	2	3
+      TEXT
+    end
+
+    it "should export tab delimited with quotes" do 
+      mem_stream = StringIO.new("", "w+")
+      DB[:nodes].export(mem_stream, :quote_char => '"')
+      mem_stream.pos = 0
+      mem_stream.read.should == <<-TEXT
 "id"	"name"	"parent_id"	"position"
 1	"one"	""	1
 2	"two"	""	2
@@ -73,7 +94,7 @@ module ExportTest
 
     it "should export everything with comma delimiter" do 
       mem_stream = StringIO.new("", "w+")
-      DB[:nodes].export(mem_stream, :delimiter => ',')
+      DB[:nodes].export(mem_stream, :quote_char => '"', :delimiter => ',')
       mem_stream.pos = 0
       mem_stream.read.should == <<-TEXT
 "id","name","parent_id","position"
@@ -94,7 +115,7 @@ module ExportTest
       
     it "should export everything with comma delimiter and no quote characters" do 
       mem_stream = StringIO.new("", "w+")
-      DB[:nodes].export(mem_stream, :delimiter => ',', :quote_char => '')
+      DB[:nodes].export(mem_stream, :delimiter => ',')
       mem_stream.pos = 0
       mem_stream.read.should == <<-TEXT
 id,name,parent_id,position
@@ -117,7 +138,7 @@ id,name,parent_id,position
       mem_stream = StringIO.new("", "w+")
       DB[:nodes].filter(:id < 3).select(:id, :name).export(mem_stream)
       mem_stream.pos = 0
-      mem_stream.read.should == "\"id\"\t\"name\"\n1\t\"one\"\n2\t\"two\"\n"
+      mem_stream.read.should == "id\tname\n1\tone\n2\ttwo\n"
     end
 
     it "should not export headers" do 
@@ -125,18 +146,18 @@ id,name,parent_id,position
       DB[:nodes].export(mem_stream, :headers => false)
       mem_stream.pos = 0
       mem_stream.read.should == <<-TEXT
-1	"one"	""	1
-2	"two"	""	2
-3	"three"	""	3
-4	"two.one"	2	1
-5	"two.two"	2	2
-6	"two.two.one"	5	1
-7	"one.two"	1	2
-8	"one.one"	1	1
-9	"five"	""	5
-10	"four"	""	4
-11	"five.one"	9	1
-12	"two.three"	2	3
+1	one		1
+2	two		2
+3	three		3
+4	two.one	2	1
+5	two.two	2	2
+6	two.two.one	5	1
+7	one.two	1	2
+8	one.one	1	1
+9	five		5
+10	four		4
+11	five.one	9	1
+12	two.three	2	3
       TEXT
     end
     
@@ -145,19 +166,19 @@ id,name,parent_id,position
       DB[:nodes].export(mem_stream, :headers => true)
       mem_stream.pos = 0
       mem_stream.read.should == <<-TEXT
-"id"	"name"	"parent_id"	"position"
-1	"one"	""	1
-2	"two"	""	2
-3	"three"	""	3
-4	"two.one"	2	1
-5	"two.two"	2	2
-6	"two.two.one"	5	1
-7	"one.two"	1	2
-8	"one.one"	1	1
-9	"five"	""	5
-10	"four"	""	4
-11	"five.one"	9	1
-12	"two.three"	2	3
+id	name	parent_id	position
+1	one		1
+2	two		2
+3	three		3
+4	two.one	2	1
+5	two.two	2	2
+6	two.two.one	5	1
+7	one.two	1	2
+8	one.one	1	1
+9	five		5
+10	four		4
+11	five.one	9	1
+12	two.three	2	3
       TEXT
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_plus
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - Michael Lang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 -05:00
+date: 2010-02-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency