CloudSesame 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d640359762a517c60a26d82969d821678bb14871
-  data.tar.gz: 7d9e1082e91951cd4d61061de81cba3416f8c93b
+  metadata.gz: 335fe9bf3866f40f945537d47a8e70ad3f23e083
+  data.tar.gz: 69a8cb804d0b705e7981a1fd798557f3fa4c622c
 SHA512:
-  metadata.gz: 392b5a7c410506f2a4c0547853c31e1ce282063191251eb3fa0f30b64cf3aa503d41bdb13e52ebaec879fa9de7f8dce00a34f846d667d6e0ea334d9b8dc4b55c
-  data.tar.gz: 064717d64e27d0ae3f172b7ab0d0bd870dd40240b93d17b5e4ff6fb6f75b7dd9cd6c4b5e0d1352dc9934997ef1c460a0ffab50c5f4b65a85736f34a7493ea1a6
+  metadata.gz: d3fa0153147426b81b495bec9e07b903f397e6fbb03f4bf66fd9e18e3b23654603abd7eaf1dcfcefb196259bd8886695775896af02b3f0198dea2d71ac8d9d01
+  data.tar.gz: aff567e8ba321f8928ad36e1ef8447668a4b467eff93d9c8c0c0f1fb29b71d477f7514620c0aee85b10471ed399957c7e2f4929cde9c0a345bb55bdd8c321e39

data/Gemfile.lock

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

data/cloud_sesame.gemspec

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

data/lib/cloud_sesame/domain/base.rb

@@ -35,6 +35,15 @@ module CloudSesame
 				define_filter_query_field(name, options)
 			end
 
+			def define_sloppiness(value)
+				context[:query, true][:sloppiness] = value.to_i
+			end
+
+			def define_fuzziness(proc = nil, &block)
+				block = proc unless block_given?
+				context[:query, true][:fuzziness] = Query::Fuzziness.new(&block)
+			end
+
 			def default_scope(proc, &block)
 				scope :default, proc, &block
 			end

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

@@ -2,7 +2,7 @@ module CloudSesame
   module Query
     module AST
       class And < MultiExpressionOperator
-        self.symbol = :and
+        SYMBOL = :and
       end
     end
   end

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

@@ -0,0 +1,30 @@
+module CloudSesame
+	module Query
+		module AST
+			class BlockChainingRelation
+				include DSL::BlockChainingMethods
+
+				attr_reader :orphan_node
+
+				def initialize(dsl_scope, dsl_return, orphan_node)
+					@dsl_scope = dsl_scope
+					@dsl_return = dsl_return
+					@orphan_node = orphan_node
+				end
+
+				def dsl_scope
+					@dsl_scope
+				end
+
+				def dsl_context
+					dsl_scope.context
+				end
+
+				def dsl_return(node = nil)
+					@dsl_scope.is_a?(Root) || !node ? @dsl_return : node
+				end
+
+			end
+		end
+	end
+end

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

@@ -0,0 +1,31 @@
+module CloudSesame
+  module Query
+    module AST
+      class FieldArray < Array
+        include DSL::FieldArrayMethods
+
+        attr_accessor :dsl_return
+        attr_reader :field, :dsl_scope, :dsl_context
+
+        def field=(field)
+          parents.clear
+          @field = field
+        end
+
+        def parents
+          @parents ||= []
+        end
+
+        def dsl_scope=(dsl_scope)
+          @dsl_context = dsl_scope.context
+          @dsl_scope = dsl_scope
+        end
+
+        def compile
+          map(&:compile).join(' ')
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module CloudSesame
   module Query
     module AST
-      class Literal < SingleBranch
+      class Literal
 
         attr_accessor :field
         attr_reader :options, :value
@@ -9,20 +9,26 @@ module CloudSesame
         def initialize(field = nil, value = nil, options = {})
           @field = field
           @value = to_value value
-          ((@options = options || {})[:included] ||= []) << @value
+          @options = options || {}
+          (@options[:included] ||= []) << @value
         end
 
-        def as_field
-          options[:as] || field
+        def is_for(field, options)
+          @field = field
+          @options = options.merge @options
         end
 
-        def compile
-          options[:detailed] ? detailed_format : standard_format
+        def is_excluded
+          options[:included].delete value
+          (options[:excluded] ||= []) << value
+        end
+
+        def as_field
+          options[:as] || field
         end
 
-        def detailed
-          options[:detailed] = true
-          return self
+        def compile(detailed = false)
+          detailed ? detailed_format : standard_format
         end
 
         private

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

@@ -1,19 +1,37 @@
 module CloudSesame
   module Query
     module AST
-      class MultiExpressionOperator < MultiBranch
-        include DSL::Boost
+      class MultiExpressionOperator < Operator
+        include DSL::Base
+        include DSL::BlockMethods
+        include DSL::FieldMethods
+        include DSL::FilterQueryMethods
+        include DSL::OperatorMethods
+        include DSL::ScopeMethods
+        include DSL::ValueMethods
 
-        def self.symbol=(symbol)
-          @symbol = symbol
+        def children
+          @children ||= create_children
         end
 
-        def self.symbol
-          @symbol
+        def compile
+          "(#{ self.class::SYMBOL  }#{ boost } #{ children.compile })" unless children.empty?
         end
 
-        def compile
-          "(#{ self.class.symbol  }#{ compile_boost } #{ compile_children })" unless children.empty?
+        def <<(object)
+          children << object
+        end
+
+        def is_excluded
+          children.map(&:is_excluded)
+        end
+
+        private
+
+        def create_children
+          array = FieldArray.new
+          array.dsl_scope = dsl_scope
+          array
         end
 
       end

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

@@ -2,20 +2,15 @@ module CloudSesame
   module Query
     module AST
       class Near < SingleExpressionOperator
-				self.symbol = :near
+        DETAILED = true
+				SYMBOL = :near
 
 				def compile
-					child.detailed if child.kind_of?(Literal)
-          "(#{ self.class.symbol  }#{ compile_boost }#{ compile_distance } #{ child.compile })" if child
+          "(#{ SYMBOL }#{ boost }#{ distance } #{ child.compile DETAILED })" if child
 				end
 
-        def distance(value)
-          @distance = value.to_i
-          return self
-        end
-
-        def compile_distance
-          " distance=#{ @distance }" if @distance
+        def distance
+          " distance=#{ options[:distance] }" if options[:distance]
         end
 
       end

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

@@ -2,7 +2,17 @@ module CloudSesame
   module Query
     module AST
       class Not < SingleExpressionOperator
-				self.symbol = :not
+				SYMBOL = :not
+
+        def <<(object)
+          object.is_excluded
+          super
+        end
+
+        def compile(detailed = nil)
+          "(#{ self.class::SYMBOL  }#{ boost } #{ child.compile })" if child
+        end
+
       end
     end
   end

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

@@ -0,0 +1,26 @@
+module CloudSesame
+  module Query
+    module AST
+      class Operator
+        SYMBOL = nil
+
+        attr_reader :context, :options
+
+        def initialize(context, options = {}, &block)
+          @context = context
+          @options = options
+          evaluate &block if block_given?
+        end
+
+        def boost
+          " boost=#{ options[:boost] }" if options[:boost]
+        end
+
+        def evaluate(&block)
+          instance_eval &block
+        end
+
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ module CloudSesame
   module Query
     module AST
       class Or < MultiExpressionOperator
-        self.symbol = :or
+        SYMBOL = :or
       end
     end
   end

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

@@ -2,12 +2,8 @@ module CloudSesame
   module Query
     module AST
       class Phrase < SingleExpressionOperator
-				self.symbol = :phrase
-
-				def compile
-					child.detailed if child.kind_of?(Literal)
-					super
-				end
+				DETAILED = true
+        SYMBOL = :prefix
       end
     end
   end

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

@@ -2,12 +2,8 @@ module CloudSesame
   module Query
     module AST
       class Prefix < SingleExpressionOperator
-				self.symbol = :prefix
-
-				def compile
-					child.detailed if child.kind_of?(Literal)
-					super
-				end
+        DETAILED = true
+				SYMBOL = :prefix
       end
     end
   end

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

@@ -4,7 +4,7 @@ module CloudSesame
       class RangeValue < Value
 
         def initialize(range = nil)
-          @data = range ? [true, to_value(range.begin), to_value(range.end), !range.exclude_end?] : [false, nil, nil, false]
+          @data = range && range.kind_of?(Range) ? [true, to_value(range.begin), to_value(range.end), !range.exclude_end?] : [false, nil, nil, false]
         end
 
         def compile

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

@@ -1,11 +1,15 @@
 module CloudSesame
   module Query
     module AST
-      class Root < And
-        self.symbol = :and
+      class Root < MultiExpressionOperator
+        SYMBOL = :and # default operator for root
 
         def compile
-          children.size > 1 ? super : compile_children
+          more_than_one_child? ? super : children.compile
+        end
+
+        def more_than_one_child?
+          children.size > 1
         end
 
       end

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

@@ -1,19 +1,28 @@
 module CloudSesame
   module Query
     module AST
-      class SingleExpressionOperator < SingleBranch
-        include DSL::Boost
+      class SingleExpressionOperator < Operator
+        include DSL::Base
+        include DSL::BlockMethods
 
-        def self.symbol=(symbol)
-          @symbol = symbol
+        DETAILED = false
+
+        attr_accessor :child
+
+        def is_for(field, field_options)
+          child.is_for field, field_options
+        end
+
+        def is_excluded
+          child.is_excluded
         end
 
-        def self.symbol
-          @symbol
+        def <<(object)
+          self.child = object
         end
 
         def compile
-          "(#{ self.class.symbol  }#{ compile_boost } #{ child.compile })" if child
+          "(#{ self.class::SYMBOL  }#{ boost } #{ child.compile self.class::DETAILED })" if child
         end
 
       end

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

@@ -2,12 +2,8 @@ module CloudSesame
   module Query
     module AST
       class Term < SingleExpressionOperator
-        self.symbol = :term
-
-        def compile
-          child.detailed if child.kind_of?(Literal)
-          super
-        end
+        DETAILED = true
+        SYMBOL = :term
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module CloudSesame
   module Query
     module AST
-      class Value < Leaf
+      class Value
 
         attr_reader :data
 
@@ -13,14 +13,14 @@ module CloudSesame
           format data
         end
 
-        def ==(value)
-          data == value || compile == value
-        end
-
         def to_s
           compile
         end
 
+        def ==(value)
+          data == value || compile == value
+        end
+
         private
 
         def format(data)

data/lib/cloud_sesame/query/builder.rb

@@ -2,11 +2,17 @@ module CloudSesame
 	module Query
 		module Builder
 			include DSL::Base
-			include DSL::FilterQuery
-			include DSL::Page
-			include DSL::Query
-			include DSL::Sort
-			include DSL::Return
+			include DSL::PageMethods
+			include DSL::QueryMethods
+			include DSL::ReturnMethods
+			include DSL::SortMethods
+
+			# Filter Query DSL
+			include DSL::BlockMethods
+			include DSL::FieldMethods
+			include DSL::FilterQueryMethods
+			include DSL::ScopeMethods
+			include DSL::ValueMethods
 
 			attr_reader :result
 
@@ -16,7 +22,7 @@ module CloudSesame
 			end
 
 			def request
-				@request ||= (clear_result; Node::Request.new context.dup)
+				@request ||= (clear_response; Node::Request.new context.dup)
 			end
 
 			def response
@@ -27,7 +33,7 @@ module CloudSesame
 				@request = nil
 			end
 
-			def clear_result
+			def clear_response
 				@response = nil
 			end
 
@@ -67,10 +73,14 @@ module CloudSesame
 
 			private
 
-			def method_scope
+			def dsl_scope
 				request.filter_query.root
 			end
 
+			def dsl_return(node = nil)
+				self
+			end
+
 		end
 	end
 end

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

@@ -5,16 +5,16 @@ module CloudSesame
 
 				private
 
-				def method_context
-					method_scope.context
+				def dsl_scope
+					self
 				end
 
-				def method_return
-					self
+				def dsl_context
+					dsl_scope.context
 				end
 
-				def method_scope
-					self
+				def dsl_return(node = nil)
+					node || dsl_scope
 				end
 
 			end

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

@@ -0,0 +1,26 @@
+module CloudSesame
+	module Query
+		module DSL
+			module BlockChainingMethods
+
+				# CLAUSE: NOT
+				# =========================================
+				def not(options = {}, &block)
+					raise missing_block unless block_given?
+					node = AST::Not.new(dsl_context, options)
+					orphan_node.evaluate &block
+					node << orphan_node
+					dsl_scope << node
+				  dsl_return node
+				end
+
+				private
+
+				def missing_block
+					Error::InvalidSyntax.new("#{ orphan_node.class::SYMBOL }.not requires a block")
+				end
+
+			end
+		end
+	end
+end

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

@@ -0,0 +1,41 @@
+module CloudSesame
+	module Query
+		module DSL
+			module BlockMethods
+
+				attr_accessor :orphan_node
+
+				# CLAUSE: AND
+				# =========================================
+				def and(options = {}, &block)
+					block_style_dsl AST::And, options, &block
+				end
+
+				alias_method :all,  :and
+				alias_method :and!, :and
+
+				# CLAUSE: OR
+				# =========================================
+				def or(options = {}, &block)
+					block_style_dsl AST::Or, options, &block
+				end
+
+				alias_method :any, :or
+				alias_method :or!, :or
+
+				private
+
+				def block_style_dsl(klass, options, &block)
+					node = klass.new dsl_context, options, &block
+					if block_given?
+						dsl_scope << node
+						dsl_return node
+					else
+						AST::BlockChainingRelation.new(dsl_scope, dsl_return, node)
+					end
+				end
+
+			end
+		end
+	end
+end

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

@@ -0,0 +1,70 @@
+module CloudSesame
+	module Query
+		module DSL
+			module FieldArrayMethods
+
+				# NEAR
+				# =======================================
+				def near(*values)
+					parents[0] = { klass: AST::Near, options: extract_options(values) }
+				  insert_and_return_children values
+				end
+
+				alias_method :sloppy, :near
+
+				# NOT
+				# =======================================
+				def not(*values)
+					parents[1] = { klass: AST::Not, options: extract_options(values) }
+				  insert_and_return_children values
+				end
+
+				alias_method :is_not, :not
+
+				# PREFIX
+				# =======================================
+				def prefix(*values)
+				  parents[0] = { klass: AST::Prefix, options: extract_options(values) }
+				  insert_and_return_children values
+				end
+
+				alias_method :start_with, :prefix
+				alias_method :begin_with, :prefix
+
+				def insert_and_return_children(values = [])
+					values.each do |value|
+						child = ensure_not_raw_value value
+						parents.compact.each do |parent|
+							node = parent[:klass].new dsl_context, parent[:options]
+							node << child
+							child = node
+				    end
+						dsl_scope << child
+					end
+					parents.clear unless values.empty?
+				  dsl_return != dsl_scope ? dsl_return : self
+				end
+
+				private
+
+				def extract_options(values)
+					values[-1].is_a?(Hash) ? values.delete_at(-1) : {}
+				end
+
+				def ensure_not_raw_value(value)
+					if value.kind_of?(AST::SingleExpressionOperator) || value.is_a?(AST::Literal)
+						value.child.is_for field, field_options
+						value
+					else
+						AST::Literal.new field, value, field_options
+					end
+				end
+
+				def field_options
+				  dsl_context[:fields][field]
+				end
+
+			end
+		end
+	end
+end

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

@@ -0,0 +1,25 @@
+module CloudSesame
+	module Query
+		module DSL
+			module FieldMethods
+
+				private
+
+				def fields
+					dsl_context[:fields]
+				end
+
+				def method_missing(field, *values, &block)
+				  if fields && (options = fields[field])
+				  	dsl_scope.children.field = field
+				  	dsl_scope.children.dsl_return = dsl_return
+				  	dsl_scope.children.insert_and_return_children values
+				  else
+				    super
+				  end
+				end
+
+			end
+		end
+	end
+end