CloudSesame 0.7.5 → 0.7.7

data/spec/cloud_sesame/query/domain/block_spec.rb

@@ -1,5 +1,5 @@
 require_relative '../dsl/applied_filter_query_spec'
-require_relative '../dsl/field_accessors_spec'
+require_relative '../dsl/literal_methods_spec'
 
 module CloudSesame
 	module Query
@@ -14,11 +14,11 @@ module CloudSesame
 	      	before { subject.instance_variable_set(:@_scopes, [scope]) }
 				end
 
-				it_behaves_like DSL::FieldAccessors do
+				it_behaves_like DSL::LiteralMethods do
 					let(:scope) { AST::Root.new(context, {}) }
 					subject { Block.new(self, context) }
 					before do
-						Block.send(:include, DSL::FieldAccessors)
+						Block.send(:include, DSL::LiteralMethods)
 						subject.instance_variable_set(:@_scopes, [scope])
 					end
 				end

data/spec/cloud_sesame/query/dsl/{field_array_methods_spec.rb → literal_chaining_methods_spec.rb}

@@ -1,7 +1,7 @@
 module CloudSesame
 	module Query
 		module DSL
-			describe FieldArrayMethods do
+			describe LiteralChainingMethods do
 
 				# Setup Test Class
 				class Product

data/spec/cloud_sesame/query/dsl/{field_accessors_spec.rb → literal_methods_spec.rb}

@@ -1,7 +1,7 @@
 module CloudSesame
   module Query
     module DSL
-      shared_examples_for FieldAccessors do
+      shared_examples_for LiteralMethods do
         let(:field_name) { :test_field_name }
         let(:_scope) { subject.send(:_scope) }
         let(:context) { { fields: { field_name => {} } } }
@@ -51,7 +51,7 @@ module CloudSesame
 
         context 'when field is registered' do
           let(:value) { "value" }
-          before { DSL::FieldAccessors.__define_accessor__(field_name) }
+          before { DSL::LiteralMethods.__define_accessor__(field_name) }
           it 'should create a literal node' do
             expect(AST::Literal).to receive(:new).with(field_name, value, options)
             subject.send(field_name, value)
@@ -68,7 +68,7 @@ module CloudSesame
           it 'should return the field array if called from inside a block' do
             array = nil
             subject.and { array = send(field_name, value) }
-            expect(array).to be_kind_of(AST::FieldArray)
+            expect(array).to be_kind_of(AST::MultiExpressionOperatorChildren)
             expect(array).to include(AST::Literal)
           end
           it 'should set the field array#field' do

data/spec/cloud_sesame/query/node/query_spec.rb

@@ -70,10 +70,32 @@ module CloudSesame
             include_examples 'common query compile actions'
           end
           context 'when fuzziness is defined' do
+            let(:query_string) { 'firstword secondword' }
             let(:parser) { Fuzziness.new }
             let(:context) {{ fuzziness: parser }}
+
             include_examples 'common query compile actions'
             include_examples 'with additional parser defined', "fuzziness"
+
+            it 'applies fuzziness to each word in the query' do
+              expect(subject.compile).to include('(firstword~2+secondword~2)')
+            end
+
+            context 'negative query terms' do
+              let(:query_string) { 'firstword -excludedword' }
+
+              it 'do not have fuzziness applied' do
+                expect(subject.compile).to include('(firstword~2+-excludedword)')
+              end
+            end
+
+            context 'wildcard query terms' do
+              let(:query_string) { 'firstword wildcard*' }
+
+              it 'do not have fuzziness applied' do
+                expect(subject.compile).to include('(firstword~2+wildcard*)')
+              end
+            end
           end
           context 'when sloppiness is defined' do
             let(:parser) { Sloppiness.new(3) }

data/spec/profiling_spec.rb

