excel2csv 0.0.6 → 0.0.7

data/README.md

@@ -2,15 +2,44 @@
 
 ### Installation and usage
 
-    gem install excel2csv
-
+``` ruby
+gem install excel2csv
+```
 
 With Gemfile
 
-    gem 'excel2csv'
+``` ruby
+gem 'excel2csv'
+```
+
+### Requirements
+
+1. Ruby > 1.9.2
+2. Java Runtime
+
+### Usage
+
+``` ruby
+require 'excel2csv'
+
+# Read csv, xls, xlsx files like with CSV#read
+Excel2CSV.read "path/to/file.csv", encoding:"windows-1251:utf-8"
+# by default Excel2CSV reads first worksheet
+Excel2CSV.read "path/to/file.xls"  # working encoding is always UTF-8
+Excel2CSV.read "path/to/file.xlsx" # working encoding is always UTF-8
+
+# Line by line reading like with CSV#foreach
+Excel2CSV.foreach("path/to/file.csv", encoding:"windows-1251:utf8") {|r| puts r}
+Excel2CSV.foreach("path/to/file.xls") {|r| puts r}
+Excel2CSV.foreach("path/to/file.xlsx") {|r| puts r}
 
+# Read non first worksheet
+Excel2CSV.read "path/to/file.xls", index:1 #reads second sheet 
+Excel2CSV.read "path/to/file.xlsx", index:2 #reads third sheet
 
-    require 'excel2csv'
 
-    Excel2CSV.read "path/to/file.xls"
-    Excel2CSV.read "path/to/file.xlsx"
+# Preview first N rows in big files
+Excel2CSV.read "path/to/file.xls", rows_limit: 2, preview: true
+Excel2CSV.read "path/to/file.xlsx", rows_limit: 2, preview: true
+Excel2CSV.read "path/to/file.csv", rows_limit: 2, preview: true
+```

data/lib/excel2csv/version.rb

@@ -1,3 +1,3 @@
 module Excel2CSV
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/excel2csv.rb

@@ -83,8 +83,8 @@ module Excel2CSV
   module_function :convert
 
   def path_to_sheet(info, options = {})
+    options.delete(:encoding) # all previews are in utf-8
     if options[:preview]
-      options.delete(:encoding) # all previews are in utf-8
       collection = info.previews
     else
       collection = info.sheets
@@ -103,13 +103,19 @@ module Excel2CSV
       total_rows = 0
       preview_rows = []
       opts = clean_options(options)
-      CSV.foreach(path, opts) do |row| 
-        if limit && total_rows <= limit
-          preview_rows << row
+
+      # Transcode file to utf-8, count total and gen preview
+
+      CSV.open("#{dest_folder}/1-#{total_rows}.csv", "wb") do |csv|
+        CSV.foreach(path, opts) do |row| 
+          if limit && total_rows <= limit
+            preview_rows << row
+          end
+          total_rows += 1
+          csv << row
         end
-        total_rows += 1
       end
-      FileUtils.cp path, "#{dest_folder}/1-#{total_rows}.csv"
+      
       if limit
         CSV.open("#{dest_folder}/1-#{limit}-of-#{total_rows}-preview.csv", "wb") do |csv|
           preview_rows.each {|row| csv << row}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel2csv
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-25 00:00:00.000000000 Z
+date: 2011-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70220199776100 !ruby/object:Gem::Requirement
+  requirement: &70102599300280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -21,7 +21,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70220199776100
+  version_requirements: *70102599300280
 description: gem for converting Excel files to csv
 email:
 - yury.korolev@gmail.com
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: extract excel worksheets to csv files