CloudSesame 0.7.10 → 0.7.11

data/lib/cloud_sesame/query/ast/abstract/value.rb

@@ -11,6 +11,7 @@ module CloudSesame
           RANGE_FORMAT = Regexp.new(/\A(\[|{)(.*),(.*)(\}|\])\z/).freeze
           DIGIT_FORMAT = Regexp.new(/\A\d+(.\d+)?\z/).freeze
           DATETIME_FORMAT = Regexp.new(/\d+{4}-\d+{2}-\d+{2}T\d+{2}:\d+{2}:\d+{2}/).freeze
+          TIME_FORMAT = Regexp.new(/\d+{4}-\d+{2}-\d+{2} \d+{2}:\d+{2}:\d+{2}/).freeze
           DATE_FORMAT = Regexp.new(/\d+{4}-\d+{2}-\d+{2}/).freeze
 
           attr_reader :value, :changed, :compiled
@@ -42,6 +43,10 @@ module CloudSesame
             value.is_a?(String) && DATETIME_FORMAT =~ value
           end
 
+          def self.string_time?(value)
+            value.is_a?(String) && TIME_FORMAT =~ value
+          end
+
           def self.string_date?(value)
             value.is_a?(String) && DATE_FORMAT =~ value
           end

data/lib/cloud_sesame/query/ast/date_value.rb

@@ -5,15 +5,19 @@ module CloudSesame
 
         COMPILE_FORMAT = '%FT%TZ'.freeze
         DATETIME_FORMAT = '%FT%T'.freeze
+        TIME_FORMAT = '%F %T %z'.freeze
         DATE_FORMAT = '%F'.freeze
 
         def self.parse(value)
           return value.parse self if value.kind_of?(RangeValue)
+          range?(value) || string_range?(value) ? RangeValue.new(value, self) : new(value)
+        end
 
-          range?(value) || string_range?(value) ? RangeValue.new(value, self) :
-          string_datetime?(value) ? new(parse_datetime(value)) :
-          string_date?(value) ? new(parse_date(value)) :
-          new(value)
+        def initialize(value, type = nil)
+          value = Value.string_datetime?(value) ? parse_datetime(value) :
+                  Value.string_time?(value) ? parse_time(value) :
+                  Value.string_date?(value) ? parse_date(value) : value
+          super(value, type)
         end
 
         def to_s
@@ -22,11 +26,15 @@ module CloudSesame
 
         private
 
-        def self.parse_datetime(string)
+        def parse_datetime(string)
           DateTime.strptime(string, DATETIME_FORMAT)
         end
 
-        def self.parse_date(string)
+        def parse_time(string)
+          DateTime.strptime(string, TIME_FORMAT)
+        end
+
+        def parse_date(string)
           Date.strptime(string, DATE_FORMAT)
         end
 

data/lib/cloud_sesame/query/ast/range_value.rb

@@ -86,7 +86,7 @@ module CloudSesame
         end
 
         def build_from_string(string)
-          matches = RANGE_FORMAT.match(strip(string)).captures
+          matches = RANGE_FORMAT.match(string.strip).captures
           matches[1,2] = matches[1,2].map { |i| i unless i.empty? }
           initialize_value(*matches)
         end

data/lib/cloud_sesame/query/ast/value.rb

@@ -18,7 +18,7 @@ module CloudSesame
           (
             range_value?(value) ? RangeValue :
             numeric_value?(value) ? NumericValue :
-            datetime?(value) ? DateValue : StringValue
+            datetime_value?(value) ? DateValue : StringValue
           ).new(value, self)
         end
 
@@ -30,6 +30,10 @@ module CloudSesame
           numeric?(value) || string_numeric?(value)
         end
 
+        def self.datetime_value?(value)
+          datetime?(value) || string_datetime?(value) || string_time?(value)
+        end
+
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Scott Chu