card 1.99.2 → 1.100.0

data/mod/pointer/lib/javascript/script_pointer_list_editor.js.coffee

@@ -29,10 +29,17 @@ $.extend decko,
   addPointerItem: (el) ->
     slot = $(el).slot()
     slot.trigger "slotDestroy"
+    # why is this necessary?
+    # this can have a lot of side effects in a multi-card form.
+
     newInput = decko.nextPointerInput decko.lastPointerItem(el)
     newInput.val ''
 
     slot.trigger "slotReady"
+    decko.initializeEditors slot
+    # should be (but is not) handled by slotReady
+    # without this, "add another" was breaking tinymce editors in same slot
+
     newInput.focus()
     decko.updateAddItemButton el
     decko.initPointerList newInput

data/mod/pointer/set/abstract/00_paging_params.rb

@@ -26,8 +26,6 @@ format do
   end
 
   def voo_search_param param
-    return unless voo&.wql
-
-    voo.wql[param]
+    voo&.wql&.dig param
   end
 end

data/mod/pointer/set/abstract/02_pointer/events.rb

@@ -26,7 +26,8 @@ event :standardize_items, :prepare_to_validate,
 end
 
 def still_pointer?
-  type_id == Card::PointerID
+  type_id == PointerID
+  # Card.new(type_id: type_id).is_a? Abstract::Pointer
 end
 
 def changed_item_names

data/mod/pointer/set/abstract/02_pointer/html_views/filter.rb

@@ -7,9 +7,7 @@ format :html do
     render_filter_items
   end
 
-  view :filter_items, unknown: true, wrap: :slot  do
-    haml :filter_items
-  end
+  view :filter_items, unknown: true, wrap: :slot, template: :haml
 
   def filtered_list_input
     with_nest_mode :normal do

data/mod/pointer/set/abstract/02_pointer/item_api.rb

@@ -24,7 +24,8 @@ def first_name args={}
 end
 
 def first_card args={}
-  fetch_item_card first_name, args
+  return unless (name = first_name)
+  fetch_item_card name, args
 end
 
 def first_code
@@ -65,7 +66,7 @@ def items= array
 end
 
 # append item to list (does not save)
-# @param item [Cardish]
+# @param cardish [Cardish]
 def << cardish
   add_item cardish
 end
@@ -87,16 +88,16 @@ def add_item! name
 end
 
 # remove item from list
-# @param name [String, Card::Name] item name
+# @param cardish [String, Card::Name] item to drop
 def drop_item cardish
   drop_item_name = Card::Name[cardish]
   items_to_content(item_names.reject { |item_name| item_name == drop_item_name })
 end
 
 # remove item from list and save card
-# @param name [String, Card::Name] item name
-def drop_item! name
-  drop_item name
+# @param cardish [String, Card::Name] item to drop
+def drop_item! cardish
+  drop_item cardish
   save!
 end
 

data/mod/pointer/set/abstract/02_pointer/options_api.rb

@@ -5,7 +5,7 @@ def options_hash
 end
 
 def json_options?
-  options_card&.type_id == Card::JsonID
+  options_card&.type_id == JsonID
 end
 
 def option_hash_from_names

data/mod/pointer/set/type/nest_list.rb

@@ -0,0 +1,40 @@
+include_set Abstract::Pointer
+
+def raw_item_strings content
+  reference_chunks(content).map(&:referee_name)
+end
+
+def item_titles default_to_name=true
+  reference_chunks.map do |chunk|
+    chunk.options[:title] || (default_to_name ? chunk.referee_name : nil)
+  end
+end
+
+format do
+  def chunk_list
+    :references
+  end
+end
+
+format :html do
+  def input_type
+    :nest_list
+  end
+
+  view :nest_list_input, cache: :never do
+    nest_list_input
+  end
+
+  def items_for_input items=nil
+    items ||= card.item_names context: :raw
+    items.empty? ? [["", ""]] : items.zip(card.item_titles(false))
+  end
+
+  def nest_list_input args={}
+    items = items_for_input args[:item_list]
+    extra_class = "pointer-link-list-ul"
+    ul_classes = classy "pointer-list-editor", extra_class
+    haml :nest_list_input, items: items, ul_classes: ul_classes,
+                           options_card: options_card_name
+  end
+end

data/mod/pointer/set/type/nest_list/nest_list_input.haml

@@ -0,0 +1,28 @@
+%ul{class: ul_classes}
+  - items.each do |reference, title|
+    %li.pointer-li.mb-1
+      %span.input-group
+        .input-group-prepend.handle
+          %span.input-group-text
+            = icon_tag :reorder
+        %span.input-group-text.text-muted.group-text-left
+          {{
+        = text_field_tag "pointer_item", reference, class: "_reference pointer-item-text form-control group-text-middle",
+        %span.input-group-text.text-muted.group-text-middle
+          |
+        = text_field_tag "pointer_item_title", title, class: "_title pointer-item-text form-control group-text-middle"
+        %span.input-group-text.text-muted.group-text-right
+          }}
+        .input-group-append
+          %span.input-group-text.p-0
+            %button.btn.btn-secondary{ type: "button"}
+              = icon_tag :edit
+        .input-group-append
+          %span.input-group-text.p-0
+            %button.pointer-item-delete.btn.btn-secondary{ type: "button"}
+              = icon_tag :remove
+
+%span.input-group
+  %button._pointer-item-add.btn.btn-secondary{ type: "submit" }
+    = icon_tag "add"
+    add another

data/mod/pointer/spec/set/abstract/paging_params_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe Card::Set::Abstract::PagingParams do
   describe "offset_param" do
     it "doesn't allow anonymous users to use extremely high values" do
       Card::Auth.signin Card::AnonymousID
-      with_params offset: 10_000 do
+      Card::Env.with_params offset: 10_000 do
         expect { Card[:all].format(:json).offset_param }
           .to raise_error(Card::Error::PermissionDenied,
                           "offset parameter exceeds maximum")

data/mod/pointer/spec/set/abstract/pointer/html_views_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Abstract::Pointer do
+RSpec.describe Card::Set::Abstract::Pointer do
   context "with simple Pointer" do
     def card_subject
       pointer = Card["Sample Pointer"]
@@ -8,9 +8,8 @@ describe Card::Set::Abstract::Pointer do
       pointer
     end
 
-    check_views_for_errors :core, :one_line_content, :input,
-                           :list, :autocomplete, :checkbox,
-                           :radio, :select, :multiselect
+    check_views_for_errors :core, :one_line_content, :input, :list, :autocomplete,
+                           :checkbox, :radio, :select, :multiselect
   end
 
   describe "editors" do

data/mod/pointer/spec/set/type/mirror_list_spec.rb

@@ -6,9 +6,12 @@ RSpec.describe Card::Set::Type::MirrorList do
   before do
     Card::Auth.as_bot do
       #create_mirrored_list "Parry Hotter+authors", "[[Darles Chickens]]"
-      Card.create! name: "Parry Hotter+authors", content: "[[Darles Chickens]]", type_id: Card::MirroredListID
-      Card.create! name: "50 grades of shy+authors", content: "[[Darles Chickens]]\n[[Stam Broker]]", type_id: Card::MirroredListID
-      #create_mirrored_list "50 grades of shy+authors", "[[Darles Chickens]]\n[[Stam Broker]]"
+      Card.create! name: "Parry Hotter+authors",
+                   content: "[[Darles Chickens]]",
+                   type_id: Card::MirroredListID
+      Card.create! name: "50 grades of shy+authors",
+                   content: "[[Darles Chickens]]\n[[Stam Broker]]",
+                   type_id: Card::MirroredListID
     end
   end
   it "doesn't allow non-cardtype as right part" do

data/mod/recaptcha/config/initializers/recaptcha.rb

@@ -0,0 +1,54 @@
+# -*- encoding : utf-8 -*-
+
+# This initializer module is mostly here to avoid adding methods/vars to the Object
+# namespace
+module RecaptchaCard
+  @deprecated = {
+    recaptcha_site_key: :recaptcha_public_key,
+    recaptcha_secret_key: :recaptcha_private_key
+  }
+  @defaults = {
+    recaptcha_site_key: "6LdoqpgUAAAAAEdhJ4heI1h3XLlpXcDf0YubriCG",
+    recaptcha_secret_key: "6LdoqpgUAAAAAP4Sz1L5PY6VKrum_RFxq4-awj4BH"
+  }
+
+  mattr_accessor :using_card_defaults
+
+  class << self
+    def load_recaptcha_config setting
+      setting = "recaptcha_#{setting}".to_sym
+      Cardio.config.send "#{setting}=", recaptcha_setting_value(setting)
+    end
+
+    def using_defaults?
+      Cardio.config.recaptcha_site_key == @defaults[:recaptcha_site_key]
+    end
+
+    # card config overrides application.rb config overrides default
+    def recaptcha_setting_value setting
+      card_value(setting) ||                  # card content
+        config_value(setting) ||              # application.rb (current setting)
+        config_value(@deprecated[setting]) || # application.rb (deprecated setting)
+        @defaults[setting]
+    end
+
+    def config_value setting
+      Cardio.config.send setting
+    end
+
+    def card_value setting
+      return unless Card::Codename.exist? setting # prevents breakage in migrations
+      value = Card[setting]&.content
+      value if value.present?
+    end
+  end
+end
+
+ActiveSupport.on_load :after_card do
+  Recaptcha.configure do |config|
+    %i[site_key secret_key].each do |setting|
+      config.send "#{setting}=", RecaptchaCard.load_recaptcha_config(setting)
+    end
+    config.verify_url = "https://www.google.com/recaptcha/api/siteverify"
+  end
+end

data/mod/recaptcha/set/all/recaptcha.rb

@@ -19,7 +19,7 @@ def recaptcha_on?
     !Auth.signed_in? &&
     !Auth.always_ok? &&
     !Auth.needs_setup? &&
-    Card.toggle(rule(:captcha))
+    Card::Rule.toggle(rule(:captcha))
 end
 
 def add_recaptcha_errors error_codes

data/mod/recaptcha/set/self/admin_info.rb

@@ -0,0 +1,32 @@
+add_to_basket :warnings, :recaptcha_config_issues
+
+def recaptcha_config_issues?
+  RecaptchaCard.using_defaults?
+end
+
+format :html do
+  def recaptcha_config_issues_message
+    warning =
+      if Card::Env.localhost?
+        # %(Your captcha is currently working with temporary settings.
+        #   This is fine for a local installation, but you will need new
+        #   recaptcha keys if you want to make this site public.)
+        I18n.t(:captcha_temp, scope: "mod.admin.set.self.admin_info",
+                              recaptcha_link: add_recaptcha_keys_link)
+      else
+        # %(You are configured to use [[*captcha]], but for that to work
+        #   you need new recaptcha keys.)
+        I18n.t(:captcha_keys, scope: "mod.admin.set.self.admin_info",
+                              recaptcha_link: add_recaptcha_keys_link,
+                              captcha_link: link_to_card(:captcha))
+      end
+    <<-HTML
+        <p>#{warning}</p>
+    HTML
+  end
+
+  def add_recaptcha_keys_link
+    link_text = I18n.t :recaptcha_keys, scope: "mod.admin.set.self.admin_info"
+    Card[:recaptcha_settings]&.format&.edit_link link_text: link_text
+  end
+end

data/mod/rules/set/rule/editor.rb

@@ -84,9 +84,9 @@ format :html do
     return super unless card.is_template?
 
     case Card.fetch_id(card.rule_set_pattern_name) # set_pattern_id
-    when Card::TypeID
+    when TypeID
       card.rule_set.anchor_name
-    when Card::SelfID
+    when SelfID
       card.rule_set.anchor.type_name
     else
       super

data/mod/rules/set/rule/html_views.rb

@@ -4,7 +4,7 @@ format :html do
     # in the search query. In that case the search doesn't work
     # properly in the context of the rule card itself.  Hence we show the query syntax
     # and not the search result.
-    if card.type_id == Card::SearchTypeID
+    if card.type_id == SearchTypeID
       render_raw
     else
       super()

data/mod/rules/set/rule/rules.rb

@@ -1,5 +1,4 @@
-event :save_recently_edited_settings, :integrate,
-      on: :save, changed: %i[type content] do
+event :save_recently_edited_settings, :integrate, on: :save, changed: %i[type content] do
   if (recent = Card[:recent_settings])
     recent.insert_item 0, name.right
     attach_subcard recent

data/mod/rules/set/type/set.rb

@@ -47,7 +47,7 @@ def uncapitalized_label
 end
 
 def all_user_ids_with_rule_for setting_code
-  Card.all_user_ids_with_rule_for self, setting_code
+  Card::Rule.all_user_ids_with_rule_for self, setting_code
 end
 
 def setting_codenames_by_group

data/mod/rules/spec/set/type/set_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Card::Set::Type::Set do
     let :structure_rule do
       Card::Auth.as_bot do
         Card.create! name: "test_card+*right+*structure",
-                     type_id: Card::HTMLID,
+                     type_id: Card::HtmlID,
                      content: "{{#{nest_syntax}}}"
       end
     end

data/mod/search/lib/card/filter_query.rb

@@ -63,8 +63,7 @@ class Card
     def build_nested_hash key, values
       return { key => values[0] } if values.one?
       val = values.pop
-      { key => val,
-        and: build_nested_hash(key, values) }
+      { key => val, and: build_nested_hash(key, values) }
     end
 
     def name_wql name

data/mod/search/set/abstract/00_filter_helper.rb

@@ -12,14 +12,12 @@ end
 # FIXME: it is inconsistent that #sort_hash has :sort as the key, but
 # #filter_hash is the _value_ of the hash with :filter as the key.
 def filter_hash
-  @filter_hash ||= begin
-    filter = Env.params[:filter] || default_filter_hash
-    filter.try(:to_unsafe_h) || filter.clone
-  end
+  @filter_hash ||=
+    Env.params[:filter].present? ? Env.hash(Env.params[:filter]) : default_filter_hash
 end
 
 def sort_param
-  safe_sql_param :sort
+  @sort_param ||= safe_sql_param :sort
 end
 
 def safe_sql_param key

data/mod/search/set/abstract/02_search_params.rb

@@ -25,7 +25,7 @@ format do
   def query_params
     return nil unless (vars = params[:query])
 
-    Card.safe_param vars
+    Env.hash vars
   end
 
   def default_limit

data/mod/search/set/abstract/03_filter.rb

@@ -18,4 +18,6 @@ format :html do
   end
 
   view :filtered_content, template: :haml, wrap: :slot
+
+  view :selectable_filtered_content, template: :haml, cache: :never
 end

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

@@ -68,7 +68,7 @@ format :html do
   end
 
   def default_filter? field
-    card.default_filter_hash.key?(field)
+    card.default_filter_hash.key? field
   end
 
   def filter_label field

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

@@ -49,23 +49,12 @@ format :html do
     text_filter_with_name_and_value name, value, opts
   end
 
-  def select_filter_type_based type_codename, order="asc"
-    # take the card name as default label
-    options = type_options type_codename, order, 80
-    select_filter type_codename, nil, options
-  end
-
   def autocomplete_filter type_code, options_card=nil
     options_card ||= Card::Name[type_code, :type, :by_name]
     text_filter type_code, "", class: "#{type_code}_autocomplete",
                                "data-options-card": options_card
   end
 
-  def multiselect_filter_type_based type_codename
-    options = type_options type_codename
-    multiselect_filter type_codename, nil, options
-  end
-
   def multiselect_filter_tag field, default, options, html_options={}
     html_options[:multiple] = true
     select_filter_tag field, default, options, html_options
@@ -104,11 +93,10 @@ format :html do
   end
 
   def type_options type_codename, order="asc", max_length=nil
-    type_card = Card[type_codename]
-    res = Card.search type_id: type_card.id, return: :name, sort: "name", dir: order
-    return res unless max_length
-
-    res.map { |i| [trim_option(i, max_length), i] }
+    Card.cache.fetch "#{type_codename}-TYPE-OPTIONS" do
+      res = Card.search type: type_codename, return: :name, sort: "name", dir: order
+      max_length ? (res.map { |i| [trim_option(i, max_length), i] }) : res
+    end
   end
 
   def trim_option option, max_length