roo 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd058c382f97cefc8605bb1fdf40a2900312d6bc
-  data.tar.gz: 4a62144cc33be58fbab07eababe5d6e8a6205c30
+  metadata.gz: a2e51de2c40930cef415563182257a853b10978e
+  data.tar.gz: 3b17c8cfb99d1a16778e20289fea7ae9b1ed88a5
 SHA512:
-  metadata.gz: 626854d9aea329f2f2113a1fba53d9981d09ccb520c5ffec06936f996f786874a2b437e3fb1125151f4c3c2248006f3b6ca4fc1e6ddb758e96b36c4ebcbe08d1
-  data.tar.gz: 1432ebdeef169aad8eb64982c612da9cff907743a2512b594ded3ebff2823428a10e9ec1a326561ab6e0c68d9bdb39b1abe15655e797304df51dde68e89e437b
+  metadata.gz: a8f57baddedd100e461fb350814c39dfe765a89a911f2cda0579281612cf37ca95fd9d0459f0572a2241d2e99871045dd5f4573d20364827f756b875a01484b4
+  data.tar.gz: 87012bc658fbc668b7e655de16b339034cf5887f3e0b3ceb468626e9203c22fd0d05e7d1bbea243525cb7c27e61e2af296f1804bc58def990dc4bf1f95463cd5

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## [2.3.1] - 2015-01-08
+## [2.3.2] 2016-02-18
+### Fixed
+- Handle url with long query params (ex. S3 secure url) [302](https://github.com/roo-rb/roo/pull/302)
+- Allow streaming for Roo::CSV [297](https://github.com/roo-rb/roo/pull/297)
+- Export Fixnums to Added csv [295](https://github.com/roo-rb/roo/pull/295)
+- Removed various Ruby warnings [289](https://github.com/roo-rb/roo/pull/289)
+- Fix incorrect example result in Readme.md [293](https://github.com/roo-rb/roo/pull/293)
+
+## [2.3.1] - 2016-01-08
 ### Fixed
 - Properly parse sci-notation number like 1E-3 [#288](https://github.com/roo-rb/roo/pull/288)
 - Include all tests in default rake run [#283](https://github.com/roo-rb/roo/pull/283)

data/README.md

@@ -113,8 +113,8 @@ end
 Use ``sheet.parse`` to return an array of rows. Column names can be a ``String`` or a ``Regexp``.
 
 ```ruby
-sheet.parse(:id => /UPC|SKU/,:qty => /ATS*\sATP\s*QTY\z/)
-# => [{:upc => 727880013358, :qty => 12}, ...]
+sheet.parse(id: /UPC|SKU/, qty: /ATS*\sATP\s*QTY\z/)
+# => [{:id => 727880013358, :qty => 12}, ...]
 ```
 
 Use the ``:header_search`` option to locate the header row and assign the header names.
@@ -126,7 +126,7 @@ sheet.parse(header_search: [/UPC*SKU/,/ATS*\sATP\s*QTY\z/])
 Use the ``:clean`` option to strip out control characters and surrounding white space.
 
 ```ruby
-sheet.parse(:clean => true)
+sheet.parse(clean: true)
 ```
 
 ### Exporting spreadsheets
@@ -209,7 +209,7 @@ Roo::OpenOffice has support for encrypted OpenOffice spreadsheets.
 
 ```ruby
 # Load an encrypted OpenOffice Spreadsheet
-ods = Roo::OpenOffice.new("myspreadsheet.ods", :password => "password")
+ods = Roo::OpenOffice.new("myspreadsheet.ods", password: "password")
 ```
 
 ``Roo::OpenOffice`` can access celltype, comments, font information, formulas and labels.

data/lib/roo/base.rb

@@ -535,6 +535,16 @@ class Roo::Base
     initialize(@filename)
   end
 
+  def find_basename(filename)
+    if uri?(filename)
+      require 'uri'
+      uri = URI::parse filename
+      File.basename(uri.path)
+    elsif !is_stream?(filename)
+      File.basename(filename)
+    end
+  end
+
   def make_tmpdir(prefix = nil, root = nil, &block)
     prefix = "#{TEMP_PREFIX}#{prefix}"
 
@@ -599,7 +609,7 @@ class Roo::Base
 
   def download_uri(uri, tmpdir)
     require 'open-uri'
-    tempfilename = File.join(tmpdir, File.basename(uri))
+    tempfilename = File.join(tmpdir, find_basename(uri))
     begin
       File.open(tempfilename, 'wb') do |file|
         open(uri, 'User-Agent' => "Ruby/#{RUBY_VERSION}") do |net|
@@ -701,6 +711,8 @@ class Roo::Base
       case onecell
       when String
         %("#{onecell.gsub('"', '""')}") unless onecell.empty?
+      when Fixnum
+        onecell.to_s
       when Float
         if onecell == onecell.to_i
           onecell.to_i.to_s

data/lib/roo/csv.rb

@@ -60,6 +60,8 @@ class Roo::CSV < Roo::Base
         tmp_filename = download_uri(filename, tmpdir)
         CSV.foreach(tmp_filename, options, &block)
       end
+    elsif is_stream?(filename_or_stream)
+      CSV.new(filename_or_stream, options).each(&block)
     else
       CSV.foreach(filename, options, &block)
     end
@@ -117,4 +119,6 @@ class Roo::CSV < Roo::Base
 
     @cleaned[sheet] = true
   end
+
+  alias_method :filename_or_stream, :filename
 end

data/lib/roo/excelx.rb

@@ -39,7 +39,7 @@ module Roo
 
       unless is_stream?(filename_or_stream)
         file_type_check(filename_or_stream, %w[.xlsx .xlsm], 'an Excel 2007', file_warning, packed)
-        basename = File.basename(filename_or_stream)
+        basename = find_basename(filename_or_stream)
       end
 
       @tmpdir = make_tmpdir(basename, options[:tmpdir_root])
@@ -426,20 +426,6 @@ module Roo
       end
     end
 
-    # NOTE: To reduce memory, styles, shared_strings, workbook can be class
-    #       variables in a Shared module.
-    def styles
-      @styles ||= Styles.new(File.join(@tmpdir, 'roo_styles.xml'))
-    end
-
-    def shared_strings
-      @shared_strings ||= SharedStrings.new(File.join(@tmpdir, 'roo_sharedStrings.xml'))
-    end
-
-    def workbook
-      @workbook ||= Workbook.new(File.join(@tmpdir, 'roo_workbook.xml'))
-    end
-
     def safe_send(object, method, *args)
       object.send(method, *args) if object && object.respond_to?(method)
     end

data/lib/roo/excelx/cell.rb

@@ -11,7 +11,7 @@ require 'roo/excelx/cell/time'
 module Roo
   class Excelx
     class Cell
-      attr_reader :type, :formula, :value, :excelx_type, :excelx_value, :style, :hyperlink, :coordinate
+      attr_reader :formula, :value, :excelx_type, :excelx_value, :style, :hyperlink, :coordinate
       attr_writer :value
 
       # DEPRECATED: Please use Cell.create_cell instead.

data/lib/roo/open_office.rb

@@ -19,7 +19,7 @@ module Roo
 
       @only_visible_sheets = options[:only_visible_sheets]
       file_type_check(filename, '.ods', 'an Roo::OpenOffice', file_warning, packed)
-      @tmpdir   = make_tmpdir(File.basename(filename), options[:tmpdir_root])
+      @tmpdir   = make_tmpdir(find_basename(filename), options[:tmpdir_root])
       @filename = local_filename(filename, @tmpdir, packed)
       # TODO: @cells_read[:default] = false
       open_oo_file(options)
@@ -285,7 +285,6 @@ module Roo
           algorithm_node['manifest:initialisation-vector']
         )
         key_derivation_name = key_derivation_node['manifest:key-derivation-name']
-        key_size            = key_derivation_node['manifest:key-size'].to_i
         iteration_count     = key_derivation_node['manifest:iteration-count'].to_i
         salt                = Base64.decode64(key_derivation_node['manifest:salt'])
 
@@ -294,10 +293,8 @@ module Roo
           start_key_generation_node[
             'manifest:start-key-generation-name'
           ]
-        key_generation_size = start_key_generation_node['manifest:key-size'].to_i
 
         hashed_password = password
-        key             = nil
 
         if key_generation_name == 'http://www.w3.org/2000/09/xmldsig#sha256'
 

data/lib/roo/version.rb

@@ -1,3 +1,3 @@
 module Roo
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

data/spec/lib/roo/csv_spec.rb

@@ -10,6 +10,13 @@ describe Roo::CSV do
     end
   end
 
+  describe '.new with stream' do
+    let(:csv) { Roo::CSV.new(File.read(path)) }
+    it 'creates an instance' do
+      expect(csv).to be_a(Roo::CSV)
+    end
+  end
+
   describe '#parse' do
     subject do
       csv.parse(options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Thomas Preymesser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -185,9 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Roo can access the contents of various spreadsheet files.
 test_files: []
-has_rdoc: