rubyXL 1.1.3 → 1.1.4

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/parser.rb

@@ -385,6 +385,8 @@ module RubyXL
       end
 
       wb.shared_strings_XML = files['sharedString'].to_s
+      wb.defined_names = files['workbook'].css('definedNames').to_s
+
 
       wb.worksheets = Array.new(@num_sheets) #array of Worksheet objs
       wb

data/lib/workbook.rb

@@ -16,7 +16,7 @@ module RubyXL
       :modified_at, :company, :application, :appversion, :num_fmts, :fonts, :fills,
       :borders, :cell_xfs, :cell_style_xfs, :cell_styles, :shared_strings, :calc_chain,
       :num_strings, :size, :date1904, :external_links, :style_corrector, :drawings,
-      :worksheet_rels, :printer_settings, :macros, :colors, :shared_strings_XML
+      :worksheet_rels, :printer_settings, :macros, :colors, :shared_strings_XML, :defined_names
 
     APPLICATION = 'Microsoft Macintosh Excel'
     APPVERSION  = '12.0000'
@@ -55,6 +55,7 @@ module RubyXL
       @macros             = nil
       @colors             = nil
       @shared_strings_XML = nil
+      @defined_names      = nil
 
       begin
         @created_at       = DateTime.parse(created_at).strftime('%Y-%m-%dT%TZ')

data/lib/worksheet.rb

@@ -1085,12 +1085,14 @@ class Worksheet < PrivateClass
 
   #change cols array
   def change_cols(i,col_index)
+    style = '0'
     if @cols[i].nil?
       @cols << {:attributes=>{:style=>nil,:min=>nil,:max=>nil,:width=>nil,:customWidth=>nil}}
     else
       @cols << deep_copy(@cols[i])
+      style = @cols[i][:attributes][:style]
     end
-    @cols.last[:attributes][:style] = (@workbook.cell_xfs[:xf].size-1).to_s
+    @cols.last[:attributes][:style] = style
     @cols.last[:attributes][:min] = (Integer(col_index)+1).to_s
     @cols.last[:attributes][:max] = (Integer(col_index)+1).to_s
     @cols.last[:attributes][:width] = '10'

data/lib/writer/workbook_writer.rb

@@ -44,15 +44,11 @@ module Writer
               end
             }
           end
-          # unless @workbook.definedNames.nil?
-          #   xml.definedNames {
-          #     @workbook.definedNames.each do |name|
-          #       xml.definedName('name'=>name[:attributes][:name]) {
-          #         # name[:]
-          #       }
-          #     end
-          #   }
-          # end
+          
+          # nokogiri builder creates CDATA tag around content, 
+          # using .text creates "html safe" &lt; and &gt; in place of < and >
+          # xml to hash method does not seem to function well for this particular piece of xml
+          xml.cdata @workbook.defined_names.to_s
 
           #TODO see if this changes with formulas
           #attributes out of order here
@@ -66,9 +62,15 @@ module Writer
         }
       end
       contents = builder.to_xml
+      p contents
       contents = contents.gsub(/\n/,'')
       contents = contents.gsub(/>(\s)+</,'><')
+      contents = contents.gsub(/<!\[CDATA\[(.*)\]\]>/,'\1')
       contents = contents.sub(/<\?xml version=\"1.0\"\?>/,'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'+"\n")
+      puts '
+      
+      '
+      puts contents
 
       contents
     end

data/rubyXL.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyXL}
-  s.version = "1.1.3"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vivek Bhagwat"]
-  s.date = %q{2011-08-11}
+  s.date = %q{2011-08-12}
   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: 21
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Vivek Bhagwat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 -04:00
+date: 2011-08-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency