ooxml_excel 0.0.3.1 → 0.0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06862da115a90c58b1290475d668f10ad6b1f768
-  data.tar.gz: 5bb0cc5ac07ca9eae03d916cc9d73e9bce33ecf4
+  metadata.gz: 650ed5f65217c586c53de12b5d1eafdaadb0d02a
+  data.tar.gz: 72fab1922ac5014a570af54842613c33b244fcb1
 SHA512:
-  metadata.gz: e4567ab39c4f21a8c4db08d98f251e5ed507829044edb204f535b6060fe4e37b6a688cba9f8fd2c03e1f852d0b751e06d16948a26c259c66cca2fd9cb9966c14
-  data.tar.gz: 85283efc68d4fed5aa3a36cd796e3201744d633997f083534d26e9aba7ec410abb77e570ee7343967e9a58b25cb8542fd7a0b9438bc11664152ff2cbe9c9c068
+  metadata.gz: 4a62e204782cf8ae3346c504ee9b9df8afbed809c771d3f104ca8106c6be71100874a7d4b8a8ecdecf3cfb92eef8831ab30b2ebef0f320ec20e62044e4e7b87c
+  data.tar.gz: 756f8984d194dbf7fc63f0abb12a31e039dfff964debe8a40243b8d6f8ff854668aa6e52208f3db3dbb3007f2d41448e4dfb22112fc58a203fa0bc715cee3841

data/lib/ooxml_excel/sheet.rb

@@ -52,7 +52,7 @@ module OOXML
           # TODO: get the value of merged cells
           # merged_cells = @xml.xpath('//mergeCells/mergeCell').map { |merged_cell| merged_cell.attributes["ref"].try(:value) }
           @xml.xpath('//sheetData/row').map do |row_node|
-            Excel::Sheet::Row.load_from_node(row_node, shared_strings)
+            Excel::Sheet::Row.load_from_node(row_node, shared_strings, styles)
           end
         end
       end
@@ -69,6 +69,11 @@ module OOXML
         end
       end
 
+      # def styles(cell_reference)
+      #   style_id = fetch_style_style_id(cell_reference)
+      #   style = @styles.by_id(style_id.to_i) if style_id.present?
+      # end
+
       def font(cell_reference)
         style_id = fetch_style_style_id(cell_reference)
         if style_id.present?
@@ -154,10 +159,10 @@ module OOXML
           (cell.present?) ? cell : BlankCell.new(id)
         end
 
-        def self.load_from_node(row_node, shared_strings)
+        def self.load_from_node(row_node, shared_strings, styles)
           new(id: row_node.attributes["r"].try(:value),
               spans: row_node.attributes["spans"].try(:value),
-              cells: row_node.xpath('c').map {  |cell_node| Row::Cell.load_from_node(cell_node, shared_strings) } )
+              cells: row_node.xpath('c').map {  |cell_node| Row::Cell.load_from_node(cell_node, shared_strings, styles) } )
         end
       end
     end
@@ -168,7 +173,6 @@ module OOXML
   class Excel
     class Sheet
       class Row
-        
         class BlankCell
           attr_reader :id
 
@@ -181,24 +185,65 @@ module OOXML
         end
 
         class Cell
-          attr_accessor :id, :t, :s, :v, :shared_strings
+          attr_accessor :id, :t, :s, :v, :shared_strings, :styles
           # t = type
           # v = value
-          # s = ??
+          # s = style
           def initialize(**attrs)
             attrs.each { |property, value| send("#{property}=", value)}
           end
 
+          def type
+            if t == 's'
+              "string"
+            elsif t == 'd'
+              "date"
+            elsif t == 'n'
+              "number"
+            else
+              # TODO: git all types
+              "string"
+            end
+          end
+
+          def style
+            @style ||= begin
+              if s.present?
+                style = styles.by_id(s.to_i)
+              end
+            end
+          end
+
+          def number_format
+            if (style.present?)
+              nf = style[:number_format]
+              (nf.present?) ? nf.gsub("\\", "") : nil
+            end
+          end
+
+          def font
+            (style.present?) ? style[:font] : nil
+          end
+
+          def fill
+            (style.present?) ? style[:fill]: nil
+          end
+
           def value
-            (v.present?) ? shared_strings[v.to_i] : nil
+            if type == "number"
+              v
+            else
+              (v.present?) ? shared_strings[v.to_i] : nil
+            end
           end
 
-          def self.load_from_node(cell_node, shared_strings)
+          def self.load_from_node(cell_node, shared_strings, styles)
             new(id: cell_node.attributes["r"].try(:value),
                 t: cell_node.attributes["t"].try(:value),
                 s: cell_node.attributes["s"].try(:value),
                 v: cell_node.at('v').try(:text),
-                shared_strings: shared_strings )
+                shared_strings: shared_strings,
+                styles: styles )
           end
         end
       end

data/lib/ooxml_excel/styles.rb

@@ -1,7 +1,7 @@
 module OOXML
   class Excel
     class Styles
-      attr_accessor :fonts, :fills, :cell_style_xfs
+      attr_accessor :fonts, :fills, :number_formats, :cell_style_xfs
       def initialize(**attrs)
         attrs.each { |property, value| send("#{property}=", value)}
       end
@@ -10,7 +10,8 @@ module OOXML
         cell_style = cell_style_xfs.fetch(id)
         {
           font: fonts_by_index(cell_style.font_id),
-          fill: fills_by_index(cell_style.fill_id)
+          fill: fills_by_index(cell_style.fill_id),
+          number_format: number_formats_by_index(cell_style.number_formatting_id),
         }
       end
 
@@ -22,11 +23,15 @@ module OOXML
         @fills[fill_index]
       end
 
+      def number_formats_by_index(number_format_index)
+        @number_formats.find { |number_format| number_format.id == number_format_index.to_s}.try(:code)
+      end
+
       def self.load_from_stream(xml_stream)
         style_doc = Nokogiri.XML(xml_stream).remove_namespaces!
         fonts = style_doc.xpath('//fonts/font')
         fills = style_doc.xpath('//fills/fill')
-
+        number_formats = style_doc.xpath('//numFmts/numFmt')
         # This element contains the master formatting records (xf) which
         # define the formatting applied to cells in this workbook.
         # link: https://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.cellformats(v=office.14).aspx
@@ -35,6 +40,7 @@ module OOXML
         self.new(
           fonts: fonts.map { |font_node| Excel::Styles::Font.load_from_node(font_node)},
           fills: fills.map { |fill_node| Excel::Styles::Fill.load_from_node(fill_node)},
+          number_formats: number_formats.map { |num_fmt_node| Excel::Styles::NumFmt.load_from_node(num_fmt_node) },
           cell_style_xfs: cell_style_xfs.map { |cell_style_xfs_node| Excel::Styles::CellStyleXfs.load_from_node(cell_style_xfs_node)}
         )
       end
@@ -68,7 +74,21 @@ module OOXML
     end
   end
 end
-
+module OOXML
+  class Excel
+    class Styles
+      class NumFmt
+        attr_accessor :id, :code
+        def self.load_from_node(num_fmt_node)
+          new_format = self.new.tap do |number_format|
+            number_format.id = num_fmt_node.attributes["numFmtId"].try(:value)
+            number_format.code = num_fmt_node.attributes["formatCode"].try(:value)
+          end
+        end
+      end
+    end
+  end
+end
 # <xf numFmtId="0" borderId="0" fillId="0" fontId="0" applyAlignment="1" applyFont="1" xfId="0"/>
 module OOXML
   class Excel

data/lib/ooxml_excel/version.rb

@@ -1,5 +1,5 @@
 module OOXML
   class Excel
-    VERSION = "0.0.3.1"
+    VERSION = "0.0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_excel
 version: !ruby/object:Gem::Version
-  version: 0.0.3.1
+  version: 0.0.3.2
 platform: ruby
 authors:
 - James Mones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport