pursuit 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9584065901bd2b27fce1df13ee13586151c96be3e04f222b81c6ee93d8f078a4
-  data.tar.gz: 81f233b5d39526129b8bdf7c7bba997e9a5b964b9bd5024bc3e3351f1105c927
+  metadata.gz: 4b1d45107d4ab3d9a2ac9d9eaf8451e6f75762f2c8ac71e51683c3afe98009c7
+  data.tar.gz: e40fa3f38548173ba042cd232347127a3059c4e7f4a417569cad81d16b2b3710
 SHA512:
-  metadata.gz: 83fcec1d5657de087a5a5fdf71b131e34632fc02328cd66d2a551c438201f9125fd8d0861d239a96a4b6b36c6ac3bde342efaa4b610a1689646540229fe456bd
-  data.tar.gz: 47d981997a463f5203b3316410d6f5e2395fc1aa448329a86a625a732c2751a3e281b4581973cb9893f3c76d68f6999f38a0fbe0020c56ecc608f99b968101b0
+  metadata.gz: 65009e855c743fad6e91b5939d59456c845976b2add94fd1d03a9603d34a6046d5e45e58dd3fc7ca33291600f1a17bb879b2c492f1d5c22102bc9f2124c591b3
+  data.tar.gz: 9662bc16e8eb17107089b5bdd7635a91d0647b71a015cff79bf43df4b517729036d8c9ff3fde2b299ca82e63e440b3abca2531eddaa35aeb306472e62a7bc708

data/.ruby-version

@@ -1 +1 @@
-3.0.2
+3.1.0

data/Gemfile.lock

@@ -1,50 +1,49 @@
 PATH
   remote: .
   specs:
-    pursuit (0.3.0)
-      activerecord (>= 5.2.0, < 6.2.0)
-      activesupport (>= 5.2.0, < 6.2.0)
+    pursuit (0.4.1)
+      activerecord (>= 5.2.0, < 7.1.0)
+      activesupport (>= 5.2.0, < 7.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.4.1)
-      actionview (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (7.0.1)
+      actionview (= 7.0.1)
+      activesupport (= 7.0.1)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.4.1)
-      activesupport (= 6.0.4.1)
+    actionview (7.0.1)
+      activesupport (= 7.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activerecord (6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activesupport (6.0.4.1)
+    activemodel (7.0.1)
+      activesupport (= 7.0.1)
+    activerecord (7.0.1)
+      activemodel (= 7.0.1)
+      activesupport (= 7.0.1)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     ast (2.4.2)
     builder (3.2.4)
     coderay (1.1.3)
-    combustion (1.3.3)
+    combustion (1.3.5)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     erubi (1.10.0)
-    ffi (1.15.4)
-    formatador (0.3.0)
+    ffi (1.15.5)
+    formatador (1.0.0)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -61,24 +60,23 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    listen (3.7.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.12.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.14.4)
+    minitest (5.15.0)
     nenv (0.3.0)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.1-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -92,70 +90,78 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.0.4.1)
-      actionpack (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
+    railties (7.0.1)
+      actionpack (= 7.0.1)
+      activesupport (= 7.0.1)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rainbow (3.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.4)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
-    rubocop (0.77.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-rails (5.0.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.3)
+    rubocop (1.25.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     shellany (0.0.1)
     sqlite3 (1.4.2)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.1)
-    yard (0.9.26)
-    zeitwerk (2.5.1)
+    thor (1.2.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   x86_64-darwin-21
 
 DEPENDENCIES
   bundler (~> 2.0)
-  combustion (~> 1.1)
+  combustion (~> 1.3)
   guard-rspec (~> 4.7)
   pursuit!
   rake (~> 13.0)
-  rspec (~> 3.8)
-  rspec-rails (~> 3.8)
-  rubocop (~> 0.77.0)
+  rspec (~> 3.10)
+  rspec-rails (~> 5.0)
+  rubocop (~> 1.25)
   sqlite3 (~> 1.4)
-  yard (~> 0.9.20)
+  yard (~> 0.9)
 
 BUNDLED WITH
-   2.2.22
+   2.3.3

data/README.md

@@ -29,7 +29,13 @@ class Product < ActiveRecord::Base
     o.attribute :description
     o.attribute :rating, unkeyed: false
 
-    # You can also create virtual attributes to search by passing in a block that returns an arel node.
+    # You can shorten the search keyword by passing the desired search term first, and then the real attribute name
+    # as the second argument.
+    #  => "category*=shirts"
+    o.attribute :category, :category_id
+
+    # It's also possible to query entirely custom Arel nodes by passing a block which returns the Arel node to query.
+    # You could use this to query a person's full name by concatenating their first and last name columns, for example.
     o.attribute :title_length, unkeyed: false do
       Arel::Nodes::NamedFunction.new('LENGTH', [
         arel_table[:title]

data/lib/pursuit/constants.rb

@@ -3,5 +3,5 @@
 module Pursuit
   # @return [String] The gem's semantic version number.
   #
-  VERSION = '0.3.0'
+  VERSION = '0.4.1'
 end

data/lib/pursuit/search.rb

@@ -51,12 +51,13 @@ module Pursuit
       return nil if terms.blank?
 
       terms.reduce(nil) do |chain, term|
-        reflection = options.record_class.reflections[term.key]
+        attribute_name = term.key.to_sym
+        reflection = options.relations.key?(attribute_name) ? options.record_class.reflections[term.key] : nil
         node = if reflection.present?
-                 attribute_names = options.relations[term.key.to_sym]
+                 attribute_names = options.relations[attribute_name]
                  build_arel_for_reflection(reflection, attribute_names, term.operator, term.value)
                else
-                 node_builder = options.keyed_attributes[term.key.to_sym]
+                 node_builder = options.keyed_attributes[attribute_name]
                  build_arel_for_node(node_builder.call, term.operator, term.value)
                end
 
@@ -89,7 +90,7 @@ module Pursuit
 
     def build_arel_for_reflection(reflection, attribute_names, operator, value)
       nodes = build_arel_for_reflection_join(reflection)
-      count_nodes = build_arel_for_relation_count(nodes, operator, value)
+      count_nodes = build_arel_for_relation_count(nodes, operator, value) unless reflection.belongs_to?
       return count_nodes if count_nodes.present?
 
       match_nodes = attribute_names.reduce(nil) do |chain, attribute_name|
@@ -103,6 +104,23 @@ module Pursuit
     end
 
     def build_arel_for_reflection_join(reflection)
+      if reflection.belongs_to?
+        build_arel_for_belongs_to_reflection_join(reflection)
+      else
+        build_arel_for_has_reflection_join(reflection)
+      end
+    end
+
+    def build_arel_for_belongs_to_reflection_join(reflection)
+      reflection_table = reflection.klass.arel_table
+      reflection_table.where(
+        reflection_table[reflection.join_primary_key].eq(
+          options.record_class.arel_table[reflection.join_foreign_key]
+        )
+      )
+    end
+
+    def build_arel_for_has_reflection_join(reflection)
       reflection_table = reflection.klass.arel_table
       reflection_through = reflection.through_reflection
 

data/lib/pursuit/search_options.rb

@@ -54,7 +54,7 @@ module Pursuit
       keys.map(&:to_s).uniq
     end
 
-    # Add a relation to the search options.
+    # Add a relation to search.
     #
     # @param name            [Symbol] The name of the relationship attribute.
     # @param attribute_names [Splat]  The name of the attributes within the relationship to search.
@@ -64,15 +64,22 @@ module Pursuit
       nil
     end
 
-    # Add a keyed attribute to search.
+    # Add an attribute to search.
     #
-    # @param name    [Symbol]  The name of the attribute.
-    # @param keyed   [Boolean] `true` when the attribute should be searchable using a keyed term, `false` otherwise.
-    # @param unkeyed [Boolean] `true` when the attribute should be searchable using an unkeyed term, `false` otherwise.
-    # @param block   [Proc]    A block which returns an Arel node to query, instead of the matching table column.
+    # @param term_name      [Symbol]  The keyed search term (can be an existing attribute, or a custom value when
+    #                                 passing either the `attribute_name` or a block returning an Arel node).
+    # @param attribute_name [Symbol]  The attribute name to search (defaults to the keyword, when left blank and no
+    #                                 block is passed).
+    # @param keyed          [Boolean] `true` when the attribute should be searchable using a keyed term,
+    #                                 `false` otherwise.
+    # @param unkeyed        [Boolean] `true` when the attribute should be searchable using an unkeyed term,
+    #                                 `false` otherwise.
+    # @param block          [Proc]    A block which returns the Arel node to query against. When left blank, the
+    #                                 matching attribute from `.arel_table` is queried instead.
     #
-    def attribute(name, keyed: true, unkeyed: true, &block)
-      attributes[name] = AttributeOptions.new(keyed, unkeyed, block || -> { record_class.arel_table[name] })
+    def attribute(term_name, attribute_name = nil, keyed: true, unkeyed: true, &block)
+      block ||= -> { record_class.arel_table[attribute_name || term_name] }
+      attributes[term_name] = AttributeOptions.new(keyed, unkeyed, block)
       nil
     end
   end

data/pursuit.gemspec

@@ -21,16 +21,16 @@ Gem::Specification.new do |spec|
 
   spec.metadata['yard.run'] = 'yri'
 
-  spec.add_runtime_dependency 'activerecord',  '>= 5.2.0', '< 6.2.0'
-  spec.add_runtime_dependency 'activesupport', '>= 5.2.0', '< 6.2.0'
+  spec.add_runtime_dependency 'activerecord',  '>= 5.2.0', '< 7.1.0'
+  spec.add_runtime_dependency 'activesupport', '>= 5.2.0', '< 7.1.0'
 
   spec.add_development_dependency 'bundler',     '~> 2.0'
-  spec.add_development_dependency 'combustion',  '~> 1.1'
+  spec.add_development_dependency 'combustion',  '~> 1.3'
   spec.add_development_dependency 'guard-rspec', '~> 4.7'
   spec.add_development_dependency 'rake',        '~> 13.0'
-  spec.add_development_dependency 'rspec',       '~> 3.8'
-  spec.add_development_dependency 'rspec-rails', '~> 3.8'
-  spec.add_development_dependency 'rubocop',     '~> 0.77.0'
-  spec.add_development_dependency 'yard',        '~> 0.9.20'
+  spec.add_development_dependency 'rspec',       '~> 3.10'
+  spec.add_development_dependency 'rspec-rails', '~> 5.0'
+  spec.add_development_dependency 'rubocop',     '~> 1.25'
+  spec.add_development_dependency 'yard',        '~> 0.9'
   spec.add_development_dependency 'sqlite3',     '~> 1.4'
 end

data/spec/internal/app/models/product.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Product < ActiveRecord::Base
+  belongs_to :category, class_name: 'ProductCategory', inverse_of: :products, optional: true
+
   has_many :variations, class_name: 'ProductVariation', inverse_of: :product
 
   validates :title, presence: true
@@ -16,5 +18,7 @@ class Product < ActiveRecord::Base
         arel_table[:title]
       ])
     end
+
+    o.attribute :category, :category_id
   end
 end

data/spec/internal/app/models/product_category.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ProductCategory < ActiveRecord::Base
+  has_many :products, class_name: 'Product', foreign_key: :category_id, inverse_of: :category, dependent: :nullify
+
+  validates :name, presence: true
+end

data/spec/internal/db/schema.rb

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
 ActiveRecord::Schema.define do
+  create_table :product_categories, id: :string, force: true do |t|
+    t.string :name, null: false
+
+    t.timestamps null: false
+  end
+
   create_table :products, force: true do |t|
+    t.belongs_to :category, type: :string, foreign_key: { to_table: 'product_categories' }
+
     t.string :title, null: false
 
     t.text :description

data/spec/pursuit/search_options_spec.rb

@@ -104,11 +104,20 @@ RSpec.describe Pursuit::SearchOptions do
       expect(search_options.attributes[:description].unkeyed).to eq(true)
     end
 
-    it 'is expected to use the matching table column node builder by default' do
+    it 'is expected to query the #term_name attribute' do
       attribute
       expect(search_options.attributes[:description].block.call).to eq(Product.arel_table[:description])
     end
 
+    context 'when passing the attribute name to search' do
+      subject(:attribute) { search_options.attribute(:desc, :description) }
+
+      it 'is expected to query the #attribute_name attribute' do
+        attribute
+        expect(search_options.attributes[:desc].block.call).to eq(Product.arel_table[:description])
+      end
+    end
+
     context 'when passing :keyed eq false' do
       subject(:attribute) { search_options.attribute(:description, keyed: false) }
 
@@ -130,7 +139,7 @@ RSpec.describe Pursuit::SearchOptions do
     context 'when passing a block' do
       subject(:attribute) { search_options.attribute(:description, &title_length_node_builder) }
 
-      it 'is expected to use the custom node builder' do
+      it 'is expected to query the result of the passed block' do
         attribute
         expect(search_options.attributes[:description].block).to eq(title_length_node_builder)
       end

data/spec/pursuit/search_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe Pursuit::Search do
 
   let(:search_options) do
     Pursuit::SearchOptions.new(Product) do |o|
+      o.relation :category, :name
       o.relation :variations, :title, :stock_status
 
       o.attribute :title
@@ -15,6 +16,8 @@ RSpec.describe Pursuit::Search do
           Product.arel_table[:title]
         ])
       end
+
+      o.attribute :cat, :category_id
     end
   end
 
@@ -251,115 +254,20 @@ RSpec.describe Pursuit::Search do
       end
     end
 
-    context 'when passed a `match` relationship search query' do
-      let(:query) { 'variations*=green' }
-
-      let(:product_a) { Product.create!(title: 'Plain Shirt') }
-      let(:product_b) { Product.create!(title: 'Funky Shirt') }
-
-      let(:product_variation_a) { ProductVariation.create!(product: product_a, title: 'Red') }
-      let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
-      let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
-
-      before do
-        product_a
-        product_b
-
-        product_variation_a
-        product_variation_b
-        product_variation_c
-      end
-
-      it 'is expected to contain the matching records' do
-        expect(perform).to contain_exactly(product_b)
-      end
-    end
-
-    context 'when passed an `equal to` relationship count query' do
-      let(:query) { 'variations==1' }
-
-      let(:product_a) { Product.create!(title: 'Plain Shirt') }
-      let(:product_b) { Product.create!(title: 'Funky Shirt') }
-      let(:product_c) { Product.create!(title: 'Socks') }
-
-      let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
-      let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
-      let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
-      let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
-
-      before do
-        product_a
-        product_b
-        product_c
-
-        product_variation_a
-        product_variation_b
-        product_variation_c
-        product_variation_d
-      end
-
-      it 'is expected to contain the matching records' do
-        expect(perform).to contain_exactly(product_c)
-      end
-    end
-
-    context 'when passed a `greater than` relationship count query' do
-      let(:query) { 'variations>1' }
-
-      let(:product_a) { Product.create!(title: 'Plain Shirt') }
-      let(:product_b) { Product.create!(title: 'Funky Shirt') }
-      let(:product_c) { Product.create!(title: 'Socks') }
-
-      let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
-      let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
-      let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
-      let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
-      let(:product_variation_e) { ProductVariation.create!(product: product_a, title: 'Black') }
-      let(:product_variation_f) { ProductVariation.create!(product: product_a, title: 'Gray') }
-
-      before do
-        product_a
-        product_b
-        product_c
-
-        product_variation_a
-        product_variation_b
-        product_variation_c
-        product_variation_d
-        product_variation_e
-        product_variation_f
-      end
-
-      it 'is expected to contain the matching records' do
-        expect(perform).to contain_exactly(product_a, product_b)
-      end
-    end
-
-    context 'when passed a `greater than or equal to` relationship count query' do
-      let(:query) { 'variations>=2' }
+    context 'when querying a custom attribute whose name matches a reflection' do
+      let(:query) { 'cat==shirts' }
 
-      let(:product_a) { Product.create!(title: 'Plain Shirt') }
-      let(:product_b) { Product.create!(title: 'Funky Shirt') }
-      let(:product_c) { Product.create!(title: 'Socks') }
+      let(:shirts_category) { ProductCategory.create!(id: 'shirts', name: 'The Shirt Collection') }
+      let(:socks_category)  { ProductCategory.create!(id: 'socks', name: 'The Sock Collection') }
 
-      let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
-      let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
-      let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
-      let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
-      let(:product_variation_e) { ProductVariation.create!(product: product_a, title: 'Black') }
-      let(:product_variation_f) { ProductVariation.create!(product: product_a, title: 'Gray') }
+      let(:product_a) { Product.create!(title: 'Plain Shirt', category: shirts_category) }
+      let(:product_b) { Product.create!(title: 'Funky Shirt', category: shirts_category) }
+      let(:product_c) { Product.create!(title: 'Socks - Pack of 4', category: socks_category) }
 
       before do
         product_a
         product_b
         product_c
-
-        product_variation_a
-        product_variation_b
-        product_variation_c
-        product_variation_d
-        product_variation_e
-        product_variation_f
       end
 
       it 'is expected to contain the matching records' do
@@ -367,99 +275,243 @@ RSpec.describe Pursuit::Search do
       end
     end
 
-    context 'when passed a `less than` relationship count query' do
-      let(:query) { 'variations<3' }
-
-      let(:product_a) { Product.create!(title: 'Plain Shirt') }
-      let(:product_b) { Product.create!(title: 'Funky Shirt') }
-      let(:product_c) { Product.create!(title: 'Socks') }
-
-      let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
-      let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
-      let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
-      let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
-      let(:product_variation_e) { ProductVariation.create!(product: product_a, title: 'Black') }
-      let(:product_variation_f) { ProductVariation.create!(product: product_a, title: 'Gray') }
+    context 'when searching a #has_many relationship' do
+      context 'when passed a `match` relationship search query' do
+        let(:query) { 'variations*=green' }
 
-      before do
-        product_a
-        product_b
-        product_c
+        let(:product_a) { Product.create!(title: 'Plain Shirt') }
+        let(:product_b) { Product.create!(title: 'Funky Shirt') }
+
+        let(:product_variation_a) { ProductVariation.create!(product: product_a, title: 'Red') }
+        let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
+        let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
+
+        before do
+          product_a
+          product_b
+
+          product_variation_a
+          product_variation_b
+          product_variation_c
+        end
 
-        product_variation_a
-        product_variation_b
-        product_variation_c
-        product_variation_d
-        product_variation_e
-        product_variation_f
+        it 'is expected to contain the matching records' do
+          expect(perform).to contain_exactly(product_b)
+        end
       end
 
-      it 'is expected to contain the matching records' do
-        expect(perform).to contain_exactly(product_a, product_c)
+      context 'when passed an `equal to` relationship count query' do
+        let(:query) { 'variations==1' }
+
+        let(:product_a) { Product.create!(title: 'Plain Shirt') }
+        let(:product_b) { Product.create!(title: 'Funky Shirt') }
+        let(:product_c) { Product.create!(title: 'Socks') }
+
+        let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
+        let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
+        let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
+        let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
+
+        before do
+          product_a
+          product_b
+          product_c
+
+          product_variation_a
+          product_variation_b
+          product_variation_c
+          product_variation_d
+        end
+
+        it 'is expected to contain the matching records' do
+          expect(perform).to contain_exactly(product_c)
+        end
+      end
+
+      context 'when passed a `greater than` relationship count query' do
+        let(:query) { 'variations>1' }
+
+        let(:product_a) { Product.create!(title: 'Plain Shirt') }
+        let(:product_b) { Product.create!(title: 'Funky Shirt') }
+        let(:product_c) { Product.create!(title: 'Socks') }
+
+        let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
+        let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
+        let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
+        let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
+        let(:product_variation_e) { ProductVariation.create!(product: product_a, title: 'Black') }
+        let(:product_variation_f) { ProductVariation.create!(product: product_a, title: 'Gray') }
+
+        before do
+          product_a
+          product_b
+          product_c
+
+          product_variation_a
+          product_variation_b
+          product_variation_c
+          product_variation_d
+          product_variation_e
+          product_variation_f
+        end
+
+        it 'is expected to contain the matching records' do
+          expect(perform).to contain_exactly(product_a, product_b)
+        end
+      end
+
+      context 'when passed a `greater than or equal to` relationship count query' do
+        let(:query) { 'variations>=2' }
+
+        let(:product_a) { Product.create!(title: 'Plain Shirt') }
+        let(:product_b) { Product.create!(title: 'Funky Shirt') }
+        let(:product_c) { Product.create!(title: 'Socks') }
+
+        let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
+        let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
+        let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
+        let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
+        let(:product_variation_e) { ProductVariation.create!(product: product_a, title: 'Black') }
+        let(:product_variation_f) { ProductVariation.create!(product: product_a, title: 'Gray') }
+
+        before do
+          product_a
+          product_b
+          product_c
+
+          product_variation_a
+          product_variation_b
+          product_variation_c
+          product_variation_d
+          product_variation_e
+          product_variation_f
+        end
+
+        it 'is expected to contain the matching records' do
+          expect(perform).to contain_exactly(product_a, product_b)
+        end
+      end
+
+      context 'when passed a `less than` relationship count query' do
+        let(:query) { 'variations<3' }
+
+        let(:product_a) { Product.create!(title: 'Plain Shirt') }
+        let(:product_b) { Product.create!(title: 'Funky Shirt') }
+        let(:product_c) { Product.create!(title: 'Socks') }
+
+        let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
+        let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
+        let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
+        let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
+        let(:product_variation_e) { ProductVariation.create!(product: product_a, title: 'Black') }
+        let(:product_variation_f) { ProductVariation.create!(product: product_a, title: 'Gray') }
+
+        before do
+          product_a
+          product_b
+          product_c
+
+          product_variation_a
+          product_variation_b
+          product_variation_c
+          product_variation_d
+          product_variation_e
+          product_variation_f
+        end
+
+        it 'is expected to contain the matching records' do
+          expect(perform).to contain_exactly(product_a, product_c)
+        end
+      end
+
+      context 'when passed a `less than or equal to` relationship count query' do
+        let(:query) { 'variations<=2' }
+
+        let(:product_a) { Product.create!(title: 'Plain Shirt') }
+        let(:product_b) { Product.create!(title: 'Funky Shirt') }
+        let(:product_c) { Product.create!(title: 'Socks') }
+
+        let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
+        let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
+        let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
+        let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
+        let(:product_variation_e) { ProductVariation.create!(product: product_a, title: 'Black') }
+        let(:product_variation_f) { ProductVariation.create!(product: product_a, title: 'Gray') }
+
+        before do
+          product_a
+          product_b
+          product_c
+
+          product_variation_a
+          product_variation_b
+          product_variation_c
+          product_variation_d
+          product_variation_e
+          product_variation_f
+        end
+
+        it 'is expected to contain the matching records' do
+          expect(perform).to contain_exactly(product_a, product_c)
+        end
+      end
+
+      context 'when passed a `greater than` and `less than` relationship count query' do
+        let(:query) { 'variations>1 variations<3' }
+
+        let(:product_a) { Product.create!(title: 'Plain Shirt') }
+        let(:product_b) { Product.create!(title: 'Funky Shirt') }
+        let(:product_c) { Product.create!(title: 'Socks') }
+
+        let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
+        let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
+        let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
+        let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
+        let(:product_variation_e) { ProductVariation.create!(product: product_a, title: 'Black') }
+        let(:product_variation_f) { ProductVariation.create!(product: product_a, title: 'Gray') }
+
+        before do
+          product_a
+          product_b
+          product_c
+
+          product_variation_a
+          product_variation_b
+          product_variation_c
+          product_variation_d
+          product_variation_e
+          product_variation_f
+        end
+
+        it 'is expected to contain the matching records' do
+          expect(perform).to contain_exactly(product_a)
+        end
       end
     end
 
-    context 'when passed a `less than or equal to` relationship count query' do
-      let(:query) { 'variations<=2' }
+    context 'when searching a #belongs_to relationship' do
+      context 'when passed a `match` relationship search query' do
+        let(:query) { 'category*=shirt' }
 
-      let(:product_a) { Product.create!(title: 'Plain Shirt') }
-      let(:product_b) { Product.create!(title: 'Funky Shirt') }
-      let(:product_c) { Product.create!(title: 'Socks') }
+        let(:product_category_a) { ProductCategory.create!(id: 'one', name: 'Shirts') }
+        let(:product_category_b) { ProductCategory.create!(id: 'two', name: 'Socks') }
 
-      let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
-      let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
-      let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
-      let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
-      let(:product_variation_e) { ProductVariation.create!(product: product_a, title: 'Black') }
-      let(:product_variation_f) { ProductVariation.create!(product: product_a, title: 'Gray') }
+        let(:product_a) { Product.create!(category: product_category_a, title: 'Plain Shirt') }
+        let(:product_b) { Product.create!(category: product_category_a, title: 'Funky Shirt') }
+        let(:product_c) { Product.create!(category: product_category_b, title: 'White Socks') }
 
-      before do
-        product_a
-        product_b
-        product_c
-
-        product_variation_a
-        product_variation_b
-        product_variation_c
-        product_variation_d
-        product_variation_e
-        product_variation_f
-      end
-
-      it 'is expected to contain the matching records' do
-        expect(perform).to contain_exactly(product_a, product_c)
-      end
-    end
+        before do
+          product_category_a
+          product_category_b
 
-    context 'when passed a `greater than` and `less than` relationship count query' do
-      let(:query) { 'variations>1 variations<3' }
+          product_a
+          product_b
+          product_c
+        end
 
-      let(:product_a) { Product.create!(title: 'Plain Shirt') }
-      let(:product_b) { Product.create!(title: 'Funky Shirt') }
-      let(:product_c) { Product.create!(title: 'Socks') }
-
-      let(:product_variation_a) { ProductVariation.create!(product: product_b, title: 'Red') }
-      let(:product_variation_b) { ProductVariation.create!(product: product_b, title: 'Green') }
-      let(:product_variation_c) { ProductVariation.create!(product: product_b, title: 'Blue') }
-      let(:product_variation_d) { ProductVariation.create!(product: product_c, title: 'White') }
-      let(:product_variation_e) { ProductVariation.create!(product: product_a, title: 'Black') }
-      let(:product_variation_f) { ProductVariation.create!(product: product_a, title: 'Gray') }
-
-      before do
-        product_a
-        product_b
-        product_c
-
-        product_variation_a
-        product_variation_b
-        product_variation_c
-        product_variation_d
-        product_variation_e
-        product_variation_f
-      end
-
-      it 'is expected to contain the matching records' do
-        expect(perform).to contain_exactly(product_a)
+        it 'is expected to contain the matching records' do
+          expect(perform).to contain_exactly(product_a, product_b)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pursuit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Nialto Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,56 +112,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,7 @@ files:
 - lib/pursuit/search_term_parser.rb
 - pursuit.gemspec
 - spec/internal/app/models/product.rb
+- spec/internal/app/models/product_category.rb
 - spec/internal/app/models/product_variation.rb
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
@@ -240,12 +241,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Advanced key-based searching for ActiveRecord objects.
 test_files:
 - spec/internal/app/models/product.rb
+- spec/internal/app/models/product_category.rb
 - spec/internal/app/models/product_variation.rb
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb