card 1.95.3 → 1.96.0

data/mod/bootstrap/set/type/customized_bootswatch_skin/html_views.rb

@@ -0,0 +1,36 @@
+include_set Abstract::Media
+include_set Abstract::BsBadge
+
+format :html do
+  view :bar_middle do
+    labeled_badge card.item_count, "items"
+  end
+
+  view :core, template: :haml do
+  end
+
+  view :bar_right do
+    ""
+  end
+
+  before :bar do
+    super()
+    voo.show :edit_button
+    class_up "bar-middle",
+             "col-3 d-none d-md-flex p-3 border-left d-flex align-items-center p-0",
+             true
+  end
+
+  view :bar_left do
+    class_up "card-title", "mb-0"
+    render :title
+  end
+
+  view :bar_bottom do
+    render_core
+  end
+
+  def edit_slot
+    haml :edit_slot
+  end
+end

data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors.rb

@@ -70,17 +70,21 @@ format :html do
                class: "tags form-control"
   end
 
-  def select_button target=parent.card
-    link_to_card target, "Select",
-                 path: { action: :update, card: { content: "[[#{card.name}]]" } },
-                 class: "btn btn-sm btn-outline-primary"
+  before :bar_right do
+    voo.show :edit_button
   end
 
-  def customize_button target=parent.card
-    link_to_card target, "Customize",
-                 path: { action: :update, card: { content: "[[#{card.name}]]" },
-                         customize: true },
-                 class: "btn btn-sm btn-outline-primary"
+  view :bar_middle do
+    <<-HTML
+      <div class="colorpicker-element">
+        <div class="input-group-addon">
+          <span class="bg-body border p-1">Text</span>
+          <span class="bg-dark text-light border p-1">Nav</span>
+            <i class="bg-primary"></i>
+          <i class="bg-secondary"></i>
+        </div>
+      </div>
+    HTML
   end
 end
 
@@ -101,5 +105,5 @@ def replace_values group, prefix=""
 end
 
 def variable_values_from_params group
-  Env.params.dig(:group)&.slice(*VARIABLE_NAMES[group]) || {}
+  Env.params.dig(group)&.slice(*VARIABLE_NAMES[group]) || {}
 end

data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/_colorpicker.haml

@@ -1,5 +1,5 @@
 .form-group.row
-  %label.col-sm-2.col-form-label
+  %label.col-sm-3.col-form-label
     = color_name
   .input-group.colorpicker-component.col-sm-6
     %input.form-control.input-lg{name: "colors[#{color_name}]", type: "text", value: color}/

data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/editor.haml

@@ -1,9 +1,13 @@
-%h4 Colors
-- colors.each do |name, color|
-  = haml_partial :colorpicker, color_name: name, color: color
-%h4 Theme colors
-- theme_colors.each do |name, value|
-  .form-group.row
-    %label.col-sm-2.col-form-label
-      = name
-    = theme_color_picker name, value
+.row
+  .col-6
+    %h4 Palette
+    - colors.each do |name, color|
+      = haml_partial :colorpicker, color_name: name, color: color
+  .col-6
+    %h4 Uses
+    - theme_colors.each do |name, value|
+      .form-group.row
+        %label.col-sm-4.col-form-label
+          = name
+        = theme_color_picker name, value
+

data/mod/core/chunk/link.rb

@@ -70,6 +70,14 @@ module Card::Content::Chunk
       end
     end
 
+    def link_target
+      if @explicit_link
+        render_obj @explicit_link
+      elsif @name
+        referee_name
+      end
+    end
+
     def process_chunk
       @process_chunk ||= render_link
     end

data/mod/core/set/abstract/code_file.rb

@@ -59,6 +59,11 @@ format :html do
     "Content is stored in file and can't be edited."
   end
 
+  view :bar_middle do
+    fa_icon("exclamation-circle", class: "text-muted pr-2") +
+      wrap_with(:span, "file", class: "text-muted")
+  end
+
   def standard_submit_button
     multi_card_editor? ? super : ""
   end

data/mod/core/set/all/chunk.rb

@@ -1,31 +1,27 @@
 
-def chunks content, type
+def chunks content, type, named=false
   content ||= self.content
   type ||= Card::Content::Chunk
-  Card::Content.new(content, self).find_chunks type
+  all_chunks = Card::Content.new(content, self).find_chunks type
+  named ? all_chunks.select(&:referee_name) : all_chunks
 end
 
-def each_chunk content, type
-  chunks(content, type).each do |chunk|
-    next unless chunk.referee_name # filter commented nests
-    yield chunk
-  end
+def reference_chunks content=nil, named=true
+  chunks content, Card::Content::Chunk::Reference, named
 end
 
-def each_reference_chunk content=nil
-  each_chunk content, Card::Content::Chunk::Reference do |chunk|
-    yield chunk
-  end
+# named=true rejects commented nests
+def nest_chunks content=nil, named=true
+  chunks content, Card::Content::Chunk::Nest, named
 end
 
-def each_nested_chunk content=nil
-  each_chunk content, Card::Content::Chunk::Nest do |chunk|
-    yield chunk
-  end
+# named=true rejects external links (since the don't refer to a card name)
+def link_chunks content=nil, named=false
+  chunks content, Card::Content::Chunk::Link, named
 end
 
 def each_item_name_with_options content=nil
-  each_reference_chunk content do |chunk|
+  reference_chunks(content).each do |chunk|
     options = chunk.respond_to?(:options) ? chunk.options : {}
     yield chunk.referee_name, options
   end
@@ -34,12 +30,18 @@ end
 format do
   def nested_fields content=nil
     result = []
-    each_nested_card(content) do |chunk|
+    each_nested_card(content, true) do |chunk|
       result << [chunk.referee_name, chunk.options]
     end
     result
   end
 
+  def nested_field_cards content=nil
+    nested_fields(content).map do |name, _options|
+      Card.fetch name
+    end
+  end
+
   def nested_cards_for_edit fields_only=false
     return normalized_edit_fields if edit_fields.present?
     result = []
@@ -72,26 +74,34 @@ format do
     card.name.field cardish
   end
 
-  def process_field chunk, processed, &_block
+  def process_field chunk, processed
     return unless process_unique_field? chunk, processed
-    yield chunk
+    yield chunk if block_given?
   end
 
   def each_nested_field content=nil, &block
     each_nested_card content, true, &block
   end
 
-  def each_nested_card content=nil, fields_only=true, &block
+  def each_nested_card content=nil, fields_only=false, &block
     processed = process_tally
-    each_nested_chunk content do |chunk|
+    nest_chunks(content).each do |chunk|
       next if fields_only && !field_chunk?(chunk)
       process_nested_chunk chunk, processed, &block
     end
   end
 
-  def each_nested_chunk content, &block
+  def uniq_nested_cards content: nil
+    with_unique_chunks do
+      nest_chunks(content).map do |chunk|
+        chunk.referee_card if unique_chunk? chunk
+      end
+    end
+  end
+
+  def nest_chunks content=nil
     content ||= _render_raw
-    card.each_nested_chunk content, &block
+    card.nest_chunks content
   end
 
   def process_tally
@@ -102,8 +112,20 @@ format do
     chunk.referee_name.to_name.field_of? card.name
   end
 
+  def unique_chunk? chunk
+    key = chunk.referee_name.key
+    return false if @processed.include? key
+    @processed << key
+    true
+  end
+
+  def with_unique_chunks
+    @processed = ::Set.new [card.key]
+    yield
+  end
+
   def process_nested_chunk chunk, processed, &block
-    virtual = chunk.referee_card && chunk.referee_card.virtual?
+    virtual = chunk.referee_card&.virtual?
     # TODO: handle structures that are non-virtual
     method = virtual ? :process_virtual_field : :process_field
     send method, chunk, processed, &block

data/mod/core/set/all/event_conditions.rb

@@ -1,15 +1,16 @@
-EVENT_CONDITIONS = %i[set on changed when optional].freeze
+def event_applies? event
+  return unless set_condition_applies? event.set_module
 
-def event_applies? event, opts
-  EVENT_CONDITIONS.all? do |key|
-    send "#{key}_condition_applies?", event, opts[key]
+  Card::Set::Event::CONDITIONS.all? do |key|
+    send "#{key}_condition_applies?", event, event.opts[key]
   end
 end
 
 private
 
-def set_condition_applies? _event, set_module
-  singleton_class.include?(set_module)
+def set_condition_applies? set_module
+  # events on Card are used for testing
+  set_module == Card || singleton_class.include?(set_module)
 end
 
 def on_condition_applies? _event, actions
@@ -32,9 +33,14 @@ def when_condition_applies? _event, block
   end
 end
 
-def optional_condition_applies? event, optional
-  return true unless optional
-  skip_event? event
+def skip_condition_applies? event, allowed
+  return true unless allowed == :allowed
+  !skip_event? event
+end
+
+def trigger_condition_applies? event, required
+  return true unless required == :required
+  trigger_event? event
 end
 
 def single_changed_condition_applies? db_column
@@ -63,6 +69,21 @@ def wrong_action action
 end
 
 def skip_event? event
-  @names_of_skipped_events ||= ::Set.new(Array.wrap(skip_event).map(&:to_sym))
-  !@names_of_skipped_events.include? event
+  @names_of_skipped_events ||= skipped_events
+  @names_of_skipped_events.include? event.name
+end
+
+def skipped_events
+  events = Array.wrap(skip_event_in_action) + Array.wrap(act_card.skip_event)
+  ::Set.new events.map(&:to_sym)
+end
+
+def trigger_event? event
+  @names_of_triggered_events ||= triggered_events
+  @names_of_triggered_events.include? event.name
+end
+
+def triggered_events
+  events = Array.wrap(trigger_event_in_action) + Array.wrap(act_card.trigger_event)
+  ::Set.new events.map(&:to_sym)
 end

data/mod/core/set/all/export.rb

@@ -26,12 +26,10 @@ format :json do
   end
 
   def items_for_export
-    items = []
-    each_nested_chunk(nil) do |chunk|
+    nest_chunks.map do |chunk|
       next if main_nest_chunk? chunk
-      items << chunk.referee_card
-    end
-    items
+      chunk.referee_card
+    end.compact
   end
 
   def valid_items_for_export

data/mod/core/set/all/item.rb

@@ -16,6 +16,10 @@ def item_keys args={}
   end
 end
 
+def item_count args={}
+  item_names(args).size
+end
+
 def include_item? item
   key = item.is_a?(Card) ? item.name.key : item.to_name.key
   item_names.map { |name| name.to_name.key }.member? key
@@ -89,4 +93,16 @@ format do
     type_from_rule = card.item_type
     options[:type] = type_from_rule if type_from_rule
   end
+
+  def listing listing_cards, item_args={}
+    listing_cards.map do |item_card|
+      nest_item item_card, item_args do |rendered, item_view|
+        wrap_item rendered, item_view
+      end
+    end
+  end
+
+  def wrap_item rendered, item_view
+    %(<div class="item-#{item_view}">#{rendered}</div>)
+  end
 end

data/mod/core/set/all/name.rb

@@ -30,6 +30,7 @@ def name= newname
   self.key = newkey if key != newkey
   update_subcard_names cardname
   write_attribute :name, cardname.s
+  name
 end
 
 def superize_name cardname

data/mod/core/set/all/references.rb

@@ -9,24 +9,30 @@ PARTIAL_REF_CODE = "P".freeze
 
 # cards that refer to self
 def referers
-  references_in.map(&:referer_id).map(&Card.method(:fetch)).compact
+  referer_cards_from_references references_in
 end
 
 # cards that include self
-def includers
-  refs = references_in.where(ref_type: "I")
-  refs.map(&:referer_id).map(&Card.method(:fetch)).compact
+def nesters
+  referer_cards_from_references references_in.where(ref_type: "I")
+end
+
+def referer_cards_from_references references
+  references.map(&:referer_id).uniq.map(&Card.method(:fetch)).compact
 end
 
 # cards that self refers to
 def referees
-  references_out.map { |ref| Card.fetch ref.referee_key, new: {} }
+  referees_from_references references_out
 end
 
 # cards that self includes
-def includees
-  refs = references_out.where(ref_type: "I")
-  refs.map { |ref| Card.fetch ref.referee_key, new: {} }
+def nestees
+  referees_from_references references_out.where(ref_type: "I")
+end
+
+def referees_from_references references
+  references.map(&:referee_key).uniq.map { |key| Card.fetch key, new: {} }
 end
 
 # cards that refer to self by name
@@ -38,7 +44,7 @@ end
 # cards that refer to self or any descendant
 def family_referers
   @family_referers ||= ([self] + descendants).map(&:referers).flatten.uniq
-  # TODO: make this more efficient!
+  # TODO: make this more efficient using partial references!
 end
 
 # replace references in card content
@@ -157,14 +163,13 @@ end
 # on rename, update names in cards that refer to self by name (as directed)
 event :update_referer_content, :finalize,
       on: :update, after: :name_change_finalized,
-      when: proc { |card| card.update_referers } do
+      when: :update_referers  do
   # FIXME: break into correct stages
   Auth.as_bot do
-    family_referers.each do |card|
+    referers.each do |card|
       next if card == self || card.structure
-      card = card.refresh
-      card.db_content = card.replace_reference_syntax name_before_last_save, name
-      card.save!
+      new_content = card.replace_reference_syntax name_before_last_save, name
+      card.refresh.update_attributes! content: new_content
     end
   end
 end
@@ -175,6 +180,10 @@ end
 # then we need to be sure that A has a partial reference
 event :update_referer_references_out, :finalize,
       on: :update, after: :name_change_finalized,
-      when: proc { |c| !c.update_referers } do
-  family_referers.map(&:update_references_out)
+      when: :not_update_referers do
+  referers.map(&:update_references_out)
+end
+
+def not_update_referers
+  !update_referers
 end