card 1.99.2 → 1.100.0

data/tmpsets/set/{mod021-standard → mod022-standard}/all/rich_html/modal.rb

@@ -7,7 +7,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/standard/set/all/rich_html/modal.rb"; end
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   MODAL_SIZE = { small: "sm", medium: nil, large: "lg", full: "full" }.freeze
-  MODAL_CLOSE_OPTS = { class: "_close-modal", "data-dismiss": "modal",
+  MODAL_CLOSE_OPTS = { "data-dismiss": "modal",
                        "data-cy": "close-modal" }.freeze
 
   wrapper :modal do |opts={}|
@@ -98,8 +98,8 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     classes = [classy("modal-dialog")]
     return classes unless opts.present?
 
-    add_modal_size_class classes, opts.delete(:size)
-    classes << "modal-dialog-centered" if opts.delete(:vertically_centered)
+    add_modal_size_class classes, opts[:size]
+    classes << "modal-dialog-centered" if opts[:vertically_centered]
     classes.join " "
   end
 

data/tmpsets/set/{mod021-standard → mod022-standard}/all/rich_html/overlay.rb

@@ -11,7 +11,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
                          type: "button" }.freeze
 
   wrapper :overlay do |opts|
-    class_up "card-slot", "_overlay d0-card-overlay bg-white"
+    class_up "card-slot", "_overlay d0-card-overlay bg-body"
     @content_body = true
     voo.hide! :menu
     overlay_frame true, overlay_header(opts[:title]), opts[:slot] do
@@ -29,10 +29,27 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
 
   view :overlay_menu do
     wrap_with :div, class: "btn-group btn-group-sm align-self-start ml-auto" do
-      [slotify_overlay_link, close_overlay_link]
+      [render_overlay_help_link, slotify_overlay_link, close_overlay_link]
     end
   end
 
+  view :overlay_help_link, cache: :never, unknown: true do
+    opts = help_popover_opts
+    add_open_guide_opts opts
+    overlay_menu_link "question-circle", opts
+  end
+
+  def add_open_guide_opts opts
+    return unless card.guide_card
+
+    slot_selector = ".bridge-sidebar > ._overlay-container-placeholder > .card-slot"
+    opts.merge! remote: true,
+                href: path(mark: card, view: :overlay_guide),
+                "data-slot-selector": slot_selector,
+                "data-slotter-mode": "overlay"
+    add_class opts, "slotter"
+  end
+
   def slotify_overlay_link
     overlay_menu_link "external-link-square", card: card
   end
@@ -48,8 +65,13 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     button_tag link_text, button_opts
   end
 
+  def overlay_delete_button
+    opts = { no_success: true }.merge OVERLAY_CLOSE_OPTS
+    delete_button opts
+  end
+
   def overlay_save_and_close_button
-    submit_button text: "Save and Close", class: "_close-overlay-on-success",
+    submit_button text: "Save and Close", class: "_close-on-success",
                   "data-cy": "submit-overlay"
   end
 
@@ -60,7 +82,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
 
   def overlay_header title=nil
     title ||= _render_overlay_title
-    class_up "d0-card-header", "bg-white text-dark"
+    class_up "d0-card-header", "bg-body"
     class_up "d0-card-header-title", "d-flex"
     header_wrap [title, _render_overlay_menu]
   end

data/tmpsets/set/{mod021-standard → mod022-standard}/all/rich_html/show.rb

@@ -9,6 +9,14 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
   def show view, args
     content = send show_method, view, args
     show_full_page? ? wrap_with_html_page(content) : content
+
+  # TODO: remove the following after tracking down wikirate encoding bug
+  rescue Card::Error::ServerError => e
+    if e.message.match?(/invalid byte sequence/)
+      Card::Lexicon.cache.reset
+      Rails.logger.info "reset name cache to prevent encoding freakiness"
+    end
+    raise e
   end
 
   def show_method

data/tmpsets/set/{mod021-standard → mod022-standard}/all/rich_html/title.rb

@@ -6,7 +6,7 @@ module Title;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/standard/set/all/rich_html/title.rb"; end
 module Format; parent.send :register_set_format, Card::Format, self; extend Card::Set::AbstractFormat
-  view :title, closed: true, perms: :none do
+  view :title, compact: true, perms: :none do
     standard_title
   end
 
@@ -20,11 +20,11 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     show_view?(:title_link, :hide) ? render_title_link : render_title_no_link
   end
 
-  view :title_link, closed: true, perms: :none do
+  view :title_link, compact: true, perms: :none do
     link_to_card card.name, render_title_no_link
   end
 
-  view :title_no_link, closed: true, perms: :none do
+  view :title_no_link, compact: true, perms: :none do
     wrapped_title standard_title
   end
 

data/tmpsets/set/{mod021-standard → mod022-standard}/right/discussion.rb

@@ -5,8 +5,14 @@ class Card; module Set; class Right
 module Discussion;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/standard/set/right/discussion.rb"; end
