CloudSesame 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3459d29078ee48b4320364769b91bbe66f7fbece
-  data.tar.gz: e77c9b2917e402329afa7206512d51f77fe973aa
+  metadata.gz: c1ab042a61e9108d439ecddd4bdf5a2b5548aa8f
+  data.tar.gz: 8b3015719e50ade4f074fb471cac15cc8abe11f3
 SHA512:
-  metadata.gz: 3d8586b977026307c6ef5027cf98f76c9fea091d75e99bfad83a67d446f53b8b469b92c56537b38e6eec0ca8fd81f8c07ab644c668fcc45e83159f6bdcf6b653
-  data.tar.gz: 9f66a716cf04f1713dca9a59fd6ef633c5d71432661d78af41110e164d51527721d1bb09d63bd464a25c00116e2308de9647a644c301e1fb22ba502b5b10caea
+  metadata.gz: 32f17eacc19c2ddb90270fe09f5e2c7c8eb0174633f269dba9fc38d1bad259362a86000b40a845cc26d4cea2b768ebafba015c66c6d83361009b308b6c5bb272
+  data.tar.gz: 2d496df6ccdc7fd728aadd58ad6fc1233d98ace2a4924026462bd7f8372116f046cbccce2137b6ac139022b829301f3534945997624f0e1b016394881cf193b6

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    CloudSesame (0.2.5)
+    CloudSesame (0.3.0)
       aws-sdk (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.2.10)
-      aws-sdk-resources (= 2.2.10)
-    aws-sdk-core (2.2.10)
+    aws-sdk (2.2.12)
+      aws-sdk-resources (= 2.2.12)
+    aws-sdk-core (2.2.12)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.10)
-      aws-sdk-core (= 2.2.10)
+    aws-sdk-resources (2.2.12)
+      aws-sdk-core (= 2.2.12)
     coderay (1.1.0)
     diff-lcs (1.2.5)
     ffi (1.9.10)
@@ -61,6 +61,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    ruby-prof (0.15.9)
     shellany (0.0.1)
     slop (3.6.0)
     thor (0.19.1)
@@ -74,3 +75,4 @@ DEPENDENCIES
   guard-rspec
   pry (~> 0)
   rspec (~> 3)
+  ruby-prof

data/cloud_sesame.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'CloudSesame'
-  s.version     = '0.2.5'
-  s.date        = '2016-01-14'
+  s.version     = '0.3.0'
+  s.date        = '2016-01-20'
   s.summary     = "AWS CloudSearch Query DSL"
   s.description = "AWS CloudSearch Query DSL"
   s.authors = ['Scott Chu', 'Emily Fan', 'Greg Ward', 'David McHoull',
@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry', '~> 0'
   s.add_development_dependency 'guard'
   s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'ruby-prof'
 end

data/lib/cloud_sesame/domain/base.rb

@@ -29,10 +29,10 @@ module CloudSesame
 			end
 
 			def field(name, options = {})
-				field_name = options[:as] || name
+				field_name = (options[:as] || name).to_sym
 				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)
+				define_filter_query_field(name.to_sym, options)
 			end
 
 			def define_sloppiness(value)
@@ -63,15 +63,22 @@ module CloudSesame
 				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
+				if (block = options[:default])
+					filter_query_defaults << Query::AST::Literal.new(name, nil, options, &block)
+				end
+				context[:filter_query, true][:fields, true][name] = options
 			end
 
 			def define_query_options(name, options)
-				context[:query_options, true][:fields, true][name.to_sym] = format_options(options)
+				context[:query_options, true][:fields, true][name] = format_options(options)
 			end
 
 			def define_facet_options(name, options)
-				context[:facet, true][name.to_sym] = format_options(options)
+				context[:facet, true][name] = format_options(options)
+			end
+
+			def filter_query_defaults
+				context[:filter_query, true][:defaults] ||= []
 			end
 
 		end

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

@@ -3,12 +3,18 @@ module CloudSesame
     module AST
       class Literal
 
+        SINGLE_QUATE = /\'/
+        ESCAPE_QUATE = "\\'"
+
         attr_accessor :field
         attr_reader :options, :value
 
         def initialize(field = nil, value = nil, options = {}, &block)
           @field = field
-          @value = valufy value
+
+          @value = Value.parse value if value
+          @value = Value.parse ValueEvaluator.new.instance_exec &block if block_given?
+
           @options = options || {}
           (@options[:included] ||= []) << @value
         end
@@ -24,20 +30,22 @@ module CloudSesame
         end
 
         def as_field
-          options[:as] || field
+          @as_field ||= (options[:as] || field).to_s
         end
 
         def compile(detailed = false)
-          detailed ? detailed_format : standard_format
+          updated? ? recompile(detailed) : @compiled
         end
 
         private
 
-        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)
-          Value.new value
+        def updated?
+          @compiled_value != value
+        end
+
+        def recompile(detailed)
+          @compiled_value = value
+          @compiled = detailed ? detailed_format : standard_format
         end
 
         def standard_format
@@ -48,8 +56,12 @@ module CloudSesame
           "field=#{ escape as_field } #{ value.compile }"
         end
 
-        def escape(data = "")
-          "'#{ data.to_s.gsub(/\'/) { "\\'" } }'"
+        def escape(data)
+          "'#{ data.gsub(SINGLE_QUATE) { ESCAPE_QUATE } }'"
+        end
+
+        class ValueEvaluator
+          include DSL::RangeMethods
         end
 
       end

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

@@ -15,7 +15,7 @@ module CloudSesame
         end
 
         def compile
-          "(#{ self.class::SYMBOL  }#{ boost } #{ children.compile })" unless children.empty?
+          "(#{ symbol  }#{ boost } #{ children.compile })" unless children.empty?
         end
 
         def <<(object)

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

@@ -6,7 +6,7 @@ module CloudSesame
 				SYMBOL = :near
 
 				def compile
-          "(#{ SYMBOL }#{ boost }#{ distance } #{ child.compile DETAILED })" if child
+          "(#{ symbol }#{ boost }#{ distance } #{ child.compile detailed })" if child
 				end
 
         def distance

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

@@ -10,7 +10,7 @@ module CloudSesame
         end
 
         def compile(detailed = nil)
-          "(#{ self.class::SYMBOL  }#{ boost } #{ child.compile })" if child
+          "(#{ symbol  }#{ boost } #{ child.compile })" if child
         end
 
       end

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

@@ -0,0 +1,13 @@
+module CloudSesame
+	module Query
+		module AST
+			class NumericValue < Value
+
+				def compile
+					data
+				end
+
+			end
+		end
+	end
+end

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

@@ -16,6 +16,10 @@ module CloudSesame
           " boost=#{ options[:boost] }" if options[:boost]
         end
 
+        def symbol
+          self.class::SYMBOL
+        end
+
       end
     end
   end

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

@@ -3,7 +3,7 @@ module CloudSesame
     module AST
       class Phrase < SingleExpressionOperator
 				DETAILED = true
-        SYMBOL = :prefix
+        SYMBOL = :phrase
       end
     end
   end

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

@@ -3,48 +3,70 @@ module CloudSesame
     module AST
       class RangeValue < Value
 
-        def initialize(range = nil)
-          @data = range.kind_of?(Range) ? [true, valufy(range.begin), valufy(range.end), !range.exclude_end?] : [false, nil, nil, false]
+        STRING_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)
+            @data = match.captures
+          else
+            default_range
+          end
         end
 
         def compile
-          "#{ lb }#{ data[1].to_s },#{ data[2].to_s }#{ ub }"
+          "#{ lb }#{ l.to_s },#{ u.to_s }#{ ub }"
         end
 
         def gt(value = nil)
-          data[0], data[1] = false, valufy(value) if value
+          data[0], data[1] = '{', Value.parse(value) if value
           return self
         end
 
         def gte(value = nil)
-          data[0], data[1] = true, valufy(value) if value
+          data[0], data[1] = '[', Value.parse(value) if value
           return self
         end
 
         def lt(value = nil)
-          data[2], data[3] = valufy(value), false if value
+          data[2], data[3] = Value.parse(value), '}' if value
           return self
         end
 
         def lte(value = nil)
-          data[2], data[3] = valufy(value), true if value
+          data[2], data[3] = Value.parse(value), ']' if value
           return self
         end
 
+        def l
+          data[1]
+        end
+
+        def u
+          data[2]
+        end
+
         private
 
-        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
+        def range_to_array(r)
+          ['[', r.begin, r.end, end_symbol(r)]
+        end
+
+        def end_symbol(value)
+          value.exclude_end? ? '}' : ']'
+        end
+
+        def default_range
+          ['{', nil, nil, '}']
         end
 
         def lb
-          data[1] && data[0] ? '[' : '{'
+          data[1] ? data[0] : '{'
         end
 
         def ub
-          data[2] && data[3] ? ']' : '}'
+          data[2] ? data[3] : '}'
         end
 
       end

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

@@ -12,6 +12,14 @@ module CloudSesame
           children.size > 1
         end
 
+        private
+
+        def create_children
+          array = FieldArray.new(context[:defaults] || [])
+          array.dsl_scope = dsl_scope
+          array
+        end
+
       end
     end
   end

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

@@ -22,7 +22,11 @@ module CloudSesame
         end
 
         def compile
