ooxml_excel 0.0.3.4 → 0.0.3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20ed498375c405e27133da180b758ea5380dcd86
-  data.tar.gz: 1a15b0d9cac077fe649fe0f23dfb4a4d0e80471f
+  metadata.gz: a4e8a2d55f8dcc29ae548606a5674f3682c5184b
+  data.tar.gz: f37a8ea439cc54f94b0f8f833f56f42bf68aa9b7
 SHA512:
-  metadata.gz: a283b2355dd5eb4fab3a6bfec94f0aaf79f74efe4fdf52b01057193883b44ffc5ed35f1e8d802287cd712ecdba096cfafdf23de366167e3c7ca5745ff4f14fb1
-  data.tar.gz: d12f8eec8217bb29f52d0af5d23daa787e23c2741146beb003adf9332ca2c39cfb5c2e1b35bb023266d6237394e31b65099a8200666b184695decdc5b5b82a0b
+  metadata.gz: 54ee46fd3a17a9a33cfff690e14ee406f8afb0284934bd3421b6e0e8739f50a61692020b3992788ded7bac448e4b1f4100ef9ea53fac4f9e2d1a58990e435b85
+  data.tar.gz: db7978d0f91c79bd66393d26e1718950b1218594397fc78465f4daf6257268e3d041898eeb6f8aeb8f20b7fbb3f534e930fe9173b8c3a0b44417d733ae5345f3

data/lib/ooxml_excel/helper/list.rb

@@ -31,7 +31,7 @@ module OOXML
 
       # Used in sheet.rb
       def list_value_formula(cell_ref)
-        data_validation = data_validations.find { |data_validation| data_validation.sqref_range.include?(cell_ref)}
+        data_validation = data_validations.find { |data_validation| data_validation.in_sqref_range?(cell_ref)}
         if data_validation.respond_to?(:type) && data_validation.type == "list"
           if data_validation.formula[/[\s\$\,\:]/]
             (data_validation.formula[/\$/].present?) ? "#{name}!#{data_validation.formula}" : data_validation.formula

data/lib/ooxml_excel/sheet.rb

@@ -264,7 +264,7 @@ module OOXML
           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 = sqref_range.find { |single_cell_letter_or_range, row_range| single_cell_letter_or_range.is_a?(Range) ? single_cell_letter_or_range.cover?(cell_letter) : single_cell_letter_or_range == cell_letter}
           range.last.include?(index) if range.present?
         end
 
@@ -311,9 +311,15 @@ module OOXML
         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)]
+          splitted_sqref = sqref.gsub(/[\d]/, '')
+          sqref_without_letters = sqref.gsub(/[^\d:]/, '')
+          if sqref.include?(':')
+            start_letter, end_letter = splitted_sqref.split(':')
+            start_index, end_index = sqref_without_letters.split(':').map(&:to_i)
+            [(start_letter..end_letter),(start_index..end_index)]
+          else
+            [(splitted_sqref..splitted_sqref),(sqref_without_letters..sqref_without_letters)]
+          end
         end
       end
     end

data/lib/ooxml_excel/styles.rb

@@ -63,10 +63,10 @@ module OOXML
           font_name_node = font_node.at('name')
           font_bold_node = font_node.at('b')
           self.new(
-            size: font_size_node.attributes["val"].value,
-            name: font_name_node.attributes["val"].value,
-            rgb_color: (font_color_node.present?) ? font_color_node.attributes["rgb"].try(:value) : nil,
-            theme: (font_color_node.present?) ? font_color_node.attributes["theme"].try(:value) : nil,
+            size: font_size_node && font_size_node.attributes["val"].value,
+            name: font_name_node && font_name_node.attributes["val"].value,
+            rgb_color: font_color_node && font_color_node.attributes["rgb"].try(:value),
+            theme: font_color_node && font_color_node.attributes["theme"].try(:value),
             bold: font_bold_node.present?
           )
         end

data/lib/ooxml_excel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_excel
 version: !ruby/object:Gem::Version
-  version: 0.0.3.4
+  version: 0.0.3.4.2
 platform: ruby
 authors:
 - James Mones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-07 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.6.4
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: OOXML Excel - Parse Excel Spreadsheets (xlsx, xlsm).