simple-spreadsheet 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f55b6eaa1895bb557edef97fc830752cfaa2a49b
-  data.tar.gz: 83307559be3427157615f805ca80a35234e95de3
+  metadata.gz: f9992270f4b1a9634eea54020454e8d0f228acf4
+  data.tar.gz: 98499b33068aed25dc0030f8d346d90ad1beb3f2
 SHA512:
-  metadata.gz: 9bf1a0acf9e7eacf8366e9d94eb12f78f1a97edd994125f5b50bc69ae871ded9e9f7625d022ea2eb384fd23bb36f5049f65476e6a33a876e346873d7599b631d
-  data.tar.gz: 3441d3459c81cf5856a338043509b098e9f8e185b5834ff90917ea8cf8f15de6e26c6e35f5ea0091ed619300b62823488f1d3700f137edafdf4ae6256312f09c
+  metadata.gz: 394429eafa9a83bc8a3367a82dbd2fbe85bb10e395f6d8892401f0621a634049a90b26eaa4f85ca75544358ef78eaf0355919f709babc0f9ea911ebdab868de8
+  data.tar.gz: 894194674acedbf5442ce273561f934159c9e152178db2efc0f53fd271bb61d9c00ad81dc1af97f85dda42ffb122e2aa88517f174b98892d65390dc3cc61ad68

data/.travis.yml

@@ -1,5 +1,15 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
+  - ruby-1.9.3
+  - ruby-2.0.0
+  - ruby-2.1.5
+  - ruby-2.2.1
+  - jruby
+  - rbx-2.4.1
+  - rbx-2.5.2
+allow_failures:
+  - jruby
+  - rbx-2.4.1
+  - rbx-2.5.2
+before_install: gem install bundler -v 1.10.5
+sudo: false

data/Gemfile.lock

@@ -1,41 +1,125 @@
 PATH
   remote: .
   specs:
-    simple-spreadsheet (0.3.1)
-      roo (>= 1.13)
-      rubyXL (= 1.2.5)
-      spreadsheet (= 0.6.5.9)
+    simple-spreadsheet (0.4.1)
+      roo (~> 2.1)
+      roo-google (~> 1.0)
+      roo-xls (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    mini_portile (0.6.1)
-    nokogiri (1.6.4.1)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.3.8)
+    autoparse (0.3.3)
+      addressable (>= 2.3.1)
+      extlib (>= 0.9.15)
+      multi_json (>= 1.0.0)
+    diff-lcs (1.2.5)
+    extlib (0.9.16)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    google-api-client (0.8.6)
+      activesupport (>= 3.2)
+      addressable (~> 2.3)
+      autoparse (~> 0.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      googleauth (~> 0.3)
+      launchy (~> 2.4)
+      multi_json (~> 1.10)
+      retriable (~> 1.4)
+      signet (~> 0.6)
+    google_drive (1.0.1)
+      google-api-client (>= 0.7.0)
+      nokogiri (>= 1.4.4, != 1.5.2, != 1.5.1)
+      oauth (>= 0.3.6)
+      oauth2 (>= 0.5.0)
+    googleauth (0.4.1)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (= 1.11)
+      signet (~> 0.6)
+    i18n (0.7.0)
+    json (1.8.3)
+    jwt (1.5.1)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    little-plugger (1.1.3)
+    logging (2.0.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    memoist (0.12.0)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    multi_json (1.11.0)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    rake (0.9.2.2)
-    roo (1.13.2)
+    oauth (0.4.7)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.4)
+    rake (10.4.2)
+    retriable (1.4.1)
+    roo (2.1.1)
+      nokogiri (~> 1)
+      rubyzip (~> 1.1, < 2.0.0)
+    roo-google (1.0.0)
+      google_drive (~> 1)
+      roo (>= 2.0.0beta1, < 3)
+    roo-xls (1.0.0)
       nokogiri
-      rubyzip
-      spreadsheet (> 0.6.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    ruby-ole (1.2.11.7)
-    rubyXL (1.2.5)
-    rubyzip (1.1.6)
-    spreadsheet (0.6.5.9)
+      roo (>= 2.0.0beta1, < 3)
+      spreadsheet (> 0.9.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    ruby-ole (1.2.11.8)
+    rubyzip (1.1.7)
+    signet (0.6.1)
+      addressable (~> 2.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      multi_json (~> 1.10)
+    spreadsheet (1.0.4)
       ruby-ole (>= 1.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  rake (~> 0.9.2.2)
-  rspec (~> 2.6.0)
+  bundler (~> 1.10)
+  rake (~> 10.1)
+  rspec (~> 3.3)
   simple-spreadsheet!
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -1,24 +1,24 @@
-# Simple Spreadsheet [![Build Status](https://secure.travis-ci.org/zenkay/simple-spreadsheet.png?branch=master)](http://travis-ci.org/zenkay/simple-spreadsheet)
+# Simple Spreadsheet 
 
-Recently I wrote a module to import raw data from Excel-like files to database and export it in various formats. To accomplish this i have to use different gems with different usage patterns so I decide to wrap them in a single simple gem. This is a spreadsheet reader and writer that (will) supports common formats: CSV (.csv), Excel (.xls, .xlsx), Open-office (.ods) and Google (online).
+[![Code Climate](https://codeclimate.com/github/zenkay/simple-spreadsheet/badges/gpa.svg)](https://codeclimate.com/github/zenkay/simple-spreadsheet) [![Travis CI](https://travis-ci.org/zenkay/simple-spreadsheet.svg?branch=master)](https://travis-ci.org/zenkay/simple-spreadsheet) [![Gem Version](https://badge.fury.io/rb/dandelionapi.svg)](http://badge.fury.io/rb/dandelionapi) [![Coverage Status](https://coveralls.io/repos/github/zenkay/simple-spreadsheet/badge.svg?branch=master)](https://coveralls.io/github/zenkay/simple-spreadsheet?branch=master)
 
-Used gems: 
+A spreadsheet reader and (in the future) writer that supports common formats: CSV (.csv), Excel (.xls, .xlsx), Open-office (.ods) and Google (online).
 
-- Roo (http://roo.rubyforge.org/)
-- Spreadsheet (http://spreadsheet.ch/)
-- RubyXL (https://github.com/gilt/rubyXL)
+## Installation
 
-## Installing
+Add this line to your application's Gemfile:
 
-Add to your Gemfile and run the `bundle` command to install it.
+```
+gem 'simple-spreadsheet'
+```
 
- ```ruby
- gem "simple-spreadsheet"
- ```
- 
-**N.B. Tested only with Ruby 1.9.2.**
+And then execute:
 
-## Basic functionality
+```
+$ bundle install
+```
+
+## Functionalities
 
 ### Reading Spreadsheet
 
@@ -116,3 +116,11 @@ s = SimpleSpreadsheet::Workbook.read("my_spreadsheets_file.tsv")
 - Writing support for all formats
 - More reading functionalities
 - Edit support for all formats
+
+## Credits
+
+- Roo (http://roo.rubyforge.org/)
+- Spreadsheet (http://rubyforge.org/projects/spreadsheet/)
+- SimpleZSLWriter (http://rubyforge.org/projects/simplxlsxwriter/)
+- XLSX (http://rubygems.org/gems/xlsx)
+- WriteExcel (https://github.com/cxn03651/writeexcel/)

data/lib/simple-spreadsheet.rb

@@ -1,5 +1,6 @@
 require "simple-spreadsheet/version"
 require 'roo'
+require 'roo-xls'
 
 module SimpleSpreadsheet
 
@@ -8,22 +9,23 @@ module SimpleSpreadsheet
   class Workbook
 
     def self.read(file, ext = nil)
-      ext = File.extname(file) if ext.nil?
+      file  = file.to_s
+      ext ||= File.extname(file)
       case ext
       when '.xls'
-        return ExcelReader.new(file)
+        ExcelReader.new(file)
       when '.xlsx'
-        return ExcelxReader.new(file)
+        ExcelxReader.new(file)
       when '.ods'
-        return OpenofficeReader.new(file)
+        OpenofficeReader.new(file)
       when '.csv'
-        return CsvReader.new(file)
+        CsvReader.new(file)
       when '.csvx'
-        return CsvxReader.new(file)
+        CsvxReader.new(file)
       when '.csvt', '.tsv'
-        return CsvtReader.new(file)
+        CsvtReader.new(file)
       else
-        return nil
+        nil
       end
     end
 

data/lib/simple-spreadsheet/classes/csv_extended.rb

@@ -1,11 +1,13 @@
 class CsvExtended < Roo::CSV
+  def initialize(path)
+    super(path, csv_options: { col_sep: "," })
+  end
 
   def foreach(sheet = nil, &block)
     index = 1
-    CSV.foreach(@filename, col_sep: ",") do |row|
+    CSV.foreach(@filename, csv_options) do |row|
       yield(row, index)
       index += 1
     end
   end
-
-end
+end

data/lib/simple-spreadsheet/classes/csvt_extended.rb

@@ -1,54 +1,13 @@
 class CsvtExtended < Roo::CSV
+  def initialize(path)
+    super(path, csv_options: { col_sep: "\t" })
+  end
 
   def foreach(sheet = nil, &block)
     index = 1
-    CSV.foreach(@filename, col_sep: "\t") do |row|
+    CSV.foreach(@filename, csv_options) do |row|
       yield(row, index)
       index += 1
     end
   end
-
-  def read_cells(sheet=nil)
-    sheet ||= @default_sheet
-    return if @cells_read[sheet]
-    @first_row[sheet] = 1
-    @last_row[sheet] = 0
-    @first_column[sheet] = 1
-    @last_column[sheet] = 1
-    rownum = 1
-    each_row csv_options.merge(col_sep: "\t") do |row|
-      row.each_with_index do |elem,i|
-        @cell[[rownum,i+1]] = cell_postprocessing rownum,i+1, elem
-        @cell_type[[rownum,i+1]] = celltype_class @cell[[rownum,i+1]]
-        if i+1 > @last_column[sheet]
-          @last_column[sheet] += 1
-        end
-      end
-      rownum += 1
-      @last_row[sheet] += 1
-    end
-    @cells_read[sheet] = true
-    #-- adjust @first_row if neccessary
-    while !row(@first_row[sheet]).any? and @first_row[sheet] < @last_row[sheet]
-      @first_row[sheet] += 1
-    end
-    #-- adjust @last_row if neccessary
-    while !row(@last_row[sheet]).any? and @last_row[sheet] and
-        @last_row[sheet] > @first_row[sheet]
-      @last_row[sheet] -= 1
-    end
-    #-- adjust @first_column if neccessary
-    while !column(@first_column[sheet]).any? and
-          @first_column[sheet] and
-          @first_column[sheet] < @last_column[sheet]
-      @first_column[sheet] += 1
-    end
-    #-- adjust @last_column if neccessary
-    while !column(@last_column[sheet]).any? and
-          @last_column[sheet] and
-          @last_column[sheet] > @first_column[sheet]
-      @last_column[sheet] -= 1
-    end
-  end
-
-end
+end

data/lib/simple-spreadsheet/classes/csvx_extended.rb

@@ -1,54 +1,13 @@
 class CsvxExtended < Roo::CSV
+  def initialize(path)
+    super(path, csv_options: { col_sep: ";" })
+  end
 
   def foreach(sheet = nil, &block)
     index = 1
-    CSV.foreach(@filename, col_sep: ";") do |row|
+    CSV.foreach(@filename, csv_options) do |row|
       yield(row, index)
       index += 1
     end
   end
-
-  def read_cells(sheet=nil)
-    sheet ||= @default_sheet
-    return if @cells_read[sheet]
-    @first_row[sheet] = 1
-    @last_row[sheet] = 0
-    @first_column[sheet] = 1
-    @last_column[sheet] = 1
-    rownum = 1
-    each_row csv_options.merge(col_sep: ";") do |row|
-      row.each_with_index do |elem,i|
-        @cell[[rownum,i+1]] = cell_postprocessing rownum,i+1, elem
-        @cell_type[[rownum,i+1]] = celltype_class @cell[[rownum,i+1]]
-        if i+1 > @last_column[sheet]
-          @last_column[sheet] += 1
-        end
-      end
-      rownum += 1
-      @last_row[sheet] += 1
-    end
-    @cells_read[sheet] = true
-    #-- adjust @first_row if neccessary
-    while !row(@first_row[sheet]).any? and @first_row[sheet] < @last_row[sheet]
-      @first_row[sheet] += 1
-    end
-    #-- adjust @last_row if neccessary
-    while !row(@last_row[sheet]).any? and @last_row[sheet] and
-        @last_row[sheet] > @first_row[sheet]
-      @last_row[sheet] -= 1
-    end
-    #-- adjust @first_column if neccessary
-    while !column(@first_column[sheet]).any? and
-          @first_column[sheet] and
-          @first_column[sheet] < @last_column[sheet]
-      @first_column[sheet] += 1
-    end
-    #-- adjust @last_column if neccessary
-    while !column(@last_column[sheet]).any? and
-          @last_column[sheet] and
-          @last_column[sheet] > @first_column[sheet]
-      @last_column[sheet] -= 1
-    end
-  end
-
-end
+end

data/lib/simple-spreadsheet/modules/roo_module.rb

@@ -1,5 +1,5 @@
 module RooModule
-  
+
   def sheets
     @engine.sheets
   end
@@ -11,24 +11,25 @@ module RooModule
       @engine.default_sheet = sheet
     end
   end
-  
+
   def first_row
     1
   end
-  
+
   def last_row
     @engine.last_row
   end
-  
+
   def first_column
     @engine.first_column
   end
-  
+
   def last_column
     @engine.last_column
   end
-  
+
   def cell(row, col, sheet=nil)
+    sheet = @engine.default_sheet if sheet.nil?
     if sheet.is_a? Integer
       @engine.cell(row, col, @engine.sheets[sheet - 1])
     else
@@ -43,5 +44,5 @@ module RooModule
       @engine.celltype(row, col, sheet)
     end
   end
-  
-end
+
+end

data/lib/simple-spreadsheet/readers/openoffice_reader.rb

@@ -7,4 +7,4 @@ class OpenofficeReader < SpreadsheetReader
 
   include RooModule
 
-end
+end

data/lib/simple-spreadsheet/version.rb

@@ -1,3 +1,3 @@
 module SimpleSpreadsheet
-  VERSION = "0.3.1"
+  VERSION = "0.4.1"
 end

data/simple-spreadsheet.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |gem|
   gem.version       = SimpleSpreadsheet::VERSION
 
   # specify any dependencies here; for example:
-  gem.add_development_dependency "rspec", "~> 2.6.0"
-  gem.add_development_dependency "rake", "~> 0.9.2.2"
-  gem.add_runtime_dependency "roo", ">= 1.13"
-  gem.add_runtime_dependency "spreadsheet", "0.6.5.9"
-  gem.add_runtime_dependency "rubyXL", "1.2.5"
+  gem.add_development_dependency "bundler", "~> 1.10"
+  gem.add_development_dependency "rake", "~> 10.1"
+  gem.add_development_dependency "rspec","~> 3.3"
+  gem.add_runtime_dependency "roo", "~> 2.1"
+  gem.add_runtime_dependency "roo-xls", "~> 1.0"
+  gem.add_runtime_dependency "roo-google", "~> 1.0"
 end

data/spec/simple-spreadsheet_csvt_spec.rb

@@ -2,7 +2,6 @@
 require 'spec_helper'
 
 describe SimpleSpreadsheet do
-  
   describe "Open CSV (.csvt) file read-only mode" do
     before do
       @workbook = SimpleSpreadsheet::Workbook.read(File.join(File.dirname(__FILE__), "fixtures/file.csvt"))
@@ -36,5 +35,4 @@ describe SimpleSpreadsheet do
       end
     end
   end
-  
-end
+end

data/spec/simple-spreadsheet_spec.rb

@@ -2,6 +2,10 @@
 require 'spec_helper'
 
 describe SimpleSpreadsheet do
-  
-    
+  let(:xls_file)  { File.expand_path '../fixtures/file.xlsx', __FILE__ }
+  let(:file_path) { Pathname.new xls_file }
+
+  it 'allows pathnames as filename argument without raising exception' do
+    expect { SimpleSpreadsheet::Workbook.read(file_path) }.to_not raise_error(NoMethodError)
+  end
 end

metadata

@@ -1,85 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: simple-spreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrea Mostosi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '10.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: spreadsheet
+  name: roo-xls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5.9
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5.9
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rubyXL
+  name: roo-google
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.0'
 description: 'Simple spreadsheet reader for common formats: Excel (.xls, .xlsx), Open-office
   (.ods) and some CSV (standard, excel, tab separated). Future versions: writing and
   more formats.'
@@ -161,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Read and write most common spreadsheet format