rubyXL 1.0.7 → 1.0.8

data/README.rdoc

@@ -9,18 +9,35 @@
 === Parsing
   workbook = RubyXL::Parser.parse("path/to/Excel/file.xlsx")
 
+
 === Creating
   workbook = RubyXL::Workbook.new
+
+
+=== Modifying
+
+==== Adding Worksheets
+  workbook.worksheets << Worksheet.new('Sheet2')
+
+==== Adding Cells
   workbook.worksheets[0].add_cell(0,0,'A1') #sets A1 to string "A1"
   workbook.worksheets[0].add_cell(0,1,'','A1') #sets A2 to value of A1
 
-=== Modifying
+==== Changing Fonts
   workbook.worksheets[0].sheet_data[0][0].change_font_bold(true) #sets A1 to bold
   workbook.worksheets[0].change_row_font_italics(0,true) #makes first row italicized
+  workbook.worksheets[0].change_column_font_name(0,'Verdana')
+
+==== Changing Fills	
+  #code here
+
+==== Merging Cells
+  #code here
 
 === Writing
   workbook.write("path/to/desired/Excel/file.xlsx")
 
+
 == For more information
 Take a look at the files in spec/lib/ for rspecs on most methods
 

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/lib/parser.rb

@@ -216,23 +216,23 @@ module RubyXL
             style_index = nil
 
             data_type = value.attribute('t').to_s
-
-            if data_type == 's' #shared string
+            
+            if (value.css('v').to_s == "") || (value.css('v').children.to_s == "") #no data
+              cell_data = nil
+            elsif data_type == 's' #shared string
               str_index = Integer(value.css('v').children.to_s)
               cell_data = shared_strings[str_index].to_s
             elsif data_type=='str' #raw string
               cell_data = value.css('v').children.to_s
             elsif data_type=='e' #error
               cell_data = value.css('v').children.to_s
-            elsif value.css('v').to_s != "" #is number
+            else# (value.css('v').to_s != "") && (value.css('v').children.to_s != "") #is number
               data_type = ''
               if(value.css('v').children.to_s =~ /\./) #is float
                 cell_data = Float(value.css('v').children.to_s)
-              else
+              else           
                 cell_data = Integer(value.css('v').children.to_s)
               end
-            else #no data
-              cell_data = nil
             end
             cell_formula = nil
             if(value.css('f').to_s != "")
@@ -240,7 +240,7 @@ module RubyXL
             end
 
             unless @data_only
-              style_index = Integer(value['s']) #nil goes to 0 (default)
+              style_index = value['s'].to_i #nil goes to 0 (default)
             else
               style_index = 0
             end
@@ -370,7 +370,7 @@ module RubyXL
         wb.appversion = files['app'].css('AppVersion').children.to_s
       end
 
-      wb.shared_strings_XML = files['sharedString']
+      wb.shared_strings_XML = files['sharedString'].to_s
 
       wb.worksheets = Array.new(@num_sheets) #array of Worksheet objs
       wb

data/lib/writer/styles_writer.rb

@@ -78,17 +78,16 @@ module Writer
           style_id_corrector['0']=0
           1.upto(@workbook.cell_xfs[:xf].size) do |i|
             style_id_corrector[i.to_s]= i-offset
-            #offset here
-            (i+1).upto(@workbook.cell_xfs[:xf].size) do |j|
-              unless i == j
-                if hash_equal(@workbook.cell_xfs[:xf][i],@workbook.cell_xfs[:xf][j])
-                  # puts "found match #{i}, #{j}"
-                  @workbook.cell_xfs[:xf].delete_at(i)
-                  style_id_corrector.delete(i.to_s)
-                  offset += 1
-                end
-              end
-            end
+            #style correction commented out until bug is fixed
+            # (i+1).upto(@workbook.cell_xfs[:xf].size) do |j|
+            #   unless i == j
+            #     if hash_equal(@workbook.cell_xfs[:xf][i],@workbook.cell_xfs[:xf][j])
+            #       @workbook.cell_xfs[:xf].delete_at(i)
+            #       style_id_corrector.delete(i.to_s)
+            #       offset += 1
+            #     end
+            #   end
+            # end
           end
           @workbook.style_corrector = style_id_corrector
 

data/rubyXL.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.0.7"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2011-08-02}
+  s.date = %q{2011-08-03}
   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 = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyXL
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Vivek Bhagwat
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 -04:00
+date: 2011-08-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: shoulda
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +45,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
   name: bundler
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,11 +61,11 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  prerelease: false
   name: jeweler
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,11 +75,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   name: rcov
   requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,11 +91,11 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
-  prerelease: false
   name: nokogiri
   requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -107,11 +107,11 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  prerelease: false
   name: rubyzip
   requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -123,9 +123,9 @@ dependencies:
         - 3
         - 4
         version: 1.3.4
-  prerelease: false
   name: rspec
   requirement: *id007
+  type: :development
 description: rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents
 email: bhagwat.vivek@gmail.com
 executables: []