ooxml_excel 0.0.3.3 → 0.0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ada37077ee27fdaea8c64512a7abf812c0eff03
-  data.tar.gz: ff04e370268cec5b568cf99b67bc74cc7abedd65
+  metadata.gz: 20ed498375c405e27133da180b758ea5380dcd86
+  data.tar.gz: 1a15b0d9cac077fe649fe0f23dfb4a4d0e80471f
 SHA512:
-  metadata.gz: 29dd6544259f4b24a954842f929d400913964956646f0f05df2b8d554737b15267cc6a1af37f5143723f664554e460d31ae57f4f0abf4f3972b24d085ea4b0d6
-  data.tar.gz: 20a7af6b3bdb49be90ff77500c35dee10e9746d09e6baf8132679b7a986fbea9023443213121966495f512f7edb72705291d989415f875341033661f9290d7ed
+  metadata.gz: a283b2355dd5eb4fab3a6bfec94f0aaf79f74efe4fdf52b01057193883b44ffc5ed35f1e8d802287cd712ecdba096cfafdf23de366167e3c7ca5745ff4f14fb1
+  data.tar.gz: d12f8eec8217bb29f52d0af5d23daa787e23c2741146beb003adf9332ca2c39cfb5c2e1b35bb023266d6237394e31b65099a8200666b184695decdc5b5b82a0b

data/lib/ooxml_excel/sheet.rb

@@ -19,7 +19,7 @@ module OOXML
       end
 
       def data_validation(cell_ref)
-        data_validations.find { |data_validation| data_validation.sqref_range.include?(cell_ref)}
+        data_validations.find { |data_validation| data_validation.in_sqref_range?(cell_ref)}
       end
 
       def column(id)
@@ -260,21 +260,12 @@ module OOXML
       class DataValidation
         attr_accessor :allow_blank, :prompt, :type, :sqref, :formula
 
-        def sqref_range
-          @sqref_range ||= begin
-            # "BH5:BH271 BI5:BI271"
-            sqref.split( ' ').map do |splitted_by_space_sqref|
-              # ["BH5:BH271, "BI5:BI271"]
-              if splitted_by_space_sqref.is_a?(Array)
-                splitted_by_space_sqref.map do |sqref|
-                  split_sqref(sqref)
-                end
-              else
-                # "BH5:BH271"
-                split_sqref(splitted_by_space_sqref)
-              end
-            end.flatten.uniq
-          end
+        def in_sqref_range?(cell_id)
+          return if cell_id.blank?
+          cell_letter = cell_id.gsub(/[\d]/, '')
+          index = cell_id.gsub(/[^\d]/, '').to_i
+          range = sqref_range.find { |cell_letter_range, row_range| cell_letter_range.include?(cell_letter)}
+          range.last.include?(index) if range.present?
         end
 
         def self.load_from_node(data_validation_node)
@@ -296,20 +287,34 @@ module OOXML
           attrs.each { |property, value| send("#{property}=", value)}
         end
 
-        def split_sqref(sqref)
-          # Example: "BH5:BH271"
-          # starting_reference: BH5
-          # ending_reference: BH271
-          starting_reference, ending_reference = sqref.split(":")
-
-          # if the starting_reference column letters are the same with ending_reference
-          # use the first one otherwise use both
-          if ending_reference.blank? || starting_reference[/A-Z{1,}/] == ending_reference[/A-Z{1,}/]
-            starting_reference
-          else
-            [starting_reference, ending_reference]
+        def sqref_range
+          @sqref_range ||= begin
+            # "BH5:BH271 BI5:BI271"
+            if !sqref.include?(':')
+              cell_letter = sqref.gsub(/[\d]/, '')
+              index = sqref.gsub(/[^\d]/, '').to_i
+              { cell_letter => (index..index)}
+            else
+              sqref.split( ' ').map do |splitted_by_space_sqref|
+                # ["BH5:BH271, "BI5:BI271"]
+                if splitted_by_space_sqref.is_a?(Array)
+                  splitted_by_space_sqref.map do |sqref|
+                    build_range(splitted_by_space_sqref)
+                  end
+                else
+                  # "BH5:BH271"
+                  build_range(splitted_by_space_sqref)
+                end
+              end.to_h
+            end
           end
         end
+
+        def build_range(sqref)
+          start_letter, end_letter = sqref.gsub(/[\d]/, '').split(':')
+          start_index, end_index = sqref.gsub(/[^\d:]/, '').split(':').map(&:to_i)
+          [(start_letter..end_letter),(start_index..end_index)]
+        end
       end
     end
   end

data/lib/ooxml_excel/styles.rb

@@ -119,7 +119,7 @@ module OOXML
   class Excel
     class Styles
       class Fill
-        attr_accessor :pattern_type, :fg_color, :fg_color_theme, :fg_color_tint, :bg_color_index, :bg_color
+        attr_accessor :pattern_type, :fg_color, :fg_color_theme, :fg_color_tint, :bg_color_index, :bg_color, :fg_color_index
 
         def initialize(**attrs)
           attrs.each { |property, value| send("#{property}=", value)}
@@ -131,12 +131,15 @@ module OOXML
           if pattern_type == "solid"
             fg_color = pattern_fill.at('fgColor')
             bg_color = pattern_fill.at('bgColor')
+            fg_color_index = fg_color.class == Nokogiri::XML::Element ? fg_color.attributes["indexed"].try(:value) : nil
+
             self.new(pattern_type: pattern_type,
                     fg_color: (fg_color.present?) ? fg_color.attributes["rgb"].try(:value) : nil,
                     fg_color_theme: (fg_color.present?) ? fg_color.attributes["theme"].try(:value) : nil,
                     fg_color_tint:  (fg_color.present?) ? fg_color.attributes["tint"].try(:value) : nil,
                     bg_color: (bg_color.present?) ?  bg_color.attributes["rgb"].try(:value) : nil,
-                    bg_color_index: (bg_color.present?) ?  bg_color.attributes["index"].try(:value) : nil)
+                    bg_color_index: (bg_color.present?) ?  bg_color.attributes["index"].try(:value) : nil,
+                    fg_color_index: fg_color_index)
           else
             self.new(pattern_type: pattern_type)
           end

data/lib/ooxml_excel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_excel
 version: !ruby/object:Gem::Version
-  version: 0.0.3.3
+  version: 0.0.3.4
 platform: ruby
 authors:
 - James Mones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: OOXML Excel - Parse Excel Spreadsheets (xlsx, xlsm).