rubyXL 1.2.7 → 1.2.8

data/VERSION

@@ -1 +1 @@
-1.2.7
+1.2.8

data/lib/rubyXL/cell.rb

@@ -17,7 +17,10 @@ module RubyXL
       @formula_attributes = fmla_attr
     end
 
-    def value
+    def value(args = {})
+      raw_values = args.delete(:raw) || false
+      return @value if raw_values
+      
       if is_date?
         return @workbook.num_to_date(@value)
       else

data/lib/rubyXL/parser.rb

@@ -98,6 +98,12 @@ module RubyXL
 
     #fills hashes for various styles
     def Parser.fill_styles(wb,style_hash)
+      ###NUM FORMATS###
+      if style_hash[:numFmts].nil?
+        style_hash[:numFmts] = {:attributes => {:count => 0}, :numFmt => []}
+      elsif style_hash[:numFmts][:attributes][:count]==1
+        style_hash[:numFmts][:numFmt] = [style_hash[:numFmts][:numFmt]]
+      end
       wb.num_fmts = style_hash[:numFmts]
 
       ###FONTS###
@@ -336,6 +342,7 @@ module RubyXL
         if File.directory?(File.join(dir_path,'xl','externalLinks'))
           files['externalLinks'] = {}
           ext_links_path = File.join(dir_path,'xl','externalLinks')
+          FileUtils.mkdir_p(ext_links_path)
           files['externalLinks']['rels'] = []
           dir = Dir.new(ext_links_path).entries.reject {|f| [".", "..", ".DS_Store", "_rels"].include? f}
 
@@ -354,7 +361,7 @@ module RubyXL
         if File.directory?(File.join(dir_path,'xl','drawings'))
           files['drawings'] = {}
           drawings_path = File.join(dir_path,'xl','drawings','_rels')
-
+          FileUtils.mkdir_p(drawings_path)
           dir = Dir.new(drawings_path).entries.reject {|f| [".", "..", ".DS_Store"].include? f}
           dir.each_with_index do |draw,i|
             files['drawings'][i+1] = File.read(File.join(drawings_path,draw))
@@ -364,7 +371,7 @@ module RubyXL
         if File.directory?(File.join(dir_path,'xl','printerSettings'))
           files['printerSettings'] = {}
           printer_path = File.join(dir_path,'xl','printerSettings')
-
+          FileUtils.mkdir_p(printer_path)
           dir = Dir.new(printer_path).entries.reject {|f| [".","..",".DS_Store"].include? f}
 
           dir.each_with_index do |print, i|
@@ -375,7 +382,7 @@ module RubyXL
         if File.directory?(File.join(dir_path,"xl",'worksheets','_rels'))
           files['worksheetRels'] = {}
           worksheet_rels_path = File.join(dir_path,'xl','worksheets','_rels')
-
+          FileUtils.mkdir_p(worksheet_rels_path)
           dir = Dir.new(worksheet_rels_path).entries.reject {|f| [".","..",".DS_Store"].include? f}
           dir.each_with_index do |rel, i|
             files['worksheetRels'][i+1] = File.read(File.join(worksheet_rels_path,rel))

data/lib/rubyXL/worksheet.rb

@@ -32,8 +32,9 @@ class Worksheet < PrivateClass
   end
 
   #returns 2d array of just the cell values (without style or formula information)
-  def extract_data
-    return @sheet_data.map {|row| row.map {|c| if c.is_a?(Cell) then c.value else nil end}}
+  def extract_data(args = {})
+    raw_values = args.delete(:raw) || false
+    return @sheet_data.map {|row| row.map {|c| if c.is_a?(Cell) then c.value(:raw => raw_values) else nil end}}
   end
 
   def get_table(headers=[],opts={})

data/rubyXL.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.2.7"
+  s.version = "1.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2012-04-10}
+  s.date = %q{2012-07-11}
   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

@@ -49,6 +49,13 @@ describe RubyXL::Parser do
       @workbook2[0].sheet_data.should == @workbook[0].sheet_data
       @workbook2[0].sheet_name.should == @workbook[0].sheet_name
     end
+
+    it 'should construct consistent number formats' do
+      @workbook2 = RubyXL::Parser.parse(@file)
+
+      @workbook2.num_fmts[:numFmt].should be_an(Array)
+      @workbook2.num_fmts[:numFmt].length.should == @workbook2.num_fmts[:attributes][:count]
+    end
   end
 
   after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 2
-  - 7
+  - 8
   segments_generated: true
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors: 
 - Vivek Bhagwat
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-10 00:00:00 -04:00
+date: 2012-07-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency