card-mod-search 0.11.1 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e58fbfabcadb566629dc3641d38a9ed6a885a6f82ab0dce2753374e3b41e6609
-  data.tar.gz: d547d5bc688ade72e3b10d726ff5b1010751cc7ca5ed1dbbaa1aaf91a9a2cddd
+  metadata.gz: a6c5e011eb6ad9f5584529fb48b1d8c0b378234da6c7d3641df61936adb3e797
+  data.tar.gz: 7d9da17ca8592ee6d0ca07dc771f0d36339e4ba269f66cbe5d5dcef02ae95ca4
 SHA512:
-  metadata.gz: 2c958bf35cb8dfee228ffbc9dac65d16e92bff2863892bf41e2fe72580dc97627f3a298f85017a7dbccb24080552a75be733628f0c36c5f0602a27dae8cbabf4
-  data.tar.gz: 6614ec6ca6a92116a15507e369d8229aa59b3f67314f8810f7a7caaebe07e0438f2a2ee9cf21557344f4c994d1a31d92fe2ab14fe02428770ebafa5a75b71c03
+  metadata.gz: 201f09f82616dfe770da0bc73fc57f3f3e5dfbb079f2e14f221c56113aee83ddba6bcf22f77c82c76fa70522efeba2bb7e91637c0bf921e0aaaed08bc7503db0
+  data.tar.gz: 4f88e3c0e2283b7354dbf53dd81a3d55fa1cf26cf6ba7148fdfe5b8afbec5a26dbc6dba510bab370b894a57df3fbe74d6e5e72077e3ac63fd493bb309972ceb8

data/lib/card/filter_query.rb

@@ -16,6 +16,7 @@ class Card
 
     def add_rule key, value
       return unless value.present?
+
       case @rules[key]
       when Symbol
         send("#{@rules[key]}_rule", key, value)
@@ -32,6 +33,7 @@ class Card
       @cql = {}
       @filter_cql.each do |cql_key, values|
         next if values.empty?
+
         case cql_key
         when :right_plus, :left_plus, :type
           merge_using_and cql_key, values
@@ -62,12 +64,14 @@ class Card
     # nest values with the same key using :and
     def build_nested_hash key, values
       return { key => values[0] } if values.one?
+
       val = values.pop
       { key => val, and: build_nested_hash(key, values) }
     end
 
     def name_cql name
       return unless name.present?
+
       @filter_cql[:name] = ["match", name]
     end
   end

data/set/abstract/02_search_params.rb

@@ -27,9 +27,7 @@ format do
   end
 
   def extra_paging_path_args
-    return {} unless (vars = query_params)
-
-    { query: vars }
+    (vars = query_params) ? { query: vars } : {}
   end
 end
 

data/set/abstract/03_filter/form_helper.rb

@@ -7,7 +7,7 @@ format :html do
 
   def select_filter field, default=nil, options=nil
     options ||= filter_options field
-    options.unshift(["--", ""]) unless default
+    options = [["--", ""]] + options unless default
     select_filter_tag field, default, options
   end
 

data/set/abstract/05_search.rb

@@ -60,6 +60,10 @@ format do
     @count_with_params ||= search_with_rescue search_params.merge(return: :count)
   end
 
+  view :filtered_count, cache: :never do
+    count_with_params
+  end
+
   def search_with_rescue query_args
     rescuing_bad_query query_args do
       card.cached_search query_args

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

@@ -1,4 +1,3 @@
-
 format do
   view :search_count, cache: :never do
     search_with_params.to_s
@@ -55,6 +54,7 @@ format :json do
 
     remaining_slots = limit - starts_with.size
     return starts_with if remaining_slots.zero?
+
     starts_with + match_search(not_names: starts_with, limit: remaining_slots)
   end
 
@@ -145,12 +145,10 @@ format :html do
     end
   end
 
-  def search_result_list klass
+  def search_result_list klass, &block
     with_paging do
       wrap_with :div, class: klass do
-        search_with_params.map do |item_card|
-          yield item_card
-        end
+        search_with_params.map(&block)
       end
     end
   end

data/set/abstract/06_cql_search.rb

@@ -14,6 +14,7 @@ end
 def item_type
   type = cql_hash[:type]
   return if type.is_a?(Array) || type.is_a?(Hash)
+
   type
 end
 
@@ -44,6 +45,7 @@ def search args={}
     # forces explicit limiting
     # can be 0 or less to force no limit
     raise "OH NO.. no limit" unless query.mods[:limit]
+
     query.run
   end
 end

data/set/self/search.rb

@@ -1,4 +1,3 @@
-
 format do
   view :search_error, cache: :never do
     sr_class = search_with_params.class.to_s
@@ -34,6 +33,7 @@ end
 format :html do
   view :title, cache: :never do
     return super() unless (title = keyword_search_title)
+
     voo.title = title
   end
 
@@ -62,12 +62,14 @@ format :json do
                   exact.name.valid? &&
                   !exact.virtual? &&
                   exact.ok?(:create)
+
     [h(exact.name), URI.escape(exact.name)]
   end
 
   def new_item_of_type exact
     return unless (exact.type_id == CardtypeID) &&
                   Card.new(type_id: exact.id).ok?(:create)
+
     [exact.name, "new/#{exact.name.url_key}"]
   end
 

data/set/type/search_type.rb

@@ -23,6 +23,7 @@ end
 format :json do
   def items_for_export
     return [] if card.content.empty? || unexportable_tag?(card.name.tag_name.key)
+
     card.item_cards
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-search
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.6
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.1
+        version: 1.101.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.1
+        version: 1.101.6
 - !ruby/object:Gem::Dependency
   name: card-mod-collection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.6
 description: ''
 email:
 - info@decko.org
@@ -83,10 +83,15 @@ files:
 - set/self/search.rb
 - set/type/cardtype.rb
 - set/type/search_type.rb
-homepage: http://decko.org
+homepage: https://decko.org
 licenses:
 - GPL-3.0
 metadata:
+  source_code_uri: https://github.com/decko-commons/decko
+  homepage_uri: https://decko.org
+  bug_tracker_uri: https://github.com/decko-commons/decko/issues
+  wiki_uri: https://decko.org
+  documentation_url: http://docs.decko.org/
   card-mod: search
 post_install_message:
 rdoc_options: []
@@ -103,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: search