pursuit 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5d86e6be4355b96bdaf0d8c02ea680e5cf0f6c3c9f5fdcd3d8e9a20785aad8b
-  data.tar.gz: 310009d659879f97ae8bc9947594533fdb0c11f20702b2bf10e1003c072b4425
+  metadata.gz: 5cf47bc77d2ccf93d20d66ee529c6554a995ee612e3135f90fd7d437f0fa5b08
+  data.tar.gz: 8ac3ace51a32566144c34cbe9ebb33d0c8327327f8ce1d2d8ae120c079a494f8
 SHA512:
-  metadata.gz: 49991dd50ed278c76d9dbc7f0dd8f48a7f41fa7905f284964a27df9bc90a55ad6833a5911b86ed159d4d4c88fc2aac736ac5feb2c1b8469fb9adbf02abca3f49
-  data.tar.gz: 6663dc11f0f6e6adc08f87834d303ed59e0269415132d7c0fdb54d96ee7ca926be69097dd26dd58d0bc836b9a9bf7f8ccfc35fd3e8f9c6976340e52b0719c5b1
+  metadata.gz: 184fd8c2520cedd0c3ac45e83e4040295de141065419ee676ea159d8a419222a9bac51a950d6e0decb0e7106f8a3839d76f1a3144786647db528b9115d10bb9b
+  data.tar.gz: 65462af7fb13f713f4680845ba297bf659d230d9285b89b2b4c1de1bde2a64402a022c7929298d022f2a9b7a8fa1f4e0bbb7e569fb88cba99e39c01db17f244d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pursuit (0.3.0)
+    pursuit (0.3.2)
       activerecord (>= 5.2.0, < 6.2.0)
       activesupport (>= 5.2.0, < 6.2.0)
 

data/README.md

@@ -26,12 +26,13 @@ class Product < ActiveRecord::Base
     # Attributes can be used for both keyed and unkeyed searching by default, but you can pass either `keyed: false` or
     # `unkeyed: false` to restrict when the attribute is searched.
     o.attribute :title
+    o.attribute :description
     o.attribute :rating, unkeyed: false
 
     # You can shorten the search keyword by passing the desired search term first, and then the real attribute name
     # as the second argument.
-    #  => "desc*=foo"
-    o.attribute :desc, :description
+    #  => "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.

data/lib/pursuit/constants.rb

@@ -3,5 +3,5 @@
 module Pursuit
   # @return [String] The gem's semantic version number.
   #
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 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
 

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_spec.rb

@@ -15,6 +15,8 @@ RSpec.describe Pursuit::Search do
           Product.arel_table[:title]
         ])
       end
+
+      o.attribute :category, :category_id
     end
   end
 
@@ -462,5 +464,26 @@ RSpec.describe Pursuit::Search do
         expect(perform).to contain_exactly(product_a)
       end
     end
+
+    context 'when querying a custom attribute whose name matches a reflection' do
+      let(:query) { 'category==shirts' }
+
+      let(:shirts_category) { ProductCategory.create!(id: 'shirts', name: 'The Shirt Collection') }
+      let(:socks_category)  { ProductCategory.create!(id: 'socks', name: 'The Sock Collection') }
+
+      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
+      end
+
+      it 'is expected to contain the matching records' do
+        expect(perform).to contain_exactly(product_a, product_b)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pursuit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Nialto Services
@@ -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
@@ -246,6 +247,7 @@ 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