openxml-xlsx 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a010100989ff2ab9093bfdea05d3535cf8de0eb1
-  data.tar.gz: 55f156afa2e40ad7a5f73b82a6e366dd39972d18
+  metadata.gz: 374ce4f77d6e68c32dcd699a9b7cc71c159c55e1
+  data.tar.gz: 99d760a114ddd00435d05e7912e6ff77e8443b8e
 SHA512:
-  metadata.gz: b6cbe628be8b61481747178a1cc4e6a9bbac64477412f39c34cb5ebbc9785563d910bf172030330e49e6ae01fd14a96717f719b32d58ae0384d2b9062eaf6469
-  data.tar.gz: ca54754a84cf214773b0d4aeb61d0ecd78d2c05e5d6660dc2e6d5059b49e8cd7dcff6e86ad899c94b3fa047174410636bfeaf6bd66ef1951bade31cd3a8c8842
+  metadata.gz: 9e79d23a902a1a7957e76f58e53f22617eaace826c94a802ed11e24f519622e9788c09488c5be5a6407b5806d4d5a1b013c7a60610126841d1995b735f98b223
+  data.tar.gz: c672ecec03e616ce3bf31f170740cbb6227908c1c74198c378d5fd1ce54db98aaef5f7d164221bd5e1293465b84539c835ac1f5b3309fe8c1859c01d082c31fb

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    openxml-xlsx (0.1.1)
+    openxml-xlsx (0.1.2)
       nokogiri
-      open_xml_package (= 0.1.0)
+      open_xml_package (= 0.2.0.beta1)
 
 GEM
   remote: https://rubygems.org/
@@ -15,9 +15,11 @@ GEM
     multi_json (1.7.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    open_xml_package (0.1.0)
+    open_xml_package (0.2.0.beta1)
       nokogiri
+      ox
       rubyzip (~> 1.1.0)
+    ox (2.2.2)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)

data/lib/xlsx.rb

@@ -6,7 +6,7 @@ module Xlsx
   REL_CALC_CHAIN = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/calcChain".freeze
   REL_THEME = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme".freeze
   REL_TABLE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table".freeze
-  
+
   TYPE_WORKBOOK = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml".freeze
   TYPE_WORKSHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml".freeze
   TYPE_THEME = "application/vnd.openxmlformats-officedocument.theme+xml".freeze
@@ -16,11 +16,11 @@ module Xlsx
   TYPE_CORE_PROPS = "application/vnd.openxmlformats-package.core-properties+xml".freeze
   TYPE_APP_PROPS = "application/vnd.openxmlformats-officedocument.extended-properties+xml".freeze
   TYPE_TABLE = "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml".freeze
-  
+
   def self.index!(collection, item)
     collection.index(item) || collection.push(item).length - 1
   end
-  
+
 end
 
 require "xlsx/elements"

data/lib/xlsx/elements/alignment.rb

@@ -1,7 +1,7 @@
 module Xlsx
   module Elements
     class Alignment < Struct.new(:horizontal, :vertical, :indent, :wrapText)
-      
+
       def attributes
         {}.tap do |attrs|
           attrs[:horizontal] = horizontal if horizontal
@@ -10,11 +10,11 @@ module Xlsx
           attrs[:wrapText] = wrapText if wrapText
         end
       end
-      
+
       def to_xml(xml)
         xml.alignment(attributes)
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/border.rb

@@ -2,7 +2,7 @@ module Xlsx
   module Elements
     class Border
       attr_reader :left_component, :right_component, :top_component, :bottom_component, :diagonal_component
-      
+
       def initialize(options={})
         @left_component = options.fetch(:left, BorderComponent.new)
         @right_component = options.fetch(:right, BorderComponent.new)
@@ -10,7 +10,7 @@ module Xlsx
         @bottom_component = options.fetch(:bottom, BorderComponent.new)
         @diagonal_component = options.fetch(:diagonal, BorderComponent.new)
       end
-      
+
       def to_xml(xml)
         xml.border do
           left_component.to_xml("left", xml)
@@ -20,7 +20,7 @@ module Xlsx
           diagonal_component.to_xml("diagonal", xml)
         end
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/border_component.rb

@@ -1,7 +1,7 @@
 module Xlsx
   module Elements
     class BorderComponent < Struct.new(:style, :color)
-      
+
       def to_xml(name, xml)
         if style && color
           xml.public_send(name, style: style) do
@@ -13,7 +13,7 @@ module Xlsx
           xml.public_send(name)
         end
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/cell.rb

@@ -4,7 +4,7 @@ module Xlsx
   module Elements
     class Cell
       attr_reader :row, :column, :value, :type, :style, :formula
-      
+
       def initialize(row, options={})
         @row = row
         @column = options.fetch(:column)
@@ -25,11 +25,11 @@ module Xlsx
         @style = package.style_ref(options[:style]) if options.key? :style
         @formula = options[:formula]
       end
-      
+
       def id
         "#{column_letter}#{row.number}"
       end
-      
+
       def column_letter
         bytes = []
         remaining = column
@@ -39,41 +39,41 @@ module Xlsx
         end
         bytes.pack "c*"
       end
-      
+
       def worksheet
         row.worksheet
       end
-      
+
       def workbook
         worksheet.workbook
       end
-      
+
       def package
         workbook.package
       end
-      
+
       def to_xml(xml)
         attributes = {"r" => id}
         attributes.merge!("s" => style) if style
         attributes.merge!("t" => "s") if type == :string
-        
+
         value = self.value
         value = string_id if type == :string
         value = serial_date if type == :date
         value = serial_time if type == :time
-        
+
         xml.c(attributes) do
           xml.f formula if formula
           xml.v value if value
         end
       end
-      
+
     private
       attr_reader :string_id, :serial_date, :serial_time
-      
+
       EXCEL_ANCHOR_DATE = Date.new(1900, 1, 1).freeze
       SECONDS_PER_DAY = 86400.freeze
-      
+
       def to_serial_date(date)
         # Excel stores dates as the number of days since 1900-Jan-0
         # Excel behaves as if 1900 was a leap year, so the number is
@@ -81,14 +81,14 @@ module Xlsx
         # http://www.cpearson.com/excel/datetime.htm
         (date - EXCEL_ANCHOR_DATE).to_i + 2
       end
-      
+
       def to_serial_time(time)
         date = to_serial_date(time.to_date)
-        
+
         seconds_since_midnight = time.hour * 3600 + time.min * 60 + time.sec
         date + (seconds_since_midnight.to_f / SECONDS_PER_DAY)
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/defined_name.rb

@@ -1,11 +1,11 @@
 module Xlsx
   module Elements
     class DefinedName < Struct.new(:name, :formula)
-      
+
       def to_xml(xml)
         xml.definedName "#{formula}", name: name
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/font.rb

@@ -1,7 +1,7 @@
 module Xlsx
   module Elements
     class Font < Struct.new(:name, :size, :styles)
-      
+
       def to_xml(xml)
         xml.font do
           xml.sz val: size
@@ -14,7 +14,7 @@ module Xlsx
           end
         end
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/indexed_color.rb

@@ -1,11 +1,11 @@
 module Xlsx
   module Elements
     class IndexedColor < Struct.new(:indexed)
-      
+
       def to_xml(name, xml)
         xml.public_send(name, indexed: indexed)
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/number_format.rb

@@ -7,7 +7,7 @@ module Xlsx
       DECIMAL = ImpliedNumberFormat.new(2).freeze                  # 0.00
       INTEGER_THOUSANDS = ImpliedNumberFormat.new(3).freeze        # #,##0
       DECIMAL_THOUSANDS = ImpliedNumberFormat.new(4).freeze        # #,##0.00
-      
+
       INTEGER_PERCENT = ImpliedNumberFormat.new(9).freeze          # 0%
       DECIMAL_PERCENT = ImpliedNumberFormat.new(10).freeze         # 0.00%
       SCIENTIFIC = ImpliedNumberFormat.new(11).freeze              # 0.00E+00
@@ -22,24 +22,24 @@ module Xlsx
       TIME_ALT = ImpliedNumberFormat.new(20).freeze                # h:mm
       TIME_SECONDS_ALT = ImpliedNumberFormat.new(21).freeze        # h:mm:ss
       DATETIME = ImpliedNumberFormat.new(22).freeze                # m/d/yy h:mm
-      
+
       FINANCIAL_INTEGER = ImpliedNumberFormat.new(37).freeze       # #,##0 ;(#,##0)
       FINANCIAL_INTEGER_RED = ImpliedNumberFormat.new(38).freeze   # #,##0 ;[Red](#,##0)
       FINANCIAL_DECIMAL = ImpliedNumberFormat.new(39).freeze       # #,##0.00 ;(#,##0.00)
       FINANCIAL_DECIMAL_RED = ImpliedNumberFormat.new(40).freeze   # #,##0.00 ;[Red](#,##0.00)
-      
+
       INTERVAL = ImpliedNumberFormat.new(45).freeze                # mm:ss
       INTERVAL_HOURS = ImpliedNumberFormat.new(46).freeze          # [h]:mm:ss
       TIMESTAMP = ImpliedNumberFormat.new(47).freeze               # mmss.0
       # SCIENTIFIC_ALT = ImpliedNumberFormat.new(48).freeze        # ##0.0E+0
       # UNKONWN = ImpliedNumberFormat.new(49).freeze               # @
-      
-      
-      
+
+
+
       def to_xml(id, xml)
         xml.numFmt(numFmtId: id, formatCode: format)
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/pattern_fill.rb

@@ -1,7 +1,7 @@
 module Xlsx
   module Elements
     class PatternFill < Struct.new(:type, :foreground_color, :background_color)
-      
+
       def to_xml(xml)
         xml.fill do
           xml.patternFill(patternType: type) do
@@ -12,7 +12,7 @@ module Xlsx
           end
         end
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/relationship.rb

@@ -3,16 +3,16 @@ require "securerandom"
 module Xlsx
   module Elements
     class Relationship < Struct.new(:type, :target, :id)
