rubyXL 2.3.4 → 2.4.0

data/rubyXL.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rubyXL 2.3.4 ruby lib
+# stub: rubyXL 2.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rubyXL"
-  s.version = "2.3.4"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Vivek Bhagwat"]
-  s.date = "2014-02-19"
+  s.date = "2014-02-20"
   s.description = "rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents"
   s.email = "bhagwat.vivek@gmail.com"
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/rubyXL/objects/color.rb",
     "lib/rubyXL/objects/column_range.rb",
     "lib/rubyXL/objects/container_nodes.rb",
+    "lib/rubyXL/objects/content_types.rb",
     "lib/rubyXL/objects/data_validation.rb",
     "lib/rubyXL/objects/document_properties.rb",
     "lib/rubyXL/objects/extensions.rb",
@@ -57,14 +58,9 @@ Gem::Specification.new do |s|
     "lib/rubyXL/parser.rb",
     "lib/rubyXL/workbook.rb",
     "lib/rubyXL/worksheet.rb",
-    "lib/rubyXL/writer/content_types_writer.rb",
-    "lib/rubyXL/writer/core_writer.rb",
-    "lib/rubyXL/writer/generic_writer.rb",
-    "lib/rubyXL/writer/styles_writer.rb",
-    "lib/rubyXL/writer/theme_writer.rb",
-    "lib/rubyXL/writer/workbook_writer.rb",
     "rdoc/README_rdoc.html",
     "rdoc/RubyXL.html",
+    "rdoc/RubyXL/AExtension.html",
     "rdoc/RubyXL/AExtensionStorageArea.html",
     "rdoc/RubyXL/Alignment.html",
     "rdoc/RubyXL/AlternateContent.html",
@@ -108,8 +104,15 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/ConditionalFormatValue.html",
     "rdoc/RubyXL/ConditionalFormatting.html",
     "rdoc/RubyXL/ConditionalFormattingRule.html",
+    "rdoc/RubyXL/ContentTypeDefault.html",
+    "rdoc/RubyXL/ContentTypeOverride.html",
+    "rdoc/RubyXL/ContentTypes.html",
+    "rdoc/RubyXL/CoreProperties.html",
+    "rdoc/RubyXL/CustomColor.html",
+    "rdoc/RubyXL/CustomColorList.html",
     "rdoc/RubyXL/CustomFilter.html",
     "rdoc/RubyXL/CustomFilters.html",
+    "rdoc/RubyXL/CustomGeometry.html",
     "rdoc/RubyXL/CustomProperties.html",
     "rdoc/RubyXL/CustomProperty.html",
     "rdoc/RubyXL/CustomSheetView.html",
@@ -133,8 +136,11 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/EmbeddedControls.html",
     "rdoc/RubyXL/Extension.html",
     "rdoc/RubyXL/ExtensionStorageArea.html",
+    "rdoc/RubyXL/Extents.html",
     "rdoc/RubyXL/ExternalReference.html",
     "rdoc/RubyXL/ExternalReferences.html",
+    "rdoc/RubyXL/ExtraColorScheme.html",
+    "rdoc/RubyXL/ExtraColorSchemeList.html",
     "rdoc/RubyXL/FieldItem.html",
     "rdoc/RubyXL/FileRecoveryProperties.html",
     "rdoc/RubyXL/FileSharing.html",
@@ -182,6 +188,8 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/OOXMLObjectInstanceMethods.html",
     "rdoc/RubyXL/OOXMLRelationshipsFile.html",
     "rdoc/RubyXL/OOXMLTopLevelObject.html",
+    "rdoc/RubyXL/ObjectDefaults.html",
+    "rdoc/RubyXL/Offset.html",
     "rdoc/RubyXL/OutlineProperties.html",
     "rdoc/RubyXL/PageMargins.html",
     "rdoc/RubyXL/PageSetup.html",
@@ -197,6 +205,7 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/PivotReference.html",
     "rdoc/RubyXL/PivotReferences.html",
     "rdoc/RubyXL/PivotTableSelection.html",
+    "rdoc/RubyXL/PresetGeometry.html",
     "rdoc/RubyXL/PrintOptions.html",
     "rdoc/RubyXL/ProtectedRange.html",
     "rdoc/RubyXL/ProtectedRanges.html",
