ooxml_excel 0.0.3.2 → 0.0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 650ed5f65217c586c53de12b5d1eafdaadb0d02a
-  data.tar.gz: 72fab1922ac5014a570af54842613c33b244fcb1
+  metadata.gz: 6ada37077ee27fdaea8c64512a7abf812c0eff03
+  data.tar.gz: ff04e370268cec5b568cf99b67bc74cc7abedd65
 SHA512:
-  metadata.gz: 4a62e204782cf8ae3346c504ee9b9df8afbed809c771d3f104ca8106c6be71100874a7d4b8a8ecdecf3cfb92eef8831ab30b2ebef0f320ec20e62044e4e7b87c
-  data.tar.gz: 756f8984d194dbf7fc63f0abb12a31e039dfff964debe8a40243b8d6f8ff854668aa6e52208f3db3dbb3007f2d41448e4dfb22112fc58a203fa0bc715cee3841
+  metadata.gz: 29dd6544259f4b24a954842f929d400913964956646f0f05df2b8d554737b15267cc6a1af37f5143723f664554e460d31ae57f4f0abf4f3972b24d085ea4b0d6
+  data.tar.gz: 20a7af6b3bdb49be90ff77500c35dee10e9746d09e6baf8132679b7a986fbea9023443213121966495f512f7edb72705291d989415f875341033661f9290d7ed

data/README.md

@@ -81,10 +81,10 @@ ooxml_excel.sheet('Test Sheet 1').column('A').hidden? # column letter
 ```
 # Font
 font_object = ooxml_excel.sheet('Test Sheet 1').font('A1')
-font.bold? # false
-font.name # Arial
-font.rgb_color # FFE10000
-font.size # 8
+font_object.bold? # false
+font_object.name # Arial
+font_object.rgb_color # FFE10000
+font_object.size # 8
 
 # Cell Fill
 fill_object = ooxml_excel.sheet('Test Sheet 1').fill('A1')
@@ -105,6 +105,9 @@ ooxml['Lists'!A1:A6] # ['1','2','3','4','5','6']
 # or loading a single value
 ooxml['Lists'!A1] # ['1']
 
+# or loading a box type values
+ooxml['Lists!A1:B2'] # [['1', '2'], ['2','3']]
+
 ```
 ### Fetching Data Validation
 ```

data/lib/ooxml_excel/helper/list.rb

@@ -49,11 +49,27 @@ module OOXML
           cell_letters = formula.gsub(/[\d]/, '').split(':')
           start_index, end_index = formula.gsub(/[^\d:]/, '').split(':').map(&:to_i)
 
-          cell_letter = cell_letters.uniq.first
-          (start_index..end_index).to_a.map do |row_index|
-            row = rows[row_index-1]
-            next if row.blank?
-            row["#{cell_letter}#{row_index}"].value
+          # This will allow values from this pattern
+          # 'SheetName!A1:C3'
+          # The number after the cell letter will be the index
+          # 1 => start_index
+          # 3 => end_index
+          # Expected output would be: [['value', 'value', 'value'], ['value', 'value', 'value'], ['value', 'value', 'value']]
+          if cell_letters.uniq.size > 1
+            start_index.upto(end_index).map do  |row_index|
+              (cell_letters.first..cell_letters.last).map do |cell_letter|
+                  row = rows[row_index-1]
+                  next if row.blank?
+                  row["#{cell_letter}#{row_index}"].value
+              end
+            end
+          else
+            cell_letter = cell_letters.uniq.first
+            (start_index..end_index).to_a.map do |row_index|
+              row = rows[row_index-1]
+              next if row.blank?
+              row["#{cell_letter}#{row_index}"].value
+            end
           end
         else
           # when only one value: B2

data/lib/ooxml_excel/sheet.rb

@@ -109,7 +109,7 @@ module OOXML
         raise 'Invalid Cell Reference!' if cell_reference[/[A-Z]{1,}\d+/].blank?
         row_index = cell_reference.scan(/[A-Z{1,}](\d+)/).flatten.first.to_i - 1
         return if rows[row_index].blank? || rows[row_index][cell_reference].blank?
-        rows[row_index][cell_reference].s
+        rows[row_index][cell_reference].style_id
       end
 
     end
@@ -185,24 +185,24 @@ module OOXML
         end
 
         class Cell
-          attr_accessor :id, :t, :s, :v, :shared_strings, :styles
-          # t = type
-          # v = value
-          # s = style
+          attr_accessor :id, :type_id, :style_id, :value_id, :shared_strings, :styles
+
           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"
+            @type ||= begin
+              case type_id
+              when 's' then :string
+              when 'n' then :number
+              when 'b' then :boolean
+              when 'd' then :date
+              when 'str' then :formula
+              when 'inlineStr' then :inline_str
+              else
+                :error
+              end
             end
           end
 
@@ -230,18 +230,20 @@ module OOXML
           end
 
           def value
-            if type == "number"
-              v
+            case type
+            when :string
+              (value_id.present?) ? shared_strings[value_id.to_i] : nil
             else
-              (v.present?) ? shared_strings[v.to_i] : nil
+              # 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),
-                t: cell_node.attributes["t"].try(:value),
-                s: cell_node.attributes["s"].try(:value),
-                v: cell_node.at('v').try(:text),
+                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

data/lib/ooxml_excel/version.rb

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

metadata

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