-      
+
       def initialize(type, target, id=nil)
         id ||= "R#{SecureRandom.hex}"
         super type, target, id
       end
-      
+
       def to_xml(xml)
         xml.Relationship("Id" => id, "Type" => type, "Target" => target)
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/row.rb

@@ -2,23 +2,23 @@ module Xlsx
   module Elements
     class Row
       attr_reader :worksheet, :number, :height, :hidden, :cells
-      
+
       def initialize(worksheet, options={})
         @worksheet = worksheet
         @number = options.fetch(:number)
         @height = options[:height]
         @hidden = options[:hidden]
         @cells = []
-        
+
         Array(options[:cells]).each do |attributes|
           add_cell attributes
         end
       end
-      
+
       def add_cell(attributes)
         cells.push Xlsx::Elements::Cell.new(self, attributes)
       end
-      
+
       def to_xml(xml)
         attributes = {"r" => number}
         attributes.merge!("ht" => height, "customHeight" => 1) if height
@@ -29,7 +29,7 @@ module Xlsx
           end
         end
       end
-      
+
     end
   end
 end

data/lib/xlsx/elements/theme_color.rb

@@ -1,11 +1,11 @@
 module Xlsx
   module Elements
     class ThemeColor < Struct.new(:theme, :tint)
-      
+
       def to_xml(name, xml)
         xml.public_send(name, theme: theme, tint: tint)
       end
-      
+
     end
   end
 end

data/lib/xlsx/package.rb

@@ -19,7 +19,7 @@ module Xlsx
     def initialize
       super
       rels.add_relationship REL_DOCUMENT, "xl/workbook.xml"
-      
+
       @xl_rels = OpenXml::Parts::Rels.new([
         { "Type" => REL_SHARED_STRINGS, "Target" => "sharedStrings.xml" },
         { "Type" => REL_STYLES, "Target" => "styles.xml" }
@@ -27,7 +27,7 @@ module Xlsx
       @shared_strings = Xlsx::Parts::SharedStrings.new
       @stylesheet = Xlsx::Parts::Stylesheet.new
       @workbook = Xlsx::Parts::Workbook.new(self)
-      
+
       # docProps/app.xml
       # docProps/core.xml
       add_part "xl/_rels/workbook.xml.rels", xl_rels

data/lib/xlsx/parts/shared_strings.rb

@@ -4,17 +4,17 @@ module Xlsx
       attr_reader :strings
 
       def initialize
-        @strings = []
+        @strings = Hash.new { |hash, key| hash[key] = hash.length }
       end
 
       def reference_of(string)
-        Xlsx.index!(strings, string)
+        strings[string]
       end
 
       def to_xml
         build_standalone_xml do |xml|
           xml.sst(xmlns: "http://schemas.openxmlformats.org/spreadsheetml/2006/main", uniqueCount: strings.length) do
-            strings.each do |string|
+            strings.each do |string, i|
               xml.si { xml.t(string) }
             end
           end

data/lib/xlsx/parts/stylesheet.rb

@@ -23,14 +23,14 @@ module Xlsx
         options[:font_id] = Xlsx.index!(fonts, options[:font]) if options.key? :font
         options[:fill_id] = Xlsx.index!(fills, options[:fill]) if options.key? :fill
         options[:border_id] = Xlsx.index!(borders, options[:border]) if options.key? :border
-        
+
         style = Style.new(
           options.fetch(:format_id, 0),
           options.fetch(:font_id, 0),
           options.fetch(:fill_id, 0),
           options.fetch(:border_id, 0),
           options.fetch(:alignment, nil))
-        
+
         Xlsx.index!(styles, style)
       end
 

data/lib/xlsx/parts/workbook.rb

@@ -27,13 +27,13 @@ module Xlsx
         package.add_part "xl/tables/#{table.filename}", table
         tables.push table
       end
-      
+
       def add_defined_names(*defined_names)
         defined_names.flatten.each do |attributes|
           add_defined_name attributes
         end
       end
-      
+
       def add_defined_name(attributes)
         defined_names.push Xlsx::Elements::DefinedName.new(attributes[:name], attributes[:formula])
       end

data/lib/xlsx/parts/worksheet.rb

@@ -27,11 +27,11 @@ module Xlsx
       def add_row(attributes)
         rows.push Xlsx::Elements::Row.new(self, attributes)
       end
-      
+
       def merge_cells(*ranges)
         ranges.each { |range| cell_ranges.push range }
       end
-      
+
       def add_table(id, name, ref, columns)
         table = Xlsx::Parts::Table.new(id, name, ref, columns)
         rels.add_relationship(REL_TABLE, "../tables/#{table.filename}")

data/lib/xlsx/version.rb

@@ -1,3 +1,3 @@
 module Xlsx
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/xlsx.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> 2.0"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "open_xml_package", "0.1.0"
+  spec.add_dependency "open_xml_package", "0.2.0.beta1"
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openxml-xlsx
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Using a simple API, create xlsx files programmatically