spreadsheet 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f644ff72e11b9264344a7fa3b882bfc2cc36c67c
-  data.tar.gz: 9c76a7e5f862ca3a2706f3ec95f891225acfd1bb
+  metadata.gz: 3b59759809c79613f618aa76b1901fbe9f51395d
+  data.tar.gz: f9139e4f955bbed1875b326f5754b751d215a8d2
 SHA512:
-  metadata.gz: 1cc27fc0a6b649df6eb051d086a847b56374c029223552da6027f1515fa72c5f22a97f7f3de2d4b8f6e92a812cfa1dc4e415e6f0fb108ea134714a5fc5d9d20c
-  data.tar.gz: 128c01ac9eced267751deffdaaa9b50bf7b5a635cea7656a64d05a821c1120377463dc80366092d25940a3f82a7dd64725ad275c0c10b0ec9855b4bfa295e28d
+  metadata.gz: 1fc8aa533c24d8207df51bf69a072438767d6783b55315bda0146b0e0da6fe4f98ca2c708b786f577206625869cd38436b9d3c0ce9a0d7cf8398ba7238ba223c
+  data.tar.gz: ff2719b9da79dbba5d323d0c2626fb351e7dbf47b77e0988aaabbbf29e56780aed6b00fdc2c7348bfbe296f0a459b805266d8d44f14e4898b9282fca8a215e46

data/History.md

@@ -1,3 +1,10 @@
+### 1.1.0 / 08.12.2015
+
+Author: Matthew Boeh <matt@crowdcompass.com>
+Date:   Mon Dec 7 11:18:55 2015 -0800
+
+* Disregard locale indicators when determining whether a cell contains a date/time.
+
 ### 1.0.9 / 18.11.2015
 
 Author: 545ch4 <s@rprojekt.org>

data/lib/spreadsheet.rb

@@ -45,7 +45,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '1.0.9'
+  VERSION = '1.1.0'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/lib/spreadsheet/format.rb

@@ -105,7 +105,8 @@ module Spreadsheet
         :date_or_time => Regexp.new(client("[hmsYMD]", 'UTF-8')),
         :datetime     => Regexp.new(client("([YMD].*[HS])|([HS].*[YMD])", 'UTF-8')),
         :time         => Regexp.new(client("[hms]", 'UTF-8')),
-        :number       => Regexp.new(client("([\#]|0+)", 'UTF-8'))
+        :number       => Regexp.new(client("([\#]|0+)", 'UTF-8')),
+        :locale       => Regexp.new(client(/\A\[\$\-\d+\]/.to_s, 'UTF-8')),
       }
 
       # Temp code to prevent merged formats in non-merged cells.
@@ -183,27 +184,35 @@ module Spreadsheet
     ##
     # Is the cell formatted as a Date?
     def date?
-      !number? && !!@regexes[:date].match(@number_format.to_s)
+      !number? && matches_format?(:date)
     end
     ##
     # Is the cell formatted as a Date or Time?
     def date_or_time?
-      !number? && !!@regexes[:date_or_time].match(@number_format.to_s)
+      !number? && matches_format?(:date_or_time)
     end
     ##
     # Is the cell formatted as a DateTime?
     def datetime?
-      !number? && !!@regexes[:datetime].match(@number_format.to_s)
+      !number? && matches_format?(:datetime)
     end
     ##
     # Is the cell formatted as a Time?
     def time?
-      !number? && !!@regexes[:time].match(@number_format.to_s)
+      !number? && matches_format?(:time)
     end
     ##
     # Is the cell formatted as a number?
     def number?
-      !!@regexes[:number].match(@number_format.to_s)
+      matches_format?(:number)
+    end
+    ##
+    # Does the cell match a particular preset format?
+    def matches_format?(name)
+      # Excel number formats may optionally include a locale identifier like this:
+      #   [$-409]
+      format = @number_format.to_s.sub(@regexes[:locale], '')
+      !!@regexes[name].match(format)
     end
   end
 end

data/test/format.rb

@@ -19,6 +19,8 @@ module Spreadsheet
       assert_equal true, @format.date?
       @format.number_format = "YMD"
       assert_equal true, @format.date?
+      @format.number_format = "[$-409]YMD"
+      assert_equal true, @format.date?
       @format.number_format = "\\$#,##0.00_);[RED]\"($\"#,##0.00\\)"
       assert_equal false, @format.date?
       @format.number_format = "0.00;[RED]\\-0.00"
@@ -32,6 +34,8 @@ module Spreadsheet
       assert_equal true, @format.date_or_time?
       @format.number_format = "hmsYMD"
       assert_equal true, @format.date_or_time?
+      @format.number_format = "[$-409]hmsYMD"
+      assert_equal true, @format.date_or_time?
       @format.number_format = "\\$#,##0.00_);[RED]\"($\"#,##0.00\\)"
       assert_equal false, @format.date_or_time?
       @format.number_format = "0.00;[RED]\\-0.00)"
@@ -62,6 +66,8 @@ module Spreadsheet
       assert_equal true, @format.time?
       @format.number_format = "hm"
       assert_equal true, @format.time?
+      @format.number_format = "[$-409]hms"
+      assert_equal true, @format.time?
       @format.number_format = "hms"
       assert_equal true, @format.time?
       @format.number_format = "\\$#,##0.00_);[RED]\"($\"#,##0.00\\)"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole