card-mod-search 0.14.2 → 0.15.1

data/set/right/creator.rb

@@ -0,0 +1,7 @@
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
+def cql_content
+  { creator_of: "_left" }
+end

data/set/right/edited.rb

@@ -1,3 +1,11 @@
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
+def cql_content
+  { edited_by: "_left", sort_by: "name" }
+end
+
 def raw_help_text
   "Cards edited by {{_left|name}}."
 end

data/set/right/editors.rb

@@ -1,3 +1,11 @@
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
+def cql_content
+  { editor_of: "_left", sort_by: "name" }
+end
+
 def raw_help_text
   "Users who have edited {{_left|name}}."
 end

data/set/right/last_edited.rb

@@ -0,0 +1,7 @@
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
+def cql_content
+  { last_edited_by: "_left" }
+end

data/set/right/linked_to_by.rb

@@ -1,3 +1,11 @@
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
+def cql_content
+  { link_to: "_left", sort_by: "name" }
+end
+
 def raw_help_text
   "Cards that link to {{_left|name}}."
 end

data/set/right/links_to.rb

@@ -1,4 +1,10 @@
-# -*- encoding : utf-8 -*-
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
+def cql_content
+  { linked_to_by: "_left", sort_by: "name" }
+end
 
 def raw_help_text
   "Cards that <em>{{_left|name}}</em> links to."

data/set/right/mates.rb

@@ -1,3 +1,11 @@
-def raw_helo_text
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
+def cql_content
+  { plus: "_left", sort_by: "name" }
+end
+
+def raw_help_text
   "If there is a card named \"X+{{_left|name}}\", then X is a mate of {{_left|name}}."
 end

data/set/right/nested_by.rb

@@ -1,3 +1,11 @@
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
 def raw_help_text
-  "Cards that include {{_left|name}}."
+  "Cards that nest {{_left|name}}."
+end
+
+def cql_content
+  { nest: "_left", sort_by: "name" }
 end

data/set/right/nests.rb

@@ -1,3 +1,11 @@
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
+def cql_content
+  { nested_by: "_left", sort_by: "name" }
+end
+
 def raw_help_text
   "Cards that {{_left|name}} includes."
 end

data/set/right/referred_to_by.rb

@@ -1,3 +1,11 @@
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
+def cql_content
+  { refer_to: "_left", sort_by: "name" }
+end
+
 def raw_help_text
   "Cards that refer to {{_left|name}}."
 end

data/set/right/refers_to.rb

@@ -1,3 +1,11 @@
+include_set Abstract::VirtualSearch
+
+assign_type :search_type
+
+def cql_content
+  { referred_to_by: "_left", sort_by: "name" }
+end
+
 def raw_help_text
   "Cards that {{_left|name}} refers to."
 end

data/set/self/recent.rb

@@ -1,4 +1,5 @@
 ACTS_PER_PAGE = 25
+MAX_ACTS_TO_SCAN = 10_000
 
 view :title do
   voo.title ||= "Recent Changes"
@@ -6,12 +7,17 @@ view :title do
 end
 
 def recent_acts
-  action_relation = qualifying_actions.where "card_acts.id = card_act_id"
-  Act.where("EXISTS (#{action_relation.to_sql})").order id: :desc
+  limiting_scan do
+    Act.joins(ar_actions: :ar_card).distinct
+       .where(Query::CardQuery.viewable_sql)
+       .where("draft is not true")
+       .order id: :desc
+  end
 end
 
-def qualifying_actions
-  Action.all_viewable.where "draft is not true"
+def limiting_scan
+  min_id = Card::Act.maximum(:id) - MAX_ACTS_TO_SCAN
+  min_id.positive? ? yield.where("card_acts.id > #{min_id}") : yield
 end
 
 format :html do
@@ -27,3 +33,31 @@ format :rss do
     render_blank
   end
 end
+
+# *Strat 1: WHERE EXISTS*
+# ~~~~~~~~~~~~~~~~~~~~~~~
+# SELECT `card_acts`.* FROM `card_acts` WHERE EXISTS (
+#   SELECT `card_actions`.*
+#   FROM `card_actions`
+#   INNER JOIN `cards` ON `cards`.`id` = `card_actions`.`card_id`
+#   WHERE (draft is not true)
+#   AND (card_acts.id = card_act_id)
+# ) ORDER BY `card_acts`.`id` DESC LIMIT 20;
+#
+#
+# *Strat 2: INNER JOIN*
+# ~~~~~~~~~~~~~~~~~~~~~
+# SELECT DISTINCT `card_acts`.* FROM `card_acts`
+# JOIN `card_actions` ON card_acts.id = card_act_id
+# JOIN `cards` ON `cards`.`id` = `card_actions`.`card_id`
+# WHERE (draft is not true)
+# ORDER BY `card_acts`.`id` DESC LIMIT 20;
+
+# 11:33
+# first run times:
+# mysql 5.7:
+# - strat 1: 0.22 sec (possibly in cache already?)
+# - strat 2: 3min 17 sec
+# mysql 8.0
+# - strat 1: 2min 1 sec
+# - strat 2: 0.01 sec

data/set/self/search/results_for_keyword.haml

@@ -0,0 +1,5 @@
+- if search_keyword.present?
+  .my-3.p-2.bg-light
+    = t :search_results_for
+    %span.search-keyword
+      = h search_keyword

data/set/self/search/search_box.haml

@@ -0,0 +1,2 @@
+.d0-search-box
+  = search_form { search_box_contents }

data/set/self/search.rb

@@ -1,9 +1,13 @@
+def match_start_only?
+  Card.config.search_box_match_start_only
+end
+
 format do
-  view :search_error, cache: :never do
-    sr_class = search_with_params.class.to_s
+  delegate :match_start_only?, to: :card
 
+  view :search_error, cache: :never do
     # don't show card content; not very helpful in this case
-    %(#{sr_class} :: #{search_with_params.message})
+    %(#{search_with_params.class} :: #{search_with_params.message})
   end
 
   def search_with_params
@@ -12,13 +16,11 @@ format do
 
   def cql_search
     query = card.parse_json_cql search_keyword
-    rescuing_bad_query query do
-      Card.search query
-    end
+    rescuing_bad_query(query) { Card.search query }
   end
 
   def search_keyword
-    @search_keyword ||= search_vars&.dig :keyword
+    @search_keyword ||= term_param || search_vars&.dig(:keyword)
   end
 
   def search_vars
@@ -28,65 +30,111 @@ format do
   def cql_keyword?
     search_keyword&.match?(/^\{.+\}$/)
   end
+
+  def complete_path
+    path mark: :search, view: :search_box_complete, format: :json
+    # path mark: :search, view: :test, format: :json
+  end
+
+  def results_path keyword
+    path mark: :search, query: { keyword: keyword }
+  end
 end
 
 format :html do
-  view :title, cache: :never do
-    return super() unless (title = keyword_search_title)
+  view :search_box, template: :haml, cache: :never
+
+  view :title do
+    voo.title ||= t(:search_results_title)
+    super()
+  end
 
-    voo.title = title
+  view :core, cache: :never do
+    [render_results_for_keyword, super()]
   end
 
-  def keyword_search_title
-    search_keyword &&
-      %(Search results for: <span class="search-keyword">#{h search_keyword}</span>)
+  view :results_for_keyword, cache: :never, template: :haml
+
+  def search_item term
+    autocomplete_item :search, icon_tag(:search), term
+  end
+
+  private
+
+  def search_form &block
+    form_tag path, method: "get", role: "search", class: classy("search-box-form"), &block
+  end
+
+  def search_box_contents
+    text_field_tag "query[keyword]", search_keyword,
+                   class: "_search-box #{classy 'search-box'} form-control w-100",
+                   autocomplete: :off,
+                   data: { completepath: complete_path },
+                   placeholder: t(:search_search_box_placeholder)
   end
 end
 
 format :json do
+  view :search_box_complete, cache: :never do
+    search_box_items :search_item, :add_item, :goto_items
+  end
+
   view :complete, cache: :never do
-    term = term_param
-    exact = Card.fetch term, new: {}
+    complete_or_match_search(start_only: match_start_only?).map do |name|
+      goto_item_label name
+    end
+  end
 
-    {
-      search: true,
-      term: term,
-      add: add_item(exact),
-      new: new_item_of_type(exact),
-      goto: goto_items(term, exact)
-    }
+  private
+
+  def search_box_items *methods
+    [].tap do |items|
+      each_search_box_item methods do |action, value, label, data|
+        items << data.merge(action: action, value: value, label: label)
+      end
+    end
   end
 
-  def add_item exact
-    return unless exact.new_card? &&
-                  exact.name.valid? &&
-                  !exact.virtual? &&
-                  exact.ok?(:create)
+  def each_search_box_item methods, &block
+    term = search_keyword
+    exact = Card.fetch term, new: {}
+    methods.map { |method| send method, term, exact, &block }
+  end
 
-    [h(exact.name), ERB::Util.url_encode(exact.name)]
+  def search_item term, _exact
+    yield :search, term, card.format.search_item(term), url: card_url(results_path(term))
   end
 
-  def new_item_of_type exact
-    return unless (exact.type_id == CardtypeID) &&
-                  Card.new(type_id: exact.id).ok?(:create)
+  def add_item term, exact
+    return unless exact.add_autocomplete_ok?
 
-    [exact.name, "new/#{exact.name.url_key}"]
+    fmt = exact.format
+    yield :add, term, fmt.render_add_autocomplete_item,
+          url: card_url(fmt.add_autocomplete_item_path)
   end
 
-  def goto_items term, exact
-    goto_names = complete_or_match_search start_only: Card.config.navbox_match_start_only
-    goto_names.unshift exact.name if add_exact_to_goto_names? exact, goto_names
-    goto_names.map do |name|
-      [name, name.to_name.url_key, h(highlight(name, term, sanitize: false))]
+  def goto_items _term, exact
+    map_goto_items exact do |item|
+      yield :goto, item, goto_item_label(item), url: path(mark: item)
     end
   end
 
-  def add_exact_to_goto_names? exact, goto_names
-    exact.known? && !goto_names.find { |n| n.to_name.key == exact.key }
+  def goto_item_label item
+    item.card.format.render_goto_autocomplete_item
+  end
+
+  def map_goto_items exact, &block
+    goto_names = complete_or_match_search start_only: match_start_only?
+    goto_names.unshift exact.name if exact.known?
+    goto_names.uniq.map(&block)
   end
 
   def term_param
-    term = query_params[:keyword]
+    # return nil unless query_params.present?
+    #
+    # term = query_params[:keyword]
+    return unless (term = super)&.present?
+
     if (term =~ /^\+/) && (main = params["main"])
       term = main + term
     end

data/set/type/cardtype.rb

@@ -1,5 +1,16 @@
 include_set Abstract::CqlSearch
 
+# should name sorting be hard coded here??
 def cql_content
-  { type_id: id, sort: :name }
+  { type_id: id, sort_by: :name }
+end
+
+def add_autocomplete_ok?
+  card.create_ok?
+end
+
+format :html do
+  def add_autocomplete_item_path
+    path action: :new
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-search
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
 - !ruby/object:Gem::Dependency
   name: card-mod-collection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
+- !ruby/object:Gem::Dependency
+  name: card-mod-format
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.15.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.15.1
+- !ruby/object:Gem::Dependency
+  name: card-mod-help
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.15.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.15.1
 description: ''
 email:
 - info@decko.org
@@ -47,32 +75,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/card/filter_query.rb
-- set/abstract/00_filter_helper.rb
-- set/abstract/02_search_params.rb
-- set/abstract/03_filter.rb
-- set/abstract/03_filter/_filter_input.haml
-- set/abstract/03_filter/filter_form.haml
-- set/abstract/03_filter/filter_form.rb
-- set/abstract/03_filter/filtered_content.haml
-- set/abstract/03_filter/form_helper.rb
-- set/abstract/03_filter/query_construction.rb
-- set/abstract/03_filter/quick_filters.haml
-- set/abstract/03_filter/selectable_filtered_content.haml
-- 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
+- README.md
+- assets/script/autocomplete.js.coffee
+- assets/script/search_box.js.coffee
+- assets/style/search.scss
+- config/locales/de.yml
+- config/locales/en.yml
+- data/files/mod_search_script_asset_output/file.js
+- data/real.yml
+- data/test.yml
+- lib/card/mod/search.rb
+- set/abstract/0_search.rb
+- set/abstract/0_search/checkbox_item.haml
+- set/abstract/0_search/search_params.rb
+- set/abstract/0_search/views.rb
+- set/abstract/cql_search.rb
 - set/abstract/search_views.rb
+- set/abstract/virtual_search.rb
+- set/all/autocomplete.rb
+- set/all/autocomplete/autocomplete_input.haml
+- set/all/autocomplete/autocomplete_item.haml
+- set/right/by_create.rb
+- set/right/by_name.rb
+- set/right/by_update.rb
 - set/right/children.rb
+- set/right/count.rb
 - set/right/created.rb
+- set/right/creator.rb
 - set/right/edited.rb
 - set/right/editors.rb
-- set/right/follow.rb
+- set/right/last_edited.rb
 - set/right/linked_to_by.rb
 - set/right/links_to.rb
 - set/right/mates.rb
@@ -82,6 +114,8 @@ files:
 - set/right/refers_to.rb
 - set/self/recent.rb
 - set/self/search.rb
+- set/self/search/results_for_keyword.haml
+- set/self/search/search_box.haml
 - set/type/cardtype.rb
 - set/type/search_type.rb
 homepage: https://decko.org
@@ -94,6 +128,7 @@ metadata:
   wiki_uri: https://decko.org
   documentation_url: http://docs.decko.org/
   card-mod: search
+  card-mod-group: gem-defaults
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -109,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: search

data/lib/card/filter_query.rb

@@ -1,78 +0,0 @@
-class Card
-  # Class for generating CQL based on filter params
-  class FilterQuery
-    def initialize filter_keys_with_values, extra_cql={}
-      @filter_cql = Hash.new { |h, k| h[k] = [] }
-      @rules = yield if block_given?
-      @rules ||= {}
-      @filter_keys_with_values = filter_keys_with_values
-      @extra_cql = extra_cql
-      prepare_filter_cql
-    end
-
-    def add_to_cql key, value
-      @filter_cql[key] << value
-    end
-
-    def add_rule key, value
-      return unless value.present?
-
-      case @rules[key]
-      when Symbol
-        send("#{@rules[key]}_rule", key, value)
-      when Proc
-        @rules[key].call(key, value).each do |cql_key, val|
-          @filter_cql[cql_key] << val
-        end
-      else
-        send "#{key}_cql", value
-      end
-    end
-
-    def to_cql
-      @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
-        else
-          merge_using_array cql_key, values
-        end
-      end
-      @cql.merge @extra_cql
-    end
-
-    private
-
-    def prepare_filter_cql
-      @filter_keys_with_values.each do |key, values|
-        add_rule key, values
-      end
-    end
-
-    def merge_using_array cql_key, values
-      @cql[cql_key] = values.one? ? values.first : values
-    end
-
-    def merge_using_and cql_key, values
-      hash = build_nested_hash cql_key, values
-      @cql.deep_merge! hash
-    end
-
-    # 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
-end

data/set/abstract/00_filter_helper.rb

@@ -1,46 +0,0 @@
-format do
-  def filter_param field
-    filter_hash[field.to_sym]
-  end
-
-  def filter_hash
-    @filter_hash ||= filter_hash_from_params || default_filter_hash
-  end
-
-  def filter_hash_from_params
-    return unless Env.params[:filter].present?
-
-    Env.hash(Env.params[:filter]).deep_symbolize_keys
-  end
-
-  def sort_param
-    @sort_param ||= safe_sql_param :sort
-  end
-
-  def safe_sql_param key
-    param = Env.params[key]
-    param.blank? ? nil : Card::Query.safe_sql(param)
-  end
-
-  def filter_keys_with_values
-    filter_keys.map do |key|
-      values = filter_param(key)
-      values.present? ? [key, values] : next
-    end.compact
-  end
-
-  # initial values for filtered search
-  def default_filter_hash
-    {}
-  end
-
-  def extra_paging_path_args
-    super.merge filter_and_sort_hash
-  end
-
-  def filter_and_sort_hash
-    { filter: filter_hash }.tap do |hash|
-      hash[:sort] = sort_param if sort_param
-    end
-  end
-end