CloudSesame 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37c4c9374c039f8cdab3da4ec22d17706baa23a4
-  data.tar.gz: 9600876e639d302f4138da57c116e947087afd43
+  metadata.gz: a97ed18065996a1ded5cc2b8719d43e668383f4f
+  data.tar.gz: 94b4b851f28cbe7b50cd7f3b7d0ce45373e07e87
 SHA512:
-  metadata.gz: bc23ba7626029370ac200ddac02a57b0731cdb695d7023f8388774f116cff99a583a6c930240f12d95ac3c702b71ecc5598d0ee82304d96c958b883ec7476383
-  data.tar.gz: 7316b4b97c6bebe8beba9320df8e2e2fde31a797ec788b2257b2922e566ac17dedc61bc576417d00a5b131d73514c2d5144e63a53ffb996277e4a23404029216
+  metadata.gz: 2f62458643e0f3e95e404b326317016c07b94657a7f17ce471601d9f603667077affd7cf4319d7dd34553818f1e85f9a6e099973f701e5cc2c4e599e0893c08d
+  data.tar.gz: 756f7b2e14460b142b8ed59d5ac63dbd3f66deff02f4af71f57b4e9213e5b8ac3c5655e42796d2a20a399c0e9eedf26c88fe00d4bf295e6ddc4a1978eb242652

data/Gemfile.lock

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

data/cloud_sesame.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'CloudSesame'
-  s.version     = '0.3.6'
+  s.version     = '0.4.0'
   s.date        = '2016-01-20'
   s.summary     = "AWS CloudSearch Query DSL"
   s.description = "AWS CloudSearch Query DSL"

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

@@ -11,12 +11,10 @@ module CloudSesame
 
         def initialize(field = nil, value = nil, options = {}, &block)
           @field = field
-
           @value = Value.parse value if value
           @value = Value.parse ValueEvaluator.new.instance_exec &block if block_given?
-
           @options = options || {}
-          (@options[:included] ||= []) << @value
+          applied[@value] = true
         end
 
         def is_for(field, options)
@@ -25,27 +23,21 @@ module CloudSesame
         end
 
         def is_excluded
-          options[:included].delete value
-          (options[:excluded] ||= []) << value
+          applied[value] = applied[value] == false ? true : false
         end
 
         def as_field
-          @as_field ||= (options[:as] || field).to_s
+          options[:as] || field
         end
 
         def compile(detailed = false)
-          updated? ? recompile(detailed) : @compiled
+          detailed ? detailed_format : standard_format
         end
 
         private
 
-        def updated?
-          @compiled_value != value
-        end
-
-        def recompile(detailed)
-          @compiled_value = value
-          @compiled = detailed ? detailed_format : standard_format
+        def applied
+          options[:applied] ||= {}
         end
 
         def standard_format
@@ -53,7 +45,7 @@ module CloudSesame
         end
 
         def detailed_format
-          "field=#{ escape as_field } #{ value.compile }"
+          "field=#{ escape as_field.to_s } #{ value.compile }"
         end
 
         def escape(data)

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

@@ -5,8 +5,8 @@ module CloudSesame
         DETAILED = true
 				SYMBOL = :near
 
-				def compile
-          "(#{ symbol }#{ boost }#{ distance } #{ child.compile detailed })" if child
+				def compile(detailed = nil)
+          "(#{ symbol }#{ boost }#{ distance } #{ child.compile operator_detailed })" if child
 				end
 
         def distance

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

@@ -6,10 +6,10 @@ module CloudSesame
 
         def <<(object)
           object.is_excluded
-          super
+          self.child = object
         end
 
-        def compile(detailed = nil)
+        def compile
           "(#{ symbol  }#{ boost } #{ child.compile })" if child
         end
 

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

@@ -9,7 +9,6 @@ module CloudSesame
         def initialize(context, options = {}, &block)
           @context = context
           @options = options
-          instance_eval &block if block_given?
         end
 
         def boost

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

@@ -3,22 +3,18 @@ module CloudSesame
     module AST
       class RangeValue < Value
 
-        STRING_FORMAT = /\A(\[|{)(.*),(.*)(\}|\])\z/
+        RANGE_FORMAT = /\A(\[|{)(.*),(.*)(\}|\])\z/
 
         def initialize(value = nil)
           @data = if value.kind_of?(Range)
             range_to_array(value)
-          elsif value.is_a?(String) && (match = STRING_FORMAT.match value)
+          elsif value.is_a?(String) && (match = string_format?(value))
             @data = match.captures
           else
             default_range
           end
         end
 
-        def compile
-          "#{ lb }#{ l.to_s },#{ u.to_s }#{ ub }"
-        end
-
         def gt(value = nil)
           data[0], data[1] = '{', Value.parse(value) if value
           return self
@@ -39,18 +35,22 @@ module CloudSesame
           return self
         end
 
-        def l
-          data[1]
+        def compile
+          "#{ lb }#{ l.to_s },#{ u.to_s }#{ ub }"
         end
 
-        def u
-          data[2]
+        def ==(object)
+          data == Value.parse(object).data
         end
 
         private
 
-        def range_to_array(r)
-          ['[', r.begin, r.end, end_symbol(r)]
+        def string_format?(string)
+           RANGE_FORMAT.match string.tr(' ', '')
+        end
+
+        def range_to_array(range)
+          ['[', range.begin, range.end, end_symbol(range)]
         end
 
         def end_symbol(value)
@@ -61,6 +61,14 @@ module CloudSesame
           ['{', nil, nil, '}']
         end
 
+        def l
+          data[1]
+        end
+
+        def u
+          data[2]
+        end
+
         def lb
           data[1] ? data[0] : '{'
         end

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

@@ -21,11 +21,11 @@ module CloudSesame
           self.child = object
         end
 
-        def compile
-          "(#{ symbol  }#{ boost } #{ child.compile detailed })" if child
+        def compile(detailed = nil)
+          "(#{ symbol  }#{ boost } #{ child.compile operator_detailed })" if child
         end
 
-        def detailed
+        def operator_detailed
           self.class::DETAILED
         end
 

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

@@ -3,7 +3,7 @@ module CloudSesame
     module AST
       class Value
 
-        RANGE_FORMAT = /\A[\[\{].*[\]\}]\z/
+        RANGE_FORMAT = /\A(\[|{)(.*),(.*)(\}|\])\z/
         DIGIT_FORMAT = /\A\d+(.\d+)?\z/
         SINGLE_QUATE = /\'/
         ESCAPE_QUATE = "\\'"
@@ -12,15 +12,14 @@ module CloudSesame
 
         def self.parse(value)
           return value if value.kind_of? AST::Value
+          return AST::NumericValue.new(value) if value.is_a?(Numeric) || (value.is_a?(String) && DIGIT_FORMAT =~ value)
           return AST::DateValue.new(value) if value.kind_of?(Date) || value.kind_of?(Time)
           return AST::RangeValue.new(value) if value.kind_of?(Range) || (value.is_a?(String) && RANGE_FORMAT =~ value)
-          return AST::NumericValue.new(value) if value.is_a?(Numeric) || (value.is_a?(String) && DIGIT_FORMAT =~ value)
           AST::Value.new(value)
         end
 
         def initialize(data)
           @data = data
-          @compiled = compile
         end
 
         def compile
@@ -46,7 +45,7 @@ module CloudSesame
           @compiled = escape @compiled_data
         end
 
-        def escape(data = "")
+        def escape(data)
           "'#{ data.gsub(SINGLE_QUATE) { ESCAPE_QUATE } }'"
         end
 

data/lib/cloud_sesame/query/builder.rb

@@ -58,7 +58,7 @@ module CloudSesame
 			def search
 				compiled = request.compile
 				raise Error::MissingQuery.new("Query or FilterQuery can not be empty!") if !compiled[:query] || compiled[:query].empty?
-				@response = client.search compiled
+				@response = searchable.cloudsearch.client.search compiled
 			end
 
 			private

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

@@ -13,6 +13,10 @@ module CloudSesame
 					dsl_scope.context
 				end
 
+				def dsl_caller
+					dsl_context[:caller]
+				end
+
 				def dsl_return(node = nil)
 					node || dsl_scope
 				end

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

@@ -26,19 +26,33 @@ module CloudSesame
 				private
 
 				def block_style_dsl(klass, options, &block)
-					node = klass.new dsl_context, options, &block
+					node = klass.new dsl_context, options
 					if block_given?
+						extract_caller_from block if on_root_level?
+						node.instance_eval &block
 						dsl_scope << node
 						dsl_return node
 					else
-						return_chaining_relation(node)
+						chaining_relation_for(node)
 					end
 				end
 
-				def return_chaining_relation(node)
+				def chaining_relation_for(node)
 					AST::BlockChainingRelation.new(dsl_scope, dsl_return, node)
 				end
 
+				def on_root_level?
+					dsl_scope.is_a?(AST::Root)
+				end
+
+				def extract_caller_from(block)
+					dsl_context[:caller] = block.binding.eval "self"
+				end
+
+				def method_missing(name, *args, &block)
+					dsl_caller ? dsl_caller.send(name, *args, &block) : super
+				end
+
 			end
 		end
 	end

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

@@ -4,27 +4,42 @@ module CloudSesame
 			module FilterQueryMethods
 
 				def included?(field, value = nil)
-					(field_options = dsl_context[:fields][field]) && (
-						(value && field_options_is(:included, field_options, value)) ||
-						(!value && field_options_not_empty_in(:included, field_options))
+					!!(
+						(field_options = dsl_context[:fields][field]) &&
+						(applied = field_options[:applied]) &&
+						(
+							(!value && applied.values.any?) ||
+							(
+								value && (index = applied.keys.index(value)) &&
+								(field_options[:applied].values[index] != false)
+							)
+						)
 					)
 				end
 
 				def excluded?(field, value = nil)
-					(field_options = dsl_context[:fields][field]) && (
-						(value && field_options_is(:excluded, field_options, value)) ||
-						(!value && field_options_not_empty_in(:excluded, field_options))
+					!!(
+						(field_options = dsl_context[:fields][field]) &&
+						(applied = field_options[:applied]) &&
+						(
+							(!value && !applied.values.all?) ||
+							(
+								value && (index = applied.keys.index(value)) &&
+								field_options[:applied].values[index] == false
+							)
+						)
 					)
 				end
 
-				private
-
-				def field_options_is(type, field_options, value)
-					(values = field_options[type]) && values.include?(value)
-				end
-
-				def field_options_not_empty_in(type, field_options)
-					field_options[type] && !field_options[type].empty?
+				def applied_filters
+					applied = {}
+					dsl_context[:fields].each do |field, options|
+						if options && options[:applied] &&
+							!(values = options[:applied].select { |k, v| v }.keys).empty?
+							applied[field] = values
+						end
+					end
+					applied
 				end
 
 			end

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

@@ -9,15 +9,6 @@ module CloudSesame
         let(:block) { Proc.new {} }
         subject { Operator.new(context, options, &block) }
 
-        describe '#initialize' do
-          context 'given a block' do
-            let(:block) { Proc.new { context[:name] = :test } }
-            it 'should evalute the block' do
-              expect(subject.context[:name]).to eq :test
-            end
-          end
-        end
-
         describe '#boost' do
           context 'given boost option' do
             let(:options) {{ boost: 2 }}

data/spec/cloud_sesame_spec.rb

@@ -62,22 +62,23 @@
 # 	end
 
 
-# 	# n = 500
-# 	# result = RubyProf.profile do
-# 	#   n.times do
+# 	n = 10_000
+#   q = nil
+# 	result = RubyProf.profile do
+# 	  n.times do
 # 			q = Product.cloudsearch.query("black   jacket").sort(price: :asc).page(1).size(1000).and {
 # 					or! {
-# 						tags "men", "women"
+# 						tags "1", "2"
 # 						and! {
-# 							tags.not "child", "home"
+# 							tags.not "3", "4"
 # 						}
 # 						and!.not {
-# 							tags.start_with "great", "nice"
-# 							tags.not.start_with "super"
-# 							tags.not.near "hello world"
-# 							tags start_with("wifi"), near("electronic")
-# 							tags term "cool"
-# 							tags phrase "flash_deal"
+# 							tags.start_with "5", "6"
+# 							tags.not.start_with "7"
+# 							tags.not.near "8"
+# 							tags start_with("9"), near("10")
+# 							tags term "11"
+# 							tags phrase "12"
 # 						}
 # 						or!.not {
 # 							price 25..100
@@ -91,15 +92,31 @@
 # 							created_at gte(Date.today).lt(Date.today + 3)
 # 						}
 # 					}
-# 				}.compile
-
-# 	#   end
-# 	# end
-# 	# printer = RubyProf::FlatPrinter.new(result)
-# 	# printer.print(STDOUT, {})
-
-# 	# q = Product.cloudsearch.and {
-# 		binding.pry
-# 	# }
+# 				}
+#         a = q.applied_filters
 
+# 	  end
+# 	end
+# 	printer = RubyProf::FlatPrinter.new(result)
+# 	printer.print(STDOUT, {})
+
+# 	binding.pry
+
+#   # class TestClass
+#   #   def initialize
+#   #     @name = "scott"
+#   #   end
+#   #   def greeting
+#   #     "hello world!"
+#   #   end
+#   #   def test_method
+#   #     local = :test
+#   #     q = Product.cloudsearch.and {
+#   #       binding.pry
+#   #     }
+#   #   end
+#   # end
+
+#   # test = TestClass.new
+#   # test.test_method
 # end

metadata

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