xlsx 0.2 → 0.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2009 Brian Buchanan. All rights reserved.
+Copyright (C) 2010-2011 Brian Buchanan. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

data/lib/xlsx.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Brian Buchanan. All rights reserved.
+# Copyright (C) 2009-2011 Brian Buchanan. All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/xlsx/cell.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Brian Buchanan. All rights reserved.
+# Copyright (C) 2009-2011 Brian Buchanan. All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/xlsx/row.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Brian Buchanan. All rights reserved.
+# Copyright (C) 2009-2011 Brian Buchanan. All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

data/lib/xlsx/workbook.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Brian Buchanan. All rights reserved.
+# Copyright (C) 2009-2011 Brian Buchanan. All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -45,6 +45,7 @@ module XLSX
     def write(filename=nil)
       @strings_count = 0
       @strings = []
+      @strings_idx = {}
       
       filename ||= @filename
       File.unlink(filename) if File.exists?(filename)
@@ -63,12 +64,19 @@ module XLSX
 
         zipfile.get_output_stream("xl/sharedStrings.xml") { |f| write_shared_strings(f) }
       end
+      
+      @strings_count = nil
+      @strings = nil
+      @strings_idx = nil
+      
+      true
     end
   
     private
       def write_content_types(f)
         x = Builder::XmlMarkup.new(:target => f, :indent => 0)
-        x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8'
+        x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8', :standalone => 'yes'
+        x << "\r\n"
         x.Types :xmlns => XMLNS_CONTENT_TYPES do |types|
           types.Override :PartName => '/docProps/app.xml', :ContentType => CT_EXTPROP
           1.upto(@sheets.size) do |sheet_no|
@@ -78,18 +86,21 @@ module XLSX
           types.Override :PartName => '/docProps/core.xml', :ContentType => CT_COREPROP
           types.Default :Extension => 'xml', :ContentType => 'application/xml'
           types.Override :PartName => '/xl/styles.xml', :ContentType => CT_SS_STYLES
+          #types.Override :PartName => '/xl/theme/theme1.xml', :ContentType => CT_THEME
           types.Override :PartName => '/xl/sharedStrings.xml', :ContentType => CT_SS_SHAREDSTRINGS
           types.Default :Extension => 'rels', :ContentType => CT_RELATIONSHIPS
+          #types.Default :Extension => 'jpeg, :ContentType => CT_JPEG
         end
       end
     
       def write_root_rels(f)
         x = Builder::XmlMarkup.new(:target => f, :indent => 0)
         x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8', :standalone => 'yes'
+        x << "\r\n"
         x.Relationships :xmlns => XMLNS_RELATIONSHIPS do |rels|
-          rels.Relationship :Id => 'rId3', :Type => REL_TYPE_EXTPROP, :Target => 'docProps/app.xml'
           rels.Relationship :Id => 'rId1', :Type => REL_TYPE_OFFICEDOC, :Target => 'xl/workbook.xml'
           rels.Relationship :Id => 'rId2', :Type => REL_TYPE_COREPROP, :Target => 'docProps/core.xml'
+          rels.Relationship :Id => 'rId3', :Type => REL_TYPE_EXTPROP, :Target => 'docProps/app.xml'
         end
       end
       
@@ -98,6 +109,7 @@ module XLSX
       
         x = Builder::XmlMarkup.new(:target => f, :indent => 0)
         x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8', :standalone => 'yes'
+        x << "\r\n"
         x.cp :coreProperties, 'xmlns:cp' => XMLNS_COREPROP, 'xmlns:dc' => XMLNS_DC,
                'xmlns:dcterms' => XMLNS_DCTERMS, 'xmlns:dcmitype' => XMLNS_DCMITYPE,
                'xmlns:xsi' => XMLNS_XSI do |cp|
@@ -113,6 +125,7 @@ module XLSX
       def write_app_properties(f)
         x = Builder::XmlMarkup.new(:target => f, :indent => 0)
         x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8', :standalone => 'yes'
+        x << "\r\n"
         x.Properties 'xmlns' => XMLNS_EXTPROP, 'xmlns:vt' => XMLNS_VT do |prop|
           prop.Application 'Microsoft Macintosh Excel'
           prop.DocSecurity '0'
@@ -145,6 +158,7 @@ module XLSX
       def write_workbook_rels(f)
         x = Builder::XmlMarkup.new(:target => f, :indent => 0)
         x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8', :standalone => 'yes'
+        x << "\r\n"
         x.Relationships :xmlns => XMLNS_RELATIONSHIPS do |rels|
           id = 1
           1.upto(@sheets.size) do |sheet_no|
@@ -153,8 +167,6 @@ module XLSX
           end
           rels.Relationship :Id => "rId#{id}", :Type => REL_TYPE_STYLES, :Target => 'styles.xml'
           id += 1
-          rels.Relationship :Id => "rId#{id}", :Type => REL_TYPE_CONNECTIONS, :Target => 'connections.xml'
-          id += 1
           rels.Relationship :Id => "rId#{id}", :Type => REL_TYPE_SHAREDSTRINGS, :Target => 'sharedStrings.xml'
         end
       end
@@ -162,11 +174,12 @@ module XLSX
       def write_workbook(f)
         x = Builder::XmlMarkup.new(:target => f, :indent => 0)
         x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8', :standalone => 'yes'
+        x << "\r\n"
         x.workbook :xmlns => XMLNS_SSXML_MAIN, 'xmlns:r' => XMLNS_OD_RELATIONSHIPS do |wb|
           wb.fileVersion :appName => 'xl', :lastEdited => '4', :lowestEdited => '4', :rupBuild => '4505'
           wb.workbookPr :date1904 => '1', :showInkAnnotation => '0', :autoCompressPictures => '0'
           wb.bookViews do |bv|
-            bv.workbookView :tabRatio => '500', :xWindow => '-20', :yWindow => '-20', :windowWidth => '47120', :windowHeight => '30680', :activeTab => '1'
+            bv.workbookView :xWindow => '-20', :yWindow => '-20', :windowWidth => '47120', :windowHeight => '30680', :tabRatio => '500', :activeTab => '1'
           end
           x.sheets do |sheets|
             1.upto(@sheets.count) do |sheet_no|
@@ -185,27 +198,29 @@ module XLSX
       end
       
       def write_worksheet(sheet, f)
-        min_col = sheet.rows.map { |r| r.min_col }.min + 1
-        max_col = sheet.rows.map { |r| r.max_col }.max + 1
+        min_col = sheet.min_col + 1
+        max_col = sheet.max_col + 1
         spans = "#{min_col}:#{max_col}"
-        dimension = "#{XLSX::Cell.cell_name(sheet.min_row + 1, min_col)}:#{XLSX::Cell.cell_name(sheet.max_row + 1, max_col)}"
+        top_left = "#{XLSX::Cell.cell_name(sheet.min_row, min_col - 1)}"
+        bottom_right = "#{XLSX::Cell.cell_name(sheet.max_row, max_col - 1)}"
+        dimension = "#{top_left}:#{bottom_right}"
         
         x = Builder::XmlMarkup.new(:target => f, :indent => 0)
         x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8', :standalone => 'yes'
-        f.write("\n")
-        x.worksheet 'xmlns:mc' => XMLNS_MARKUP_COMPATIBILITY,
-          'mc:PreserveAttributes' => 'mv:*',
-          'mc:Ignorable' => 'mv',
+        x << "\r\n"
+        x.worksheet 'xmlns' => XMLNS_SSXML_MAIN,
           'xmlns:r' => XMLNS_OD_RELATIONSHIPS,
+          'xmlns:mc' => XMLNS_MARKUP_COMPATIBILITY,
           'xmlns:mv' => XMLNS_MAC_VML,
-          'xmlns' => XMLNS_SSXML_MAIN do |ws|
+          'mc:Ignorable' => 'mv',
+          'mc:PreserveAttributes' => 'mv:*' do |ws|
           ws.dimension :ref => dimension
           ws.sheetViews do |sviews|
             sviews.sheetView :workbookViewId => '0' do |sv|
-              sv.selection :activeCell => 'A1', :sqref => 'A1'
+              sv.selection :activeCell => top_left, :sqref => top_left
             end
           end
-          ws.sheetFormatPr :defaultRowHeight => '13', :baseColWidth => '10'
+          ws.sheetFormatPr :baseColWidth => '10', :defaultRowHeight => '13'
           ws.sheetData do |sd|
             sheet.rows.each do |row|
               cells = row.to_a
@@ -219,9 +234,19 @@ module XLSX
                     when Numeric
                       c.v(value.to_s)
                     else
-                      @strings << value.to_s
+                      str = value.to_s
+                      if @strings_idx[str]
+                        c.v(@strings_idx[str])
+                      else
+                        # Duplicate the value before freezing it, if necessary.
+                        str = str.dup if value.is_a?(String)
+
+                        str.freeze
+                        @strings_idx[str] = @strings.size.to_s
+                        c.v(@strings.size.to_s)
+                        @strings << str
+                      end
                       @strings_count += 1
-                      c.v((@strings.size - 1).to_s)
                     end
                   end
                 end
@@ -230,15 +255,15 @@ module XLSX
           end
           ws.sheetCalcPr :fullCalcOnLoad => '1'
           ws.phoneticPr :fontId => '1', :type => 'noConversion'
-          ws.pageMargins :left => '0.75', :bottom => '1', :header => '0.5', :footer => '0.5', :right => '0.75', :top => '1'
-          ws.pageSetup :horizontalDpi => '4294967292', :orientation => 'portrait', :verticalDpi => '4294967292'
+          ws.pageMargins :left => '0.75', :right => '0.75', :top => '1', :bottom => '1', :header => '0.5', :footer => '0.5'
         end
       end
       
       def write_shared_strings(f)
         x = Builder::XmlMarkup.new(:target => f, :indent => 0)
-        x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8'
-        x.sst :count => @strings_count, :uniqueCount => @strings.size, :xmlns => XMLNS_SSXML_MAIN do |sst|
+        x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8', :standalone => 'yes'
+        x << "\r\n"
+        x.sst :xmlns => XMLNS_SSXML_MAIN, :count => @strings_count, :uniqueCount => @strings.size do |sst|
           @strings.each do |string|
             sst.si do |si|
               si.t string
@@ -251,7 +276,8 @@ module XLSX
       
       def write_styles(f)
         x = Builder::XmlMarkup.new(:target => f, :indent => 0)
-        x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8'
+        x.instruct! 'xml', :version => '1.0', :encoding => 'UTF-8', :standalone => 'yes'
+        x << "\r\n"
         x.styleSheet :xmlns => XMLNS_SSXML_MAIN do |ss|
           ss.fonts :count => '2' do |fonts|
             fonts.font do |font|
@@ -277,10 +303,10 @@ module XLSX
             end
           end
           ss.cellStyleXfs :count => 1 do |cs|
-            cs.xf :fontId => '0', :numFmtId => '0', :borderId => '0', :fillId => '0'
+            cs.xf :numFmtId => '0', :fontId => '0', :fillId => '0', :borderId => '0'
           end
           ss.cellXfs :count => 1 do |cs|
-            cs.xf :fontId => '0', :numFmtId => '0', :borderId => '0', :xfId => '0', :fillId => '0'
+            cs.xf :numFmtId => '0', :fontId => '0', :fillId => '0', :borderId => '0', :xfId => '0'
           end
           ss.cellStyles :count => 1 do |cs|
             cs.cellStyle :name => 'Normal', :xfId => '0', :builtinId => '0'
@@ -313,6 +339,7 @@ module XLSX
     CT_SS_STYLES = 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'
     CT_SS_SHAREDSTRINGS = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'
     CT_RELATIONSHIPS = 'application/vnd.openxmlformats-package.relationships+xml'
+    CT_JPEG = 'image/jpeg'
 
     REL_TYPE_EXTPROP = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties'
     REL_TYPE_OFFICEDOC = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument'

data/lib/xlsx/worksheet.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Brian Buchanan. All rights reserved.
+# Copyright (C) 2009-2011 Brian Buchanan. All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -34,6 +34,14 @@ module XLSX
       @max_row = 0
     end
   
+    def min_col
+      rows.map { |r| r.min_col }.min
+    end
+    
+    def max_col
+      rows.map { |r| r.max_col }.max
+    end
+
     def row(row_number)
       @rows[row_number]
     end

metadata

@@ -1,61 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: xlsx
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  version: "0.2"
+version: !ruby/object:Gem::Version
+  version: '0.3'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Brian Buchanan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-18 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153669420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153669420
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &2153668780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2153668780
 description: XLSX is a Ruby library for writing simple XLSX-format Excel documents.
 email: bwb@holo.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - LICENSE
-files: 
+files:
 - README
 - LICENSE
 - lib/xlsx.rb
@@ -63,38 +48,30 @@ files:
 - lib/xlsx/worksheet.rb
 - lib/xlsx/row.rb
 - lib/xlsx/cell.rb
-has_rdoc: true
 homepage: http://github.com/bwbuchanan/xlsx
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --inline-source
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 2
 summary: XLSX is a Ruby library for writing simple XLSX-format Excel documents.
 test_files: []
-