ooxl 0.0.1.4.12 → 0.0.1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d7cf128c102c85420cf8490a3e6c46d6885537c
-  data.tar.gz: 22ead8ea6734892db79611aac96396901ac51cfa
+  metadata.gz: fcec03506c3c4e21b6310bffde739a12e30f5d96
+  data.tar.gz: bfee2c62d03972e22c227a1d27e5a5152b50e042
 SHA512:
-  metadata.gz: 1841d0338c8e3d5ef192b2b6d161f3a6cf8a2983fa41dee75398602515f2d669d0ea5be1b1c905f7e2bac03fd273abf512e2dc9634fe74cf42eac60654db9671
-  data.tar.gz: ba98ee85c70a650ff63d87c37be901d2913c67178a8e590c12e4fcc2e7e3fa4ee904e42378e35eda6638fcf47cd7d22e916cee4d03fb617eb0d174a1c31bac8e
+  metadata.gz: '087477ffd62a55cb0d92835acc0ba5ac42d73cd82d0b72fb41f44b6195ced487c47450b55bce7d7caf3f9ddd0fc999d59c258577c65b546fe4221ac727653e67'
+  data.tar.gz: 7cc62053353763d581770465f530fee84b7665094b36171eddd590a479e32caa7aab9022508737947ae5382bd1ec651bd7c5dbfa685d06abf3bfc1e35510af34

data/lib/ooxl/util.rb

@@ -16,5 +16,16 @@ class OOXL
     def uniform_reference(ref)
       ref.to_s[/[A-Z]/] ? letter_index(ref) + 1 : ref
     end
+
+    def node_value_extractor(node)
+      node.try(:value)
+    end
+
+    def node_attribute_value(node, attribute_name)
+      unless node.blank?
+        attribute = node.attributes.find { |key, attribute| key == attribute_name}
+        attribute[1].value if attribute.present?
+      end
+    end
   end
 end

data/lib/ooxl/version.rb

@@ -1,3 +1,3 @@
 class OOXL
-  VERSION = "0.0.1.4.12"
+  VERSION = "0.0.1.4.13"
 end

data/lib/ooxl/xl_objects/cell.rb

@@ -8,7 +8,8 @@ class OOXL
   #  <v>113944</v>
   # </c>
   class Cell
-    attr_accessor :id, :type_id, :style_id, :value_id, :shared_strings, :styles
+    extend Util
+    attr_accessor :id, :type_id, :style_id, :value, :shared_strings, :styles
 
     def initialize(**attrs)
       attrs.each { |property, value| send("#{property}=", value)}
@@ -89,23 +90,33 @@ class OOXL
       (style.present?) ? style[:fill]: nil
     end
 
-    def value
-      case type
-      when :string
-        (value_id.present?) ? shared_strings[value_id.to_i] : nil
+    def self.load_from_node(cell_node, shared_strings, styles)
+      type_id = node_attribute_value(cell_node, 't')
+      new(id: node_attribute_value(cell_node, 'r'),
+          type_id: type_id,
+          style_id: node_attribute_value(cell_node, 's'),
+          value: extract_value(type_id, cell_node, shared_strings),
+          styles: styles )
+    end
+
+    def self.extract_value(type_id, cell_node, shared_strings)
+      value_id = cell_node.at('v').try(:text)
+
+      case type_id
+
+      when 's'
+        (value_id.present?) ? shared_strings[ Integer(value_id) ] : nil
+
+      when 'inlineStr'
+        value = []
+        cell_node.xpath('is').each do |text_node|
+          value << text_node.xpath('r/t|t').map { |value_node| value_node.text}.join('')
+        end
+        value.join('')
       else
-        # TODO: to support other types soon
         value_id
       end
-    end
 
-    def self.load_from_node(cell_node, shared_strings, styles)
-      new(id: cell_node.attributes["r"].try(:value),
-          type_id: cell_node.attributes["t"].try(:value),
-          style_id: cell_node.attributes["s"].try(:value),
-          value_id: cell_node.at('v').try(:text),
-          shared_strings: shared_strings,
-          styles: styles )
     end
   end
 

data/lib/ooxl/xl_objects/fill.rb

@@ -8,7 +8,7 @@ class OOXL
     def self.load_from_node(fill_node)
       pattern_fill = fill_node.at('patternFill')
 
-      pattern_type = pattern_fill.attributes["patternType"].value
+      pattern_type = pattern_fill.attributes["patternType"].try(:value)
       if pattern_type == "solid"
         fg_color = pattern_fill.at('fgColor')
         bg_color = pattern_fill.at('bgColor')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxl
 version: !ruby/object:Gem::Version
-  version: 0.0.1.4.12
+  version: 0.0.1.4.13
 platform: ruby
 authors:
 - James Mones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport