mastico 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 205e8a8cf46ddea34bb51b18aac1cb1598b50e72
-  data.tar.gz: 52aaa582fc56299a0b304b2367cc897375e3787a
+SHA256:
+  metadata.gz: 46282da7310c519736cd0947cd37b93cb28324ca7c4bfec8e4d042f4dcfbd112
+  data.tar.gz: bb39aaacb4a89cfa83143347a2136246fed4ef40f930abf7a1b5561fe5e7550a
 SHA512:
-  metadata.gz: 6b4fa50b5278ad53a9d8215efa07d53a6b5658b8ecd70d95a10687679879e33ceb7524976d3d3114a9e87318df09128db079cb59b5a86756135b937dc6023430
-  data.tar.gz: b385bb2c52e244029adbcddfdff64af685bce5beb4eccc8d8d4184e88112a82b589cbae4a2f6c90a57bf6afb7072f09f0324e6adf8fa4c280f1937a3d22607b8
+  metadata.gz: 8917049d8ab75f18fb6a53446e1ddabba4c5ba9ff595e22dee3ee5869d8e0a1a7a90fcd577584d95f832d6d2642441892e776b06f68d8673a572be6e25db2f8c
+  data.tar.gz: 9c92b1644a6f6dbb285682cf1560c125ad5af4cb408d4fd81844707750041b5d265a89f68a6f88db86c517fea6f480003c8f73607ecdf2b22b3f8bc2cbad86b8

data/lib/mastico/query.rb

@@ -24,6 +24,7 @@ module Mastico
       @fields = fields
       @word_weight = word_weight
       @options = options
+      @parts = nil
     end
 
     def perform(scope)
@@ -33,28 +34,32 @@ module Mastico
     private
 
     def parts
-      clean = query.strip.gsub(/\s+/, ' ').downcase
-      terms = clean.split(" ")
-      term_parts = terms.map do |term|
-        weight = word_weight.call(term)
-        next nil if weight == 0.0
-        chewy_term_query(term: term, weight: weight)
-      end
-      term_parts = term_parts.compact
-      case term_parts.size
-      when 0
-        nil
-      when 1
-        term_parts[0]
-      else
-        # We have multiple words in the query -
-        # all of them **must** match
-        {bool: {must: term_parts}} # AND query
-      end
+      @parts ||=
+        begin
+          clean = query.strip.gsub(/\s+/, ' ').downcase
+          terms = clean.split(" ")
+          term_parts = terms.map do |term|
+            weight = word_weight.call(term)
+            next nil if weight == 0.0
+            chewy_term_query(term: term, weight: weight)
+          end
+          term_parts = term_parts.compact
+          case term_parts.size
+          when 0
+            nil
+          when 1
+            term_parts[0]
+          else
+            # We have multiple words in the query -
+            # all of them **must** match
+            {bool: {must: term_parts}} # AND query
+          end
+        end
     end
 
     def chewy_term_query(term:, weight:)
       parts = []
+
       if term.length >= options[:minimum_term_length]
         relevant_fields(:term).each do |field, field_boost|
           parts << chewy_multi_match_term_query(
@@ -64,8 +69,9 @@ module Mastico
           )
         end
       end
+
       if term.length >= options[:minimum_prefix_length]
-        relevant_fields(:term).each do |field, field_boost|
+        relevant_fields(:prefix).each do |field, field_boost|
           parts << chewy_multi_match_prefix_query(
             query: term,
             fields: [field],
@@ -73,8 +79,9 @@ module Mastico
           )
         end
       end
+
       if term.length >= options[:minimum_infix_length]
-        relevant_fields(:term).each do |field, field_boost|
+        relevant_fields(:infix).each do |field, field_boost|
           parts << chewy_multi_match_infix_query(
             query: term,
             fields: [field],
@@ -82,8 +89,9 @@ module Mastico
           )
         end
       end
+
       if term.length >= options[:minimum_fuzzy_length]
-        relevant_fields(:term).each do |field, field_boost|
+        relevant_fields(:fuzzy).each do |field, field_boost|
           parts << chewy_multi_match_fuzzy_query(
             query: term,
             fields: [field],
@@ -91,6 +99,7 @@ module Mastico
           )
         end
       end
+
       parts.compact!
 
       if parts.size > 0

data/lib/mastico/version.rb

@@ -1,3 +1,3 @@
 module Mastico
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/mastico.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "pry-byebug", "~> 3.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastico
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matteo Manzo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A chewy helper