card 1.99.2 → 1.100.0

data/tmpsets/set/mod014-machines/abstract/script.rb

@@ -64,7 +64,7 @@ module Format; parent.send :register_set_format, Card::Format, self; extend Card
 end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  def editor
+  def input_type
     :ace_editor
   end
 

data/tmpsets/set/mod014-machines/self/script_decko.rb

@@ -9,10 +9,11 @@ include_set Abstract::CodeFile
 
 def source_files
   %w[mod editor name_editor autosave doubleclick layout navbox upload
-     slot modal overlay recaptcha
-     slotter bridge
+     slot modal overlay recaptcha slotter bridge
      nest_editor nest_editor_rules nest_editor_options nest_editor_name
-     components decko follow card_menu slot_ready filter filter_items].map do |n|
+     link_editor
+     components decko follow card_menu slot_ready
+     filter filter_links filter_items selectable_filtered_content].map do |n|
     "decko/#{n}.js.coffee"
   end
 end

data/tmpsets/set/mod014-machines/type/css.rb

@@ -57,7 +57,7 @@ module Format; parent.send :register_set_format, Card::Format, self; extend Card
 end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  def editor
+  def input_type
     :ace_editor
   end
 

data/tmpsets/set/mod015-settings/abstract/permission.rb

@@ -10,6 +10,10 @@ def standardize_items
   super unless content == "_left"
 end
 
+def options_rule_card
+  Card[:cards_with_account]
+end
+
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   view :pointer_core do
     wrap_with :div, pointer_items, class: "pointer-list"
@@ -23,11 +27,11 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     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/tmpsets/set/mod015-settings/all/supports_content_options.rb

@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class All
+# Set: All cards (SupportsContentOptions)
+#
+module SupportsContentOptions;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/settings/set/all/supports_content_options.rb"; end
+def supports_content_options?
+  false
+end
+
+def supports_content_option_view?
+  false
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/settings/set/all/supports_content_options.rb ~~

data/tmpsets/set/mod015-settings/right/content_option_view.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Right
+# Set: All "+ContentOptionView" cards
+#
+module ContentOptionView;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/settings/set/right/content_option_view.rb"; end
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  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
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/settings/set/right/content_option_view.rb ~~

data/tmpsets/set/mod015-settings/right/content_options.rb

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Right
+# Set: All "+ContentOptions" cards
+#
+module ContentOptions;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/settings/set/right/content_options.rb"; end
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  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
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/settings/set/right/content_options.rb ~~

data/tmpsets/set/mod015-settings/right/default.rb

@@ -8,15 +8,31 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/settings/set/righ
 include_set Abstract::TemplatedNests
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  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/tmpsets/set/mod015-settings/right/guide.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Right
+# Set: All "+Guide" cards
+#
+# include_set Abstract::TemplatedNests
+module Guide;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/settings/set/right/guide.rb"; end
+
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  def raw_help_text
+    # LOCALIZE
+    "Appears in the full editor view to guide users."
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/settings/set/right/guide.rb ~~

data/tmpsets/set/mod015-settings/right/help.rb

@@ -13,7 +13,8 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
   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/tmpsets/set/mod015-settings/right/input_type.rb

@@ -0,0 +1,44 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Right
+# Set: All "+InputType" cards
+#
+module InputType;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/settings/set/right/input_type.rb"; end
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  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
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/settings/set/right/input_type.rb ~~

data/tmpsets/set/mod015-settings/right/read.rb

@@ -9,70 +9,80 @@ include Abstract::Permission
 
 format :html do include Abstract::Permission::HtmlFormat end
 
-event :cascade_read_rule, :finalize, after: :update_rule_cache,
-                                     when: :is_rule? do
+event :cascade_read_rule, :finalize, after: :update_rule_cache, when: :is_rule? do
   return unless name_is_changing? || trash_is_changing?
 
-  update_read_ruled_cards rule_set
+  update_read_ruled_cards
 end
 
-def reset_patterns_if_rule saving=false
-  return unless (set = super)
-  add_to_read_rule_update_queue set.item_cards(limit: 0) if saving
-end
-
-# TODO: the following really needs a refactor.
-#
-# It was written (long ago) to handle different kinds of changes, but this
-# could be significantly simplified with smarter events.
-
-def update_read_ruled_cards set
-  self.class.clear_read_rule_cache
+def update_read_ruled_cards
+  Card::Rule.clear_read_rule_cache
   Card.cache.reset # maybe be more surgical, just Auth.user related
   expire # probably shouldn't be necessary,
   # but was sometimes getting cached version when card should be in the
   # trash.  could be related to other bugs?
 
-  updated = update_read_rules_of_set_members set
-
-  # then find all cards with me as read_rule_id that were not just updated
-  # and regenerate their read_rules
-  return if new_card?
-
-  Card.search(read_rule_id: id) do |card|
-    card.update_read_rule unless updated.include?(card.key)
-  end
+  processed = update_read_rules_of_set_members
+  update_cards_with_read_rule_id processed unless new?
 end
 
-def update_read_rules_not_overridden_by_narrower_rules cur_index,
-                                                       rule_class_index, set
-  set.item_cards(limit: 0).each_with_object(::Set.new) do |item_card, in_set|
-    in_set << item_card.key
-    next if cur_index < rule_class_index
+def update_read_rules_of_set_members
+  return unless rule_pattern_index
 
-    item_card.update_read_rule
+  each_member do |member, processed|
+    processed << member.key
+    member.update_read_rule unless member_has_overriding_rule?(member)
   end
 end
 
-event :process_read_rule_update_queue, :finalize do
-  Array.wrap(@read_rule_update_queue).each(&:update_read_rule)
-  @read_rule_update_queue = []
+def member_has_overriding_rule? member
+  pattern_index(Card.fetch_id(member.read_rule_class)) < rule_pattern_index
 end
 
-def update_read_rules_of_set_members set
-  return ::Set.new if trash || !(class_id = id_of_set_class(set))
+# cards with this card as a read_rule_id
+# These may include cards that are no longer set members if the card was renamed
+# (edge case)
+def update_cards_with_read_rule_id processed
+  processed ||= ::Set.new
+  Card::Auth.as_bot do
+    Card.search(read_rule_id: id) do |card|
+      card.update_read_rule unless processed.include?(card.key)
+    end
+  end
+end
 
-  rule_class_ids = set_patterns.map(&:pattern_id)
+def each_member
   Auth.as_bot do
-    if (rule_class_index = rule_class_ids.index(class_id))
-      cur_index = rule_class_ids.index Card[read_rule_class].id
-      update_read_rules_not_overridden_by_narrower_rules cur_index,
-                                                         rule_class_index, set
-    else
-      warn "No current rule index #{class_id}, #{rule_class_ids.inspect}"
-      ::Set.new
+    all_members.each_with_object(::Set.new) do |member, processed|
+      yield member, processed
     end
   end
 end
+
+def all_members
+  rule_set.item_cards limit: 0
+end
+
+def rule_pattern_index
+  return if trash
+
+  @rule_pattern_index ||= pattern_index rule_set&.tag&.id
+end
+
+def pattern_index pattern_id
+  pattern_ids.index(pattern_id) || invalid_pattern_id(pattern_id)
+end
+
+def pattern_ids
+  @pattern_ids ||= set_patterns.map(&:pattern_id)
+end
+
+def invalid_pattern_id pattern_id
+  Rails.logger.info "invalid pattern id for read rule: #{pattern_id}"
+end
+
+event :process_read_rule_update_queue, :finalize do
+  left&.update_read_rule
+end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/settings/set/right/read.rb ~~

data/tmpsets/set/mod015-settings/right/script.rb

@@ -18,5 +18,11 @@ view :javascript_include_tag do
     <script src="#{card.machine_output_url}" type="text/javascript"></script>
   )
 end
+
+module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  def raw_help_text
+    "JavaScript (or CoffeeScript) for card's page."
+  end
+end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/settings/set/right/script.rb ~~

data/tmpsets/set/mod015-settings/right/structure.rb

@@ -14,9 +14,15 @@ module RssFormat; parent.send :register_set_format, Card::Format::RssFormat, sel
 end
 
 module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
-  view :closed_content do
+  view :one_line_content do
     "#{_render_type} : #{_render_raw}"
   end
+
+  def visible_cardtype_groups
+    hash = ::Card::Set::Self::Cardtype::GROUP.slice("Text")
+    hash["Organize"] = ["Search"]
+    hash
+  end
 end
 
 event :update_structurees_references, :integrate,

data/tmpsets/set/mod015-settings/right/style.rb

@@ -29,10 +29,10 @@ module HtmlFormat; parent.send :register_set_format, Card::Format::HtmlFormat, s
     :bar
   end
 
-  view :editor, template: :haml
+  view :input, template: :haml
 
   def themes
-    card.rule_card(:options).item_cards
+    card.rule_card(:content_options).item_cards
   end
 
   def selectable_themes

data/tmpsets/set/mod015-settings/self/autoname.rb

@@ -6,6 +6,8 @@ module Autoname;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/settings/set/self/autoname.rb"; end
 extend Card::Setting
-setting_opts group: :templating, position: 4
+setting_opts group: :templating, position: 4,
+             help_text: "Autogenerate name for new cards by incrementing this value. "\
+                        "[[http://decko.org/autonaming|more]]"
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/settings/set/self/autoname.rb ~~

data/tmpsets/set/mod015-settings/self/captcha.rb

@@ -6,6 +6,9 @@ module Captcha;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/settings/set/self/captcha.rb"; end
 extend Card::Setting
-setting_opts group: :permission, position: 5
+setting_opts group: :permission, position: 5,
+             help_text: "Anti-spam setting.  Requires non-signed-in users to complete a "\
+                        "[[http://decko.org/captcha|captcha]] before adding or editing "\
+                        "cards (where permitted)."
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/settings/set/self/captcha.rb ~~

data/tmpsets/set/mod015-settings/self/content_option_view.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Self
+# Set: The card "ContentOptionView"
+#
+module ContentOptionView;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/settings/set/self/content_option_view.rb"; end
+extend Card::Setting
+setting_opts group: :editing, position: 6,
+             restricted_to_type: %i[list pointer session],
+             rule_type_editable: false,
+             help_text: "Label view for radio button and checkbox items.  "\
+                        "[[http://decko.org/Pointer|more]]",
+             applies: lambda  { |prototype|
+                        prototype.supports_content_options? &&
+                          prototype.rule_card(:input_type)&.supports_content_option_view?
+                      }
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/settings/set/self/content_option_view.rb ~~