card 1.98.3 → 1.99.0

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

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Set::Rule::BarView do
+  def card_subject
+    Card.fetch("*read+*right+*input type", new: {})
+  end
+
+  check_html_views_for_errors
+
+  it "renders setting view for a *input type rule", as_bot: true do
+    expect_view("rule_edit").to have_tag "div.modal" do
+      with_tag "div.rule-section", count: 2
+    end
+  end
+end

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

@@ -2,8 +2,22 @@
 
 RSpec.describe Card::Set::Rule::Editor do
   def card_subject
-    Card.fetch("*read+*right+*input", new: {})
+    Card.fetch("*read+*right+*input type", new: {})
   end
 
   check_html_views_for_errors
+
+  describe "#left_type_for_nest_editor_set_selection" do
+    def type_for_set_structure set_name
+      Card.fetch("#{set_name}+*structure").format.left_type_for_nest_editor_set_selection
+    end
+
+    it "finds anchor name for type structure rules" do
+      expect(type_for_set_structure("Role+*type")).to eq("Role")
+    end
+
+    it "finds anchor type for self structure rules" do
+      expect(type_for_set_structure("Sign up+*self")).to eq("Cardtype")
+    end
+  end
 end

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

@@ -6,17 +6,4 @@ RSpec.describe Card::Set::Type::Set::HtmlViews do
   end
 
   check_html_views_for_errors
-
-  it "renders setting table for a right set" do
-    expect_view("open", card: "*read+*right")
-      .to have_tag "div", with: { id: "Xread-Xright-open-view" } do
-      with_tag "form", with: { role: "filter" }
-      with_tag "table" do
-        with_tag "tr", with: { id: "Xread-Xright-Xcreate-rule_row-view" } do
-          with_tag "td", "create"
-          with_tag "td", "Shark"
-        end
-      end
-    end
-  end
 end

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

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Set::Type::Set::SettingLists do
+  def card_subject
+    Card.fetch("User+*type")
+  end
+
+  specify "#nest_editor_field_related_settings", as_bot: true do
+    create ["characters", :right, :input_type], content: "select"
+    create ["characters", :right, :default], type_id: Card::ListID
+    card = Card.new name: "RichText+characters+*type plus right"
+    expect(card.format(:html).nest_editor_field_related_settings)
+      .to eq %i[default help input_type content_options content_option_view]
+  end
+
+  check_html_views_for_errors
+end

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

@@ -55,14 +55,9 @@ RSpec.describe Card::Set::Type::Set do
 
     it "produces template editor with close link within large brackets" do
       set_card = nested_card.fetch trait: :right
-      expect(set_card.format.render(:template_editor)).to have_tag("div.card-slot") do
-        with_tag "div.template-editor-left", text: "{{"
-        with_tag "div.template-editor-main" do
-          with_tag "div.template-closer"
-          with_tag "div.card-header"
-          with_tag "div.card-body"
-        end
-        with_tag "div.template-editor-right", text: "}}"
+      expect(set_card.format.render(:template_link)).to have_tag("div.card-slot") do
+        with_text(/^\{\{.+\}\}$/)
+        with_tag "a", "modal_nest_rules"
       end
     end
   end

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

@@ -16,8 +16,9 @@ format :html do
     multiselect_filter_tag field, default, options
   end
 
-  def text_filter field, opts={}
-    text_filter_with_name_and_value filter_name(field), filter_param(field), opts
+  def text_filter field, default=nil, opts={}
+    value = filter_param(field) || default
+    text_filter_with_name_and_value filter_name(field), value, opts
   end
 
   def text_filter_with_name_and_value name, value, opts
@@ -26,12 +27,13 @@ format :html do
     text_field_tag name, value, opts
   end
 
-  def range_filter field, opts={}
+  def range_filter field, default={}, opts={}
     add_class opts, "simple-text range-filter-subfield"
+    default ||= {}
     output [range_sign(:from),
-            sub_text_filter(field, :from, opts),
+            sub_text_filter(field, :from, default, opts),
             range_sign(:to),
-            sub_text_filter(field, :to, opts)]
+            sub_text_filter(field, :to, default, opts)]
   end
 
   def range_sign side
@@ -41,9 +43,9 @@ format :html do
     end
   end
 
-  def sub_text_filter field, subfield, opts={}
+  def sub_text_filter field, subfield, default={}, opts={}
     name = "filter[#{field}][#{subfield}]"
-    value = filter_hash.dig field, subfield
+    value = filter_hash.dig(field, subfield) || default[subfield]
     text_filter_with_name_and_value name, value, opts
   end
 

data/mod/search/set/abstract/search/views.rb

@@ -41,9 +41,9 @@ format :json do
     complete_or_match_search limit: AUTOCOMPLETE_LIMIT
   end
 
-  def complete_or_match_search limit: AUTOCOMPLETE_LIMIT
+  def complete_or_match_search limit: AUTOCOMPLETE_LIMIT, start_only: false
     starts_with = complete_search limit: limit
-    return starts_with if Card.config.navbox_match_start_only
+    return starts_with if start_only
 
     remaining_slots = limit - starts_with.size
     return starts_with if remaining_slots.zero?

data/mod/search/set/right/children.rb

@@ -0,0 +1,4 @@
+def raw_help_text
+  "Cards formed by \"mating\" {{_left|name}} with another card. "\
+  "eg: \"{{_left|name}}+mate\"."
+end

data/mod/search/set/right/created.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "Cards created by {{_left|name}}."
+end

data/mod/search/set/right/edited.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "Cards edited by {{_left|name}}."
+end

data/mod/search/set/right/editors.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "Users who have edited {{_left|name}}."
+end

data/mod/search/set/right/follow.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "Get notified about changes"
+end

data/mod/search/set/right/linked_to_by.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "Cards that link to {{_left|name}}."
+end

data/mod/search/set/right/links_to.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "Cards that <em>{{_left|name}}</em> links to."
+end

data/mod/search/set/right/mates.rb

@@ -0,0 +1,3 @@
+def raw_helo_text
+  "If there is a card named \"X+{{_left|name}}\", then X is a mate of {{_left|name}}."
+end

data/mod/search/set/right/nested_by.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "Cards that include {{_left|name}}."
+end

data/mod/search/set/right/nests.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "Cards that {{_left|name}} includes."
+end

data/mod/search/set/right/referred_to_by.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "Cards that refer to {{_left|name}}."
+end

data/mod/search/set/right/refers_to.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "Cards that {{_left|name}} refers to."
+end

data/mod/search/set/self/search.rb

@@ -75,7 +75,7 @@ format :json do
   end
 
   def goto_items term, exact
-    goto_names = complete_or_match_search
+    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))]

data/mod/search/set/type/search_type.rb

@@ -26,10 +26,11 @@ format :json do
     card.item_cards
   end
 
-  # avoid running the search from +*options (huge results) and +*structure (errors)
+  # 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[options structure].map { |code| code.cardname.key }.include? tag_key
+    %i[content_options structure].map { |code| code.cardname.key }.include? tag_key
   end
 end
 
@@ -52,12 +53,12 @@ format :html do
     _render search_result_view
   end
 
-  view :closed do
-    voo.hide :closed_content
+  view :bar do
+    voo.hide :one_line_content
     super()
   end
 
-  view :closed_content, cache: :never do
+  view :one_line_content, cache: :never do
     if depth > max_depth
       "..."
     else

data/mod/settings/lib/card/setting.rb

@@ -13,7 +13,12 @@ class Card
     mattr_accessor :groups, :group_names, :user_specific
     def self.extended host_class
       # accessible in E and O
-      host_class.mattr_accessor :restricted_to_type, :rule_type_editable, :short_help_text
+      host_class.mattr_accessor :restricted_to_type, :rule_type_editable, :short_help_text,
+                                :raw_help_text, :right_set, :applies
+      setting_class_name = host_class.to_s.split("::").last
+      host_class.ensure_set { "Card::Set::Right::#{setting_class_name}" }
+      host_class.right_set = Card::Set::Right.const_get(setting_class_name)
+      host_class.right_set.mattr_accessor :raw_help_text
     end
 
     def self.codenames
@@ -52,7 +57,9 @@ class Card
                   name.match(/::(\w+)$/)[1].underscore.to_sym
       self.rule_type_editable = opts[:rule_type_editable]
       self.restricted_to_type = permitted_type_ids opts[:restricted_to_type]
-      self.short_help_text = opts[:help_text]
+      self.short_help_text = opts[:short_help_text]
+      self.applies = opts[:applies]
+      right_set.raw_help_text = self.raw_help_text = opts[:help_text]
       return unless opts[:user_specific]
       @@user_specific << @codename
     end
@@ -69,8 +76,14 @@ class Card
       end
     end
 
-    def applies_to_cardtype type_id
-      !restricted_to_type || restricted_to_type.include?(type_id)
+    def applies_to_cardtype type_id, prototype=nil
+      (!restricted_to_type || restricted_to_type.include?(type_id)) &&
+        (!prototype || applies_to_prototype?(prototype))
+    end
+
+    def applies_to_prototype? prototype
+      return true unless applies
+      applies.call(prototype)
     end
 
     private