-def show_comment_box_in_related?
-  true
+view :titled, unknown: true do
+  voo.show :comment_box
+  super()
+end
+
+view :open, unknown: true do
+  voo.show :comment_box
+  super()
 end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/standard/set/right/discussion.rb ~~

data/tmpsets/set/{mod021-standard → mod022-standard}/right/head.rb

@@ -14,6 +14,10 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     process_content render_raw
   end
 
+  view :one_line_content do
+    raw_one_line_content
+  end
+
   view :core do
     process_content ::CodeRay.scan(render_raw, :html).div
   end

data/tmpsets/set/mod022-standard/right/type_plus_right.rb

@@ -0,0 +1,13 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Right
+# Set: All "+TypePlusRight" cards
+#
+module TypePlusRight;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/standard/set/right/type_plus_right.rb"; end
+def related_sets _with_self=false
+  [[name, Card::Set::TypePlusRight.label(name.left)],
+   ["#{name[1]}+*right", Card::Set::Right.label(name[1])]]
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/standard/set/right/type_plus_right.rb ~~

data/tmpsets/set/mod022-standard/self/cardtype.rb

@@ -0,0 +1,51 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Self
+# Set: The card "Cardtype"
+#
+module Cardtype;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/standard/set/self/cardtype.rb"; end
+GROUP = {
+  "Text" => %w[RichText PlainText Markdown Phrase HTML],
+  "Data" => %w[Number Toggle Date URI],
+  "Upload" => %w[File Image],
+  "Custom" => [],
+  "Organize" => ["List", "Pointer", "Search", "Link list",
+                 "Mirror List", "Mirrored List"],
+  "Template" => ["Notification template", "Email template", "Twitter template"],
+  "Admin" => ["Cardtype", "User", "Role", "Sign up", "Session", "Set", "Setting"],
+  "Styling" => ["Layout", "Skin", "Bootswatch skin", "Customized bootswatch skin", "CSS", "SCSS"],
+  "Scripting" => %w[JSON JavaScript CoffeeScript]
+}.freeze
+
+#DEFAULT_RULE_GROUPS = ["Text", "Data", "Upload", "Organize - Search"]
+#STRUCTURE_RULE_GROUPS = ["Text", "Organize > Search"]
+
+# group for each cardtype: { "RichText => "Content", "Layout" => "Admin", ... }
+GROUP_MAP = GROUP.each_with_object({}) do |(cat, types), h|
+  types.each { |t| h[t] = cat }
+end
+
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  view :grouped_list do
+    GROUP.keys.map do |group|
+      type_list = group == "Custom" ? custom_types : GROUP[group]
+      next if type_list.empty?
+
+      [wrap_with(:h5, group), wrap_with(:p, listing(type_list))]
+    end.flatten.join "\n"
+  end
+
+  def custom_types
+    custom_types = []
+
+    Card.search(type_id: Card::CardtypeID, return: "name").each do |name|
+      next if ::Card::Set::Self::Cardtype::GROUP_MAP[name]
+
+      custom_types << name
+    end
+    custom_types
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/standard/set/self/cardtype.rb ~~

data/tmpsets/set/mod022-standard/self/sidebar.rb

@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Self
+# Set: The card "Sidebar"
+#
+module Sidebar;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/standard/set/self/sidebar.rb"; end
+def raw_help_text
+  <<-TEXT
+    Sidebar content of [[Layouts]] with sidebar. [[http://decko.org/sidebar|more]]
+  TEXT
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/standard/set/self/sidebar.rb ~~

data/tmpsets/set/{mod021-standard → mod022-standard}/type/basic.rb

@@ -19,7 +19,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
   end
 
   def table_of_contents content
-    return if nest_mode == :closed || !content.present?
+    return if nest_mode == :compact || !content.present?
 
     min = card.rule(:table_of_contents).to_i
     return unless min && min > 0
@@ -39,7 +39,7 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     content.gsub!(/<(h\d)>(.*?)<\/h\d>/i) do |match|
       if $LAST_MATCH_INFO
         tag, value = $LAST_MATCH_INFO[1, 2]
-        value = ActionView::Base.new.strip_tags(value).strip
+        value = strip_tags(value).strip
         next if value.empty?
         item = { value: value, uri: URI.escape(value) }
         case tag.downcase

data/tmpsets/set/mod022-standard/type/cardtype.rb

@@ -0,0 +1,136 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Type
+# Set: All "Cardtype" cards
+#
+module Cardtype;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/standard/set/type/cardtype.rb"; end
+include_set Abstract::WqlSearch
+
+def wql_content
+  { type_id: id, sort: :name }
+end
+
+def related_sets with_self=false
+  sets = []
+  sets << ["#{name}+*type", Card::Set::Type.label(name)] if known?
+  sets + super
+end
+
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  view :type, unknown: true do
+    link_to_card card.type_card, nil, class: "cardtype"
+  end
+
+  def type_formgroup args={}
+    if card.cards_of_type_exist?
+      wrap_with :div, tr(:cards_exist, cardname: safe_name)
+    else
+      super
+    end
+  end
+
+  view :add_link do
+    add_link
+  end
+
+  view :add_button do
+    add_link class: "btn btn-secondary"
+  end
+
+  def add_link opts={}
+    voo.title ||= tr(:add_card, cardname: safe_name)
+    link_to render_title, add_link_opts(opts)
+  end
+
+  def add_link_opts opts
+    modal = opts.delete :modal
+    modal = true if modal.nil?
+    opts[:path] = add_path(modal ? :new_in_modal : :new)
+    modal ? modal_link_opts(opts) : opts
+  end
+
+  view :add_url do
+    card_url _render_add_path
+  end
+
+  def add_path view
+    path_args = { mark: card.name }
+    process_voo_params(path_args) if voo.params
+    if view == :new
+      path_args[:action] = :new
+    else
+      path_args[:action] = :type
+      path_args[:view] = view
+    end
+    path path_args
+  end
+
+  # don't cache because it depends on update permission for another card
+  view :configure_link, cache: :never, perms: ->(fmt) { fmt.can_configure? } do
+    configure_link
+  end
+
+  def can_configure?
+    Card.fetch(card, :type, :structure, new: {}).ok? :update
+  end
+
+  view :configure_button, cache: :never, denial: :blank,
+                          perms:  ->(fmt) { fmt.can_configure? } do
+    configure_link "btn btn-secondary"
+  end
+
+  def configure_link css_class=nil
+    return "" unless Card.fetch(card, :type, :structure, new: {}).ok? :update
+
+    voo.title ||= tr(:configure_card, cardname: safe_name.pluralize)
+    title = _render_title
+    link_to_card card, title, path: { view: :bridge, bridge: { tab: :rules_tab },
+                                      set: Card::Name[safe_name, :type] },
+                              class: css_classes("configure-type-link ml-3", css_class)
+  end
+
+  private
+
+  def process_voo_params path_args
+    context = ((@parent&.card) || card).name
+    Rack::Utils.parse_nested_query(voo.params).each do |key, value|
+      value = value.to_name.absolute(context) if value
+      key = key.to_name.absolute(context)
+      path_args[key] = value
+    end
+  end
+end
+
+include Basic
+
+def cards_of_type_exist?
+  !new_card? && Card.where(trash: false, type_id: id).exists?
+end
+
+def create_ok?
+  Card.new(type_id: id).ok? :create
+end
+
+def was_cardtype?
+  type_id_before_act == Card::CardtypeID
+end
+
+event :check_for_cards_of_type, after: :validate_delete do
+  errors.add :cardtype, tr(:cards_exist, cardname: name) if cards_of_type_exist?
+end
+
+event :check_for_cards_of_type_when_type_changed,
+      :validate, changing: :type, when: :was_cardtype? do
+  if cards_of_type_exist?
+    errors.add :cardtype, tr(:error_cant_alter, name: name_before_act)
+  end
+end
+
+event :validate_cardtype_name, :validate, on: :save, changed: :name do
+  if %r{[<>/]}.match?(name)
+    errors.add :name, tr(:error_invalid_character_in_cardtype, banned: "<, >, /")
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/standard/set/type/cardtype.rb ~~

data/tmpsets/set/{mod021-standard → mod022-standard}/type/number.rb

@@ -7,7 +7,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/standard/set/type/number.rb"; end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  def editor
+  def input_type
     :text_field
   end
 end

data/tmpsets/set/{mod021-standard → mod022-standard}/type/phrase.rb

@@ -6,7 +6,7 @@ module Phrase;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/standard/set/type/phrase.rb"; end
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  def editor
+  def input_type
     :text_field
   end
 end

data/tmpsets/set/{mod021-standard → mod022-standard}/type/session.rb

@@ -7,6 +7,10 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/standard/set/type/session.rb"; end
 include_set Pointer
 
+def virtual?
+  session_content.present?
+end
+
 def history?
   false
 end
@@ -15,22 +19,46 @@ def followable?
   false
 end
 
-event :store_in_session, :initialize, on: :save, changed: :content do
-  Env.session[key] = db_content
-  self.db_content = ""
+def recaptcha_on?
+  false
 end
 
-event :delete_in_session, :validate, on: :delete do
-  Env.session[key] = nil
-  abort :success
+def session_key
+  "_card_#{key}"
+end
+
+def session_content
+  Env.session[session_key]
+end
+
+def session_content= val
+  Env.session[session_key] = val
 end
 
 def content
-  Env.session[key]
+  db_content || session_content
+end
+
+event :store_in_session, :prepare_to_store, on: :save do
+  self.session_content = db_content
+  abort :success
+end
+
+event :delete_in_session, :prepare_to_store, on: :delete do
+  self.session_content = nil
+  abort :success
+end
+
+def ok_to_create
+  true
+end
+
+def ok_to_update
+  true
 end
 
-def content= val
-  self.db_content = Env.session[key] = val
+def add_to_trash args
+  yield args.merge trash: true
 end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat