card-mod-search 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '086c398c42eee05ce5f259e81ec289ee396fa08c549d949b105619510248ad9a'
-  data.tar.gz: 5295c16a266f5ff4d078584912352e73dc8a542b0f2c898dacd3d08cc7b9fbad
+  metadata.gz: b62c6363e1945d22f1a8ad2d7575801b6884437b9f8fed6b891220c434b3a052
+  data.tar.gz: 72f33ec4982f972c9f8a6384430087d5f6703092b8e77e5358193898ea3a63d3
 SHA512:
-  metadata.gz: 2b84ac11b4919acb3c8b4317befecdfd63a25a545d84f7bd19ade832cc410967581c939f9e5b0a5451dc80fe9df8044f79099c739e9108b77589144df47b4fd9
-  data.tar.gz: 2fed172ce5954d4f12d884202c95aea374a3cb1bcbddd097d854544902a8eb8d2e207f1de2fbad9cd478936411aaa05f6037441ab0ef091c6137d70bf1ee0a45
+  metadata.gz: db553b0e06bd1176428ad59a4baa8fb9d5b7383a852fc10d0b3340d9689d01222f076d436317d6350cc57fe6a56685e6b8a8275ae23909da7c968b9ebb5e64d8
+  data.tar.gz: '009f9d91b870c53ace919b18a047cd91d939436cd4969e57bc45624900d810f2f10801183dd85d443f3f17e0259dba37553e5159fcd94ee3a701bbd8423bd601'

data/lib/card/filter_query.rb

@@ -25,7 +25,7 @@ class Card
           @filter_cql[cql_key] << val
         end
       else
-        send("#{key}_cql", value)
+        send "#{key}_cql", value
       end
     end
 

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

@@ -85,7 +85,7 @@ format :html do
   end
 
   def filter_label_from_name field
-    Card.fetch_name(field) { field.to_s.titleize }
+    Card.fetch_name(field) { field.to_s.sub(/^\*/, "").titleize }
   end
 
   def filter_action_path

data/set/abstract/03_filter.rb

@@ -22,6 +22,7 @@ format :html do
   view :filtered_content, template: :haml, wrap: :slot
 
   view :filtered_results do
+    class_up "card-slot", "_filter-result-slot"
     wrap { render_core }
   end
 

data/set/abstract/06_cql_search.rb

@@ -13,9 +13,7 @@ end
 
 def item_type
   type = cql_hash[:type]
-  return if type.is_a?(Array) || type.is_a?(Hash)
-
-  type
+  type unless type.is_a?(Array) || type.is_a?(Hash)
 end
 
 # for override, eg when required subqueries are known to be missing

data/set/abstract/filter_list.rb

@@ -0,0 +1,11 @@
+def cql_content
+  { referred_to_by: "_" }
+end
+
+def item_cards args={}
+  standard_item_cards args
+end
+
+def count
+  item_strings.size
+end

data/set/abstract/search_views.rb

@@ -0,0 +1,74 @@
+format do
+  view :core, cache: :never do
+    _render search_result_view
+  end
+
+  def search_result_view
+    case search_with_params
+    when Exception              then :search_error
+    when Integer                then :search_count
+    when nest_mode == :template then :raw
+    else                         :card_list
+    end
+  end
+end
+
+format :json do
+  def items_for_export
+    return [] if card.content.empty? || unexportable_tag?(card.name.tag_name.key)
+
+    card.item_cards
+  end
+
+  # avoid running the search from +:content_options (huge results)
+  # and +:structure (errors)
+  # TODO: make this configurable in set mods
+  def unexportable_tag? tag_key
+    %i[content_options structure].map { |code| code.cardname.key }.include? tag_key
+  end
+end
+
+format :rss do
+  view :feed_body do
+    case raw_feed_items
+    when Exception then @xml.item(render!(:search_error))
+    when Integer then @xml.item(render!(:search_count))
+    else super()
+    end
+  end
+
+  def raw_feed_items
+    @raw_feed_items ||= search_with_params
+  end
+end
+
+format :html do
+  view :core do
+    _render search_result_view
+  end
+
+  view :bar do
+    voo.hide :one_line_content
+    super()
+  end
+
+  view :one_line_content, cache: :never do
+    if depth > max_depth
+      "..."
+    else
+      search_params[:limit] = closed_limit
+      _render_core hide: "paging", items: { view: :link }
+      # TODO: if item is queryified to be "name", then that should work.
+      # otherwise use link
+    end
+  end
+
+  def rss_link_tag
+    path_opts = { format: :rss }
+    Array(search_params[:vars]).compact.each { |k, v| opts["_#{k}"] = v }
+    tag "link", rel: "alternate",
+                type: "application/rss+xml",
+                title: "RSS",
+                href: path(path_opts)
+  end
+end

data/set/self/search.rb

@@ -63,7 +63,7 @@ format :json do
                   !exact.virtual? &&
                   exact.ok?(:create)
 
-    [h(exact.name), CGI.escape(exact.name)]
+    [h(exact.name), ERB::Util.url_encode(exact.name)]
   end
 
   def new_item_of_type exact

data/set/type/search_type.rb

@@ -1,81 +1,9 @@
 include_set Type::Json
 include_set Abstract::CqlSearch
+include_set Abstract::SearchViews
 
 format do
-  view :core, cache: :never do
-    _render search_result_view
-  end
-
   def chunk_list
     :query
   end
-
-  def search_result_view
-    case search_with_params
-    when Exception              then :search_error
-    when Integer                then :search_count
-    when nest_mode == :template then :raw
-    else                         :card_list
-    end
-  end
-end
-
-format :json do
-  def items_for_export
-    return [] if card.content.empty? || unexportable_tag?(card.name.tag_name.key)
-
-    card.item_cards
-  end
-
-  # avoid running the search from +:content_options (huge results)
-  # and +:structure (errors)
-  # TODO: make this configurable in set mods
-  def unexportable_tag? tag_key
-    %i[content_options structure].map { |code| code.cardname.key }.include? tag_key
-  end
-end
-
-format :rss do
-  view :feed_body do
-    case raw_feed_items
-    when Exception then @xml.item(render!(:search_error))
-    when Integer then @xml.item(render!(:search_count))
-    else super()
-    end
-  end
-
-  def raw_feed_items
-    @raw_feed_items ||= search_with_params
-  end
-end
-
-format :html do
-  view :core do
-    _render search_result_view
-  end
-
-  view :bar do
-    voo.hide :one_line_content
-    super()
-  end
-
-  view :one_line_content, cache: :never do
-    if depth > max_depth
-      "..."
-    else
-      search_params[:limit] = closed_limit
-      _render_core hide: "paging", items: { view: :link }
-      # TODO: if item is queryified to be "name", then that should work.
-      # otherwise use link
-    end
-  end
-
-  def rss_link_tag
-    path_opts = { format: :rss }
-    Array(search_params[:vars]).compact.each { |k, v| opts["_#{k}"] = v }
-    tag "link", rel: "alternate",
-                type: "application/rss+xml",
-                title: "RSS",
-                href: path(path_opts)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-search
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.103.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.2
+        version: 1.103.3
 - !ruby/object:Gem::Dependency
   name: card-mod-collection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
 description: ''
 email:
 - info@decko.org
@@ -59,14 +59,15 @@ files:
 - set/abstract/03_filter/query_construction.rb
 - set/abstract/03_filter/quick_filters.haml
 - set/abstract/03_filter/selectable_filtered_content.haml
-- set/abstract/04_right_filter_form.rb
 - set/abstract/05_search.rb
 - set/abstract/05_search/checkbox_item.haml
 - set/abstract/05_search/select_item.haml
 - set/abstract/05_search/views.rb
 - set/abstract/06_cql_search.rb
+- set/abstract/filter_list.rb
 - set/abstract/filterable.rb
 - set/abstract/filterable_bar.rb
+- set/abstract/search_views.rb
 - set/right/children.rb
 - set/right/created.rb
 - set/right/edited.rb

data/set/abstract/04_right_filter_form.rb

@@ -1,26 +0,0 @@
-# To be included in a field card to get a filter for the parent.
-# The core view renders a filter for the left card.
-
-include_set Set::Abstract::Filter
-
-def virtual?
-  new?
-end
-
-format :html do
-  def filter_action_path
-    path mark: card.name.left, view: filter_view
-  end
-
-  view :core, cache: :never do
-    filter_fields slot_selector: filter_selector
-  end
-
-  def filter_view
-    :filter_result
-  end
-
-  def filter_selector
-    ".#{filter_view}-view"
-  end
-end