CloudSesame 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64e3bd3d865b5e88973e645777b5eb239ecba731
-  data.tar.gz: aacdce5cf520442a2ddb233fa7f1e32aa53cfa21
+  metadata.gz: f00925c20af3319d8ce8f88dc5dff6387d8d68b6
+  data.tar.gz: f175cc69bb9a53b6a7e3c783c67d482d0361d64b
 SHA512:
-  metadata.gz: 318149aaa04d9cb4ecd2d62452c880351029c0d4a4e5194e943e72480707295c9a993bccdb5f6522bfccb9deafc5bbe1cd4ad98438b5898b0df302c1019dd169
-  data.tar.gz: 89e95869db7307f10b161ee28a0b6afd582bcdc2079f34dead7054f32fb412e2019927c4de282eac8b6db7d56cdaf2fb40646af968f4d6d9b9638e31f30ed43f
+  metadata.gz: 1eed85f4d9436110b17c7e0b842713daaaf5278014fd20f5a8c2e00931392bfb0d5e66b3ee0f796bb4df36f31753497f43353f1b93826247dbb4b0a2c03ff2f6
+  data.tar.gz: 6d4a8daea2e4edfbecbf33c325022295040a0b73ca8e8c9c11e451a23d1e2b49d728319d542a76fac93a73d1ba7a8872f3b0ce77502611519effc572fcbfd304

data/Gemfile.lock

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

data/cloud_sesame.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'CloudSesame'
-  s.version     = '0.1.3'
-  s.date        = '2016-01-13'
+  s.version     = '0.1.4'
+  s.date        = '2016-01-14'
   s.summary     = "AWS CloudSearch Query Interface"
   s.description = "AWS CloudSearch Query Interface"
   s.authors = ['Scott Chu', 'Emily Fan', 'Greg Ward', 'David McHoull',

data/lib/cloud_sesame.rb

@@ -8,35 +8,44 @@ require 'forwardable'
 require 'abstract_object'
 require 'cloud_sesame/config/credential'
 
+# Custom Errors
+# ===============================================
 require 'cloud_sesame/query/error/missing_operator_symbol'
 require 'cloud_sesame/query/error/missing_query'
 
-
+# Query DSL Methods
+# ===============================================
 require 'cloud_sesame/query/dsl/base'
+require 'cloud_sesame/query/dsl/query'
+require 'cloud_sesame/query/dsl/page'
+require 'cloud_sesame/query/dsl/sort'
 require 'cloud_sesame/query/dsl/and'
 require 'cloud_sesame/query/dsl/or'
 require 'cloud_sesame/query/dsl/range'
 require 'cloud_sesame/query/dsl/literal'
+require 'cloud_sesame/query/dsl/literal_helper'
 require 'cloud_sesame/query/dsl/scope'
 require 'cloud_sesame/query/dsl/filter_query'
 
-
-require 'cloud_sesame/query/dsl'
-require 'cloud_sesame/query/builder'
-
+# Query Query Filter Query AST Tree
+# ===============================================
 require 'cloud_sesame/query/ast/multi_branch'
 require 'cloud_sesame/query/ast/single_branch'
-require 'cloud_sesame/query/ast/leaf'
 require 'cloud_sesame/query/ast/root'
-require 'cloud_sesame/query/ast/operator'
+require 'cloud_sesame/query/ast/leaf'
+require 'cloud_sesame/query/ast/multi_expression_operator'
 require 'cloud_sesame/query/ast/and'
 require 'cloud_sesame/query/ast/or'
+require 'cloud_sesame/query/ast/single_expression_operator'
 require 'cloud_sesame/query/ast/not'
-require 'cloud_sesame/query/ast/literal'
+require 'cloud_sesame/query/ast/near'
+require 'cloud_sesame/query/ast/prefix'
 require 'cloud_sesame/query/ast/compound_array'
-require 'cloud_sesame/query/ast/prefix_literal'
+require 'cloud_sesame/query/ast/literal'
 require 'cloud_sesame/query/ast/value'
 
+# Query Request Nodes
+# ===============================================
 require 'cloud_sesame/query/node/abstract'
 require 'cloud_sesame/query/node/request'
 require 'cloud_sesame/query/node/query'
@@ -48,12 +57,17 @@ require 'cloud_sesame/query/node/facet'
 require 'cloud_sesame/query/node/page'
 require 'cloud_sesame/query/node/sort'
 
+# Query Builder Interface
+# ===============================================
+require 'cloud_sesame/query/builder'
+
+# Domain Objects
+# ===============================================
 require 'cloud_sesame/domain/base'
 require 'cloud_sesame/domain/client'
 require 'cloud_sesame/domain/config'
 require 'cloud_sesame/domain/context'
 
-
 # Public Interface
 # ===============================================
 module CloudSesame
@@ -69,7 +83,16 @@ module CloudSesame
     end
 
     def define_cloudsearch(&block)
-      cloudsearch.instance_eval &block if block_given?
+      if block_given?
+        cloudsearch.definition = block
+        cloudsearch.instance_eval &block
+      end
+    end
+
+    def load_definition_from(klass)
+      if klass.respond_to?(:cloudsearch) && klass.cloudsearch.definition
+        cloudsearch.instance_eval &klass.cloudsearch.definition
+      end
     end
 
   end

data/lib/cloud_sesame/domain/base.rb

@@ -2,18 +2,19 @@ module CloudSesame
 	module Domain
 		class Base
 			extend Forwardable
+			include Query::DSL::Scope
 
-			attr_reader :searchable_class
+			attr_accessor :definition
+			attr_reader :searchable
 
 			def_delegator :client, :config
 
-			def_delegators 	:builder, :query, :terms,
-																:page, :size,
-																:sort, :and, :or,
-																:included?, :excluded?
+			def_delegators 	:builder, :query, :page, :size, :sort,
+																:and, :or, :included?, :excluded?,
+																:method_context, :method_return, :method_scope
 
-			def initialize(searchable_class)
-				@searchable_class = searchable_class
+			def initialize(searchable)
+				@searchable = searchable
 			end
 
 			def client
@@ -21,7 +22,7 @@ module CloudSesame
 			end
 
 			def builder
-				@builder ||= CloudSesame::Query::Builder.new context, searchable_class
+				@builder ||= CloudSesame::Query::Builder.new context, searchable
 			end
 
 			# DEFAULT CONTEXT METHODS
@@ -36,22 +37,14 @@ module CloudSesame
 			end
 
 			def field(name, options = {})
-				# define filter query fields
-				context[:filter_query, true][:fields, true][name.to_sym] = {}
-
-				# define query options fields
-				define_query_options(name, options[:query]) if options[:query]
-
-				# define facet options
-				define_facet_options(name, options[:facet]) if options[:facet]
+				field_name = options[:as] || name
+				define_query_options(field_name, options.delete(:query)) if options[:query]
+				define_facet_options(field_name, options.delete(:facet)) if options[:facet]
+				define_filter_query_field(name, options)
 			end
 
-			def define_query_options(name, query_options)
-				context[:query_options, true][:fields, true][name.to_sym] = format_options(query_options)
-			end
-
-			def define_facet_options(name, facet_options)
-				context[:facet, true][name.to_sym] = format_options(facet_options)
+			def default_scope(proc, &block)
+				scope :default, proc, &block
 			end
 
 			def scope(name, proc = nil, &block)
@@ -65,6 +58,21 @@ module CloudSesame
 				options.is_a?(Hash) ? options : {}
 			end
 
+			def define_filter_query_field(name, options)
+				if (as = options[:as]) && (existing_options = context[:filter_query, true][:fields, true].delete(as))
+					options.merge!(existing_options)
+				end
+				context[:filter_query, true][:fields, true][name.to_sym] = options
+			end
+
+			def define_query_options(name, options)
+				context[:query_options, true][:fields, true][name.to_sym] = format_options(options)
+			end
+
+			def define_facet_options(name, options)
+				context[:facet, true][name.to_sym] = format_options(options)
+			end
+
 		end
 	end
 end

data/lib/cloud_sesame/domain/context.rb

@@ -16,6 +16,10 @@ module CloudSesame
         table[key] = value
       end
 
+      def delete(key)
+        table.delete key
+      end
+
       def each(&block)
         table.each &block
       end

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

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

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

@@ -9,7 +9,6 @@ module CloudSesame
 
         def field=(field)
           self.parent = nil
-          self.literal = AST::Literal
           @field = field
         end
 
@@ -20,21 +19,30 @@ module CloudSesame
 
         # SINGLE BRANCH OPERATOR
         # =======================================
+
+        # NOT
+        # =======================================
         def not(*values)
           self.parent = AST::Not
-          self.literal = AST::Literal
-          insert_children(values)
-          return self
+          insert_and_return_children(values)
         end
 
         alias_method :is_not, :not
 
+        # NEAR
+        # =======================================
+        def near(*values)
+          self.parent = AST::Near
+          insert_and_return_children(values)
+        end
+
+        alias_method :sloppy, :near
+
         # PREFIX LITERAL
         # =======================================
         def prefix(*values)
-          self.literal = AST::PrefixLiteral
-          insert_children(values)
-          return self
+          self.parent = AST::Prefix
+          insert_and_return_children(values)
         end
 
         alias_method :start_with, :prefix
@@ -44,21 +52,22 @@ module CloudSesame
         # =======================================
         # def range
         #   self.literal = AST::PrefixLiteral
-        #   insert_children(values)
+        #   insert_and_return_children(values)
         #   return self
         # end
 
         # alias_method :start_with, :prefix
 
-        def insert_children(values = [])
+        def insert_and_return_children(values = [])
           values.each do |value|
             if parent
               self << (node = parent.new scope.context)
-              node.child = literal.new(field, value, options)
+              node.child = AST::Literal.new(field, value, options)
             else
-              self << literal.new(field, value, options)
+              self << AST::Literal.new(field, value, options)
             end
           end
+          return self
         end
 
         private

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

@@ -13,12 +13,36 @@ module CloudSesame
           (options[:included] ||= []) << value
         end
 
+        def detailed
+          options[:detailed] = true
+          return self
+        end
+
         def value=(value)
           @value = Value.new(value)
         end
 
         def compile
-          "#{ field }:#{ value.compile }"
+          options[:detailed] ? long_format : short_format
+        end
+
+        def as_field
+          options[:as] || field
+        end
+
+        private
+
+        def short_format
+          "#{ as_field }:#{ value.compile }"
+        end
+
+
+        def long_format
+          "field=#{ escape as_field } #{ value.compile }"
+        end
+
+        def escape(data = "")
+          "'#{ data.to_s.gsub(/\'/) { "\\'" } }'"
         end
 
       end

data/lib/cloud_sesame/query/ast/{operator.rb → multi_expression_operator.rb}

@@ -1,7 +1,7 @@
 module CloudSesame
   module Query
     module AST
-      class Operator < MultiBranch
+      class MultiExpressionOperator < MultiBranch
 
         # Operator Symbol Writer
         def self.symbol=(symbol)

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

@@ -0,0 +1,15 @@
+module CloudSesame
+  module Query
+    module AST
+      class Near < SingleExpressionOperator
+				self.symbol = :near
+
+				def compile
+					child.detailed
+					super
+				end
+
+      end
+    end
+  end
+end

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

@@ -1,12 +1,8 @@
 module CloudSesame
   module Query
     module AST
-      class Not < SingleBranch
-
-      	def compile
-				"(not #{ child.compile })"
-      	end
-
+      class Not < SingleExpressionOperator
+				self.symbol = :not
       end
     end
   end

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

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

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

@@ -0,0 +1,15 @@
+module CloudSesame
+  module Query
+    module AST
+      class Prefix < SingleExpressionOperator
+				self.symbol = :prefix
+
+				def compile
+					child.detailed
+					super
+				end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module CloudSesame
+  module Query
+    module AST
+      class SingleExpressionOperator < SingleBranch
+
+        # Operator Symbol Writer
+        def self.symbol=(symbol)
+          @symbol = symbol
+        end
+
+        # Operator Symbol Getter
+        def self.symbol
+          @symbol
+        end
+
+        def compile
+          raise Error::MissingOperatorSymbol if self.class.symbol.nil?
+          "(#{ self.class.symbol  } #{ child.compile })" if child
+        end
+
+      end
+    end
+  end
+end

data/lib/cloud_sesame/query/builder.rb

@@ -3,57 +3,31 @@ module CloudSesame
 		class Builder
 			include DSL::Base
 			include DSL::FilterQuery
+			include DSL::Page
+			include DSL::Query
+			include DSL::Sort
 
-			attr_accessor :context, :searchable_class
+			attr_reader :context, :searchable, :result
 
-			def initialize(default_context, searchable_class)
+			def initialize(default_context, searchable)
 				@context = default_context
-				@searchable_class = searchable_class
+				@searchable = searchable
 			end
 
 			def request
-				@request ||= Node::Request.new context.dup
+				@request ||= (clear_result; Node::Request.new context.dup)
 			end
 
-			def reset
+			def clear_request
 				@request = nil
 			end
 
-			def inspect
-				"#<CloudSesame::Query::Builder:#{ object_id } #{ request.compile }>"
-			end
-
-			# CHAINABLE METHODS
-			# =========================================
-
-			def query(string)
-				request.query.query = string
-				return self
-			end
-
-			def terms(*terms)
-				request.query.terms.concat terms
-				return self
+			def clear_result
+				@result = nil
 			end
 
-			def exclude_terms(*terms)
-				request.query.terms.concat terms.map { |t| "-#{ t }" }
-				return self
-			end
-
-			def page(value)
-				request.page.page = value.to_i
-				return self
-			end
-
-			def size(value)
-				request.page.size = value.to_i
-				return self
-			end
-
-			def sort(hash = {})
-				hash.each { |key, value| request.sort[key] = value }
-				return self
+			def inspect
+				"#<CloudSesame::Query::Builder:#{ object_id } #{ request.compile }>"
 			end
 
 			# ENDING METHODS
@@ -61,10 +35,9 @@ module CloudSesame
 
 			def search
 				compiled = request.compile
-				raise Error::MissingQuery.new("Query can not be empty!") unless compiled[:query] && !compiled[:query].empty?
-				result = searchable_class.cloudsearch.client.search compiled
-				reset
-				result
+				raise Error::MissingQuery.new("Query or FilterQuery can not be empty!") if !compiled[:query] || compiled[:query].empty?
+				clear_request
+				@result = searchable.cloudsearch.client.search compiled
 			end
 
 			private

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

@@ -6,6 +6,7 @@ module CloudSesame
 				include And
 				include Or
 				include Literal
+				include LiteralHelper
 
 				# { fields: { tags: { excluded: [100] } } }
 				def included?(field, value = nil)

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

@@ -11,14 +11,6 @@ module CloudSesame
 				  node
 				end
 
-				def date(date_object)
-					strip date_object.strftime('%FT%TZ')
-				end
-
-				def strip(string)
-					string.gsub(/ /, '')
-				end
-
 				private
 
 				def fields
@@ -28,8 +20,7 @@ module CloudSesame
 				def method_missing(field, *values, &block)
 				  if fields && (options = fields[field])
 				  	method_scope.children.field = field
-				  	method_scope.children.insert_children(values)
-				  	method_scope.children
+				  	method_scope.children.insert_and_return_children(values)
 				  else
 				    super
 				  end

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

@@ -0,0 +1,17 @@
+module CloudSesame
+	module Query
+		module DSL
+			module LiteralHelper
+
+				def d(date_object)
+					strip date_object.strftime('%FT%TZ')
+				end
+
+				def strip(string)
+					string.gsub(/ /, '')
+				end
+
+			end
+		end
+	end
+end

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

@@ -0,0 +1,27 @@
+module CloudSesame
+	module Query
+		module DSL
+			module Page
+
+				def page(input = nil)
+					if input
+						request.page.page = input.to_i
+						return self
+					else
+						request.page.page
+					end
+				end
+
+				def size(input)
+					if input
+						request.page.size = input.to_i
+						return self
+					else
+						request.page.size
+					end
+				end
+
+			end
+		end
+	end
+end

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

@@ -0,0 +1,18 @@
+module CloudSesame
+	module Query
+		module DSL
+			module Query
+
+				def query(input = nil)
+					if input
+						request.query.query = input
+						return self
+					else
+						request.query.query
+					end
+				end
+
+			end
+		end
+	end
+end

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

@@ -11,7 +11,7 @@ module CloudSesame
 
 				def method_missing(name, *args, &block)
 					if scopes && (callback = scopes[name])
-						method_scope.instance_exec *args, &callback
+						self.instance_exec *args, &callback
 					  method_return
 					else
 						super

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

@@ -0,0 +1,20 @@
+module CloudSesame
+	module Query
+		module DSL
+			module Sort
+
+				def sort(input = nil)
+					if input.is_a? Hash
+						input.each { |key, value| request.sort[key] = value }
+						return self
+					elsif input
+						request.sort[input]
+					else
+						request.sort.sorting_attributes
+					end
+				end
+
+			end
+		end
+	end
+end

data/spec/cloud_sesame/domain/base_spec.rb

@@ -9,7 +9,7 @@ module CloudSesame
 
       describe '#initalize' do
         it 'should set searchable class' do
-          expect(subject.searchable_class).to eq "Test"
+          expect(subject.searchable).to eq "Test"
         end
       end
 

data/spec/cloud_sesame/query/ast/{operator_spec.rb → multi_expression_operator_spec.rb}

@@ -3,14 +3,14 @@ require "spec_helper"
 module CloudSesame
   module Query
     module AST
-      describe Operator do
+      describe MultiExpressionOperator do
         let(:proc) { Proc.new {} }
-        let(:operator) { Operator.new({}, &proc )}
-        before { Operator.symbol = :symbol }
+        let(:operator) { MultiExpressionOperator.new({}, &proc )}
+        before { MultiExpressionOperator.symbol = :symbol }
 
         describe '#compile' do
           it 'should raise an error if operator symbol has not being set' do
-            Operator.symbol = nil
+            MultiExpressionOperator.symbol = nil
             expect{ operator.compile }.to raise_error(Error::MissingOperatorSymbol)
           end
 

data/spec/cloud_sesame_spec.rb

@@ -1,58 +1,63 @@
 require 'spec_helper'
 
-describe CloudSesame, focus: true do
+describe CloudSesame do
+
+	# # AWS initializer
+	# require 'yaml'
+	# YAML.load_file('aws.yml').each do |key, value|
+	# 	ENV["AWS_#{ key }"] = value
+	# end
+
+	# # Domain Initializer /config/initializers/cloudsearch.rb
+	# CloudSesame::Domain::Client.configure do |config|
+	# 	config.access_key = ENV['AWS_ACCESS_KEY_ID']
+	# 	config.secret_key = ENV['AWS_SECRET_ACCESS_KEY']
+	# end
+
+	# # Usage Example
+	# class Product
+	# 	include CloudSesame
+
+	# 	define_cloudsearch do
+	# 		# Product CloudSesame Config
+	# 		config.endpoint = ENV['AWS_ENDPOINT']
+	# 		config.region 	= ENV['AWS_REGION']
+
+	# 		default_size 100
+	# 		field :searchable_text, 		query: { weight: 2 }
+	# 		field :description, 				query: true
+	# 		field :tags
+
+	# 		field :affiliate_advertiser_ext_id, facet: { size: 50 }
+	# 		field :currency, 						facet: true
+	# 		field :discount_percentage, facet: { buckets: %w([10,100] [25,100] [50,100] [70,100]), method: 'interval' }
+	# 		field :manufacturer_name, 	facet: { size: 50 }
+	# 		field :price, 							facet: { buckets: %w([0,25] [25,50] [50,100] [100,200] [200,}), method: 'interval' }
+	# 		field :category_string, 		facet: { sort: 'bucket', size: 10_000 }
+	# 		field :created_at
+
+	# 		scope :men_tag, -> { tags "men" }
+	# 		scope :and_mens, -> { and! { tags "men"} }
+
+	# 	end
+
+	# end
+
+	# class NewProduct < Product
+	# 	load_definition_from Product
+
+	# 	define_cloudsearch do
+	# 		field :searchable_text, 		query: { weight: 4 }
+	# 	end
+	# end
+
+	# # Example Query
+	# # result = Product.cloudsearch.query("shoes")
+	# # .page(3)
+	# # .or {
+	# # 	tags.not.near "men", "women"
+	# # }
 
-	# AWS initializer
-	require 'yaml'
-	YAML.load_file('aws.yml').each do |key, value|
-		ENV["AWS_#{ key }"] = value
-	end
-
-	# Domain Initializer /config/initializers/cloudsearch.rb
-	CloudSesame::Domain::Client.configure do |config|
-		config.access_key = ENV['AWS_ACCESS_KEY_ID']
-		config.secret_key = ENV['AWS_SECRET_ACCESS_KEY']
-	end
-
-	# Usage Example
-	class Product
-		include CloudSesame
-
-		define_cloudsearch do
-
-			# Product CloudSesame Config
-			config.endpoint = ENV['AWS_ENDPOINT']
-			config.region 	= ENV['AWS_REGION']
-
-			default_size 100
-
-			field :searchable_text, 		query: { weight: 2 }
-			field :description, 				query: true
-			field :tags
-
-			field :affiliate_advertiser_ext_id, facet: { size: 50 }
-			field :currency, 						facet: true
-			field :discount_percentage, facet: { buckets: %w([10,100] [25,100] [50,100] [70,100]), method: 'interval' }
-			field :manufacturer_name, 	facet: { size: 50 }
-			field :price, 							facet: { buckets: %w([0,25] [25,50] [50,100] [100,200] [200,}), method: 'interval' }
-			field :category_string, 		facet: { sort: 'bucket', size: 10_000 }
-			field :created_at
-
-			scope :men_tag, -> { tags "men" }
-			scope :and_mens, -> { and! { tags "men"} }
-
-		end
-
-	end
-
-	result = Product.cloudsearch.query("shoes")
-	.page(3)
-	.or {
-		tags.not.start_with 'home', 'outdoor'
-		price.start_with(100)
-	}
-
-	# result.included?(price: 100)
 	# binding.pry
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Scott Chu
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -111,22 +111,27 @@ files:
 - lib/cloud_sesame/query/ast/leaf.rb
 - lib/cloud_sesame/query/ast/literal.rb
 - lib/cloud_sesame/query/ast/multi_branch.rb
+- lib/cloud_sesame/query/ast/multi_expression_operator.rb
+- lib/cloud_sesame/query/ast/near.rb
 - lib/cloud_sesame/query/ast/not.rb
-- lib/cloud_sesame/query/ast/operator.rb
 - lib/cloud_sesame/query/ast/or.rb
-- lib/cloud_sesame/query/ast/prefix_literal.rb
+- lib/cloud_sesame/query/ast/prefix.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
 - lib/cloud_sesame/query/ast/value.rb
 - lib/cloud_sesame/query/builder.rb
-- lib/cloud_sesame/query/dsl.rb
 - lib/cloud_sesame/query/dsl/and.rb
 - lib/cloud_sesame/query/dsl/base.rb
 - lib/cloud_sesame/query/dsl/filter_query.rb
 - lib/cloud_sesame/query/dsl/literal.rb
+- lib/cloud_sesame/query/dsl/literal_helper.rb
 - lib/cloud_sesame/query/dsl/or.rb
+- lib/cloud_sesame/query/dsl/page.rb
+- lib/cloud_sesame/query/dsl/query.rb
 - lib/cloud_sesame/query/dsl/range.rb
 - lib/cloud_sesame/query/dsl/scope.rb
+- lib/cloud_sesame/query/dsl/sort.rb
 - lib/cloud_sesame/query/error/missing_operator_symbol.rb
 - lib/cloud_sesame/query/error/missing_query.rb
 - lib/cloud_sesame/query/node/abstract.rb
@@ -145,7 +150,7 @@ files:
 - spec/cloud_sesame/query/ast/and_spec.rb
 - spec/cloud_sesame/query/ast/literal_spec.rb
 - spec/cloud_sesame/query/ast/multi_branch_spec.rb
-- spec/cloud_sesame/query/ast/operator_spec.rb
+- spec/cloud_sesame/query/ast/multi_expression_operator_spec.rb
 - spec/cloud_sesame/query/ast/or_spec.rb
 - spec/cloud_sesame/query/ast/root_spec.rb
 - spec/cloud_sesame/query/ast/value_spec.rb
@@ -196,7 +201,7 @@ test_files:
 - spec/cloud_sesame/query/ast/and_spec.rb
 - spec/cloud_sesame/query/ast/literal_spec.rb
 - spec/cloud_sesame/query/ast/multi_branch_spec.rb
-- spec/cloud_sesame/query/ast/operator_spec.rb
+- spec/cloud_sesame/query/ast/multi_expression_operator_spec.rb
 - spec/cloud_sesame/query/ast/or_spec.rb
 - spec/cloud_sesame/query/ast/root_spec.rb
 - spec/cloud_sesame/query/ast/value_spec.rb

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

@@ -1,17 +0,0 @@
-module CloudSesame
-  module Query
-    module AST
-      class PrefixLiteral < Literal
-
-        def compile
-          "(prefix field=#{ escape(field) } #{ value.compile })"
-        end
-
-        def escape(data = "")
-          "'#{ data.to_s.gsub(/\'/) { "\\'" } }'"
-        end
-
-      end
-    end
-  end
-end

data/lib/cloud_sesame/query/dsl.rb

@@ -1,62 +0,0 @@
-# module CloudSesame
-#   module Query
-#     module DSL
-
-#       # CLAUSE: AND
-#       # =========================================
-#       def and(&block)
-#         filter_query.children << AST::And.new(context, &block)
-#         return filter_query
-#       end
-
-#       alias_method :all,  :and
-#       alias_method :and!, :and
-#       alias_method :+,    :and
-
-#       # CLAUSE: OR
-#       # =========================================
-#       def or(&block)
-#         filter_query.children << AST::Or.new(context, &block)
-#         return filter_query
-#       end
-
-#       alias_method :any, :or
-#       alias_method :or!, :or
-
-#       # CLAUSE: LITERAL
-#       # =========================================
-#       def literal(field, value, options = {})
-#         node = AST::Literal.new(field, value, options)
-#         filter_query.children << node
-#         node
-#       end
-
-#       def prefix(literals)
-#         literals.each { |literal| literal.options[:prefix] = true }
-#         return filter_query
-#       end
-
-#       private
-
-#       def filter_query
-#         self
-#       end
-
-#       def scopes
-#         filter_query.context[:scopes]
-#       end
-
-#       def method_missing(field, *values, &block)
-#         if context[:fields] && (options = context[:fields][field])
-#           values.map { |value| literal(field, value, options) }
-#         elsif scope && (callback = scope[field])
-#           filter_query.instance_exec *values, &callback
-#           return filter_query
-#         else
-#           super
-#         end
-#       end
-
-#     end
-#   end
-# end