simple-spreadsheet 0.2.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f55b6eaa1895bb557edef97fc830752cfaa2a49b
+  data.tar.gz: 83307559be3427157615f805ca80a35234e95de3
+SHA512:
+  metadata.gz: 9bf1a0acf9e7eacf8366e9d94eb12f78f1a97edd994125f5b50bc69ae871ded9e9f7625d022ea2eb384fd23bb36f5049f65476e6a33a876e346873d7599b631d
+  data.tar.gz: 3441d3459c81cf5856a338043509b098e9f8e185b5834ff90917ea8cf8f15de6e26c6e35f5ea0091ed619300b62823488f1d3700f137edafdf4ae6256312f09c

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
+  - 2.0.0
+  - 2.1

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    simple-spreadsheet (0.1.5)
-      roo (= 1.11.2)
+    simple-spreadsheet (0.3.1)
+      roo (>= 1.13)
       rubyXL (= 1.2.5)
       spreadsheet (= 0.6.5.9)
 
@@ -10,11 +10,11 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    mini_portile (0.5.1)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
+    mini_portile (0.6.1)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
     rake (0.9.2.2)
-    roo (1.11.2)
+    roo (1.13.2)
       nokogiri
       rubyzip
       spreadsheet (> 0.6.4)
@@ -28,7 +28,7 @@ GEM
     rspec-mocks (2.6.0)
     ruby-ole (1.2.11.7)
     rubyXL (1.2.5)
-    rubyzip (0.9.9)
+    rubyzip (1.1.6)
     spreadsheet (0.6.5.9)
       ruby-ole (>= 1.0)
 

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

@@ -1,4 +1,4 @@
-class CsvExtended < Roo::Csv
+class CsvExtended < Roo::CSV
 
   def foreach(sheet = nil, &block)
     index = 1

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

@@ -1,4 +1,4 @@
-class CsvtExtended < Roo::Csv
+class CsvtExtended < Roo::CSV
 
   def foreach(sheet = nil, &block)
     index = 1
@@ -9,15 +9,14 @@ class CsvtExtended < Roo::Csv
   end
 
   def read_cells(sheet=nil)
-    sheet = @default_sheet unless sheet
-    @cell_type = {} unless @cell_type
-    @cell = {} unless @cell
+    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
-    CSV.foreach(@filename, {:col_sep => "\t"}) do |row|
+    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]]
@@ -30,41 +29,26 @@ class CsvtExtended < Roo::Csv
     end
     @cells_read[sheet] = true
     #-- adjust @first_row if neccessary
-    loop do
-      if !row(@first_row[sheet]).any? and @first_row[sheet] < @last_row[sheet]
-        @first_row[sheet] += 1
-      else
-        break
-      end
+    while !row(@first_row[sheet]).any? and @first_row[sheet] < @last_row[sheet]
+      @first_row[sheet] += 1
     end
     #-- adjust @last_row if neccessary
-    loop do
-      if !row(@last_row[sheet]).any? and @last_row[sheet] and
-          @last_row[sheet] > @first_row[sheet]
-        @last_row[sheet] -= 1
-      else
-        break
-      end
+    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
-    loop do
-      if !column(@first_column[sheet]).any? and
+    while !column(@first_column[sheet]).any? and
           @first_column[sheet] and
           @first_column[sheet] < @last_column[sheet]
-        @first_column[sheet] += 1
-      else
-        break
-      end
+      @first_column[sheet] += 1
     end
     #-- adjust @last_column if neccessary
-    loop do
-      if !column(@last_column[sheet]).any? and
+    while !column(@last_column[sheet]).any? and
           @last_column[sheet] and
           @last_column[sheet] > @first_column[sheet]
-        @last_column[sheet] -= 1
-      else
-        break
-      end
+      @last_column[sheet] -= 1
     end
   end
+
 end

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

@@ -1,4 +1,4 @@
-class CsvxExtended < Roo::Csv
+class CsvxExtended < Roo::CSV
 
   def foreach(sheet = nil, &block)
     index = 1
@@ -9,15 +9,14 @@ class CsvxExtended < Roo::Csv
   end
 
   def read_cells(sheet=nil)
-    sheet = @default_sheet unless sheet
-    @cell_type = {} unless @cell_type
-    @cell = {} unless @cell
+    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
-    CSV.foreach(@filename, {:col_sep => ";"}) do |row|
+    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]]
@@ -30,41 +29,26 @@ class CsvxExtended < Roo::Csv
     end
     @cells_read[sheet] = true
     #-- adjust @first_row if neccessary
-    loop do
-      if !row(@first_row[sheet]).any? and @first_row[sheet] < @last_row[sheet]
-        @first_row[sheet] += 1
-      else
-        break
-      end
+    while !row(@first_row[sheet]).any? and @first_row[sheet] < @last_row[sheet]
+      @first_row[sheet] += 1
     end
     #-- adjust @last_row if neccessary
-    loop do
-      if !row(@last_row[sheet]).any? and @last_row[sheet] and
-          @last_row[sheet] > @first_row[sheet]
-        @last_row[sheet] -= 1
-      else
-        break
-      end
+    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
-    loop do
-      if !column(@first_column[sheet]).any? and
+    while !column(@first_column[sheet]).any? and
           @first_column[sheet] and
           @first_column[sheet] < @last_column[sheet]
-        @first_column[sheet] += 1
-      else
-        break
-      end
+      @first_column[sheet] += 1
     end
     #-- adjust @last_column if neccessary
-    loop do
-      if !column(@last_column[sheet]).any? and
+    while !column(@last_column[sheet]).any? and
           @last_column[sheet] and
           @last_column[sheet] > @first_column[sheet]
-        @last_column[sheet] -= 1
-      else
-        break
-      end
+      @last_column[sheet] -= 1
     end
   end
+
 end

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

@@ -2,7 +2,7 @@ class OpenofficeReader < SpreadsheetReader
 
   def initialize(file)
     super
-    @engine = Roo::Openoffice.new(@path) # Roo
+    @engine = Roo::OpenOffice.new(@path) # Roo
   end
 
   include RooModule

data/lib/simple-spreadsheet/version.rb

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

data/simple-spreadsheet.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   # 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.11.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"
 end

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: simple-spreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrea Mostosi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,23 +76,22 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.5
-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.'
+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.'
 email:
 - andrea.mostosi@zenkay.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -155,27 +144,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/zenkay/simple-spreadsheet
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Read and write most common spreadsheet format
 test_files:
 - spec/fixtures/file.csv