CloudSesame 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4760f588f53d52c647ac43ab20eb4e2f1fc0cee
-  data.tar.gz: 0ab550a8cdadd3cf77002a4b39c7b556c782a479
+  metadata.gz: cad47f21e63d0bbeb0258dbb151d48e0ec5641fa
+  data.tar.gz: 84db3ca4528fcf0d12f4f434774cc79d8a6c878c
 SHA512:
-  metadata.gz: 85982cd6bccb2d8a74da708ce5e30000916dab8d8e97bdd23ec77b056e3fa451b2f4e4bfa92bd69f7b5d53092bb12b304245e6bdfe204af667938863796f8d40
-  data.tar.gz: 10c0e7f35306648b13fa936e4baaaf9aefc2d06b220c3dec8aac399b79d6750906c50efa1106921d60a38b02a57a167ebd72f8e68a124f5482065a616bb23588
+  metadata.gz: 3ad6883b3f6132987d65ddfb8134a082e2b605317a7a1ade5f8e7b5512e63e5137668d45985e5e15b2bcfbd84527ee348d8d6d8b9e813ac24f42f4cf684127f7
+  data.tar.gz: b792c52ccc362256a202fbdf9c151bebd4a21ce8128e9d2efe8d66710e30690c55ef8564aa912848bdad131b8ba8847158e80d2e93672cb4d20ae0d6dbc7d1d5

data/Gemfile.lock

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

data/README.md

@@ -1,17 +1,17 @@
 #CloudSesame
-Light and Flexible CloudSearch Query Interface
+Powerful and Flexible CloudSearch Query DSL
 
-#Install
+#Installation
 * In terminal type:
 ```
 gem install CloudSesame
 ```
-* Or add this line to the application in Gemfile:
+* Or add this line to the application in `Gemfile`:
 ```
-gem 'CloudSesame
+gem 'CloudSesame'
 ```
 
-#Setup AWS Credentials
+#AWS Credentials
 *Create a initializer file, example: `config/initializers/cloud_sesame.rb`
 ```
 require 'cloud_sesame'
@@ -21,68 +21,122 @@ CloudSesame::Domain::Client.configure do |config|
 	config.secret_key = ENV['AWS_SECRET_ACCESS_KEY']
 end
 ```
-#Usage
+
+#Model Setup
 ##1. Mix CloudSesame into any class or model
+- `include CloudSesame` in a model or class
+- call `define_cloudsearch` and pass in a block to define the cloudsearch
+
+#####define_cloudsearch(&block)
+Includes all Model/Class specific cloudsearch configurations
+#####config.endpoint=(string)
+Set AWS CloudSearch instance search endpoint
+#####config.region=(string) 
+Set AWS CloudSearch isntance region
+#####default_size(integer = 10) 
+Set default search size
+#####define_sloppiness(integer)
+Setup sloppy query, it is turned off by default
+#####define_fuzziness(&block)
+Setup fuzziness, it is turned off by default.
+the block can set 3 values 
+- **max_fuzziness(integer = 3)**
+	maxinmum fuzziness per word
+- **min_char_size(integer = 6)**
+	minimum word length to trigger fuzziness
+- **fuzzy_percent(float = 0.17)**
+	percent used to calculate the fuzziness based on the word length, fuzziness whill choose between the calculated result and maximum fizziness, whichever is smaller.
+	[(word.size * fuzzy_percent).round, max_fuzziness].min
+
+#####field(symbol, options = {})
+calling field and pass in a field_name will create an literal method, which can be called to create a literal expression
+
+**field examples with query options**
+```
+field :name, query: true			
+# COMPILED: query_options[:fields] = ["name"]
+
+field :tags, query: { weight: 2 }
+# COMPILED: query_options[:fields] = ["name", "tags^2"]
+```
+**field example with facet**
+```
+# To enable facet
+field :currency, facet: true
+
+# To enable facet with buckets
+field :discount, facet: { 				
+	buckets: %w([10,100] [25,100] [50,100] [70,100]), 
+	method: 'interval' 
+}
+
+# To enable facet with max size
+field :manufacturer, facet: { size: 50 }
+
+# To enable facet with sorting
+field :category, facet: { sort: 'bucket', size: 10_000 }	
+
+```
+
+#####scope(symbol, proc, &block)
+ActiveRecord styled scope method. Scope allows you to specify commonly-used queries which can be referenced as method calls on cloudsearch or inside of operator block
+
+ 
+
+**complete example**
 ```
 class Product < ActiveRecord::Base
 	include CloudSesame
 	
-	# call `define_cloudsearch` to setup your CloudSearch config, default size (optional), fields, and scopes (optional)
 	define_cloudsearch do 
 	
-		# REQUIRED: class specific config
 		config.endpoint = ENV['AWS_PRODUCT_SEARCH_ENDPOINT']
 		config.region 	= ENV['AWS_PRODUCT_SEARCH_REGION']
 		
-		# default query size is 10
 		default_size <integer>
 		
-		# turn on sloppy query with distance
-		define_sloppiness 3
+		define_sloppiness <integer>
 		
-		# turn on fuzzy search
 		define_fuzziness {
-			max_fuzziness <integer> # => maximum fuzziness per word, DEFAULT: 3
-			min_char_size <integer>	# => minimum word size to trigger fuzziness, DEFAULT: 6
-			fuzzy_percent <float>	# => [(word.size * fuzzy_percent).round, max_fuzziness].min, DEFAULT: 0.17
+			max_fuzziness <integer>
+			min_char_size <integer>
+			fuzzy_percent <float>	
 		}
 		
-		# field config
-		field :product_name,	query: { weight: <integer> }	# => query_options[:fields] = ["product_name^<integer>"]
-		field :description,		query: true						# => query_options[:fields] = ["description"]
+		field :product_name,	query: { weight: <integer> }
+		field :description,		query: true
 		
-		field :currency,		facet: true				# => enable facet
-		field :discount,	 	facet: { 				# => enable facet with buckets
+		field :currency,		facet: true		
+		field :discount,	 	facet: { 
 			buckets: %w([10,100] [25,100] [50,100] [70,100]), 
 			method: 'interval' 
 		}
-		field :manufacturer,	facet: { size: 50 }		# => enable facet with max size
-		field :category,		facet: { 				# => enable facet with sorting
-			sort: 'bucket', size: 10_000 
+		field :manufacturer,	facet: { size: <integer> }
+		field :category,		facet: { 
+			sort: 'bucket', size: <integer> 
 		}
 		
 		field :created_at
 		
-		# scope examples
-		
-		# INPUT: "puma", 
-		# OUPUT: query="shoes", filter_query="(and manufacturer:'puma')"
 		scope :shoes_by_brand, ->(brand = nil) { query("shoes").and { manufacturer brand } if brand }
-		
-		# INPUT: 1
-		# OUPUT: filter_query="(and created_at:{'2016-01-17T00:00:00Z',})"
+	
 		scope :created_in, ->(days = nil) { and { created_at r.gt(Date.today - days) } if days }
 		
 	end
 end
 ```
-##2. Inheriting from another class or model
+
+#####load_definition_from(Class/Model)
+every cloud 
 ```
-# Inheriting Definitions from another class
 class ExclusiveProduct < Product
-
-	# load previous define cloudsearch definition
+	# load any define cloudsearch definition from class/model
 	load_definition_from Product
+end
+```
+
+```
+	
 	
 	# call define_cloudsearch again to override config 
 	# or map field to a different name
@@ -186,7 +240,10 @@ Product.cloudsearch.or { and!.not { ...} }
 ```
 
 ###Field Methods
-* field can be set by calling #<field_name> *values
+#####field_name(*values)
+- calling the field_name with multiple values will generate multiple field expression
+- fields can be chained together
+
 ```
 Product.cloudsearch.name("shoes")				
 # OUTPUT: "name:'shoes'"
@@ -200,7 +257,10 @@ Product.cloudsearch.name("shoes").price(100)
 Product.cloudsearch.and { name "shoes"; price 25..100 }
 # OUTPUT: "(and name:'shoes' price:[25,100])"
 ```
-* #not, #prefix (#start_with, #begin_with), #near can be chained after #<field_name> and takes multiple values
+
+#####field_name.field_array_method(*values)
+- #not, #prefix (#start_with, #begin_with), #near can be called after the field_name
+- #not can be chained with another operator after, example: `name.not.prefix`
 ```
 Product.cloudsearch.and { name.not "shoes"; ... }
 # OUTPUT: "(and (not name:'shoes') ...)"
@@ -242,11 +302,17 @@ r.gt(Date.today)	=> "{'2016-01-18T00:00:00Z',}"
 ```
 
 ###Search Related Methods
-* #search  => send off the request, save and returns the response and clear the request
-* #found   => returns the hits found from the response 
-* #results => returns the hits.hit from the response
-* #each    => Calls the given block once for each result, passing that result as a parameter. Returns the results itself.
-* #map     => Creates a new array containing the results returned by the block.
-
-###Other Methods
-* #
+* #search   => send off the request, save and returns the response and clear the request
+* #found    => returns the hits found from the response 
+* #results  => returns the hits.hit from the response
+* #each     => Calls the given block once for each result, passing that result as a parameter. Returns the results itself.
+* #map      => Creates a new array containing the results returned by the block.
+* #request  => returns the cloudsearch ast tree
+* #response => returns the last response
+* #clear_request => resets the request
+* #clear_reponse => resets the response
+* 
+###MISC Methods
+* #compile  => compiles the current query and return the compiled hash
+* 
+

data/cloud_sesame.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'CloudSesame'
-  s.version     = '0.2.2'
+  s.version     = '0.2.3'
   s.date        = '2016-01-14'
-  s.summary     = "AWS CloudSearch Query Interface"
-  s.description = "AWS CloudSearch Query Interface"
+  s.summary     = "AWS CloudSearch Query DSL"
+  s.description = "AWS CloudSearch Query DSL"
   s.authors = ['Scott Chu', 'Emily Fan', 'Greg Ward', 'David McHoull',
     'Alishan Ladhani', 'Justine Jones', 'Gillian Chesnais', 'Jeff Li']
   s.email = 'dev@retailcommon.com'

data/lib/cloud_sesame/domain/base.rb

@@ -2,7 +2,7 @@ module CloudSesame
 	module Domain
 		class Base
 			extend Forwardable
-			include Query::Builder
+			include Query::Methods
 
 			attr_accessor :definition
 			attr_reader :searchable, :result

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

@@ -6,9 +6,9 @@ module CloudSesame
         attr_accessor :field
         attr_reader :options, :value
 
-        def initialize(field = nil, value = nil, options = {})
+        def initialize(field = nil, value = nil, options = {}, &block)
           @field = field
-          @value = to_value value
+          @value = valufy value
           @options = options || {}
           (@options[:included] ||= []) << @value
         end
@@ -33,7 +33,7 @@ module CloudSesame
 
         private
 
-        def to_value(value)
+        def valufy(value)
           return value if value.kind_of? Value
           return RangeValue.new value if value.kind_of? Range
           return DateValue.new(value) if value.kind_of?(Date) || value.kind_of?(Time)

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

@@ -7,8 +7,8 @@ module CloudSesame
         include DSL::FieldMethods
         include DSL::FilterQueryMethods
         include DSL::OperatorMethods
+        include DSL::RangeMethods
         include DSL::ScopeMethods
-        include DSL::ValueMethods
 
         def children
           @children ||= create_children

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