data/mod/settings/set/abstract/permission.rb

@@ -3,6 +3,10 @@ def standardize_items
   super unless content == "_left"
 end
 
+def options_rule_card
+  Card[:cards_with_account]
+end
+
 format :html do
   view :pointer_core do
     wrap_with :div, pointer_items, class: "pointer-list"
@@ -16,11 +20,11 @@ format :html do
     end
   end
 
-  view :closed_content, cache: :never do
+  view :one_line_content, cache: :never do
     render_core items: { view: :link }
   end
 
-  view :editor do
+  view :input do
     item_names = inheriting? ? [] : card.item_names
     %(
       #{_render_hidden_content_field}

data/mod/settings/set/all/supports_content_options.rb

@@ -0,0 +1,7 @@
+def supports_content_options?
+  false
+end
+
+def supports_content_option_view?
+  false
+end

data/mod/settings/set/right/content_option_view.rb

@@ -0,0 +1,10 @@
+format :html do
+  def quick_edit
+    if card.left.prototype_default_card&.try(:show_content_options?) &&
+       card.left.prototype.rule_card(:input_type)&.supports_content_option_view?
+      super
+    else
+      ""
+    end
+  end
+end

data/mod/settings/set/right/content_options.rb

@@ -0,0 +1,18 @@
+format :html do
+  def quick_edit
+    card.left.prototype_default_card.try(:show_content_options?) ? super : ""
+  end
+
+  def quick_editor
+    wrap_type_formgroup do
+      type_field class: "type-field rule-type-field _submit-on-select"
+    end +
+      wrap_content_formgroup do
+        text_field :content, class: "d0-card-content _submit-after-typing"
+      end
+  end
+
+  def visible_cardtype_groups
+    { "Organize" => %w[List Pointer] }
+  end
+end

data/mod/settings/set/right/default.rb

@@ -1,15 +1,31 @@
 include_set Abstract::TemplatedNests
 
 format :html do
-  view :closed_content do
+  view :one_line_content do
     raw = _render_raw
     "#{card.type_name} : #{raw.present? ? raw : '<em>empty</em>'}"
   end
 
+  def quick_form_opts
+    super.merge "data-update-foreign-slot":
+                ".card-slot.quick_edit-view.RIGHT-Xinput_type,"\
+                ".card-slot.quick_edit-view.RIGHT-Xcontent_option"\
+                ".card-slot.quick_edit-view.RIGHT-Xcontent_option_view"
+  end
+
   def quick_editor
     wrap_type_formgroup do
       type_field class: "type-field rule-type-field _submit-on-select"
-    end
+    end +
+      wrap_content_formgroup do
+        text_field :content, class: "d0-card-content _submit-after-typing"
+      end
+  end
+
+  def visible_cardtype_groups
+    hash = ::Card::Set::Self::Cardtype::GROUP.slice("Text",  "Data", "Upload")
+    hash["Organize"] = ["List", "Pointer", "Link list"]
+    hash
   end
 end
 

data/mod/settings/set/right/help.rb

@@ -6,7 +6,8 @@ format :html do
   end
 
   def quick_editor
-    formgroup "content", editor: :content, help: false do
+    # TODO: refactor when voo.input_type is ready.  (and use class_up)
+    formgroup "Content", input: :content, help: false do
       text_field :content, value: card.content,
                  class: "d0-card-content _submit-after-typing"
     end

data/mod/settings/set/right/input_type.rb

@@ -0,0 +1,35 @@
+format :html do
+  def quick_editor
+    @submit_on_change = true
+    super
+  end
+
+  def quick_form_opts
+    super.merge "data-update-foreign-slot":
+                ".card-slot.quick_edit-view.RIGHT-Xcontent_option_view"
+  end
+
+  def default_input_type
+    :radio
+  end
+
+  def raw_help_text
+    "edit interface for list cards"
+  end
+
+  def option_label_text option_name
+    super.downcase
+  end
+
+  def quick_edit
+    card.left.prototype_default_card.try(:show_input_type?) ? super : ""
+  end
+end
+
+def option_names
+  left.prototype_default_card&.try(:input_type_content_options) || super
+end
+
+def supports_content_option_view?
+  item_name.in? ["checkbox", "radio", "filtered list"]
+end

data/mod/settings/set/right/script.rb

@@ -11,3 +11,9 @@ view :javascript_include_tag do
     <script src="#{card.machine_output_url}" type="text/javascript"></script>
   )
 end
+
+format :html do
+  def raw_help_text
+    "JavaScript (or CoffeeScript) for card's page."
+  end
+end