csv2sql 0.2.070529155119 → 0.3.1

data/History.txt

@@ -0,0 +1,4 @@
+
+=== 0.3.0 / 2008-07-07
+
+* new gem, rdoc public

data/Manifest.txt

@@ -0,0 +1,9 @@
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+lib/csv2sql.rb
+tests/files/gmclient.csv
+tests/files/multilinecells.csv
+tests/instant.rb
+tests/test.rb

data/Rakefile

@@ -0,0 +1,31 @@
+
+require 'rubygems'
+require 'hoe'
+
+$:.unshift(File.dirname(__FILE__) + "/lib")
+require 'csv2sql'
+
+RUBYFORGE_PROJECT = 'csv2sql'
+
+Hoe.new('Csv2sql', Csv2sql::VERSION) do |p|
+  p.name            = RUBYFORGE_PROJECT
+  p.author          = "Mirek Rusin"
+  p.email           = 'ruby@mirekrusin.com'
+  p.summary         = "Csv2sql provides an easy way to convert comma separated files to sql"
+  p.description     = "Csv2sql provides an easy way to convert comma separated files to sql"
+  p.url             = "http://rubyforge.com/projects/#{RUBYFORGE_PROJECT}"
+  p.clean_globs     = ['test/actual'] # Remove this directory on "rake clean"
+  p.remote_rdoc_dir = '' # Release to root
+  p.changes         = p.paragraphs_of('CHANGELOG', 0..1).join("\n\n")
+  #p.rsync_args     << ' --exclude=statsvn/'
+  # * extra_deps - An array of rubygem dependencies.
+end
+
+desc 'Publish RDoc to RubyForge via pscp'
+task :publish_docs_via_pscp => [:clean, :docs] do
+  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+  sh %{pscp -r doc/* #{config["username"]}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/}
+end 
+
+desc "Release and publish documentation"
+task :default => [:release, :publish_docs_via_pscp]

data/lib/csv2sql.rb

@@ -28,14 +28,17 @@ require 'pathname'
 #
 class Csv2sql
   
+  VERSION = '0.3.1'
+  
   @@defaults = {
-    :before => "",   # can be changed to "start transaction;\n"
-    :after  => ";\n" # can be changes to "commit;\n"
+    :before     => "",   # can be changed to "start transaction;\n"
+    :after      => ";\n" # can be changes to "commit;\n"
   }
   
-  def self.default_value_filter(v, i, j, k)
+  def self.default_value_filter(v, i=nil, j=nil)
     return 'null' if v.to_s == ''
     return v.to_s if v.is_a? Float or v.is_a? Fixnum
+    v.gsub!(/\\/, '\\\\')
     v.gsub!(/"/, '\\"')
     "\"#{v}\""
   end
@@ -104,8 +107,10 @@ class Csv2sql
   #   :row_format
   #   :row_glue
   #   :after
+  #   :when_empty
   #
   def to_any(args={})
+    args[:when_empty]  ||= ""
     args[:values_glue] ||= ", "
     args[:row_format]  ||= "%s"
     args[:row_glue]    ||= "\n"
@@ -121,48 +126,45 @@ class Csv2sql
           r << args[:row_format].call(values) # LOOK OUT: args[:values_glue] ignored
         end
     end
-    r = r.join args[:row_glue]
-    r = args[:before] + r if args[:before]
-    r = r + args[:after] if args[:after]
-    r
+    if r.size > 0
+      r = r.join args[:row_glue]
+      r = args[:before] + r if args[:before]
+      r = r + args[:after] if args[:after]
+      r
+    else
+      args[:when_empty]
+    end
   end
   
   # Parse file
   #
-  # args[:csv_line_filter] - proc, called with (line, line_number)
-  # args[:values_filter] - proc, called with (values, csv_line_number, filtered_line_number)
+  # args[:values_filter] - proc, called with (values, line_number)
+  # args[:value_filter] - proc, called with values, line_number, column_number
   #
   def parse(args={})
     args[:value_filter] ||= Csv2sql.method :default_value_filter
-    
-    i = j = 0
-    File.open(@filename, 'r').each_line do |line|
-      i += 1
-      line = args[:csv_line_filter].call(line, i) if args[:csv_line_filter]
-      if line
-        j += 1
-        unless values = CSV.parse_line(line)
-          raise "ERROR:#{@filename}:#{i}:#{j} #{line}"
-        else
-          
-          values = args[:values_filter].call(values, i, j) if args[:values_filter]
-          
-          if values
-          
-            if args[:value_filter] # LOOK OUT! value_filter is for single value
-              k = -1
-              values = values.map do |value|
-                k += 1
-                args[:value_filter].call(value, i, j, k)
-              end
-            end
-            
-            yield values if values
-            
+    data = open(@filename, 'r').read
+    last_offset = offset = 0
+    i = 0
+    begin
+      values = []
+      last_offset = offset
+      parsed_cells, offset = CSV.parse_row(data, offset, values)
+      # TODO: ignore blank lines? what about single column csv files with blank values?
+      values = args[:values_filter].call(values, i) if args[:values_filter]
+      if values
+        if args[:value_filter] # LOOK OUT! value_filter is for single value, values_filter is for whole row
+          j = -1
+          values = values.map do |value|
+            j += 1
+            args[:value_filter].call(value, i, j)
           end
         end
+        yield values if values
       end
-    end
+      i += 1
+    end while parsed_cells > 0
+    #raise "Illegal format error in #{@filename} at row starting with the line #{i} (last offset #{offset} not the same as the data size #{data.size})" if offset != data.size
   end
 
 end

data/tests/files/multilinecells.csv

@@ -0,0 +1,4 @@
+DM,"Antrim
+Mansions
+",0199S
+WO,"Demo Block",0000S

data/tests/test.rb

@@ -1,16 +1,19 @@
 
 require 'test/unit'
 require '../lib/csv2sql'
+require 'pp'
 
 class Csv2sqlTest < Test::Unit::TestCase
   
   def setup
     @files_dir = File.dirname(__FILE__) + '/files'
     @gmclient_file = "#{@files_dir}/gmclient.csv"
+    @multilinecells_file = "#{@files_dir}/multilinecells.csv"
   end
   
-  def test_to_inserts()
-    
+  def test_multiline_cells
+    r = Csv2sql.new(@multilinecells_file).to_inserts.split /insert into/
+    assert_equal 3, r.size # 2 rows
   end
   
 end 

metadata

@@ -1,51 +1,72 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: csv2sql
 version: !ruby/object:Gem::Version 
-  version: 0.2.070529155119
-date: 2007-05-29 00:00:00 +01:00
-summary: Csv2sql provides an easy way to convert comma separated files to sql
-require_paths: 
-- lib
-email: ruby@mirekrusin.com
-homepage: http://mirekrusin.com/ruby/csv2sql
-rubyforge_project: 
-description: 
-autorequire: csv2sql
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.3.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Mirek Rusin
-files: 
-- tests/files
-- tests/instant.rb
-- tests/test.rb
-- tests/files/gmclient.csv
-- lib/csv2sql.rb
-- README
-test_files: []
-
-rdoc_options: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
-extra_rdoc_files: 
-- README
+date: 2008-07-07 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.6.0
+    version: 
+description: Csv2sql provides an easy way to convert comma separated files to sql
+email: ruby@mirekrusin.com
 executables: []
 
 extensions: []
 
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- lib/csv2sql.rb
+- tests/files/gmclient.csv
+- tests/files/multilinecells.csv
+- tests/instant.rb
+- tests/test.rb
+has_rdoc: true
+homepage: http://rubyforge.com/projects/csv2sql
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: csv2sql
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Csv2sql provides an easy way to convert comma separated files to sql
+test_files: []