CloudSesame 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d1d680e39e44b948dc04bd6a8f996cd7d109229
-  data.tar.gz: 795b99bd61a96360994718f242a13a4510b234ac
+  metadata.gz: 02f14e8cadd284a12b337f3e28fb7744e1065227
+  data.tar.gz: 565265a014c5a268368eeda35351ce1ae1d992ed
 SHA512:
-  metadata.gz: 94ea33464a2dcda66f409ba6c557a5969356b78d86f0df81bd11080841fc2b081e2186755dbab733d35affe4f0401679475b7877dd201000e969696015e7c07d
-  data.tar.gz: e84cd330e1d8924bef29f2f1a6eac044f43548b8b57392e1dbd0b907c41c992ab60cdc54a769c4965c90256c8f2282c612051ead15670d41d033e66545aa1408
+  metadata.gz: b92efd2b60322029bd31fb265cef7af32e3103cb1a9c170698561128269950853cb47bc036a4ba6e5fd477ce5ab200a8a3ced3eb65c43689aa039f44a835b0ec
+  data.tar.gz: 3b4d7b871accdebdd3cfa671074911be4407fce7973de202db242f8390600724751958c8f64ac4b0967bec26e43075e09adecb133c9a3e9884362a34e1d00768

data/Gemfile.lock

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

data/cloud_sesame.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'CloudSesame'
-  s.version     = '0.9.3'
+  s.version     = '0.9.4'
   s.date        = '2016-09-12'
   s.summary     = "AWS CloudSearch Query DSL"
   s.description = "AWS CloudSearch Query DSL"

data/lib/cloud_sesame.rb

@@ -37,7 +37,6 @@ require 'cloud_sesame/query/dsl/range_helper'
 require 'cloud_sesame/query/dsl/response_methods'
 require 'cloud_sesame/query/dsl/return_methods'
 require 'cloud_sesame/query/dsl/sort_methods'
-require 'cloud_sesame/query/dsl/k_gram_phrase_methods'
 require 'cloud_sesame/query/dsl/any_term_methods'
 
 # Query Query Domain Objects

data/lib/cloud_sesame/query/builder.rb

@@ -11,7 +11,6 @@ module CloudSesame
       include DSL::ReturnMethods
       include DSL::ScopeAccessors
       include DSL::SortMethods
-      include DSL::KGramPhraseMethods
       include DSL::AnyTermMethods
 
       # ClassSpecific construct class callback

data/lib/cloud_sesame/query/domain/block.rb

@@ -9,7 +9,6 @@ module CloudSesame
         include DSL::RangeHelper
         include DSL::ScopeAccessors
         include DSL::BindCaller
-        include DSL::KGramPhraseMethods
         include DSL::AnyTermMethods
 
         after_construct { |_, field_accessor| include field_accessor }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Scott Chu
@@ -189,7 +189,6 @@ files:
 - lib/cloud_sesame/query/dsl/bind_caller.rb
 - lib/cloud_sesame/query/dsl/block_styled_operators.rb
 - lib/cloud_sesame/query/dsl/inspect_method.rb
-- lib/cloud_sesame/query/dsl/k_gram_phrase_methods.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
@@ -249,7 +248,6 @@ files:
 - spec/cloud_sesame/query/dsl/any_term_methods_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/k_gram_phrase_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
@@ -323,7 +321,6 @@ test_files:
 - spec/cloud_sesame/query/dsl/any_term_methods_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/k_gram_phrase_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

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

@@ -1,51 +0,0 @@
-module CloudSesame
-  module Query
-    module DSL
-      module KGramPhraseMethods
-        DELIMITER = ' '.freeze
-        MULTIPLIER = 10 # Even number that controls the separation between k-grams
-
-        def k_gram_phrase(field, value, options = {})
-          if value && !value.empty?
-            words = value.split(DELIMITER).compact
-
-            or!(options) do
-              literal field, phrase(value, boost: MULTIPLIER * words.size + MULTIPLIER)
-
-              each_k_gram_combination(words, options[:min]) do |combination, original|
-                remaining_terms = (original - combination).join(' ')
-                unique_phrase = combination.join(' ')
-                boost = MULTIPLIER * combination.size
-
-                and!(boost: boost + MULTIPLIER / 2 + MULTIPLIER) do
-                  literal field, phrase(unique_phrase)
-                  literal field, term(remaining_terms)
-                end
-
-                literal field, phrase(unique_phrase, boost: boost / 2)
-              end
-
-              literal field, term(value, boost: MULTIPLIER + MULTIPLIER)
-              any_term(field, words.join(' '))
-            end
-          end
-
-          _return != _scope ? _return : self
-        end
-
-        private
-
-        def each_k_gram_combination(array, min)
-          min ||= 4
-          size = array.size
-          m = [size - min, 1].max
-          n = size - 1
-          while n > m
-            array.each_cons(n) { |con| yield(con, array) }
-            n -= 1
-          end
-        end
-      end
-    end
-  end
-end

data/spec/cloud_sesame/query/dsl/k_gram_phrase_methods_spec.rb

@@ -1,119 +0,0 @@
-module CloudSesame
-  module Query
-    module DSL
-      describe KGramPhraseMethods do
-
-        class Product
-          include CloudSesame
-          define_cloudsearch do
-            field :name, query: { weight: 2 }, type: :string
-            field :description, query: { weight: 0.4 }, type: :string
-          end
-        end
-
-        subject(:cloudsearch) { Product.cloudsearch.builder }
-        let(:root) { cloudsearch.request.filter_query.root }
-
-        describe '#k_gram_phrase' do
-          let(:phrase) { 'listerine mouth wash' }
-
-          it 'inserts an OR node at its scope level' do
-            expect { cloudsearch.k_gram_phrase(:name, phrase) }.to change { root.children }.by([AST::Or])
-          end
-
-          describe 'in the OR node' do
-            let(:or_node) { root.children.first }
-
-            it 'builds a phrase node with original term' do
-              cloudsearch.k_gram_phrase(:name, phrase)
-
-              phrase_node = or_node.children.first
-              expect(phrase_node).to be_kind_of AST::Phrase
-              expect(phrase_node.child.value).to eq(phrase)
-              expect(phrase_node.options[:boost]).to eq(KGramPhraseMethods::MULTIPLIER * 3 + KGramPhraseMethods::MULTIPLIER)
-            end
-
-            it 'builds a term node with original term' do
-              cloudsearch.k_gram_phrase(:name, phrase)
-
-              term_node = or_node.children[-2]
-              expect(term_node).to be_kind_of AST::Term
-              expect(term_node.child.value).to eq(phrase)
-              expect(term_node.options[:boost]).to eq(KGramPhraseMethods::MULTIPLIER + KGramPhraseMethods::MULTIPLIER)
-            end
-
-            it 'builds bunch of phrase nodes with k grams' do
-              cloudsearch.k_gram_phrase(:name, phrase)
-              k_nodes = or_node.children[1..-2]
-
-              expect(k_nodes[0]).to be_kind_of AST::And
-
-              expect(k_nodes[1]).to be_kind_of AST::Phrase
-              expect(k_nodes[1].options[:boost]).to eq(KGramPhraseMethods::MULTIPLIER * 2 / 2)
-              expect(k_nodes[1].child.value).to eq('listerine mouth')
-
-              expect(k_nodes[2]).to be_kind_of AST::And
-
-              expect(k_nodes[3]).to be_kind_of AST::Phrase
-              expect(k_nodes[3].options[:boost]).to eq(KGramPhraseMethods::MULTIPLIER * 2 / 2)
-              expect(k_nodes[3].child.value).to eq('mouth wash')
-            end
-
-            it 'builds the correct first And node (for k-gram plus excluded terms)' do
-              cloudsearch.k_gram_phrase(:name, phrase)
-              and_node = or_node.children[1..-2][0]
-
-              expect(and_node.options[:boost]).to eq(KGramPhraseMethods::MULTIPLIER * 2 + KGramPhraseMethods::MULTIPLIER / 2 + KGramPhraseMethods::MULTIPLIER)
-
-              expect(and_node.children.first).to be_kind_of AST::Phrase
-              expect(and_node.children.first.child.value).to eq('listerine mouth')
-
-              expect(and_node.children.last).to be_kind_of AST::Term
-              expect(and_node.children.last.child.value).to eq('wash')
-            end
-
-            it 'builds the correct second And node (for k-gram plus excluded terms)' do
-              cloudsearch.k_gram_phrase(:name, phrase)
-              and_node = or_node.children[1..-2][2]
-
-              expect(and_node.options[:boost]).to eq(KGramPhraseMethods::MULTIPLIER * 2 + KGramPhraseMethods::MULTIPLIER / 2 + KGramPhraseMethods::MULTIPLIER)
-
-              expect(and_node.children.first).to be_kind_of AST::Phrase
-              expect(and_node.children.first.child.value).to eq('mouth wash')
-
-              expect(and_node.children.last).to be_kind_of AST::Term
-              expect(and_node.children.last.child.value).to eq('listerine')
-            end
-
-            it 'builds an or node with term nodes for each word' do
-              cloudsearch.k_gram_phrase(:name, phrase)
-              node = or_node.children.last
-
-              expect(node).to be_kind_of(AST::Or)
-              expect(node.children.length).to eq(3)
-              expect(node.children[0]).to be_kind_of(AST::Term)
-              expect(node.children[0].child.value).to eq('listerine')
-              expect(node.children[1]).to be_kind_of(AST::Term)
-              expect(node.children[1].child.value).to eq('mouth')
-              expect(node.children[2]).to be_kind_of(AST::Term)
-              expect(node.children[2].child.value).to eq('wash')
-            end
-
-            it 'splits the phrase on space and nothing else' do
-              cloudsearch.k_gram_phrase(:name, 'word-word2 word3')
-              expect(or_node.children.length).to eq(3)
-            end
-          end
-
-          context 'when phrase is empty' do
-            let(:phrase) { nil }
-
-            it 'does not build anything' do
-              expect { cloudsearch.k_gram_phrase(:name, phrase) }.to_not change { root.children }
-            end
-          end
-        end
-      end
-    end
-  end
-end