card 1.93.3 → 1.93.4

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

@@ -1,8 +1,4 @@
-
-#set_scope = "haml"
-
 format do
-
   include Card::Set::Format::HamlViews
 
   define_method :the_scope do
@@ -44,9 +40,9 @@ format do
 
   def haml *args, &block
     if args.first.is_a? Symbol
-      process_haml_template *args
+      process_haml_template(*args)
     else
-      process_haml *args, &block
+      process_haml(*args, &block)
     end
   end
 
@@ -59,7 +55,7 @@ format do
 
   def process_haml *args
     args.unshift yield if block_given?
-    haml_to_html *args
+    haml_to_html(*args)
   end
 
   def process_haml_template template_name, locals={}

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

@@ -0,0 +1,92 @@
+def item_names _args={}
+  format._render_raw.split(/[,\n]/)
+end
+
+def item_cards _args={} # FIXME: this is inconsistent with item_names
+  [self]
+end
+
+def item_type
+  nil
+end
+
+def item_keys args={}
+  item_names(args).map do |item|
+    item.to_name.key
+  end
+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
+end
+
+def add_item item
+  return if include_item? item
+  self.content = "#{content}\n#{name}"
+end
+
+def drop_item item
+  return unless include_item? item
+  new_names = item_names.reject { |i| i == item }
+  self.content = new_names.empty? ? "" : new_names.join("\n")
+end
+
+def insert_item index, name
+  new_names = item_names
+  new_names.delete name
+  new_names.insert index, name
+  self.content = new_names.join "\n"
+end
+
+def add_id id
+  add_item "~#{id}"
+end
+
+def drop_id id
+  drop_item "~#{id}"
+end
+
+def insert_id index, id
+  insert_item index, "~#{id}"
+end
+
+format do
+  def item_links _args={}
+    raw(render_core).split(/[,\n]/)
+  end
+
+  def nest_item cardish, options={}, &block
+    options = item_view_options options
+    options[:nest_name] = Card::Name[cardish].s
+    nest cardish, options, &block
+  end
+
+  def implicit_item_view
+    view = params[:item] || voo_items_view || default_item_view
+    Card::View.canonicalize view
+  end
+
+  def voo_items_view
+    return unless voo && (items = voo.items)
+    items[:view]
+  end
+
+  def default_item_view
+    :name
+  end
+
+  def item_view_options new_options={}
+    options = (voo.items || {}).clone
+    options = options.merge new_options
+    options[:view] ||= implicit_item_view
+    determine_item_view_options_type options
+    options
+  end
+
+  def determine_item_view_options_type options
+    return if options[:type]
+    type_from_rule = card.item_type
+    options[:type] = type_from_rule if type_from_rule
+  end
+end

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

@@ -200,6 +200,42 @@ rescue
   self
 end
 
+
+def right_id= card_or_id
+  write_card_or_id :right_id, card_or_id
+end
+
+def left_id= card_or_id
+  write_card_or_id :left_id, card_or_id
+end
+
+def type_id= card_or_id
+  write_card_or_id :type_id, card_or_id
+end
+
+def write_card_or_id attribute, card_or_id
+  if card_or_id.is_a? Card
+    write_attribute_to_card attribute, card_or_id
+  else
+    write_attribute attribute, card_or_id
+  end
+end
+
+def write_attribute_to_card attribute, card
+  if card.id
+    write_attribute attribute, card.id
+  else
+    add_subcard card
+    card.director.prior_store = true
+    with_id_when_exists(card) do |id|
+      write_attribute attribute, id
+    end
+  end
+end
+
+def with_id_when_exists card, &block
+  card.director.call_after_store(&block)
+end
 event :set_autoname, :prepare_to_validate, on: :create do
   if name.blank? && (autoname_card = rule_card(:autoname))
     self.name = autoname autoname_card.db_content

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

@@ -10,6 +10,18 @@ def subfield field_name
   subcards.field field_name
 end
 
+def subcards
+  @subcards ||= Card::Subcards.new self
+end
+
+def subcards?
+  subcards.present?
+end
+
+def expire_subcards
+  subcards.clear
+end
+
 # phase_method :attach_subcard, before: :store do |name_or_card, args=nil|
 # TODO: handle differently in different stages
 def attach_subcard name_or_card, args={}
@@ -57,26 +69,23 @@ def deep_clear_subcards
   subcards.deep_clear
 end
 
-def unfilled?
-  (content.empty? || content.strip.empty?) &&
-    (comment.blank? || comment.strip.blank?) &&
-    !subcards.present?
-end
-
 event :handle_subcard_errors do
   subcards.each do |subcard|
     subcard.errors.each do |field, err|
-      err = "#{field} #{err}" unless %i[content abort].member? field
-      errors.add subcard.name.from(name), err
+      subcard_error subcard, field, err
     end
   end
 end
 
+def subcard_error subcard, field, err
+  err = "#{field} #{err}" unless %i[content abort].member? field
+  errors.add subcard.name.from(name), err
+end
+
 event :reject_empty_subcards, :prepare_to_validate do
   subcards.each_with_key do |subcard, key|
-    if subcard.new? && subcard.unfilled?
-      remove_subcard(key)
-      director.subdirectors.delete(subcard)
-    end
+    next unless subcard.new? && subcard.unfilled?
+    remove_subcard(key)
+    director.subdirectors.delete(subcard)
   end
 end

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

@@ -0,0 +1,50 @@
+format :html do
+  view :tabs do
+    construct_tabs "tabs"
+  end
+
+  def construct_tabs tab_type
+    tabs = { active: {}, paths: {} }
+    voo.items[:view] ||= :content
+    card.each_item_name_with_options(_render_raw) do |name, options|
+      construct_tab tabs, name, options
+    end
+    lazy_loading_tabs tabs[:paths], tabs[:active][:name],
+                      tabs[:active][:content], type: tab_type
+  end
+
+  def construct_tab tabs, name, explicit_options
+    tab_options = item_view_options explicit_options
+    tabs[:paths][name] = {
+      title: nest(name, view: :title, title: tab_options[:title]),
+      path: nest_path(name, tab_options).html_safe
+    }
+    return unless tabs[:active].empty?
+    tabs[:active] = { name: name, content: nest(name, tab_options) }
+  end
+
+  # def tab_title title, name
+  #   return name unless title
+  #   name.to_name.title title, @context_names
+  # end
+
+  view :pills do
+    construct_tabs "pills"
+  end
+
+  view :tabs_static do
+    construct_static_tabs "tabs"
+  end
+
+  view :pills_static do
+    construct_static_tabs "pills"
+  end
+
+  def construct_static_tabs tab_type
+    tabs = {}
+    card.item_cards.each do |item|
+      tabs[item.name] = nest item, item_view_options(args)
+    end
+    static_tabs tabs, tab_type
+  end
+end

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

@@ -99,6 +99,10 @@ end
 event :validate_delete_children, after: :validate_delete, on: :delete do
   return if errors.any?
   children.each do |child|
+    next unless child
+    # prevents errors in cases where a child is deleted prior to this point
+    # and thus is not returned by the fetch in #children
+
     child.trash = true
     add_subcard child
     # next if child.valid?

data/mod/core/spec/set/all/chunk_spec.rb

@@ -0,0 +1,45 @@
+RSpec.describe Card::Set::All::Chunk do
+  describe "#edit_fields" do
+    def format_with_edit_fields args
+      Card["A"].format_with(:html) do
+        define_method :edit_fields do
+          args
+        end
+      end
+    end
+
+    it "interprets strings as field names" do
+      format = format_with_edit_fields ["B", "+C"]
+      expect(format.render_edit).to have_tag ".card-slot" do
+        with_tag ".card-editor.RIGHT-b", with: { card_name: "A+B" }
+        with_tag ".card-editor.RIGHT-c", with: { card_name: "A+C" }
+      end
+    end
+
+    it "doesn't make card objects to fields" do
+      format = format_with_edit_fields [Card["B"]]
+      expect(format.render_edit).to have_tag ".card-editor", with: { card_name: "B" }
+    end
+
+    it "treats symbols as codenames", as_bot: true do
+      format = format_with_edit_fields [:write, :basic]
+      expect(format.render_edit).to have_tag ".card-slot" do
+        with_tag ".card-editor.RIGHT-Xwrite", with: { card_name: "A+*write" }
+        with_tag ".card-editor.RIGHT-basic", with: { card_name: "A+Basic" }
+      end
+    end
+
+    example "absolute option", as_bot: true do
+      format = format_with_edit_fields [[:self, { absolute: true }]]
+      expect(format.render_edit).to have_tag ".card-editor", with: { card_name: "*self" }
+    end
+
+    example "title argument" do
+      format = format_with_edit_fields [["B", "custom title"]]
+      expect(format.render_edit)
+        .to have_tag ".card-editor.RIGHT-b", with: { card_name: "A+B" } do
+        with_tag ".card-title", text: "custom title"
+      end
+    end
+  end
+end

data/mod/core/spec/set/all/collection_spec.rb

@@ -26,12 +26,12 @@ describe Card::Set::All::Collection do
     end
   end
 
-  describe "#extended_list" do
-    it "returns item's content for pointer setting" do
-      c = Card.new(name: "foo", type: "Pointer", content: "[[Z]]")
-      expect(c.extended_list).to eq(["I'm here to be referenced to"])
-    end
-  end
+  # describe "#extended_list" do
+  #   it "returns item's content for pointer setting" do
+  #     c = Card.new(name: "foo", type: "Pointer", content: "[[Z]]")
+  #     expect(c.extended_list).to eq(["I'm here to be referenced to"])
+  #   end
+  # end
 
   describe "#extended_item_cards" do
     it "returns the 'leaf cards' of a tree of pointer cards" do

data/mod/history/set/all/action_view.rb

@@ -5,7 +5,7 @@ format :html do
   end
 
   view :action_expanded do |args|
-    render_action_content args[:action], :expanded
+    action_content args[:action], :expanded
   end
 
   def default_action_summary_args args

data/mod/machines/lib/javascript/decko.js.coffee

@@ -194,6 +194,9 @@ $(window).ready ->
     return false if !$.rails.allowAction $(this)
     $.rails.handleRemote $(this)
 
+  $('body').on 'click', '._clickable.slotter', (event)->
+    $.rails.handleRemote $(this)
+
   $('body').on 'ajax:beforeSend', '.slotter', (event, xhr, opt)->
     return if opt.skip_before_send
 

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

@@ -105,8 +105,6 @@ format :html do
     raw %(<ul class="pointer-radio-list">#{options}</ul>)
   end
 
-
-
   view :select do |_args|
     select_input
   end

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

@@ -93,7 +93,7 @@ format :data do
 end
 
 format :csv do
-  view :core, mod: All::Collection::CsvFormat
+  view :core, mod: All::AllCsv::CsvFormat
 
   view :card_list do
     items = super()

data/mod/search/set/all/filter.rb

@@ -6,6 +6,4 @@ format :html do
                        sort_input_field: sort_input_field,
                        form_args: form_args
   end
-
 end
-

data/mod/search/template/all/filter/_filter_input.haml

@@ -1,6 +1,6 @@
 .input-group.mb-2.card-outline-primary.mr-2._filter-input{"data-category" => key}
   %span.input-group-btn
-    %button.btn.btn-default.btn._delete-filter-input{:type => "button"}
+    %button.btn.btn-secondary.btn._delete-filter-input{:type => "button"}
       %strong
         %i.material-icons close
   %span.input-group-addon._selected-category

data/mod/search/template/all/filter/filter_form.haml

@@ -25,7 +25,7 @@
                 = haml_partial :filter_input, key: key, category: category
 
             .dropdown._add-filter-dropdown
-              %button.btn.btn-default.dropdown-toggle{"aria-expanded" => "false",
+              %button.btn.btn-secondary.dropdown-toggle{"aria-expanded" => "false",
                                                       "aria-haspopup" => "true",
                                                       "data-toggle" => "dropdown",
                                                       :type => "button"}

data/mod/standard/set/all/rich_html/editing.rb

@@ -162,7 +162,7 @@ format :html do
     voo.show :toolbar
     frame do
       with_nest_mode :edit do
-        process_nested_fields
+        multi_card_edit
       end
     end
   end

data/mod/standard/set/all/rich_html/form.rb

@@ -1,5 +1,3 @@
-
-
 format :html do
   # FIELDSET VIEWS
   view :content_formgroup, cache: :never do
@@ -81,7 +79,7 @@ format :html do
   def edit_slot
     case
     when inline_nests_editor?  then _render_core
-    when multi_card_editor?    then multi_card_edit_fields
+    when multi_card_editor?    then multi_card_edit(true)
     when in_multi_card_editor? then editor_in_multi_card
     else                            single_card_edit_field
     end
@@ -96,7 +94,8 @@ format :html do
   def multi_card_editor?
     nests_editor? ||                         # editor configured in voo
       voo.structure || voo.edit_structure || # structure configured in voo
-      card.structure                         # structure in card rule
+      card.structure ||                      # structure in card rule
+      edit_fields.present?                   # list of fields in card rule
   end
 
   # test: are we already within a multi-card form?
@@ -125,8 +124,9 @@ format :html do
     end
   end
 
-  def multi_card_edit_fields
-    nested_fields_for_edit.map do |name, options|
+  def multi_card_edit fields_only=false
+    nested_cards_for_edit(fields_only).map do |name, options|
+      options ||= {}
       options[:hide] = [options[:hide], :toolbar].compact
       nest name, options
     end.join "\n"
@@ -236,7 +236,6 @@ format :html do
     end
   end
 
-
   # FIELD VIEWS
 
   def add_junction_class