csv2sql 0.3.1 → 0.3.070927135848

data/lib/csv2sql.rb

@@ -28,11 +28,9 @@ 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=nil, j=nil)
@@ -107,10 +105,8 @@ 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"
@@ -126,14 +122,10 @@ class Csv2sql
           r << args[:row_format].call(values) # LOOK OUT: args[:values_glue] ignored
         end
     end
-    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
+    r = r.join args[:row_glue]
+    r = args[:before] + r if args[:before]
+    r = r + args[:after] if args[:after]
+    r
   end
   
   # Parse file
@@ -143,16 +135,10 @@ class Csv2sql
   #
   def parse(args={})
     args[:value_filter] ||= Csv2sql.method :default_value_filter
-    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?
+    CSV.open(@filename, 'r').each_with_index do |values, i|
       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|
@@ -160,11 +146,11 @@ class Csv2sql
             args[:value_filter].call(value, i, j)
           end
         end
+        
         yield values if values
+        
       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
 
 end

metadata

@@ -1,72 +1,52 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.2
+specification_version: 1
 name: csv2sql
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.070927135848
+date: 2007-09-27 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: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - Mirek Rusin
-autorequire: 
-bindir: bin
-cert_chain: []
-
-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
 - 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: 
+- lib/csv2sql.rb
+- README
+test_files: []
+
+rdoc_options: []
+
+extra_rdoc_files: 
+- README
+executables: []
+
+extensions: []
+
 requirements: []
 
-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: []
+dependencies: []
 

data/History.txt

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

data/Manifest.txt

@@ -1,9 +0,0 @@
-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

@@ -1,31 +0,0 @@
-
-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]