card-mod-search 0.11.3 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f10cadf09bfd58e7a6361fbec9aaa2bc2fe24cdfc6c9df1245657ec8f6a4deb
-  data.tar.gz: 94fba1f07b64166998755430d20129f06f225d5da5e0f82954313c018ae8a798
+  metadata.gz: da80215b28b3fd3a1435b178a743ee3e604368833c2d8bafc45f98de457b21de
+  data.tar.gz: 4ef54f7fa398567d897d83e4119645eda8aa36e1f5a9ea9c26c57384ef27e5fe
 SHA512:
-  metadata.gz: a63d2059b8b1c277eb27637bde95cca0804ba9bc8bb9f87ce5a61a9b482b9192e0003b9f9664d4e9cf822f8166532f64c75e47e1e34a24c43abf925b7aba4fe1
-  data.tar.gz: baf6b4f536e0320490833eee85cc7438a243914dd476907cec303de85783bd1f963af0887045721a6efb0888fd89d4fbd96b646dcf04db3927383c459da67029
+  metadata.gz: 97ebfda126f45fb310eddae1389e0d8901245a6045388bdae669adefce59c0509068f456826a969ab4d2edc027db8994bafdff55b9bceb32590e473f58b6f85e
+  data.tar.gz: 3ba15a45174a9468861195da7b7af3199b62111ef0dcae15f37d35b24edd205d6b250511a1714d88187a84b1ebdb3cdb652bc184bc44200656b776b75917acb3

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/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.3
+  version: 0.11.7
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-08-01 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.3
+        version: 1.101.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.3
+        version: 1.101.7
 - !ruby/object:Gem::Dependency
   name: card-mod-collection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.7
 description: ''
 email:
 - info@decko.org
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: search