rubyXL 1.2.5 → 1.2.6

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/lib/rubyXL/cell.rb

@@ -29,7 +29,8 @@ module RubyXL
       if !@value.is_a?(String)
         if @workbook.num_fmts
           num_fmt_id = xf_id()[:numFmtId]
-          num_fmt = @workbook.num_fmts[:numFmt].select { |f| f[:attributes][:numFmtId] == num_fmt_id }[0].andand[:attributes].andand[:formatCode]
+          tmp_num_fmt = @workbook.num_fmts[:numFmt].select { |f| f[:attributes][:numFmtId] == num_fmt_id }[0]
+          num_fmt = (tmp && tmp[:attributes] && tmp[:attributes][:formatCode]) ? tmp[:attributes][:formatCode] : nil
           if num_fmt && workbook.date_num_fmt?(num_fmt)
             return true
           end

data/lib/rubyXL/parser.rb

@@ -40,9 +40,13 @@ module RubyXL
 
     # data_only allows only the sheet data to be parsed, so as to speed up parsing
     # However, using this option will result in date-formatted cells being interpreted as numbers
-    def Parser.parse(file_path, data_only=false)
-      @data_only = data_only
-      files = Parser.decompress(file_path)
+    def Parser.parse(file_path, opts = {})
+
+      # options handling
+      @data_only = opts.is_a?(TrueClass)||!!opts[:data_only]
+      skip_filename_check = !!opts[:skip_filename_check]
+
+      files = Parser.decompress(file_path, skip_filename_check)
       wb = Parser.fill_workbook(file_path, files)
 
       if(files['sharedString'] != nil)
@@ -213,7 +217,7 @@ module RubyXL
         ##end legacy drawing
       end
 
-      
+
       row_data = files[j].xpath('/xmlns:worksheet/xmlns:sheetData/xmlns:row[xmlns:c[xmlns:v]]',namespaces)
       row_data.each do |row|
         unless @data_only
@@ -261,7 +265,7 @@ module RubyXL
             cell_data = v_element_content
           else# (value.css('v').to_s != "") && (value.css('v').children.to_s != "") #is number
             data_type = ''
-            if(v_element_content =~ /\./) #is float
+            if(v_element_content =~ /\./ or v_element_content =~ /\d+e\-?\d+/i) #is float
               cell_data = Float(v_element_content)
             else
               cell_data = Integer(v_element_content)
@@ -295,12 +299,16 @@ module RubyXL
       end
     end
 
-    def Parser.decompress(file_path)
+    def Parser.decompress(file_path, skip_filename_check = false)
       #ensures it is an xlsx/xlsm file
       if(file_path =~ /(.+)\.xls(x|m)/)
         dir_path = $1.to_s
       else
-        raise 'Not .xlsx or .xlsm excel file'
+        if skip_filename_check
+          dir_path = file_path
+        else
+          raise 'Not .xlsx or .xlsm excel file'
+        end
       end
 
       dir_path = File.join(File.dirname(dir_path), make_safe_name(Time.now.to_s))
@@ -345,7 +353,7 @@ module RubyXL
 
         if File.directory?(File.join(dir_path,'xl','drawings'))
           files['drawings'] = {}
-          drawings_path = File.join(dir_path,'xl','drawings')
+          drawings_path = File.join(dir_path,'xl','drawings','_rels')
 
           dir = Dir.new(drawings_path).entries.reject {|f| [".", "..", ".DS_Store"].include? f}
           dir.each_with_index do |draw,i|

data/rubyXL.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2012-01-25}
+  s.date = %q{2012-04-10}
   s.description = %q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
   s.email = %q{bhagwat.vivek@gmail.com}
   s.extra_rdoc_files = [

data/spec/lib/parser_spec.rb

@@ -32,8 +32,18 @@ describe RubyXL::Parser do
       lambda {@workbook2 = RubyXL::Parser.parse(@time_str+".xls")}.should raise_error
     end
 
+    it 'should not cause an error if an xlsx or xlsm workbook is not passed but the skip_filename_check option is used' do
+      filename = @time_str
+      FileUtils.cp(@file, filename)
+      
+      lambda {@workbook2 = RubyXL::Parser.parse(filename)}.should raise_error
+      lambda {@workbook2 = RubyXL::Parser.parse(filename, :skip_filename_check => true)}.should_not raise_error
+      
+      File.delete(filename)
+    end
+    
     it 'should only read the data and not any of the styles (for the sake of speed) when passed true' do
-      @workbook2 = RubyXL::Parser.parse(@file, true)
+      @workbook2 = RubyXL::Parser.parse(@file, :data_only => true)
 
       @workbook2.worksheets.size.should == @workbook.worksheets.size
       @workbook2[0].sheet_data.should == @workbook[0].sheet_data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 2
-  - 5
+  - 6
   segments_generated: true
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors: 
 - Vivek Bhagwat
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 -05:00
+date: 2012-04-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency