CloudSesame 0.7.4 → 0.7.5

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

@@ -8,6 +8,8 @@ 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
+          DATE_FORMAT = Regexp.new(/\d+{4}-\d+{2}-\d+{2}/).freeze
 
           attr_reader :value, :changed, :compiled
 
@@ -31,6 +33,14 @@ module CloudSesame
             value.kind_of?(Date) || value.kind_of?(Time)
           end
 
+          def self.string_datetime?(value)
+            value.is_a?(String) && DATETIME_FORMAT =~ value
+          end
+
+          def self.string_date?(value)
+            value.is_a?(String) && DATE_FORMAT =~ value
+          end
+
           def initialize(value, type = nil)
             self.value = value
             @type = type

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

@@ -3,10 +3,20 @@ module CloudSesame
     module AST
       class DateValue < StringValue
 
-        FORMAT = '%FT%TZ'.freeze
+        COMPILE_FORMAT = '%FT%TZ'.freeze
+        DATETIME_FORMAT = '%FT%T'.freeze
+        DATE_FORMAT = '%F'.freeze
 
         def self.parse(value)
-          range?(value) || string_range?(value) ? RangeValue.new(value, self) : new(value)
+          if value.kind_of?(RangeValue)
+            value.type = self
+            return 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)
         end
 
         def to_s
@@ -15,12 +25,20 @@ module CloudSesame
 
         private
 
+        def self.parse_datetime(string)
+          DateTime.strptime(string, DATETIME_FORMAT)
+        end
+
+        def self.parse_date(string)
+          Date.strptime(string, DATE_FORMAT)
+        end
+
         def recompile(value)
           super strip format value
         end
 
         def format(value)
-          value.strftime FORMAT
+          value.strftime COMPILE_FORMAT
         end
 
       end

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

@@ -6,7 +6,7 @@ module CloudSesame
         TYPES = {
           string: StringValue,
           numeric: NumericValue,
-          date: DateValue
+          datetime: DateValue
         }
 
         def self.map_type(symbol)

data/spec/cloud_sesame/query/ast/date_value_spec.rb

@@ -0,0 +1,49 @@
+module CloudSesame
+  module Query
+    module AST
+      describe DateValue do
+
+        subject { DateValue.parse(value) }
+
+        describe '.parse' do
+          context 'when value is a date or datetime object' do
+            let(:value) { DateTime.now }
+            it 'should return an DateValue object' do
+              expect(subject).to be_kind_of(DateValue)
+              expect(subject.value).to be_kind_of(Date)
+            end
+          end
+          context 'when value is a datetime in string format' do
+            let(:value) { "2016-03-09T13:50:41+00:00" }
+            it 'should return an DateValue object' do
+              expect(subject).to be_kind_of(DateValue)
+              expect(subject.value).to be_kind_of(Date)
+            end
+          end
+          context 'when value is a date in string format' do
+            let(:value) { "2016-03-09" }
+            it 'should return an DateValue object' do
+              expect(subject).to be_kind_of(DateValue)
+              expect(subject.value).to be_kind_of(Date)
+            end
+          end
+          context 'when value is a RangeValue object' do
+            let(:value) { RangeValue.new.gt(Date.today).lt(Date.today + 3) }
+            it 'should return an RangeValue object contains DateValue inside' do
+              expect(subject).to be_kind_of(RangeValue)
+              expect(subject.value[1, 2]).to include(DateValue)
+            end
+          end
+          context 'when value is a range object' do
+            let(:value) { "[2016-03-09T13:50:41+00:00,2016-03-10]" }
+            it 'should return an RangeValue object contains DateValue inside' do
+              expect(subject).to be_kind_of(RangeValue)
+              expect(subject.value[1, 2]).to include(DateValue)
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/spec/profiling_spec.rb

@@ -109,7 +109,7 @@ fdescribe CloudSesame do
 
   @tags = [1, 2]
   q = nil
-  profile 10_000 do
+  profile 1 do
   	q = Product.cloudsearch
   						.query("black leather jacket")
   						.sort(price: :asc, created_at: :desc)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Scott Chu
@@ -230,6 +230,7 @@ files:
 - spec/cloud_sesame/query/ast/abstract/single_expression_operator_spec.rb
 - spec/cloud_sesame/query/ast/abstract/value_spec.rb
 - spec/cloud_sesame/query/ast/and_spec.rb
+- spec/cloud_sesame/query/ast/date_value_spec.rb
 - spec/cloud_sesame/query/ast/numeric_value_spec.rb
 - spec/cloud_sesame/query/ast/or_spec.rb
 - spec/cloud_sesame/query/ast/range_value_spec.rb
@@ -293,6 +294,7 @@ test_files:
 - spec/cloud_sesame/query/ast/abstract/single_expression_operator_spec.rb
 - spec/cloud_sesame/query/ast/abstract/value_spec.rb
 - spec/cloud_sesame/query/ast/and_spec.rb
+- spec/cloud_sesame/query/ast/date_value_spec.rb
 - spec/cloud_sesame/query/ast/numeric_value_spec.rb
 - spec/cloud_sesame/query/ast/or_spec.rb
 - spec/cloud_sesame/query/ast/range_value_spec.rb