@@ -213,6 +222,7 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/Scenario.html",
     "rdoc/RubyXL/Scenarios.html",
     "rdoc/RubyXL/Selection.html",
+    "rdoc/RubyXL/ShapeDefault.html",
     "rdoc/RubyXL/SharedStringsTable.html",
     "rdoc/RubyXL/Sheet.html",
     "rdoc/RubyXL/SheetCalculationProperties.html",
@@ -227,6 +237,7 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/Sqref.html",
     "rdoc/RubyXL/Stop.html",
     "rdoc/RubyXL/StringNode.html",
+    "rdoc/RubyXL/StringNodeW3C.html",
     "rdoc/RubyXL/StringValue.html",
     "rdoc/RubyXL/Stylesheet.html",
     "rdoc/RubyXL/TableParts.html",
@@ -236,9 +247,11 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/Theme.html",
     "rdoc/RubyXL/ThemeElements.html",
     "rdoc/RubyXL/Top10.html",
+    "rdoc/RubyXL/TwoDTransform.html",
     "rdoc/RubyXL/Variant.html",
     "rdoc/RubyXL/Vector.html",
     "rdoc/RubyXL/VectorValue.html",
+    "rdoc/RubyXL/VisualProperties.html",
     "rdoc/RubyXL/WebPublishObject.html",
     "rdoc/RubyXL/WebPublishObjects.html",
     "rdoc/RubyXL/WebPublishingItem.html",
@@ -257,13 +270,6 @@ Gem::Specification.new do |s|
     "rdoc/RubyXL/WorksheetProtection.html",
     "rdoc/RubyXL/WorksheetView.html",
     "rdoc/RubyXL/WorksheetViews.html",
-    "rdoc/RubyXL/Writer.html",
-    "rdoc/RubyXL/Writer/ContentTypesWriter.html",
-    "rdoc/RubyXL/Writer/CoreWriter.html",
-    "rdoc/RubyXL/Writer/GenericWriter.html",
-    "rdoc/RubyXL/Writer/StylesWriter.html",
-    "rdoc/RubyXL/Writer/ThemeWriter.html",
-    "rdoc/RubyXL/Writer/WorkbookWriter.html",
     "rdoc/RubyXL/XF.html",
     "rdoc/created.rid",
     "rdoc/fonts.css",

data/spec/lib/parser_spec.rb

@@ -7,6 +7,8 @@ describe RubyXL::Parser do
   before do
     @workbook = RubyXL::Workbook.new
     @workbook.add_worksheet("Test Worksheet")
+    @time = Time.at(Time.now.to_i) # Excel only saves times with 1-second precision.
+    @time2 = @time + 123456
 
     ws = @workbook.add_worksheet("Escape Test")
     ws.add_cell(0, 0, "&")
@@ -29,8 +31,12 @@ describe RubyXL::Parser do
     ws.add_cell(3, 2, -123.456e78)
     ws.add_cell(3, 3, -123.456e-78)
 
-    @time_str = Time.now.to_s
+    @workbook.creator = "test creator"
+    @workbook.modifier = "test modifier"
+    @workbook.created_at = @time
+    @workbook.modified_at = @time2
 
+    @time_str = Time.now.to_s
     @file = Dir::Tmpname.make_tmpname(['rubyXL', '.xlsx'], nil)
     @workbook.write(@file)
   end
@@ -55,7 +61,7 @@ describe RubyXL::Parser do
       
       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
     
@@ -86,6 +92,14 @@ describe RubyXL::Parser do
       @workbook2["Escape Test"][1][2].value.should == ">"
     end
 
+    it 'should parse Core properties correctly' do
+      @workbook2 = RubyXL::Parser.parse(@file)
+      @workbook2.creator.should == "test creator"
+      @workbook2.modifier.should == "test modifier"
+      @workbook2.created_at.should == @time
+      @workbook2.modified_at.should == @time2
+    end
+
   end
 
   after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyXL
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.4.0
 platform: ruby
 authors:
 - Vivek Bhagwat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -133,6 +133,7 @@ files:
 - lib/rubyXL/objects/color.rb
 - lib/rubyXL/objects/column_range.rb
 - lib/rubyXL/objects/container_nodes.rb
+- lib/rubyXL/objects/content_types.rb
 - lib/rubyXL/objects/data_validation.rb
 - lib/rubyXL/objects/document_properties.rb
 - lib/rubyXL/objects/extensions.rb
@@ -155,14 +156,9 @@ files:
 - lib/rubyXL/parser.rb
 - lib/rubyXL/workbook.rb
 - lib/rubyXL/worksheet.rb
-- lib/rubyXL/writer/content_types_writer.rb
-- lib/rubyXL/writer/core_writer.rb
-- lib/rubyXL/writer/generic_writer.rb
-- lib/rubyXL/writer/styles_writer.rb
-- lib/rubyXL/writer/theme_writer.rb
-- lib/rubyXL/writer/workbook_writer.rb
 - rdoc/README_rdoc.html
 - rdoc/RubyXL.html
+- rdoc/RubyXL/AExtension.html
 - rdoc/RubyXL/AExtensionStorageArea.html
 - rdoc/RubyXL/Alignment.html
 - rdoc/RubyXL/AlternateContent.html
@@ -206,8 +202,15 @@ files:
 - rdoc/RubyXL/ConditionalFormatValue.html
 - rdoc/RubyXL/ConditionalFormatting.html
 - rdoc/RubyXL/ConditionalFormattingRule.html
+- rdoc/RubyXL/ContentTypeDefault.html
+- rdoc/RubyXL/ContentTypeOverride.html
+- rdoc/RubyXL/ContentTypes.html
+- rdoc/RubyXL/CoreProperties.html
+- rdoc/RubyXL/CustomColor.html
+- rdoc/RubyXL/CustomColorList.html
 - rdoc/RubyXL/CustomFilter.html
 - rdoc/RubyXL/CustomFilters.html
+- rdoc/RubyXL/CustomGeometry.html
 - rdoc/RubyXL/CustomProperties.html
 - rdoc/RubyXL/CustomProperty.html
 - rdoc/RubyXL/CustomSheetView.html
@@ -231,8 +234,11 @@ files:
 - rdoc/RubyXL/EmbeddedControls.html
 - rdoc/RubyXL/Extension.html
 - rdoc/RubyXL/ExtensionStorageArea.html
+- rdoc/RubyXL/Extents.html
 - rdoc/RubyXL/ExternalReference.html
 - rdoc/RubyXL/ExternalReferences.html
+- rdoc/RubyXL/ExtraColorScheme.html
+- rdoc/RubyXL/ExtraColorSchemeList.html
 - rdoc/RubyXL/FieldItem.html
 - rdoc/RubyXL/FileRecoveryProperties.html
 - rdoc/RubyXL/FileSharing.html
@@ -280,6 +286,8 @@ files:
 - rdoc/RubyXL/OOXMLObjectInstanceMethods.html
 - rdoc/RubyXL/OOXMLRelationshipsFile.html
 - rdoc/RubyXL/OOXMLTopLevelObject.html
+- rdoc/RubyXL/ObjectDefaults.html
+- rdoc/RubyXL/Offset.html
 - rdoc/RubyXL/OutlineProperties.html
 - rdoc/RubyXL/PageMargins.html
 - rdoc/RubyXL/PageSetup.html
@@ -295,6 +303,7 @@ files:
 - rdoc/RubyXL/PivotReference.html
 - rdoc/RubyXL/PivotReferences.html
 - rdoc/RubyXL/PivotTableSelection.html
+- rdoc/RubyXL/PresetGeometry.html
 - rdoc/RubyXL/PrintOptions.html
 - rdoc/RubyXL/ProtectedRange.html
 - rdoc/RubyXL/ProtectedRanges.html
@@ -311,6 +320,7 @@ files:
 - rdoc/RubyXL/Scenario.html
 - rdoc/RubyXL/Scenarios.html
 - rdoc/RubyXL/Selection.html
+- rdoc/RubyXL/ShapeDefault.html
 - rdoc/RubyXL/SharedStringsTable.html
 - rdoc/RubyXL/Sheet.html
 - rdoc/RubyXL/SheetCalculationProperties.html
@@ -325,6 +335,7 @@ files:
 - rdoc/RubyXL/Sqref.html
 - rdoc/RubyXL/Stop.html
 - rdoc/RubyXL/StringNode.html
