ooxl 0.0.1.4.15 → 0.0.1.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cd2eaced2a635d0489216d35cc2993cad4b862d
-  data.tar.gz: ec8120ea78a434dff4a456f3d8f78c82b9cefd8f
+  metadata.gz: 9117afb68f904cbe4b5991da76bf4b5a1d73778a
+  data.tar.gz: eb8f5cce279755713aac13899e8d267555a485f7
 SHA512:
-  metadata.gz: 4d34305f65ec24ac089ea1b3497d53e658b79ae0cad782a95bcac453f70f71122663f1a777fbd7b3dcc349fb00fad18fbddcebc5d7c0934226c93c30a2428f3a
-  data.tar.gz: 759e4eb418cbe51928692830cd515964067826621eba57ac38c2c6c03268e8e243d7e82ab7d4c1796df894fda664f13d612e683ed5b06d52f0d7b903170868c1
+  metadata.gz: 6d544aa1cc2afc2c230749f5c15357d4d00815423cadb551f138622a79186e05cf3ac04b4811e145e44578543c622d43e6e7c09fdf5064b53fa9606796b1ab81
+  data.tar.gz: cef443f411c7b69f97e024c857e3c76d623e8c2e1310d025f45ca8a6e00bd6308a0158c117b6cc2f6a90f3c7135cf3423631fcbb2a6bb4477ba51827f7fe1765

data/lib/ooxl/util.rb

@@ -21,6 +21,16 @@ class OOXL
       node.try(:value)
     end
 
+    def column_letter_to_number(column_letter)
+      pow = column_letter.length - 1
+      result = 0
+      column_letter.each_byte do |b|
+        result += 26**pow * (b - 64)
+        pow -= 1
+      end
+      result
+    end
+
     def node_attribute_value(node, attribute_name)
       unless node.blank?
         attribute = node.attributes.find { |key, attribute| key == attribute_name}

data/lib/ooxl/version.rb

@@ -1,3 +1,3 @@
 class OOXL
-  VERSION = "0.0.1.4.15"
+  VERSION = "0.0.1.4.16"
 end

data/lib/ooxl/xl_objects/sheet/data_validation.rb

@@ -1,6 +1,7 @@
 class OOXL
   class Sheet
     class DataValidation
+      include Util
       attr_accessor :allow_blank, :prompt, :type, :sqref, :formula
 
       def in_sqref_range?(cell_id)
@@ -8,11 +9,19 @@ class OOXL
         cell_letter = cell_id.gsub(/[\d]/, '')
         index = cell_id.gsub(/[^\d]/, '').to_i
         range = sqref_range.find do |single_cell_letter_or_range, row_range|
-          single_cell_letter_or_range.is_a?(Range) ? single_cell_letter_or_range.include?(cell_letter) : single_cell_letter_or_range == cell_letter
+          single_cell_letter_or_range.is_a?(Range) ? single_cell_letter_or_range.include?(cell_letter) || in_normalized_range?(single_cell_letter_or_range, cell_letter) : single_cell_letter_or_range == cell_letter
         end
         range.last.include?(index) if range.present?
       end
 
+      def in_normalized_range?(range, letter_to_find)
+        if range.first.length != range.last.length
+          (column_letter_to_number(range.first)..column_letter_to_number(range.last)).include?(column_letter_to_number(letter_to_find))
+        else
+          range.include?(letter_to_find)
+        end
+      end
+
       def self.load_from_node(data_validation_node)
         allow_blank = data_validation_node.attribute('allowBlank').try(:value)
         prompt = data_validation_node.attribute('prompt').try(:value)

data/lib/ooxl/xl_objects/sheet.rb

@@ -21,7 +21,7 @@ class OOXL
     end
 
     def comment(cell_ref)
-      @comments[cell_ref]
+      @comments[cell_ref] unless @comments.blank?
     end
 
     def data_validation(cell_ref)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxl
 version: !ruby/object:Gem::Version
-  version: 0.0.1.4.15
+  version: 0.0.1.4.16
 platform: ruby
 authors:
 - James Mones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: OOXL Excel - Parse Excel Spreadsheets (xlsx, xlsm).