@@ -1,155 +1,155 @@
-require 'spec_helper'
-
-fdescribe CloudSesame do
-  # FAKE RAILS AND RAILS CACHE
-  # =====================================
-  class ::Rails
-  	def self.cache
-  		@cache ||= FakeCache.new
-  	end
-  end
-
-  class ::FakeCache
-  	def table
-  		@table ||= {}
-  	end
-  	def fetch(key, &block)
-  		table[key] ||= (block.call if block_given?)
-  	end
-  end
-
-  # 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
-
-  	def self.greeting
-  		"hello world!"
-  	end
-
-  	define_cloudsearch do
-  		# Product CloudSesame Config
-  		config.endpoint = ENV['AWS_ENDPOINT']
-  		config.region 	= ENV['AWS_REGION']
-
-      caching_with :RailsCache
-
-  		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 }, type: :string
-  		field :description, 				query: { weight: 0.5 }, type: :string
-  		field :tags,								type: :string
-
-  		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,					type: :datetime
-
-  	end
-
-  end
-
-  class Coupon
-    include CloudSesame
-
-    VALID_COUPON_RANK = 20
-
-    define_cloudsearch do
-      config.endpoint = ENV['AWS_ENDPOINT']
-      config.region   = ENV['AWS_REGION']
-
-      default_size 10
-
-      define_sloppiness 3
-
-      define_fuzziness do
-        max_fuzziness 3
-        min_char_size 6
-        fuzzy_percent 0.17
-      end
-
-      field :end_date,                            as: :date1
-      field :rank,                                as: :num1, default: -> { gte VALID_COUPON_RANK }
-      field :searchable_text,                     query: true
-      field :affiliate_advertiser_search_ext_id,  as: :string1, facet: { size: 50 }
-      field :countries,                           as: :string_array1
-      field :deal_types,                          as: :string_array2, facet: {}
-      field :tags,                                as: :string_array3, facet: {}
-      field :type,                                default: -> { 'Catalog::CouponSearchable' }
-    end
-
-  end
-
-  @tags = [1, 2]
-  q = nil
-  profile 1 do
-  	q = Product.cloudsearch
-  						.query("black leather jacket")
-  						.sort(price: :asc, created_at: :desc)
-  						.page(3)
-  						.size(1000)
-  						.price { gt 1 }
-  						.tags { "2" }
-  						.and {
-  							or! {
-  								tags *@tags
-  								tags nil
-  								and! {
-  									tags.not "3", "4"
-  								}
-  								and!.not {
-  									tags.start_with "5", "6"
-  									tags.not.start_with("7")
-  									tags.not.near("8", distance: 7)
-  									tags start_with("9"), near("10")
-  									tags term("11", boost: 2)
-  									tags.not phrase "12"
-  								}
-  								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)
-  								}
-  							}
-  						}
-
-  	q.compile
-
-  end
-
-  binding.pry
-
-end
+# require 'spec_helper'
+
+# fdescribe CloudSesame do
+#   # FAKE RAILS AND RAILS CACHE
+#   # =====================================
+#   class ::Rails
+#   	def self.cache
+#   		@cache ||= FakeCache.new
+#   	end
+#   end
+
+#   class ::FakeCache
+#   	def table
+#   		@table ||= {}
+#   	end
+#   	def fetch(key, &block)
+#   		table[key] ||= (block.call if block_given?)
+#   	end
+#   end
+
+#   # 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
+
+#   	def self.greeting
+#   		"hello world!"
+#   	end
+
+#   	define_cloudsearch do
+#   		# Product CloudSesame Config
+#   		config.endpoint = ENV['AWS_ENDPOINT']
+#   		config.region 	= ENV['AWS_REGION']
+
+#       caching_with :RailsCache
+
+#   		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 }, type: :string
+#   		field :description, 				query: true, type: :string
+#   		field :tags,								type: :string
+
+#   		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,					type: :datetime
+
+#   	end
+
+#   end
+
+#   class Coupon
+#     include CloudSesame
+
+#     VALID_COUPON_RANK = 20
+
+#     define_cloudsearch do
+#       config.endpoint = ENV['AWS_ENDPOINT']
+#       config.region   = ENV['AWS_REGION']
+
+#       default_size 10
+
+#       define_sloppiness 3
+
+#       define_fuzziness do
+#         max_fuzziness 3
+#         min_char_size 6
+#         fuzzy_percent 0.17
+#       end
+
+#       field :end_date,                            as: :date1
+#       field :rank,                                as: :num1, default: -> { gte VALID_COUPON_RANK }
+#       field :searchable_text,                     query: true
+#       field :affiliate_advertiser_search_ext_id,  as: :string1, facet: { size: 50 }
+#       field :countries,                           as: :string_array1
+#       field :deal_types,                          as: :string_array2, facet: {}
+#       field :tags,                                as: :string_array3, facet: {}
+#       field :type,                                default: -> { 'Catalog::CouponSearchable' }
+#     end
+
+#   end
+
+#   @tags = [1, 2]
+#   q = nil
+#   profile 1 do
+#   	q = Product.cloudsearch
+#   						.query("black leather jacket")
+#   						.sort(price: :asc, created_at: :desc)
+#   						.page(3)
+#   						.size(1000)
+#   						.price { gt 1 }
+#   						.tags { "2" }
+#   						.and {
+#   							or! {
+#   								tags *@tags
+#   								tags nil
+#   								and! {
+#   									tags.not "3", "4"
+#   								}
+#   								and!.not {
+#   									tags.start_with "5", "6"
+#   									tags.not.start_with("7")
+#   									tags.not.near("8", distance: 7)
+#   									tags start_with("9"), near("10")
+#   									tags term("11", boost: 2)
+#   									tags.not phrase "12"
+#   								}
+#   								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)
+#   								}
+#   							}
+#   						}
+
+#   	q.compile
+
+#   end
+
+#   binding.pry
+
+# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
 platform: ruby
 authors:
 - Scott Chu
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -167,8 +167,8 @@ files:
 - lib/cloud_sesame/query/ast/abstract/value.rb
 - lib/cloud_sesame/query/ast/and.rb
 - lib/cloud_sesame/query/ast/date_value.rb
-- lib/cloud_sesame/query/ast/field_array.rb
 - lib/cloud_sesame/query/ast/literal.rb
+- lib/cloud_sesame/query/ast/multi_expression_operator_children.rb
 - lib/cloud_sesame/query/ast/near.rb
 - lib/cloud_sesame/query/ast/not.rb
 - lib/cloud_sesame/query/ast/numeric_value.rb
@@ -187,9 +187,9 @@ files:
 - lib/cloud_sesame/query/dsl/applied_filter_query.rb
 - lib/cloud_sesame/query/dsl/bind_caller.rb
 - lib/cloud_sesame/query/dsl/block_styled_operators.rb
-- lib/cloud_sesame/query/dsl/field_accessors.rb
-- lib/cloud_sesame/query/dsl/field_array_methods.rb
 - lib/cloud_sesame/query/dsl/inspect_method.rb
+- lib/cloud_sesame/query/dsl/literal_chaining_methods.rb
+- lib/cloud_sesame/query/dsl/literal_methods.rb
 - lib/cloud_sesame/query/dsl/operators.rb
 - lib/cloud_sesame/query/dsl/page_methods.rb
 - lib/cloud_sesame/query/dsl/query_methods.rb
@@ -231,16 +231,23 @@ files:
 - spec/cloud_sesame/query/ast/abstract/value_spec.rb
 - spec/cloud_sesame/query/ast/and_spec.rb
 - spec/cloud_sesame/query/ast/date_value_spec.rb
+- spec/cloud_sesame/query/ast/field_array_spec.rb
+- spec/cloud_sesame/query/ast/literal_spec.rb
+- spec/cloud_sesame/query/ast/not_spec.rb
 - spec/cloud_sesame/query/ast/numeric_value_spec.rb
 - spec/cloud_sesame/query/ast/or_spec.rb
+- spec/cloud_sesame/query/ast/phrase_spec.rb
 - spec/cloud_sesame/query/ast/range_value_spec.rb
 - spec/cloud_sesame/query/ast/root_spec.rb
+- spec/cloud_sesame/query/ast/string_value_spec.rb
+- spec/cloud_sesame/query/ast/term_spec.rb
+- spec/cloud_sesame/query/ast/value_spec.rb
 - spec/cloud_sesame/query/builder_spec.rb
 - spec/cloud_sesame/query/domain/block_spec.rb
 - spec/cloud_sesame/query/dsl/applied_filter_query_spec.rb
 - spec/cloud_sesame/query/dsl/block_styled_operators_spec.rb
-- spec/cloud_sesame/query/dsl/field_accessors_spec.rb
-- spec/cloud_sesame/query/dsl/field_array_methods_spec.rb
+- spec/cloud_sesame/query/dsl/literal_chaining_methods_spec.rb
+- spec/cloud_sesame/query/dsl/literal_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
@@ -295,16 +302,23 @@ test_files:
 - spec/cloud_sesame/query/ast/abstract/value_spec.rb
 - spec/cloud_sesame/query/ast/and_spec.rb
 - spec/cloud_sesame/query/ast/date_value_spec.rb
+- spec/cloud_sesame/query/ast/field_array_spec.rb
+- spec/cloud_sesame/query/ast/literal_spec.rb
+- spec/cloud_sesame/query/ast/not_spec.rb
 - spec/cloud_sesame/query/ast/numeric_value_spec.rb
 - spec/cloud_sesame/query/ast/or_spec.rb
+- spec/cloud_sesame/query/ast/phrase_spec.rb
 - spec/cloud_sesame/query/ast/range_value_spec.rb
 - spec/cloud_sesame/query/ast/root_spec.rb
+- spec/cloud_sesame/query/ast/string_value_spec.rb
+- spec/cloud_sesame/query/ast/term_spec.rb
+- spec/cloud_sesame/query/ast/value_spec.rb
 - spec/cloud_sesame/query/builder_spec.rb
 - spec/cloud_sesame/query/domain/block_spec.rb
 - spec/cloud_sesame/query/dsl/applied_filter_query_spec.rb
 - spec/cloud_sesame/query/dsl/block_styled_operators_spec.rb
-- spec/cloud_sesame/query/dsl/field_accessors_spec.rb
-- spec/cloud_sesame/query/dsl/field_array_methods_spec.rb
+- spec/cloud_sesame/query/dsl/literal_chaining_methods_spec.rb
+- spec/cloud_sesame/query/dsl/literal_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