@@ -11,29 +11,29 @@ module CloudSesame
           "#{ lb }#{ data[1].to_s },#{ data[2].to_s }#{ ub }"
         end
 
-        def gt(value)
-          data[0], data[1] = false, to_value(value)
+        def gt(value = nil)
+          data[0], data[1] = false, valufy(value) if value
           return self
         end
 
-        def gte(value)
-          data[0], data[1] = true, to_value(value)
+        def gte(value = nil)
+          data[0], data[1] = true, valufy(value) if value
           return self
         end
 
-        def lt(value)
-          data[2], data[3] = to_value(value), false
+        def lt(value = nil)
+          data[2], data[3] = valufy(value), false if value
           return self
         end
 
-        def lte(value)
-          data[2], data[3] = to_value(value), true
+        def lte(value = nil)
+          data[2], data[3] = valufy(value), true if value
           return self
         end
 
         private
 
-        def to_value(value)
+        def valufy(value)
           return value if value.kind_of? Value
           return DateValue.new(value) if value.kind_of?(Date) || value.kind_of?(Time)
           Value.new value

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

@@ -1,37 +1,42 @@
+# =========================================================
+# field array methods enables field array to chain
+# operators after calling the field expression
+# accessor
+# =========================================================
 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
+				  insert values
 				end
 
 				alias_method :is_not, :not
 
+				# NEAR
+				# =======================================
+				def near(*values)
+					parents[0] = { klass: AST::Near, options: extract_options(values) }
+				  insert values
+				end
+
+				alias_method :sloppy, :near
+
 				# PREFIX
 				# =======================================
 				def prefix(*values)
 				  parents[0] = { klass: AST::Prefix, options: extract_options(values) }
-				  insert_and_return_children values
+				  insert values
 				end
 
 				alias_method :start_with, :prefix
 				alias_method :begin_with, :prefix
 
-				def insert_and_return_children(values = [])
+				def insert(values = [])
 					values.each do |value|
 						child = ensure_not_raw_value value
 						parents.compact.each do |parent|
@@ -53,7 +58,7 @@ module CloudSesame
 
 				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.is_for field, field_options
 						value
 					else
 						AST::Literal.new field, value, field_options

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

@@ -5,15 +5,11 @@ module CloudSesame
 
 				private
 
-				def fields
-					dsl_context[:fields]
-				end
-
 				def method_missing(field, *values, &block)
-				  if fields && (options = fields[field])
+				  if (fields = dsl_context[:fields]) && fields[field]
 				  	dsl_scope.children.field = field
 				  	dsl_scope.children.dsl_return = dsl_return
-				  	dsl_scope.children.insert_and_return_children values
+				  	dsl_scope.children.insert values
 				  else
 				    super
 				  end

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

@@ -39,11 +39,11 @@ module CloudSesame
 				end
 
 				def create_literal(klass, options, value)
-					(operator = klass.new dsl_context, options) << literal(value)
-					return operator
+					(node = klass.new dsl_context, options) << fieldless_literal(value)
+					return node
 				end
 
-				def literal(value)
+				def fieldless_literal(value)
 					AST::Literal.new nil, value
 				end
 

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

@@ -0,0 +1,25 @@
+module CloudSesame
+	module Query
+		module DSL
+			module RangeMethods
+
+				def gt(input)
+					AST::RangeValue.new.gt(input)
+				end
+
+				def gte(input)
+					AST::RangeValue.new.gte(input)
+				end
+
+				def lt(input)
+					AST::RangeValue.new.lt(input)
+				end
+
+				def lte(input)
+					AST::RangeValue.new.lte(input)
+				end
+
+			end
+		end
+	end
+end

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

@@ -3,16 +3,23 @@ module CloudSesame
     module DSL
       module ReturnMethods
 
-        def all_fields
-          request.return_field.value = :all_fields
+        def return_fields(*fields)
+          unless fields.empty?
+            request.return_field.fields = fields
+            return self
+          else
+            request.return_field.fields
+          end
         end
 
-        def no_fields
-          request.return_field.value = :no_fields
+        def return_no_fields
+          request.return_field.fields = ['_no_fields']
+          return self
         end
 
-        def score
-          request.return_field.value = :score
+        def include_score
+          request.return_field.fields << '_score'
+          return self
         end
 
       end

data/lib/cloud_sesame/query/{builder.rb → methods.rb}

@@ -1,6 +1,6 @@
 module CloudSesame
 	module Query
-		module Builder
+		module Methods
 			include DSL::Base
 			include DSL::PageMethods
 			include DSL::QueryMethods
@@ -12,7 +12,6 @@ module CloudSesame
 			include DSL::FieldMethods
 			include DSL::FilterQueryMethods
 			include DSL::ScopeMethods
-			include DSL::ValueMethods
 
 			attr_reader :result
 

data/lib/cloud_sesame/query/node/fuzziness.rb

@@ -26,8 +26,7 @@ module CloudSesame
         end
 
         def parse(string)
-          result = each_with(string) { |word| fuzziness word }
-          join_by_and result
+          join_by_and each_with(string) { |word| fuzziness word }
         end
 
         private
@@ -46,8 +45,8 @@ module CloudSesame
           end
         end
 
-        def join_by_and(*args)
-          (args = args.flatten.compact).size > 1 ? "(#{ args.join('+') })" : args[0]
+        def join_by_and(args = [])
+          (args = args.compact).size > 1 ? "(#{ args.join('+') })" : args[0]
         end
 
         def excluding_term?(word)

data/lib/cloud_sesame/query/node/query.rb

@@ -10,7 +10,10 @@ module CloudSesame
 				end
 
 				def compile
-					{ query: join_by_or(query, fuzziness, sloppiness) }
+					compiled = [query]
+					compiled << fuzziness if context[:fuzziness]
+					compiled << sloppiness if context[:sloppiness]
+					{ query: join_by_or(compiled) }
 				end
 
 				private
@@ -23,8 +26,8 @@ module CloudSesame
 					context[:sloppiness] && query && query.include?(' ') ? "\"#{ query }\"~#{ context[:sloppiness] }" : nil
 				end
 
-				def join_by_or(*args)
-					(args = args.flatten.compact).size > 1 ? "(#{ args.join('|') })" : args[0]
+				def join_by_or(args = [])
+					(args = args.compact).size > 1 ? "(#{ args.join('|') })" : args[0]
 				end
 
 			end

data/lib/cloud_sesame/query/node/return.rb

@@ -3,16 +3,14 @@ module CloudSesame
     module Node
       class Return < Abstract
 
-        attr_accessor :value
+        attr_accessor :fields
 
-        def compile
-          { return: format(value) } if value
+        def fields
+          @fields ||= []
         end
 
-        private
-
-        def format(value)
-          value.to_s.gsub(/^_?/, '_')
+        def compile
+          { return: fields.join(',') } unless fields.empty?
         end
 
       end

data/lib/cloud_sesame.rb

@@ -28,9 +28,8 @@ require 'cloud_sesame/query/dsl/field_methods'
 require 'cloud_sesame/query/dsl/field_array_methods'
 require 'cloud_sesame/query/dsl/filter_query_methods'
 require 'cloud_sesame/query/dsl/operator_methods'
+require 'cloud_sesame/query/dsl/range_methods'
 require 'cloud_sesame/query/dsl/scope_methods'
-require 'cloud_sesame/query/dsl/value_methods'
-
 
 # Query Query Filter Query AST Tree
 # ===============================================
@@ -69,7 +68,7 @@ require 'cloud_sesame/query/node/return'
 
 # Query Builder Interface
 # ===============================================
-require 'cloud_sesame/query/builder'
+require 'cloud_sesame/query/methods'
 
 # Domain Objects
 # ===============================================

data/spec/cloud_sesame/query/{builder_spec.rb → methods_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module CloudSesame
   module Query
-    describe Builder do
+    describe Methods do
       let(:client) { {} }
       let(:searchable_class) { "Test" }
       subject { Builder.new(client, searchable_class) }

data/spec/cloud_sesame_spec.rb

@@ -66,26 +66,35 @@ describe CloudSesame do
 	# end
 
 	# # Example Query
-	# query = Product.cloudsearch.query("shoes").and {
-	# 	searchable_text(start_with("puma")).not("nike")
-	# }
-	# .created_at(Time.now).description("wasup")
-
-	# # .and {
-	# # 	or!(boost: 2) {
-	# # 		# tags.not start_with "flash_deal"
-	# # 		tags.not.start_with "flash_deal"
-	# # 		# tags.near"sales"
-	# # 		# tags start_with("flash_deal"), near("sales")
-	# # 	}
-	# # 	or!.not {
-	# # 		currency "CAD", "EUR"
-	# # 	}
-	# # 	and! {
-	# # 		price r.gte(100).lt(200)
-	# # 	}
-
-
-	# binding.pry
+	# require 'benchmark'
+	# Benchmark.bm do |x|
+	#   x.report do
+	#   	1.times do |i|
+	#   		query = Product.cloudsearch.query("black   jacket").sort(price: :ast).page(1).size(1000).or {
+	#   				or! {
+	#   					tags("men", "women")
+	#   				}
+	#   				tags.not start_with("automotive"), "home"
+	#   				and! {
+	#   					price gt(100).lt(500)
+	# 	  				created_at gt(Date.today - 7)
+	# 	  				currency "CAD", "USD"
+	#   				}
+
+	# 				}.or {
+	# 					and! {
+	# 						tags "outdoor"
+	#   					price gt(200).lt(1000)
+	# 	  				created_at gt(Date.today - 7)
+	# 	  				currency "CAD", "USD"
+	#   				}
+	# 				}
+
+	# 			query.compile
+	#   	end
+ #  	end
+	# end
+
+
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Scott Chu
@@ -87,7 +87,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: AWS CloudSearch Query Interface
+description: AWS CloudSearch Query DSL
 email: dev@retailcommon.com
 executables: []
 extensions: []
@@ -124,7 +124,6 @@ files:
 - lib/cloud_sesame/query/ast/single_expression_operator.rb
 - lib/cloud_sesame/query/ast/term.rb
 - lib/cloud_sesame/query/ast/value.rb
-- lib/cloud_sesame/query/builder.rb
 - lib/cloud_sesame/query/dsl/base.rb
 - lib/cloud_sesame/query/dsl/block_chaining_methods.rb
 - lib/cloud_sesame/query/dsl/block_methods.rb
@@ -134,14 +133,14 @@ files:
 - lib/cloud_sesame/query/dsl/operator_methods.rb
 - lib/cloud_sesame/query/dsl/page_methods.rb
 - lib/cloud_sesame/query/dsl/query_methods.rb
+- lib/cloud_sesame/query/dsl/range_methods.rb
 - lib/cloud_sesame/query/dsl/return_methods.rb
 - lib/cloud_sesame/query/dsl/scope_methods.rb
 - lib/cloud_sesame/query/dsl/sort_methods.rb
-- lib/cloud_sesame/query/dsl/value_methods.rb
 - lib/cloud_sesame/query/error/invalid_syntax.rb
 - lib/cloud_sesame/query/error/missing_operator_symbol.rb
 - lib/cloud_sesame/query/error/missing_query.rb
-- lib/cloud_sesame/query/fuzziness.rb
+- lib/cloud_sesame/query/methods.rb
 - lib/cloud_sesame/query/node/abstract.rb
 - lib/cloud_sesame/query/node/facet.rb
 - lib/cloud_sesame/query/node/filter_query.rb
@@ -157,13 +156,13 @@ files:
 - spec/abstract_object_spec.rb
 - spec/cloud_sesame/domain/base_spec.rb
 - spec/cloud_sesame/domain/context_spec.rb
-- spec/cloud_sesame/query/builder_spec.rb
 - spec/cloud_sesame/query/dsl/base_spec.rb
 - spec/cloud_sesame/query/dsl/block_chaining_methods_spec.rb
 - spec/cloud_sesame/query/dsl/block_methods_spec.rb
 - spec/cloud_sesame/query/dsl/field_array_methods_spec.rb
 - spec/cloud_sesame/query/dsl/field_methods_spec.rb
 - spec/cloud_sesame/query/dsl_spec.rb
+- spec/cloud_sesame/query/methods_spec.rb
 - spec/cloud_sesame/query/node/abstract_spec.rb
 - spec/cloud_sesame/query/node/facet_spec.rb
 - spec/cloud_sesame/query/node/filter_query_spec.rb
@@ -198,18 +197,18 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: AWS CloudSearch Query Interface
+summary: AWS CloudSearch Query DSL
 test_files:
 - spec/abstract_object_spec.rb
 - spec/cloud_sesame/domain/base_spec.rb
 - spec/cloud_sesame/domain/context_spec.rb
-- spec/cloud_sesame/query/builder_spec.rb
 - spec/cloud_sesame/query/dsl/base_spec.rb
 - spec/cloud_sesame/query/dsl/block_chaining_methods_spec.rb
 - spec/cloud_sesame/query/dsl/block_methods_spec.rb
 - spec/cloud_sesame/query/dsl/field_array_methods_spec.rb
 - spec/cloud_sesame/query/dsl/field_methods_spec.rb
 - spec/cloud_sesame/query/dsl_spec.rb
+- spec/cloud_sesame/query/methods_spec.rb
 - spec/cloud_sesame/query/node/abstract_spec.rb
 - spec/cloud_sesame/query/node/facet_spec.rb
 - spec/cloud_sesame/query/node/filter_query_spec.rb

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

@@ -1,25 +0,0 @@
-module CloudSesame
-	module Query
-		module DSL
-			module ValueMethods
-
-				# DATE
-        # =======================================
-				def date(date)
-					AST::DateValue.new date
-				end
-
-				alias_method :d, :date
-
-        # RANGE
-        # =======================================
-				def range(range = nil)
-					AST::RangeValue.new range
-				end
-
-				alias_method :r, :range
-
-			end
-		end
-	end
-end

data/lib/cloud_sesame/query/fuzziness.rb

@@ -1,58 +0,0 @@
-module CloudSesame
-  module Query
-    class Fuzziness
-
-      def initialize(&block)
-
-        # default fuzziness
-        @max_fuzziness = 3
-        @min_char_size = 6
-        @fuzzy_percent = 0.17
-
-        instance_eval &block if block_given?
-      end
-
-      def max_fuzziness(int)
-        @max_fuzziness = int.to_i
-      end
-
-      def min_char_size(int)
-        @min_char_size = int.to_i
-      end
-
-      def fuzzy_percent(float)
-        @fuzzy_percent = float.to_f
-      end
-
-      def parse(string)
-        result = each_with(string) { |word| fuzziness word }
-        join_by_and result
-      end
-
-      private
-
-      def each_with(string, &block)
-        string.split(' ').map &block
-      end
-
-      def fuzziness(word)
-        if word.length >= @min_char_size && !excluding_term?(word)
-          fuzziness = (word.length * @fuzzy_percent).round
-          fuzziness = [fuzziness, @max_fuzziness].min
-          "#{word}~#{fuzziness}"
-        else
-          word
-        end
-      end
-
-      def join_by_and(*args)
-        (args = args.flatten.compact).size > 1 ? "(#{ args.join('+') })" : args[0]
-      end
-
-      def excluding_term?(word)
-        !!word.match(/^\-/)
-      end
-
-    end
-  end
-end