sheets 1.1.1 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ac9a23b6a8bbce5e11d002260b36023ea91edb3d
+  data.tar.gz: d8009b52e8584a447478cbce27967e8816dc119a
+SHA512:
+  metadata.gz: 6cbe7db5c44a346c30e62d17d253f1e9e93437bb113faa6cd2b73ddd2f4a6c40235309646b11c7604416ed3e30a1206a1614a5073f9b0e6d88c2802cf3acf965
+  data.tar.gz: dd72683529416168abcf4938a6ff02bbbfa0e119ba10b570412dff0c5be40b4b8a102a88f4b0794b48adf540c52c68ac030bba813035c511ead8d0633f09b1b6

data/.gitignore

@@ -6,4 +6,6 @@ Gemfile.lock
 pkg/*
 doc/*
 log/*
-*.rbc
+*.rbc
+.ruby-version
+coverage

data/.travis.yml

@@ -1,7 +1,10 @@
 rvm:
- - 1.8.7
  - 1.9.2
  - 1.9.3
- - ree
+ - 2.0.0
+ - 2.1.0
  - rbx
- - jruby
+ - jruby
+notifications:
+  email:
+   - brad.spaulding@gmail.com

data/README.md

@@ -3,9 +3,9 @@ Sheets
 
 Sheets is a Facade on top of many spreadsheet formats, presenting them as simple, unified, native ruby arrays. It is intended to allow applications to easily import data from a wide variety of spreadsheet formats.
 
-With Sheets, all cell values are strings representing the final, evaluated value of the cell. 
+With Sheets, all cell values are strings representing the final, evaluated value of the cell.
 
-This does mean that, in some cases, you will be casting data back into its native format. 
+This does mean that, in some cases, you will be casting data back into its native format.
 
 However, this eliminates the need to deal with multiple spreadsheet formats and normalize data types in your application logic.
 
@@ -85,12 +85,14 @@ Test Suite Results
 
 Sheets uses Travis-CI for Continuous Integration.
 
-[![Build Status](http://travis-ci.org/bspaulding/Sheets.png)](http://travis-ci.org/bspaulding/Sheets)
+[![Build Status](https://travis-ci.org/bspaulding/Sheets.png?branch=master)](https://travis-ci.org/bspaulding/Sheets)
+
+[![Code Climate](https://codeclimate.com/github/bspaulding/Sheets.png)](https://codeclimate.com/github/bspaulding/Sheets)
 
 License
 ----------
 
-Sheets is licensed under the [MIT License](http://www.opensource.org/licenses/mit-license.php). 
+Sheets is licensed under the [MIT License](http://www.opensource.org/licenses/mit-license.php).
 
 Please note that Sheets is dependent upon the Spreadsheet gem, which is licensed under the [GPLv3](http://www.opensource.org/licenses/gpl-3.0.html).
 
@@ -101,4 +103,4 @@ Sheets takes advantage of the work done in these gems:
 
 * [spreadsheet](http://rubygems.org/gems/spreadsheet)
 * [rubyzip](http://rubygems.org/gems/rubyzip)
-* [nokogiri](http://rubygems.org/gems/nokogiri)
+* [nokogiri](http://rubygems.org/gems/nokogiri)

data/Rakefile

@@ -2,54 +2,10 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-testing_rubies = %w[1.8.7 1.9.2 ree ree-1.8.7-2010.01 jruby rbx]
-
 task :default => :test
+task :test do
+  require File.join(File.expand_path(File.dirname(__FILE__)), 'test', 'test_helper.rb')
+  Dir[ File.join(File.expand_path(File.dirname(__FILE__)), 'test', '**', '*_test.rb') ].each {|file| require file }
 
-namespace :test do
-  task :current do
-    require File.join(File.expand_path(File.dirname(__FILE__)), 'test', 'test_helper.rb')
-    Dir[ File.join(File.expand_path(File.dirname(__FILE__)), 'test', '**', '*_test.rb') ].each {|file| require file }
-  end
-
-  task :all do
-    File.delete('test/results.json') if File.exists?('test/results.json')
-    system "rvm --json #{testing_rubies.join(',')} rake test > test/results.json"
-  end
-end
-
-task :test => ['test:current']
-
-namespace :install do
-  def ruby_installed?(ruby)
-    !%x[rvm use #{ruby}].include?('not installed')
-  end
-
-  task :rubies do
-    testing_rubies.each do |ruby|
-      puts ruby
-      puts "----------"
-
-      ruby_installed?(ruby) ? puts('- Installed.') : system("rvm install #{ruby}")
-    end
-  end
-
-  task :bundles => :rubies do
-    testing_rubies.each do |ruby|
-      puts ruby
-      puts "----------"
-
-      puts '- Installing bundler...'
-      system "rvm #{ruby} gem install --no-rdoc --no-ri bundler"
-      
-      puts '- Installing bundle...'
-      system "rvm #{ruby} exec bundle install"
-    end
-  end
 end
 
-namespace :clean do
-  task :rbx do
-    Dir[ File.join(File.expand_path(File.dirname(__FILE__)), '**', '*.rbc') ].each {|file| File.delete(file) }
-  end
-end

data/lib/sheets.rb

@@ -2,6 +2,12 @@ module Sheets
   module Parsers; end
   module Renderers; end
 
+  class Utilities
+    def self.subclasses_in(klass)
+      klass.constants.collect {|constant_name| klass.const_get(constant_name) }
+    end
+  end
+
   class UnsupportedSpreadsheetFormatError < StandardError; end
 end
 
@@ -18,4 +24,4 @@ require File.join lib_path, 'sheets', 'renderers', 'base.rb'
 Dir[ File.join lib_path, 'sheets', 'renderers', '*_renderer.rb' ].each {|file| require file }
 
 # Load Sheets::Base
-require File.join lib_path, 'sheets', 'base.rb'
+require File.join lib_path, 'sheets', 'base.rb'

data/lib/sheets/parseable.rb

@@ -1,14 +1,14 @@
 module Sheets
   module Parseable
     include Enumerable
-    
+
     def self.included(base)
       base.extend(ClassMethods)
     end
 
     module ClassMethods
       def parseable_formats
-        Sheets::Parsers.constants.collect {|constant_name| Sheets::Parsers.const_get(constant_name) }.map(&:formats).flatten.uniq
+        Sheets::Utilities.subclasses_in(Sheets::Parsers).map(&:formats).flatten.uniq
       end
     end
 
@@ -36,4 +36,4 @@ module Sheets
       @parser ||= parser_class.new(@data, @extension, @file_path) unless parser_class.nil?
     end
   end
-end
+end

data/lib/sheets/parsers/nokogiri_ods_parser.rb

@@ -1,11 +1,11 @@
 require 'nokogiri'
-require 'zip/zip'
+require 'zip'
 
 class Sheets::Parsers::NokogiriOdsParser < Sheets::Parsers::Base
   parses :ods
 
   def to_array
-    rows.collect do |row| 
+    rows.collect do |row|
       table_cells = []
       row.xpath('table:table-cell').each do |cell|
         repeat = cell.attributes["number-columns-repeated"].text.to_i if cell.attributes["number-columns-repeated"]
@@ -21,7 +21,7 @@ class Sheets::Parsers::NokogiriOdsParser < Sheets::Parsers::Base
 
   # returns the zipfile object for the document
   def zipfile
-    @zipfile ||= Zip::ZipFile.open( @file_path )
+    @zipfile ||= Zip::File.open( @file_path )
   end
 
   def content_doc

data/lib/sheets/parsers/nokogiri_xlsx_parser.rb

@@ -1,47 +1,50 @@
 require 'nokogiri'
-require 'zip/zip'
+require 'zip'
 
 class Sheets::Parsers::NokogiriXlsxParser < Sheets::Parsers::Base
   parses :xlsx
 
   def to_array
-    # Create Matrices
-    matrices = worksheets.collect do |worksheet|
-      worksheet.css('sheetData>row').collect do |row|
-        row.css('c').collect do |cell|
-          cell_value = cell.css('v').text
-
-          if cell.attribute('t')
-            celltype = cell.attribute('t').value
-            if celltype == 's'
-              # Load Shared String Value
-              cell_value = shared_strings[cell_value.to_i]
-            elsif celltype == 'b'
-              cell_value = (cell_value == "1") ? "TRUE" : "FALSE"
-            end
-          end
-          
-          if cell.attribute('s') && cell.attribute('s').value == "1"
-            cell_value = (base_date + cell_value.to_f).strftime('%Y-%m-%d') # Date conversion
-          end
-
-          if cell_value.match(/\A[0-9]+\.?[0-9]*\Z/)
-            cell_value = cell_value.to_f.to_s
-          end
-
-          cell_value
-        end
-      end
+    extract_worksheet(worksheets.first)
+  end
+
+  private
+
+  def extract_worksheet(worksheet)
+    worksheet.css('sheetData>row').collect {|row| extract_row(row) }
+  end
+
+  def extract_row(row)
+    row.css('c').collect {|cell| value_for_cell(cell) }
+  end
+
+  def value_for_cell(cell)
+    cell_value = value_for_cell_type(cell.css('v').text, cell_type(cell))
+
+    if cell.attribute('s') && cell.attribute('s').value == "1"
+      cell_value = (base_date + cell_value.to_f).strftime('%Y-%m-%d') # Date conversion
+    end
+
+    if cell_value.match(/\A[0-9]+\.?[0-9]*\Z/)
+      cell_value = cell_value.to_f.to_s
     end
 
-    matrices.first
+    cell_value
   end
 
-  private
+  def cell_type(cell)
+    cell.attribute('t') ? cell.attribute('t').text : nil
+  end
+
+  def value_for_cell_type(cell_value, type)
+    { 's' => shared_strings[cell_value.to_i],
+      'b' => ((cell_value == "1") ? "TRUE" : "FALSE")
+    }[type] || cell_value
+  end
 
   # returns the zipfile object for the document
   def zipfile
-    @zipfile ||= Zip::ZipFile.open( @file_path )
+    @zipfile ||= Zip::File.open( @file_path )
   end
 
   # returns a nokogiri document for the workbook

data/lib/sheets/renderable.rb

@@ -6,14 +6,14 @@ module Sheets
 
     module ClassMethods
       def renderable_formats
-        Sheets::Renderers.constants.collect {|constant_name| Sheets::Renderers.const_get(constant_name) }.map(&:formats).flatten.uniq
+        Sheets::Utilities.subclasses_in(Sheets::Renderers).map(&:formats).flatten.uniq
       end
     end
 
     def method_missing(method_name, *args, &block)
       match = method_name.to_s.match(/\Ato_(.*)/i)
       format = match[1] unless match.nil?
-      
+
       format.nil? || !self.class.renderable_formats.include?(format) ? super(method_name, args, block) : renderer(format).send(method_name)
     end
 
@@ -26,11 +26,11 @@ module Sheets
 
       classes.delete(nil)
 
-      classes.first      
+      classes.first
     end
 
     def renderer(format = @extension)
       renderer_class(format).new(to_array, format) unless renderer_class(format).nil?
     end
   end
-end
+end

data/lib/sheets/version.rb

@@ -1,3 +1,3 @@
 module Sheets
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/sheets.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "sheets"
 
-  s.add_dependency('spreadsheet', '>= 0.6.5.2')
-  s.add_dependency('rubyzip', '>= 0.9.4')
-  s.add_dependency('nokogiri', '>= 1.4.3.1')
+  s.add_dependency('spreadsheet', '~>0.9.7')
+  s.add_dependency('rubyzip', '~>1.1.0')
+  s.add_dependency('nokogiri', '~>1.6.1')
 
-  s.add_development_dependency('rake', '0.9.2')
+  s.add_development_dependency('rake', '~>10.1.1')
+  s.add_development_dependency('simplecov')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/parsers/nokogiri_xlsx_parser_test.rb

@@ -1,10 +1,25 @@
 class TestNokogiriXlsxParser < Test::Unit::TestCase
-  def setup
+  def test_does_not_raise_error_when_second_workbook_has_id_of_3
     file_path = File.expand_path("../../data/reordered_workbooks.xlsx", __FILE__)
-    @sheet = Sheets::Parsers::NokogiriXlsxParser.new(File.read(file_path), :xlsx, file_path)
+    sheet = Sheets::Parsers::NokogiriXlsxParser.new(File.read(file_path), :xlsx, file_path)
+    assert_nothing_raised { sheet.to_array }
   end
 
-  def test_does_not_raise_error_when_second_workbook_has_id_of_3
-    assert_nothing_raised { @sheet.to_array }
+  def test_boolean_cell_type
+    file_path = File.expand_path("../../data/simple_with_booleans.xlsx", __FILE__)
+    sheet = Sheets::Parsers::NokogiriXlsxParser.new(File.read(file_path), :xlsx, file_path)
+    assert_equal sheet.to_array, [
+      ["Date", "Impressions", "Clicks", "Actions", "Boolean"],
+      ["2011-01-01", "10.0", "10.0", "10.0", "TRUE"],
+      ["2011-01-02", "10.0", "10.0", "10.0", "TRUE"],
+      ["2011-01-03", "10.0", "10.0", "10.0", "FALSE"],
+      ["2011-01-04", "10.0", "10.0", "10.0", "FALSE"],
+      ["2011-01-05", "10.0", "10.0", "10.0", "TRUE"],
+      ["2011-01-06", "10.0", "10.0", "10.0", "TRUE"],
+      ["2011-01-07", "10.0", "10.0", "10.0", "FALSE"],
+      ["2011-01-08", "10.0", "10.0", "10.0", "FALSE"],
+      ["2011-01-09", "10.0", "10.0", "10.0", "TRUE"],
+      ["2011-01-10", "10.0", "10.0", "10.0", "TRUE"]
+    ]
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,9 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'test/unit'
 
 puts 'Loading Test Generators'
 Dir[ File.join(File.expand_path(File.dirname(__FILE__)), 'generators', '*.rb') ].each {|file| puts "- #{file}"; require file }
 
-require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'sheets.rb')
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'sheets.rb')

metadata

@@ -1,80 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: sheets
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Bradley J. Spaulding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5.2
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5.2
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3.1
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3.1
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.1.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Work with spreadsheets easily in a native ruby format.
 email:
 - brad.spaulding@gmail.com
@@ -82,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,6 +114,7 @@ files:
 - test/data/simple.ods
 - test/data/simple.xls
 - test/data/simple.xlsx
+- test/data/simple_with_booleans.xlsx
 - test/generators/test_classes.rb
 - test/parseable_test.rb
 - test/parsers/basic_parsers_test.rb
@@ -122,33 +128,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/bspaulding/Sheets
 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'
-      segments:
-      - 0
-      hash: -333247326234641115
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -333247326234641115
 requirements: []
 rubyforge_project: sheets
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sheets provides a Facade for importing spreadsheets that gives the application
   control. Any Spreadsheet can be represented as either (1) a two dimensional array,
   or (2) an array of hashes. Sheets' goal is to convert any spreadsheet format to
@@ -161,6 +160,7 @@ test_files:
 - test/data/simple.ods
 - test/data/simple.xls
 - test/data/simple.xlsx
+- test/data/simple_with_booleans.xlsx
 - test/generators/test_classes.rb
 - test/parseable_test.rb
 - test/parsers/basic_parsers_test.rb