ooxl 0.0.1.4.2 → 0.0.1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dbd162a56c9167fec434f9975d905a4dca69c79
-  data.tar.gz: e483a49838c4f29346bac04ca5311d5ca8ba9ac2
+  metadata.gz: 151eec32fedade6ddda1ceb1640dd96ea21b27e3
+  data.tar.gz: 67e32ab6fa64205b3bdd8e130b441338f7cfface
 SHA512:
-  metadata.gz: febc4c1834fccadc03de6ede23cec6426a7adc2efa1aa998b6fe59ffd819324d24ac74de8d3d56fbdb151e7a0e1117b4846626f560ab37870ced107fc7b140cb
-  data.tar.gz: 2d9b0da9836a3d8481caa05a61f8a3233ba6f341642db6474d6e7b14187da2746cd0e265f644cd3f000f64fbe4f54e14a18908e811ece6a935985e0f79ea4d23
+  metadata.gz: 177c5802385bc0a0ce106c992379e91e2660db986990d4235a5a96aecbf647e2824dbcac06972ee5dd3f9c6e29b1bc8535b2702f98e0cfea7edb0887ec697dbb
+  data.tar.gz: b921d5b3e6aa9208d15fba79ad3c5fee5c6c92ba166a6ab9e221ac11d94079a03f0e8debcc83d015d5c59f2397725c72aa63f65bc8ff378a6e140f8b3a717f73

data/lib/ooxl/list_helper.rb

@@ -0,0 +1,26 @@
+class OOXL
+  module ListHelper
+    # fetch dropdown values based on given data validation formula
+    def list_values(formula)
+      # "Lists!$J$2:$J$4"
+
+      # for list values explicitly stated
+      if formula.include?(',')
+        formula.gsub('"', '').split(',')
+      elsif !formula.include?('!') && formula[/$/]
+        puts "Warning: This formula is not yet supported: #{formula} in your Data Validation's formula."
+        []
+      else
+        # # required for fetching values
+        sheet_name = formula.gsub(/[\$\']/, '').scan(/^[^!]*/).first
+        cell_range = formula.gsub(/\$/, '').scan(/(?<=!).+/).first
+
+        # fetch the sheet of the cell reference
+        working_sheet = sheet(sheet_name)
+
+        # gather values
+        list_values = working_sheet.list_values_from_cell_range(cell_range)
+      end
+    end
+  end
+end

data/lib/ooxl/ooxl.rb

@@ -1,21 +1,24 @@
 class OOXL
   include Enumerable
-  def initialize(spreadsheet_filepath)
+  include ListHelper
+
+  def initialize(spreadsheet_filepath, options={})
     @workbook = nil
     @sheets = {}
     @styles = []
     @comments = {}
     @relationships = {}
+    @options = options
     parse_spreadsheet_contents(spreadsheet_filepath)
   end
 
-  def self.open(spreadsheet_filepath)
-    new(spreadsheet_filepath)
+  def self.open(spreadsheet_filepath, options={})
+    new(spreadsheet_filepath, options)
   end
 
   def sheets(skip_hidden: false)
     @workbook.sheets.map do |sheet|
-      next if sheet[:state] != 'visible' &&  skip_hidden
+      next if sheet[:state] != 'visible' &&  (@options[:skip_hidden_sheets] || skip_hidden)
       sheet[:name]
     end.compact
   end
@@ -42,20 +45,16 @@ class OOXL
   def [](text)
     # immediately treat as cell range if an exclamation point is detected
     # otherwise, normally load a sheet
-
-    text.include?('!') ? load_list_values(text) : sheet(text)
+    text.include?('!') ? load_cell_range(text) : sheet(text)
   end
 
   def named_range(name)
-    # "Hidden11390550_39"=>"Hidden!$B$734:$B$735"
-    # ooxml.named_range('Hidden11390550_107')
-    # a typical named range would be be
     # yes_no => 'Lists'!$A$1:$A$6
     defined_name = @workbook.defined_names[name]
-    load_list_values(defined_name) if defined_name.present?
+    load_cell_range(defined_name) if defined_name.present?
   end
 
-  def load_list_values(range_text)
+  def load_cell_range(range_text)
     # get the sheet name => 'Lists'
     sheet_name = range_text.gsub(/[\$\']/, '').scan(/^[^!]*/).first
     # fetch the cell range => '$A$1:$A$6'
@@ -63,7 +62,6 @@ class OOXL
     # get the sheet object and fetch the cells in range
     sheet(sheet_name).list_values_from_cell_range(cell_range)
   end
-  alias_method :list_values, :load_list_values
 
   def fetch_comments(sheet_index)
     final_sheet_index = sheet_index+1

data/lib/ooxl/version.rb

@@ -1,3 +1,3 @@
 class OOXL
-  VERSION = "0.0.1.4.2"
+  VERSION = "0.0.1.4.4"
 end

data/lib/ooxl/xl_objects/cell.rb

@@ -10,6 +10,14 @@ class OOXL
     end
   end
 
+  # where,
+  # r = reference
+  # s = style
+  # t = type
+  # v = value
+  # <c r="A1" s="227" t="s">
+  #  <v>113944</v>
+  # </c>
   class Cell
     attr_accessor :id, :type_id, :style_id, :value_id, :shared_strings, :styles
 
@@ -18,7 +26,7 @@ class OOXL
     end
 
     def next_id(offset: 1, location: "bottom")
-      _, column_letter, column_index = id.partition(/[A-Z]/)
+      _, column_letter, column_index = id.partition(/[A-Z]+/)
 
       # ensure that all are numbers
       column_index = column_index.to_i

data/lib/ooxl/xl_objects/column.rb

@@ -1,6 +1,6 @@
 class OOXL
   class Column
-    attr_accessor :id, :width, :custom_width, :id_range, :hidden
+    attr_accessor :id, :width, :custom_width, :id_range, :hidden, :best_fit
     alias_method :hidden?, :hidden
 
     def initialize(**attrs)
@@ -11,9 +11,14 @@ class OOXL
       hidden_attr = column_node.attributes["hidden"]
       new(id: column_node.attributes["min"].try(:value),
           width: column_node.attributes["width"].try(:value),
+          best_fit: column_node.attributes["best_fit"].try(:value),
           custom_width: column_node.attributes["custom_width"].try(:value),
           id_range: (column_node.attributes["min"].value.to_i..column_node.attributes["max"].value.to_i).to_a,
           hidden: (hidden_attr.present?) ? hidden_attr.value == "1" : false)
     end
   end
 end
+
+#    <col min="3" max="3" width="6.42578125" bestFit="1" customWidth="1" />
+#    <col min="4" max="5" width="12.7109375" customWidth="1" />
+#    <col min="6" max="8" width="6.42578125" customWidth="1" />

data/lib/ooxl/xl_objects/comments.rb

@@ -22,7 +22,6 @@ class OOXL
           comment_text_node.text
         end
 
-        # value = (comment_node.xpath('./text/r/t').last || comment_node.at_xpath('./text/r/t') || comment_node.at_xpath('./text/t')).text
         id = comment_node.attributes["ref"].to_s
         [id, value]
       end.to_h
@@ -30,3 +29,98 @@ class OOXL
     end
   end
 end
+
+
+# <comments>
+#    <authors>
+#       <author>Author1</author>
+#    </authors>
+#    <commentList>
+#       <comment ref="J1" authorId="0" shapeId="0">
+#          <text>
+#             <r>
+#                <rPr>
+#                   <sz val="8" />
+#                   <color indexed="81" />
+#                   <rFont val="Tahoma" />
+#                   <family val="2" />
+#                </rPr>
+#                <t>Is the product weight consistent? ( Yes or No)</t>
+#             </r>
+#          </text>
+#       </comment>
+#       <comment ref="L1" authorId="0" shapeId="0">
+#          <text>
+#             <r>
+#                <rPr>
+#                   <sz val="8" />
+#                   <color indexed="81" />
+#                   <rFont val="Tahoma" />
+#                   <family val="2" />
+#                </rPr>
+#                <t xml:space="preserve">Enter weight of product without any packaging.
+# </t>
+#             </r>
+#          </text>
+#       </comment>
+#       <comment ref="O1" authorId="0" shapeId="0">
+#          <text>
+#             <r>
+#                <rPr>
+#                   <sz val="8" />
+#                   <color indexed="81" />
+#                   <rFont val="Tahoma" />
+#                   <family val="2" />
+#                </rPr>
+#                <t>Number of days product can remain on store shelf.</t>
+#             </r>
+#             <r>
+#                <rPr>
+#                   <sz val="8" />
+#                   <color indexed="81" />
+#                   <rFont val="Tahoma" />
+#                   <family val="2" />
+#                </rPr>
+#                <t xml:space="preserve">
+# </t>
+#             </r>
+#          </text>
+#       </comment>
+#       <comment ref="P1" authorId="0" shapeId="0">
+#          <text>
+#             <r>
+#                <rPr>
+#                   <sz val="8" />
+#                   <color indexed="81" />
+#                   <rFont val="Tahoma" />
+#                   <family val="2" />
+#                </rPr>
+#                <t>Total life of product in number of days (including shelf life).</t>
+#             </r>
+#             <r>
+#                <rPr>
+#                   <sz val="8" />
+#                   <color indexed="81" />
+#                   <rFont val="Tahoma" />
+#                   <family val="2" />
+#                </rPr>
+#                <t xml:space="preserve">
+# </t>
+#             </r>
+#          </text>
+#       </comment>
+#       <comment ref="Q1" authorId="0" shapeId="0">
+#          <text>
+#             <r>
+#                <rPr>
+#                   <sz val="8" />
+#                   <color indexed="81" />
+#                   <rFont val="Tahoma" />
+#                   <family val="2" />
+#                </rPr>
+#                <t>Product packaging Weight only!</t>
+#             </r>
+#          </text>
+#       </comment>
+#    </commentList>
+# </comments>

data/lib/ooxl/xl_objects/relationships.rb

@@ -36,3 +36,14 @@ class OOXL
 
   end
 end
+
+# Only supporting comments for now
+
+# <Relationships>
+#    <Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing" Target="../drawings/vmlDrawing1.vml" />
+#    <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing" Target="../drawings/drawing1.xml" />
+#    <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/customProperty" Target="../customProperty1.bin" />
+#    <Relationship Id="rId6" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments" Target="../comments1.xml" />
+#    <Relationship Id="rId5" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp" Target="../ctrlProps/ctrlProp2.xml" />
+#    <Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp" Target="../ctrlProps/ctrlProp1.xml" />
+# </Relationships>

data/lib/ooxl/xl_objects/row.rb

@@ -27,3 +27,7 @@ class OOXL
     end
   end
 end
+
+# <row r="1" spans="1:38" s="111" customFormat="1" ht="75" x14ac:dyDescent="0.2">
+#   <c r="A1" s="108" t="s">
+# </row>

data/lib/ooxl/xl_objects/styles/cell_style_reference.rb

@@ -17,3 +17,10 @@ class OOXL
     end
   end
 end
+
+# <cellStyleXfs count="4">
+#    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" />
+#    <xf numFmtId="0" fontId="1" fillId="0" borderId="0" />
+#    <xf numFmtId="0" fontId="39" fillId="0" borderId="0" applyProtection="0" />
+#    <xf numFmtId="9" fontId="1" fillId="0" borderId="0" applyFont="0" applyFill="0" applyBorder="0" applyAlignment="0" applyProtection="0" />
+# </cellStyleXfs>

data/lib/ooxl/xl_objects/styles/fill.rb

@@ -29,3 +29,48 @@ class OOXL
     end
   end
 end
+
+# <fills count="9">
+#    <fill>
+#       <patternFill patternType="none" />
+#    </fill>
+#    <fill>
+#       <patternFill patternType="gray125" />
+#    </fill>
+#    <fill>
+#       <patternFill patternType="solid">
+#          <fgColor theme="0" tint="-0.249977111117893" />
+#          <bgColor indexed="64" />
+#       </patternFill>
+#    </fill>
+#    <fill>
+#       <patternFill patternType="solid">
+#          <fgColor theme="0" tint="-0.249977111117893" />
+#          <bgColor indexed="31" />
+#       </patternFill>
+#    </fill>
+#    <fill>
+#       <patternFill patternType="solid">
+#          <fgColor theme="0" tint="-4.9989318521683403E-2" />
+#          <bgColor indexed="64" />
+#       </patternFill>
+#    </fill>
+#    <fill>
+#       <patternFill patternType="solid">
+#          <fgColor rgb="FFFFFF00" />
+#          <bgColor indexed="64" />
+#       </patternFill>
+#    </fill>
+#    <fill>
+#       <patternFill patternType="solid">
+#          <fgColor theme="0" tint="-0.24994659260841701" />
+#          <bgColor indexed="64" />
+#       </patternFill>
+#    </fill>
+#    <fill>
+#       <patternFill patternType="solid">
+#          <fgColor rgb="FFFFCC99" />
+#          <bgColor indexed="64" />
+#       </patternFill>
+#    </fill>
+# </fills>

data/lib/ooxl/xl_objects/styles/font.rb

@@ -22,3 +22,21 @@ class OOXL
     end
   end
 end
+
+# <fonts count="3">
+#    <font>
+#       <sz val="10" />
+#       <name val="Arial" />
+#    </font>
+#    <font>
+#       <sz val="10" />
+#       <name val="Arial" />
+#       <family val="2" />
+#    </font>
+#    <font>
+#       <b />
+#       <sz val="9" />
+#       <name val="Arial" />
+#       <family val="2" />
+#    </font>
+# </fonts>

data/lib/ooxl/xl_objects/styles/number_formatting.rb

@@ -11,3 +11,22 @@ class OOXL
     end
   end
 end
+
+# <numFmts count="16">
+#    <numFmt numFmtId="172" formatCode="000\ 00000\ 00000\ 0" />
+#    <numFmt numFmtId="173" formatCode="00000.0000" />
+#    <numFmt numFmtId="174" formatCode="00.0" />
+#    <numFmt numFmtId="175" formatCode="0000.0" />
+#    <numFmt numFmtId="176" formatCode="000000000" />
+#    <numFmt numFmtId="177" formatCode="0000" />
+#    <numFmt numFmtId="178" formatCode="0000000" />
+#    <numFmt numFmtId="179" formatCode="mm/dd/yy" />
+#    <numFmt numFmtId="180" formatCode="000000" />
+#    <numFmt numFmtId="181" formatCode="00" />
+#    <numFmt numFmtId="182" formatCode="0.000" />
+#    <numFmt numFmtId="183" formatCode="0.0" />
+#    <numFmt numFmtId="184" formatCode="000\ 00000\ 00000" />
+#    <numFmt numFmtId="185" formatCode="000000\ 000" />
+#    <numFmt numFmtId="186" formatCode="00000" />
+#    <numFmt numFmtId="187" formatCode="[$-F800]dddd\,\ mmmm\ dd\,\ yyyy" />
+# </numFmts>

data/lib/ooxl.rb

@@ -7,6 +7,7 @@ require 'zip'
 require "ooxl/version"
 
 # library
+require "ooxl/list_helper"
 require "ooxl/ooxl"
 require "ooxl/util"
 require "ooxl/xl_objects/workbook"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxl
 version: !ruby/object:Gem::Version
-  version: 0.0.1.4.2
+  version: 0.0.1.4.4
 platform: ruby
 authors:
 - James Mones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,6 +116,7 @@ files:
 - bin/console
 - bin/setup
 - lib/ooxl.rb
+- lib/ooxl/list_helper.rb
 - lib/ooxl/ooxl.rb
 - lib/ooxl/util.rb
 - lib/ooxl/version.rb