CloudSesame 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f00925c20af3319d8ce8f88dc5dff6387d8d68b6
-  data.tar.gz: f175cc69bb9a53b6a7e3c783c67d482d0361d64b
+  metadata.gz: b7aad854d12632f7a254e4d4130381ecf2c1e468
+  data.tar.gz: d150f9b6a91d47da8fd83df34b967c78507221bf
 SHA512:
-  metadata.gz: 1eed85f4d9436110b17c7e0b842713daaaf5278014fd20f5a8c2e00931392bfb0d5e66b3ee0f796bb4df36f31753497f43353f1b93826247dbb4b0a2c03ff2f6
-  data.tar.gz: 6d4a8daea2e4edfbecbf33c325022295040a0b73ca8e8c9c11e451a23d1e2b49d728319d542a76fac93a73d1ba7a8872f3b0ce77502611519effc572fcbfd304
+  metadata.gz: 1a2374d616b59d412dcc228f51343ce56e0d9686ffc322f272a7ded656976ffeaab5492cd83547feec36619279bea6a97d094f66b8377692f3e509f89122ce2b
+  data.tar.gz: 816abf070d875a9d1d2df1e54bd0b1aa23618d09c1bcbf0d4e067c6abb6170667c8889b649066bd5fbe3d1aa4be712ce5251bfc73562fdd9a0f5c4ccac1f2ceb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    CloudSesame (0.1.3)
+    CloudSesame (0.1.4)
       aws-sdk (~> 2)
 
 GEM

data/cloud_sesame.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'CloudSesame'
-  s.version     = '0.1.4'
+  s.version     = '0.1.5'
   s.date        = '2016-01-14'
   s.summary     = "AWS CloudSearch Query Interface"
   s.description = "AWS CloudSearch Query Interface"

data/lib/cloud_sesame.rb

@@ -43,6 +43,8 @@ require 'cloud_sesame/query/ast/prefix'
 require 'cloud_sesame/query/ast/compound_array'
 require 'cloud_sesame/query/ast/literal'
 require 'cloud_sesame/query/ast/value'
+require 'cloud_sesame/query/ast/date_value'
+require 'cloud_sesame/query/ast/range_value'
 
 # Query Request Nodes
 # ===============================================

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

@@ -0,0 +1,21 @@
+module CloudSesame
+  module Query
+    module AST
+      class DateValue < Value
+
+        def initialize(data)
+          @data = data
+        end
+
+        def compile
+          strip escape @data.strftime('%FT%TZ')
+        end
+
+        def to_s
+          compile
+        end
+
+      end
+    end
+  end
+end

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

@@ -7,8 +7,9 @@ module CloudSesame
         attr_reader :value, :options
 
         def initialize(field, value, options = {})
-          @field = field
-          @value = Value.new(value)
+          self.field = field
+          self.value = value
+
           @options = options
           (options[:included] ||= []) << value
         end
@@ -19,7 +20,7 @@ module CloudSesame
         end
 
         def value=(value)
-          @value = Value.new(value)
+          @value = value.kind_of?(Value) ? value : Value.new(value)
         end
 
         def compile

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

@@ -0,0 +1,78 @@
+module CloudSesame
+  module Query
+    module AST
+      class RangeValue < Value
+
+        attr_accessor :lower_bound_included,
+                      :upper_bound_included
+
+        def initialize
+          @data = [nil, nil]
+        end
+
+        def compile
+          strip "#{ lower_bound }#{ lower.compile if lower },#{ upper.compile if upper }#{ upper_bound }"
+        end
+
+        def to_s
+          compile
+        end
+
+        def gt(value)
+          self.lower = value
+          self.lower_bound_included = false
+          return self
+        end
+
+        def gte(value)
+          self.lower = value
+          self.lower_bound_included = true
+          return self
+        end
+
+        def lt(value)
+          self.upper = value
+          self.upper_bound_included = false
+          return self
+        end
+
+        def lte(value)
+          self.upper = value
+          self.upper_bound_included = true
+          return self
+        end
+
+        def lower
+          data[0]
+        end
+
+        def lower=(value)
+          data[0] = to_value(value)
+        end
+
+        def upper
+          data[1]
+        end
+
+        def upper=(value)
+          data[1] = to_value(value)
+        end
+
+        def lower_bound
+          lower && lower_bound_included ? '[' : '{'
+        end
+
+        def upper_bound
+          upper && upper_bound_included ? ']' : '}'
+        end
+
+        private
+
+        def to_value(value)
+          value.kind_of?(Value) ? value : Value.new(value)
+        end
+
+      end
+    end
+  end
+end

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

@@ -27,11 +27,14 @@ module CloudSesame
           data.to_s =~ /^\d+(.\d+)?$/
         end
 
-        # "hello" => "'hello'"
         def escape(data = "")
           "'#{ data.to_s.gsub(/\'/) { "\\'" } }'"
         end
 
+        def strip(string)
+          string.gsub(/ /, '')
+        end
+
       end
     end
   end

data/lib/cloud_sesame/query/dsl/literal_helper.rb

@@ -3,12 +3,12 @@ module CloudSesame
 		module DSL
 			module LiteralHelper
 
-				def d(date_object)
-					strip date_object.strftime('%FT%TZ')
+				def d(date)
+					AST::DateValue.new date
 				end
 
-				def strip(string)
-					string.gsub(/ /, '')
+				def r
+					AST::RangeValue.new
 				end
 
 			end

data/spec/cloud_sesame_spec.rb

@@ -50,14 +50,12 @@ describe CloudSesame do
 	# 		field :searchable_text, 		query: { weight: 4 }
 	# 	end
 	# end
-
 	# # Example Query
-	# # result = Product.cloudsearch.query("shoes")
-	# # .page(3)
-	# # .or {
-	# # 	tags.not.near "men", "women"
-	# # }
-
+	# result = Product.cloudsearch.query("shoes")
+	# .or {
+	# 	created_at "[#{ d(Date.today - 3) },}"
+	# 	created_at r.gte(d(Date.today - 3))
+	# }
 	# binding.pry
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Scott Chu
@@ -108,6 +108,7 @@ files:
 - lib/cloud_sesame/domain/context.rb
 - lib/cloud_sesame/query/ast/and.rb
 - lib/cloud_sesame/query/ast/compound_array.rb
+- lib/cloud_sesame/query/ast/date_value.rb
 - lib/cloud_sesame/query/ast/leaf.rb
 - lib/cloud_sesame/query/ast/literal.rb
 - lib/cloud_sesame/query/ast/multi_branch.rb
@@ -116,6 +117,7 @@ files:
 - lib/cloud_sesame/query/ast/not.rb
 - lib/cloud_sesame/query/ast/or.rb
 - lib/cloud_sesame/query/ast/prefix.rb
+- lib/cloud_sesame/query/ast/range_value.rb
 - lib/cloud_sesame/query/ast/root.rb
 - lib/cloud_sesame/query/ast/single_branch.rb
 - lib/cloud_sesame/query/ast/single_expression_operator.rb