-          "(#{ self.class::SYMBOL  }#{ boost } #{ child.compile self.class::DETAILED })" if child
+          "(#{ symbol  }#{ boost } #{ child.compile detailed })" if child
+        end
+
+        def detailed
+          self.class::DETAILED
         end
 
       end

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

@@ -3,14 +3,28 @@ module CloudSesame
     module AST
       class Value
 
+        RANGE_FORMAT = /\A[\[\{].*[\]\}]\z/
+        DIGIT_FORMAT = /\A\d+(.\d+)?\z/
+        SINGLE_QUATE = /\'/
+        ESCAPE_QUATE = "\\'"
+
         attr_reader :data
 
+        def self.parse(value)
+          return value if value.kind_of? AST::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
-          format data
+          updated? ? recompile : @compiled
         end
 
         def to_s
@@ -23,24 +37,21 @@ module CloudSesame
 
         private
 
-        def format(data)
-          range?(data) || digits?(data) ? data : escape(data)
-        end
-
-        def range?(data)
-          data =~ /^[\[\{].*[\]\}]$/
+        def updated?
+          @compiled_data != @data
         end
 
-        def digits?(data)
-          data.to_s =~ /^\d+(.\d+)?$/
+        def recompile
+          @compiled_data = @data
+          @compiled = escape @compiled_data
         end
 
         def escape(data = "")
-          "'#{ data.to_s.gsub(/\'/) { "\\'" } }'"
+          "'#{ data.gsub(SINGLE_QUATE) { ESCAPE_QUATE } }'"
         end
 
         def strip(string)
-          string.gsub(/ /, '')
+          string.tr(" ", "")
         end
 
       end

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

@@ -3,18 +3,22 @@ module CloudSesame
 		module DSL
 			module FieldMethods
 
-				private
-
-				def method_missing(field, *values, &block)
-				  if (fields = dsl_context[:fields]) && fields[field]
-				  	dsl_scope.children.field = field
+				def literal(name, *values)
+					if (fields = dsl_context[:fields]) && fields[name]
+				  	dsl_scope.children.field = name
 				  	dsl_scope.children.dsl_return = dsl_return
 				  	dsl_scope.children.insert values
 				  else
-				    super
+				  	false
 				  end
 				end
 
+				private
+
+				def method_missing(name, *values, &block)
+				  (result = literal(name, *values)) ? result : super
+				end
+
 			end
 		end
 	end

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

@@ -5,18 +5,18 @@ module CloudSesame
 
 				# CLAUSE: PAGE and SIZE
 				# =========================================
-				def page(input = nil)
-					if input
+				def page(input = false)
+					if input || input.nil?
 						request.page.start = nil
-						request.page.page = input.to_i
+						request.page.page = (input || 1).to_i
 						return self
 					else
 						request.page.page
 					end
 				end
 
-				def start(input = nil)
-					if input
+				def start(input = false)
+					if input || input.nil?
 						request.page.page = nil
 						request.page.start = input.to_i
 						return self
@@ -25,10 +25,14 @@ module CloudSesame
 					end
 				end
 
-				def size(input)
+				alias_method :offset,  :start
+
+				def size(input = false)
 					if input
 						request.page.size = input.to_i
 						return self
+					elsif input.nil?
+						return self
 					else
 						request.page.size
 					end

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

@@ -8,20 +8,7 @@ module CloudSesame
         end
 
         def root
-          @root ||= create_root_with_default_values
-        end
-
-        private
-
-        def create_root_with_default_values
-          root = CloudSesame::Query::AST::Root.new context
-          context[:fields].each do |field, options|
-            if options && (block = options[:default])
-              value = root.instance_exec &block
-              root << AST::Literal.new(field, value, options)
-            end
-          end if context[:fields]
-          root
+          @root ||= CloudSesame::Query::AST::Root.new context
         end
 
       end

data/lib/cloud_sesame.rb

@@ -17,19 +17,18 @@ require 'cloud_sesame/query/error/missing_query'
 # Query DSL Methods
 # ===============================================
 require 'cloud_sesame/query/dsl/base'
-require 'cloud_sesame/query/dsl/query_methods'
-require 'cloud_sesame/query/dsl/page_methods'
-require 'cloud_sesame/query/dsl/sort_methods'
-require 'cloud_sesame/query/dsl/return_methods'
-
 require 'cloud_sesame/query/dsl/block_methods'
 require 'cloud_sesame/query/dsl/block_chaining_methods'
-require 'cloud_sesame/query/dsl/field_methods'
 require 'cloud_sesame/query/dsl/field_array_methods'
+require 'cloud_sesame/query/dsl/field_methods'
 require 'cloud_sesame/query/dsl/filter_query_methods'
 require 'cloud_sesame/query/dsl/operator_methods'
+require 'cloud_sesame/query/dsl/page_methods'
+require 'cloud_sesame/query/dsl/query_methods'
 require 'cloud_sesame/query/dsl/range_methods'
+require 'cloud_sesame/query/dsl/return_methods'
 require 'cloud_sesame/query/dsl/scope_methods'
+require 'cloud_sesame/query/dsl/sort_methods'
 
 # Query Query Filter Query AST Tree
 # ===============================================
@@ -48,6 +47,7 @@ require 'cloud_sesame/query/ast/term'
 require 'cloud_sesame/query/ast/literal'
 require 'cloud_sesame/query/ast/value'
 require 'cloud_sesame/query/ast/date_value'
+require 'cloud_sesame/query/ast/numeric_Value'
 require 'cloud_sesame/query/ast/range_value'
 require 'cloud_sesame/query/ast/root'
 

data/profiler.rb

@@ -0,0 +1,91 @@
+require 'profile'
+require 'yaml'
+require_relative './cloud_sesame.rb'
+
+# AWS initializer
+# =======================================================
+
+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
+
+		define_sloppiness 3
+
+		define_fuzziness do
+			max_fuzziness 3
+			min_char_size 6
+			fuzzy_percent 0.17
+		end
+
+		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,					default: -> { gt Date.today }
+
+		scope :shoes_by_brand, ->(brand = nil) { query("shoes").and { manufacturer_name brand }  if brand }
+		scope :and_mens do
+			and! { tags "men"}
+		end
+
+	end
+
+end
+
+def query
+	query = Product.cloudsearch
+		.query("black   jacket")
+		.sort(price: :asc)
+		.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
+
+query

data/spec/cloud_sesame_spec.rb

@@ -1,100 +1,105 @@
-require 'spec_helper'
-
-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
-	# require 'cloud_sesame'
-
-	# 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
-
-	# 		define_sloppiness 3
-
-	# 		define_fuzziness do
-	# 			max_fuzziness 3
-	# 			min_char_size 6
-	# 			fuzzy_percent 0.17
-	# 		end
-
-	# 		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 :shoes_by_brand, ->(brand = nil) { query("shoes").and { manufacturer_name brand }  if brand }
-	# 		scope :and_mens do
-	# 			and! { tags "men"}
-	# 		end
-
-	# 	end
-
-	# end
-
-	# class NewProduct < Product
-	# 	load_definition_from Product
-
-	# 	define_cloudsearch do
-	# 		field :searchable_text, 		query: { weight: 4 }
-	# 		field :name, as: :text1
-	# 	end
-	# end
-
-	# # Example Query
-	# 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
+# require 'spec_helper'
+# require 'ruby-prof'
+# require 'benchmark'
+
+# 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
+# 	# =======================================================
+# 	require 'cloud_sesame'
+
+# 	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
+
+# 			define_sloppiness 3
+
+# 			define_fuzziness do
+# 				max_fuzziness 3
+# 				min_char_size 6
+# 				fuzzy_percent 0.17
+# 			end
+
+# 			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,					default: -> { gt Date.today }
+
+# 			scope :shoes_by_brand, ->(brand = nil) { query("shoes").and { manufacturer_name brand }  if brand }
+# 			scope :and_mens do
+# 				and! { tags "men"}
+# 			end
+
+# 		end
+
+# 	end
+
+
+# 	# n = 500
+# 	# 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"
+# 						and! {
+# 							tags.not "child", "home"
+# 						}
+# 						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"
+# 						}
+# 						or!.not {
+# 							price 25..100
+# 							price 100...200
+# 							price gte(200).lt(300)
+# 							price gte(300)
+# 						}
+# 						or! {
+# 							created_at Date.today - 7
+# 							created_at gte(Date.today)
+# 							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
+# 	# }
+
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Scott Chu
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -87,6 +87,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: AWS CloudSearch Query DSL
 email: dev@retailcommon.com
 executables: []
@@ -115,6 +129,7 @@ files:
 - 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/numeric_value.rb
 - lib/cloud_sesame/query/ast/operator.rb
 - lib/cloud_sesame/query/ast/or.rb
 - lib/cloud_sesame/query/ast/phrase.rb
@@ -153,6 +168,7 @@ files:
 - lib/cloud_sesame/query/node/request.rb
 - lib/cloud_sesame/query/node/return.rb
 - lib/cloud_sesame/query/node/sort.rb
+- profiler.rb
 - spec/abstract_object_spec.rb
 - spec/cloud_sesame/domain/base_spec.rb
 - spec/cloud_sesame/domain/context_spec.rb