excel2csv 0.1.0 → 0.2.0

data/excel2csv.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Excel2CSV::VERSION
 
-  gem.add_development_dependency "rspec", "<= 2.6"
+  gem.add_development_dependency "rspec", ">= 2.8"
 end

data/lib/excel2csv/info.rb

@@ -1,4 +1,5 @@
-require "fileutils"
+require 'fileutils'
+require 'json'
 
 module Excel2CSV
   class Info
@@ -13,20 +14,22 @@ module Excel2CSV
     end
 
     def read
-      Dir["#{@working_folder}/*.csv"].map do |file|
-        name = File.basename(file)
-        m = /(?<sheet>\d+)-(?<rows>\d+)(-of-(?<total_rows>\d+))?/.match(name)
-        next if !m
-        total_rows   = (m[:total_rows] || m[:rows]).to_i
-        preview_rows = m[:rows].to_i
-        if name =~ /preview/
-          @previews << {path: file, total_rows:total_rows, rows:preview_rows}
-        else
-          @sheets << {path: file, total_rows:total_rows, rows:total_rows}
-        end
+      info = JSON.parse(File.read("#{@working_folder}/info.json"))
+      info['sheets'].each do |sheet_info|
+        @sheets << {
+          path:       "#{@working_folder}/#{sheet_info['fullOutput']}",
+          total_rows: sheet_info['rowCount'],
+          rows:       sheet_info['rowCount'],
+          title:      sheet_info['title']
+        }
+        
+        @previews << {
+          path:       "#{@working_folder}/#{sheet_info['previewOutput']}",
+          total_rows: sheet_info['rowCount'],
+          rows:       info['perSheetRowLimitForPreviews'],
+          title:      sheet_info['title']
+        } if sheet_info['previewOutput']
       end
-      @previews.sort! {|a, b| a[:path] <=> b[:path]}
-      @sheets.sort! {|a, b| a[:path] <=> b[:path]}
     end 
 
     def clean

data/lib/excel2csv/version.rb

@@ -1,3 +1,3 @@
 module Excel2CSV
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/excel2csv.rb

@@ -3,6 +3,7 @@ require "excel2csv/info"
 
 require "csv"
 require "tmpdir"
+require "json"
 
 module Excel2CSV
   
@@ -60,13 +61,20 @@ module Excel2CSV
     limit = options[:rows]
     path = File.expand_path(path)
     if path =~ /\.csv$/
+      json = {
+        'generatePreviews' => !!limit,
+        'perSheetRowLimitForPreviews' => limit,
+        'sourceFile' => path.to_s,
+        'targetDir' => working_folder
+      }
       total_rows = 0
       preview_rows = []
       opts = clean_options(options)
-
+      sheetJson = {}
+      
+      full_output = "1-#{total_rows}.csv"
       # Transcode file to utf-8, count total and gen preview
-
-      CSV.open("#{working_folder}/1-#{total_rows}.csv", "wb") do |csv|
+      CSV.open("#{working_folder}/#{full_output}", "wb") do |csv|
         CSV.foreach(path, opts) do |row| 
           if limit && total_rows <= limit
             preview_rows << row
@@ -75,12 +83,20 @@ module Excel2CSV
           csv << row
         end
       end
+      sheetJson['fullOutput'] = full_output
+      sheetJson['rowCount'] = total_rows
       
       if limit
-        CSV.open("#{working_folder}/1-#{limit}-of-#{total_rows}-preview.csv", "wb") do |csv|
+        preview_output = "1-#{limit}-of-#{total_rows}-preview.csv"
+        sheetJson['previewOutput'] = preview_output
+        CSV.open("#{working_folder}/#{preview_output}", "wb") do |csv|
           preview_rows.each {|row| csv << row}
         end
       end
+      json['sheets'] = [sheetJson]
+      File.open "#{working_folder}/info.json", "wb" do |f|
+        f.write(JSON.generate(json))
+      end
     else
       java_options = options[:java_options] || "-Dfile.encoding=utf8 -Xms512m -Xmx512m -XX:MaxPermSize=256m"
       rows_limit = limit ? "-r #{limit}" : ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel2csv
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70182857005000 !ruby/object:Gem::Requirement
+  requirement: &70145909631480 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70182857005000
+  version_requirements: *70145909631480
 description: gem for converting Excel files to csv
 email:
 - yury.korolev@gmail.com
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: extract excel worksheets to csv files