+- rdoc/RubyXL/StringNodeW3C.html
 - rdoc/RubyXL/StringValue.html
 - rdoc/RubyXL/Stylesheet.html
 - rdoc/RubyXL/TableParts.html
@@ -334,9 +345,11 @@ files:
 - rdoc/RubyXL/Theme.html
 - rdoc/RubyXL/ThemeElements.html
 - rdoc/RubyXL/Top10.html
+- rdoc/RubyXL/TwoDTransform.html
 - rdoc/RubyXL/Variant.html
 - rdoc/RubyXL/Vector.html
 - rdoc/RubyXL/VectorValue.html
+- rdoc/RubyXL/VisualProperties.html
 - rdoc/RubyXL/WebPublishObject.html
 - rdoc/RubyXL/WebPublishObjects.html
 - rdoc/RubyXL/WebPublishingItem.html
@@ -355,13 +368,6 @@ files:
 - rdoc/RubyXL/WorksheetProtection.html
 - rdoc/RubyXL/WorksheetView.html
 - rdoc/RubyXL/WorksheetViews.html
-- rdoc/RubyXL/Writer.html
-- rdoc/RubyXL/Writer/ContentTypesWriter.html
-- rdoc/RubyXL/Writer/CoreWriter.html
-- rdoc/RubyXL/Writer/GenericWriter.html
-- rdoc/RubyXL/Writer/StylesWriter.html
-- rdoc/RubyXL/Writer/ThemeWriter.html
-- rdoc/RubyXL/Writer/WorkbookWriter.html
 - rdoc/RubyXL/XF.html
 - rdoc/created.rid
 - rdoc/fonts.css

data/lib/rubyXL/writer/content_types_writer.rb

@@ -1,113 +0,0 @@
-module RubyXL
-  module Writer
-    class ContentTypesWriter < GenericWriter
-
-      def filepath
-        '[Content_Types].xml'
-      end
-
-      def write()
-
-        render_xml do |xml|
-          xml << (xml.create_element('Types',
-                    :xmlns => 'http://schemas.openxmlformats.org/package/2006/content-types') { |root|
-
-            unless @workbook.printer_settings.empty?
-              root << xml.create_element('Default', {
-                        :Extension => 'bin',
-                        :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings' })
-            end
-            root << xml.create_element('Default', {
-                      :Extension => 'rels',
-                      :ContentType => 'application/vnd.openxmlformats-package.relationships+xml' })
-
-            root << xml.create_element('Default', {
-                      :Extension => 'xml',
-                      :ContentType => 'application/xml' })
-
-            root << xml.create_element('Default', {
-                      :Extension => 'jpeg',
-                      :ContentType => 'image/jpeg' })
-
-#           if @workbook.macros.nil? && @workbook.drawings.empty?
-            root << xml.create_element('Override', {
-                      :PartName    => '/xl/workbook.xml',
-                      :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml' })
-#           else
-#             xml.Override('PartName'=>'/xl/workbook.xml',
-#               'ContentType'=>"application/vnd.ms-excel.sheet.macroEnabled.main+xml")
-#           end
-
-            @workbook.worksheets.each_with_index { |sheet,i|
-              root << xml.create_element('Override', {
-                        :PartName    => "/xl/worksheets/sheet#{i+1}.xml",
-                        :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml' })
-            }
-
-            root << xml.create_element('Override', {
-                      :PartName    => '/xl/theme/theme1.xml',
-                      :ContentType => 'application/vnd.openxmlformats-officedocument.theme+xml' })
-
-            root << xml.create_element('Override', {
-                      :PartName    => '/xl/styles.xml',
-                      :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml' })
-
-            unless @workbook.shared_strings_container.empty?
-              root << xml.create_element('Override', {
-                        :PartName    => '/xl/sharedStrings.xml',
-                        :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml' })
-            end
-
-            @workbook.drawings.each_pair { |k, v|
-              root << xml.create_element('Override', {
-                        :PartName    => "/#{@workbook.drawings.local_dir_path}/#{k}",
-                        :ContentType => 'application/vnd.openxmlformats-officedocument.drawing+xml' })
-#            xml.Default('Extension'=>'vml',
-#              'ContentType'=>'application/vnd.openxmlformats-officedocument.vmlDrawing')
-            }
-
-            @workbook.charts.each_pair { |k, v|
-              case k
-              when /^chart\d*.xml$/ then
-                root << xml.create_element('Override', {
-                          :PartName    => "/#{@workbook.charts.local_dir_path}/#{k}",
-                          :ContentType => 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml' })
-              when /^style\d*.xml$/ then
-                root << xml.create_element('Override', {
-                          :PartName    => "/#{@workbook.charts.local_dir_path}/#{k}",
-                          :ContentType => 'application/vnd.ms-office.chartstyle+xml' })
-              when /^colors\d*.xml$/ then
-                root << xml.create_element('Override', {
-                          :PartName    => "/#{@workbook.charts.local_dir_path}/#{k}",
-                          :ContentType => 'application/vnd.ms-office.chartcolorstyle+xml' })
-              end
-            }
-
-            root << xml.create_element('Override', {
-                      :PartName    => '/docProps/core.xml',
-                      :ContentType => 'application/vnd.openxmlformats-package.core-properties+xml' })
-
-            root << xml.create_element('Override', {
-                      :PartName    => '/docProps/app.xml',
-                      :ContentType => 'application/vnd.openxmlformats-officedocument.extended-properties+xml' })
-
-            unless @workbook.external_links.nil?
-              1.upto(@workbook.external_links.size-1) do |i|
-                root << xml.create_element('Override', {
-                          :PartName    => "/xl/externalLinks/externalLink#{i}.xml",
-                          :ContentType => 'application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml' })
-              end
-            end
-
-            unless @workbook.macros.nil?
-              root << xml.create_element('Override', {
-                        :PartName    => '/xl/vbaProject.bin',
-                        :ContentType => 'application/vnd.ms-office.vbaProject' })
-            end
-          })
-        end
-      end
-
-    end
-  end
-end

data/lib/rubyXL/writer/core_writer.rb

@@ -1,34 +0,0 @@
-module RubyXL
-  module Writer
-    class CoreWriter < GenericWriter
-
-      def filepath
-        File.join('docProps', 'core.xml')
-      end
-
-      def write()
-        render_xml do |xml|
-          xml << (xml.create_element('cp:coreProperties', 
-                     'xmlns:cp' => 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties',
-                     'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
-                     'xmlns:dcterms' => 'http://purl.org/dc/terms/',
-                     'xmlns:dcmitype' => 'http://purl.org/dc/dcmitype/',
-                     'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance') { |root|
-
-            root << xml.create_element('dc:creator',        @workbook.creator)
-            root << xml.create_element('cp:lastModifiedBy', @workbook.modifier)
-
-            unless @workbook.created_at.to_s.empty?
-              root << xml.create_element('dcterms:created',  { 'xsi:type' => 'dcterms:W3CDTF' }, @workbook.created_at)
-            end
-
-            unless @workbook.modified_at.to_s.empty?
-              root << xml.create_element('dcterms:modified', { 'xsi:type' => 'dcterms:W3CDTF' }, @workbook.modified_at)
-            end
-          })
-        end
-      end
-
-    end
-  end
-end

data/lib/rubyXL/writer/generic_writer.rb

@@ -1,43 +0,0 @@
-require 'rubygems'
-require 'nokogiri'
-
-module RubyXL
-  module Writer
-    class GenericWriter
-
-      def initialize(workbook)
-        @workbook = workbook
-        # +self.class+ makes sure constant is pulled from descendant class, not from this one.
-        # self.class::FILEPATH
-      end
-
-      def filepath
-        raise 'Subclass responsebility'
-      end
-
-      def render_xml
-        seed_xml = Nokogiri::XML('<?xml version = "1.0" standalone ="yes"?>')
-        seed_xml.encoding = 'UTF-8'
-
-        yield(seed_xml)
-
-        seed_xml.to_xml({ :indent => 0, :save_with => Nokogiri::XML::Node::SaveOptions::AS_XML })
-      end
-
-      def add_to_zip(zipfile)
-        output = write
-        return if output.nil?
-        zipfile.get_output_stream(filepath) { |f| f << output }
-      end
-
-      def ooxml_object
-        raise 'Subclass responsebility'
-      end
-
-      def write
-        ooxml_object && ooxml_object.write_xml
-      end
-
-    end
-  end
-end