card-mod-search 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4e0888157c8ae7db22a9ac094ed705e61cb6df0cc971aac5910304d1feba587
-  data.tar.gz: f442615afe24128dcd1506df6d8d99989ebfa915f3be4785e5a456a0de05bcbd
+  metadata.gz: 2b984c349feeb19b84a22304807c81954763bd0231d9058e74fc1d486a332cdf
+  data.tar.gz: 86aca9cc8d4c5f2f420cc15a2974d41133ea480e13de55353c2534e673031479
 SHA512:
-  metadata.gz: a4712a996ebe145ac011e05f3528b015de3f45d2575d443c14716df8f2a09623534b057336be5122b45188d05b3fce01b4065364348371023e8a86a6a4c78a45
-  data.tar.gz: bdaf29e1e625c1132c3bd2d02a0e58af2d447ee709b3483c802f9ae92c4362193c9533c894d8ca298d49524f384d065d4d55e13e53fbb27afb10c77dd58d4418
+  metadata.gz: 7df1ccbc3dd598c4638e96b11b1ebb557cc42214c680589d19e52e04f969ea794b9298b8701d259b853792b757a8f940a1e196f445c5735c0cca5859d89f974e
+  data.tar.gz: 9f7244334094de50ee81a26d2f112362fc7d52f8c3f1b333f1324a5bd52cdbaefb3a7bbc5328e1ce23c7688ee23df9707930c92095d88e1f1614d74c154d873c

data/set/abstract/0_search/search_params.rb

@@ -20,6 +20,24 @@ format do
     (vars = params[:query]) ? Env.hash(vars) : {}
   end
 
+  def type_param
+    type = query_params[:type]
+    type.present? && type
+  end
+
+  def term_param
+    params[:term]
+  end
+
+  def search_keyword
+    @search_keyword ||= term_param || search_vars&.dig(:keyword)
+  end
+
+  def search_vars
+    # root.respond_to?(:search_params) ? root.search_params[:vars] :
+    search_params[:vars]
+  end
+
   def default_limit
     100
   end

data/set/abstract/0_search/views.rb

@@ -8,9 +8,7 @@ format do
   end
 
   view :card_list, cache: :never do
-    if search_with_params.empty?
-      "no results"
-    else
+    with_results do
       search_with_params.map do |item_card|
         nest_item item_card
       end.join "\n"
@@ -28,15 +26,9 @@ format do
   def item_cards
     search_with_params
   end
-
-  def term_param
-    params[:term]
-  end
 end
 
 format :json do
-  AUTOCOMPLETE_LIMIT = 8 # number of name suggestions for autocomplete text fields
-
   # NOCACHE because paging_urls is uncacheable hash and thus not safe to merge
   view :molecule, cache: :never do
     molecule.merge render_paging_urls
@@ -80,7 +72,7 @@ format :json do
   end
 
   def complete_cql
-    term_param.present? ? { complete: term_param } : {}
+    { complete: term_param.to_s }
   end
 
   def match_cql not_names
@@ -112,15 +104,17 @@ end
 
 format :html do
   view :card_list, cache: :never do
-    with_results do
-      klasses = "card-list card-list-#{item_view_options[:view]} search-result-list"
-      search_result_list(klasses) { |item_card| card_list_item item_card }
+    klasses = "card-list card-list-#{item_view_options[:view]} search-result-list"
+    search_result_list(klasses) do
+      search_with_params.map do |item_card|
+        card_list_item item_card
+      end
     end
   end
 
   view :checkbox_list, cache: :never do
-    with_results do
-      search_result_list "_search-checkbox-list pe-2" do |item_card|
+    search_result_list "_search-checkbox-list pe-2" do
+      search_with_params.map do |item_card|
         checkbox_item item_card
       end
     end
@@ -139,11 +133,7 @@ format :html do
   end
 
   def search_result_list klass, &block
-    with_paging do
-      wrap_with :div, class: klass do
-        search_with_params.map(&block)
-      end
-    end
+    with_results { with_paging { wrap_with :div, class: klass, &block } }
   end
 
   def checkbox_item item_card

data/set/abstract/0_search.rb

@@ -1,5 +1,7 @@
 include_set Abstract::Paging
 
+AUTOCOMPLETE_LIMIT = 8 # number of name suggestions for autocomplete text fields
+
 def search _args={}
   raise Error, "search not overridden"
 end

data/set/abstract/cql_search.rb

@@ -13,7 +13,7 @@ end
 
 def item_type_id
   type = cql_hash[:type]
-  type = type&.card_id unless type.is_a? Hash
+  type = type&.card_id if plausible_type? type
   type if type.is_a? Integer
 end
 
@@ -65,12 +65,18 @@ def query args={}
   Query.new standardized_query_args(args), name
 end
 
+private
+
 def standardized_query_args args
   args = cql_hash.merge args.symbolize_keys
   args[:context] ||= name
   args
 end
 
+def plausible_type? type
+  type.class.in?([String, Symbol, Integer]) && type != "_left"
+end
+
 format do
   def default_limit
     card_content_limit || super

data/set/all/autocomplete.rb

@@ -48,3 +48,9 @@ format :html do
     card.name
   end
 end
+
+format :json do
+  view :select2_option do
+    { id: "~#{card.id}", text: card.name }
+  end
+end

data/set/right/mates.rb

@@ -1,5 +1,8 @@
-include_set Abstract::VirtualSearch,
-            cql_content: { plus: "_left", sort_by: "name" },
-            raw_help_text:
-              'If there is a card named "X+{{_left|name}}", ' \
-              "then X is a mate of {{_left|name}}."
+# too slow on large databases.
+# requires joining cards to cards to cards.
+
+# include_set Abstract::VirtualSearch,
+#             cql_content: { plus: "_left", sort_by: "name" },
+#             raw_help_text:
+#               'If there is a card named "X+{{_left|name}}", ' \
+#               "then X is a mate of {{_left|name}}."

data/set/self/search.rb

@@ -19,14 +19,6 @@ format do
     rescuing_bad_query(query) { Card.search query }
   end
 
-  def search_keyword
-    @search_keyword ||= term_param || search_vars&.dig(:keyword)
-  end
-
-  def search_vars
-    root.respond_to?(:search_params) ? root.search_params[:vars] : search_params[:vars]
-  end
-
   def cql_keyword?
     search_keyword&.match?(/^\{.+\}$/)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-search
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.107.0
+        version: 1.108.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.107.0
+        version: 1.108.0
 - !ruby/object:Gem::Dependency
   name: card-mod-collection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: card-mod-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: card-mod-help
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 description: ''
 email:
 - info@decko.org
@@ -122,7 +122,7 @@ files:
 - set/type/search_type.rb
 homepage: https://decko.org
 licenses:
-- GPL-3.0
+- GPL-3.0-or-later
 metadata:
   source_code_uri: https://github.com/decko-commons/decko
   homepage_uri: https://decko.org
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: search