card-mod-search 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b91e3f82c4631b82c56aad295dc20b128f9fffcbf8d038e927b5b5bf4ebdc5c
-  data.tar.gz: 88b0423d13d1eba7d6a1e9e8f1f9b859d13b85491613ae05efe7970e15156d17
+  metadata.gz: ab247713e806c7f460d3d47b4b3052a4aee4a2cb90b72f521cd65613a798519a
+  data.tar.gz: d5e7b8bfe70a3b2ea8d549c13629fa68104d1ed6fda504f6f3b5ab69858874b2
 SHA512:
-  metadata.gz: fbe34fa188b58c055449bd6789106ec32fa2652d80e8fa9ccb7147d0eab6d6a7a0905fbba84128f7c43185d9fe1609227ad07aefbdb59f8476e4d817c89f50a2
-  data.tar.gz: bab5d5d2e0af84aa1e5e0a35dd1aff04103dcaf186c10b2f8590f78ddb6a676cea3005a4e83a5c2c18bdcde8bf075721357fd49c9800895d88f3271801527a69
+  metadata.gz: 31979f104835320a171003ee56e5a2dc761dc437cf777d9d7baf7baf05715746eccb60dfce4e7d903222beb67b05b829655105d8574f6145b08ea123e64d7413
+  data.tar.gz: 3a8b7174d25f86ec40b044b3a78e800543276788f5b1d085251682dc6c6edc02e94dfb14354f55232ace66bbb2a766831750109d43f32510fc3de64a5c44a24d

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/filter_form.haml

@@ -53,4 +53,4 @@
               // RESET BUTTON
               ._reset-filter{ "data-reset": reset_filter_data }
                 %button.btn.btn-sm.btn-secondary{ type: "button" }
-                  %i.fa.fa-sync
+                  %i.fa.fa-sync-alt

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/select_item.haml

@@ -1,8 +1,8 @@
 .filter-header.card-header
   %h5
     Select Item
-    .badge.badge-secondary
-      = card.count
+    -#.badge.badge-secondary
+    -#  = card.count
 .filter-selector.p-2
   - if card.count > 0
     .filter-bulk-selector.pb-3

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.0
+  version: 0.11.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-05-10 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.0
+        version: 1.101.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        version: 1.101.5
 - !ruby/object:Gem::Dependency
   name: card-mod-collection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
 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