card 1.97.0.1 → 1.98.0

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

@@ -11,18 +11,6 @@ format :html do
     end.join "\n"
   end
 
-  def stat_number
-    card.item_count
-  end
-
-  def stat_label
-    stat_number == 1 ? "item" : "items"
-  end
-
-  def short_content
-    "#{stat_number} #{stat_label}"
-  end
-
   def standard_pointer_core
     with_paging do |paging_args|
       wrap_with :div, standard_pointer_items(paging_args), class: "pointer-list"
@@ -30,7 +18,7 @@ format :html do
   end
 
   def standard_pointer_items paging_args
-    pointer_items paging_args.extract!(:limit, :offset)
+    pointer_items(paging_args.extract!(:limit, :offset)).join(voo.separator || "\n")
   end
 
   view :closed_content do
@@ -58,6 +46,10 @@ format :html do
     list_input
   end
 
+  # view :nav_item do
+  #   nav_dropdown
+  # end
+
   def list_input args={}
     items = items_for_input args[:item_list]
     extra_class = "pointer-list-ul"
@@ -104,7 +96,7 @@ format :html do
                        filter_card: filter_card.name,
                        slot_selector: filtered_list_slot_class,
                        item_selector: "_filtered-list-item",
-                       slot: { hide: :modal_footer },
+                       slot: { hide: [:modal_footer] },
                        filter: { not_ids: card.item_ids.map(&:to_s).join(",") } }
   end
 

data/mod/pointer/set/abstract/02_pointer/html_views/filter.rb

@@ -1,13 +1,13 @@
 format :html do
-  view :filtered_list, tags: :unknown_ok do
+  view :filtered_list, unknown: true do
     filtered_list_input
   end
 
-  view :filter_items_modal, tags: :unknown_ok, cache: :never, wrap: :modal do
+  view :filter_items_modal, unknown: true, wrap: :modal do
     render_filter_items
   end
 
-  view :filter_items, tags: :unknown_ok, cache: :never, wrap: :slot  do
+  view :filter_items, unknown: true, wrap: :slot  do
     haml :filter_items
   end
 
@@ -22,9 +22,10 @@ format :html do
     end
   end
 
-  def add_selected_link
+  # NOCACHE because params alter view
+  view :add_selected_link, cache: :never, unknown: true do
     link_to "Add Selected",
-            path: { item: params[:item], filter_card: params[:filter_card] },
+            path: { filter_card: params[:filter_card] },
             class: "_add-selected slotter _close-modal btn btn-primary disabled",
             data: { "slot-selector": ".#{params[:slot_selector]}",
                     "item-selector": ".#{params[:item_selector]}",

data/mod/pointer/set/abstract/02_pointer/html_views/filter/filter_items.haml

@@ -1,7 +1,7 @@
-._filter-items.container-fluid.nodblclick
+._filter-items.container-fluid.nodblclick._noFilterUrlUpdates
   .row
     = nest filter_card, view: :filter_form
-    ._unselected.col-6.border.mt-2.pl-0.pr-0
+    ._unselected.col-6.border.mt-2.px-0
       = nest filter_card, view: :select_item,
                           items: { view: implicit_item_view },
                           wql: { limit: 10 }
@@ -11,20 +11,18 @@
           %h5
             Selected
             .badge.badge-secondary
-              %span._selected-items
-                0
+              %span._selected-items 0
         ._selected-item-list{ style: "display:none" }
-          .p-3.deselector
+          .deselector.p-2
             %input#deselect-all._deselect-all{ type: "checkbox", checked: true, disabled: true }
             %label{ for: "deselect-all" }
               deselect
-              %span._selected-items
-                0
+              %span._selected-items 0
               following
-          ._selected-bin.pr-2
+          ._selected-bin.p-2
       ._filter-help.alert.alert-secondary
         Filter and select items to add them here.
       .form-group
-        .selected-item-buttons.pl-3
+        .selected-item-buttons.p-2
           = button_tag "Cancel", class: "cancel-modal", data: { dismiss: :modal }
-          = add_selected_link
+          = render :add_selected_link

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

@@ -38,7 +38,7 @@ end
 # Data views
 
 format :data do
-  view :core, cache: :never do
+  view :core do
     nest_item_array
   end
 end
@@ -87,7 +87,6 @@ format :css do
   end
 
   view :core do
-    voo.items[:view] = params[:item] if params[:item]
     nest_item_array.join "\n\n"
   end
 

data/mod/pointer/set/type/link_list.rb

@@ -0,0 +1,23 @@
+include_set Abstract::Pointer
+
+def item_names
+  reference_chunks.map(&:referee_name)
+end
+
+def item_titles
+  reference_chunks.map do |chunk|
+    chunk.options[:title] || chunk.referee_name
+  end
+end
+
+format do
+  def chunk_list
+    :references
+  end
+end
+
+format :html do
+  def editor
+    :ace_editor
+  end
+end

data/mod/pointer/set/type/list.rb

@@ -0,0 +1,16 @@
+include_set Abstract::Pointer
+
+def each_reference_out
+  item_names.each do |name|
+    yield(name, Card::Content::Chunk::Link::CODE)
+  end
+end
+
+format :html do
+  view :view_list do
+    %i[info_bar bar box closed titled labeled].map do |view|
+      voo.items[:view] = view
+      wrap_with :p, [content_tag(:h3, "#{view} items"), render_content]
+    end
+  end
+end

data/mod/pointer/set/type/mirror_list.rb

@@ -0,0 +1,93 @@
+include_set Abstract::Pointer
+
+event :validate_listed_by_name, :validate, on: :save, changing: :name do
+  if !junction? || !right || right.type_id != CardtypeID
+    errors.add :name, tr(:cardtype_right)
+  end
+end
+
+event :validate_listed_by_content, :validate,
+      on: :save, changing: :content do
+  item_cards(content: content).each do |item_card|
+    next unless item_card.type_id != right.id
+    errors.add(
+      :content,
+      "#{item_card.name} has wrong cardtype; " \
+      "only cards of type #{name.right} are allowed"
+    )
+  end
+end
+
+event :update_content_in_list_cards, :prepare_to_validate,
+      on: :save, changing: :content do
+  return unless db_content.present?
+  new_items = item_keys(content: db_content)
+  old_items = item_keys(content: old_content)
+  remove_items(old_items - new_items)
+  add_items(new_items - old_items)
+end
+
+def old_content
+  db_content_before_act.present? ? db_content_before_act : content_cache.read(key)
+end
+
+def remove_items items
+  items.each do |item|
+    next unless (lc = list_card item)
+    lc.drop_item name.left
+    subcards.add lc
+  end
+end
+
+def add_items items
+  items.each do |item|
+    if (lc = list_card(item))
+      lc.add_item name.left
+      subcards.add lc
+    else
+      subcards.add(name: "#{Card[item].name}+#{left.type_name}",
+                   type: "list",
+                   content: "[[#{name.left}]]")
+    end
+  end
+end
+
+def content_cache
+  Card::Cache[Card::Set::Type::MirrorList]
+end
+
+def content
+  content_cache.fetch(key) do
+    generate_content
+  end
+end
+
+def generate_content
+  listed_by.map do |item|
+    "[[%s]]" % item.to_name.left
+  end.join "\n"
+end
+
+def listed_by
+  Card.search(
+    { type_id: Card::MirroredListID, right: trunk.type_name,
+      left: { type: name.tag }, refer_to: name.trunk, return: :name },
+    "all cards listed by #{name}"
+  )
+end
+
+def update_cached_list
+  if trunk
+    Card::Cache[Card::Set::Type::MirrorList].write key, generate_content
+  else
+    Card::Cache[Card::Set::Type::MirrorList].delete key
+  end
+end
+
+def list_card item
+  Card.fetch item, left.type_name
+end
+
+def unfilled?
+  false
+end

data/{tmpsets/set/mod016-standard/type/list.rb → mod/pointer/set/type/mirrored_list.rb}

@@ -1,31 +1,26 @@
-# -*- encoding : utf-8 -*-
-class Card; module Set; class Type; module List; extend Card::Set
-# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/standard/set/type/list.rb ~~
-include_set Pointer
+include_set Abstract::Pointer
 
 event :validate_list_name, :validate, on: :save, changed: :name do
-  if !junction? || !right || right.type_id != CardtypeID
-    errors.add :name, "must have a cardtype name as right part"
-  end
+  errors.add :name, tr(:cardtype_right) if !junction? || !right || right.type_id != CardtypeID
 end
 
 event :validate_list_item_type_change, :validate,
       on: :save, changed: :name do
   item_cards.each do |item_card|
-    next unless item_card.type_cardname.key != item_type_name.key
-    errors.add :name,
-               "name conflicts with list items' type; " \
-               "delete content first"
+    next unless item_card.type_name.key != item_type_name.key
+    errors.add :name, tr(:conflict_item_type)
   end
 end
 
 event :validate_list_content, :validate,
       on: :save, changed: :content do
   item_cards.each do |item_card|
-    next unless item_card.type_cardname.key != item_type_name.key
-    errors.add :content,
-               "#{item_card.name} has wrong cardtype; " \
-               "only cards of type #{cardname.right} are allowed"
+    next unless item_card.type_name.key != item_type_name.key
+    errors.add :content, tr(
+      :only_type_allowed,
+      cardname: item_card.name,
+      cardtype: name.right
+    )
   end
 end
 
@@ -35,7 +30,7 @@ event :create_listed_by_cards, :prepare_to_validate,
     listed_by_name = "#{item_name}+#{left.type_name}"
     next if director.main_director.card.key == listed_by_name.to_name.key
     if !Card[listed_by_name]
-      add_subcard listed_by_name, type_id: ListedByID
+      add_subcard listed_by_name, type_id: MirrorListID
     else
       Card[listed_by_name].update_references_out
     end
@@ -51,8 +46,8 @@ event :update_related_listed_by_card_on_content_update, :finalize,
       on: :update, changed: :content do
   new_items = item_keys
   changed_items =
-    if db_content_was
-      old_items = item_keys(content: db_content_was)
+    if db_content_before_act
+      old_items = item_keys(content: db_content_before_act)
       old_items + new_items - (old_items & new_items)
     else
       new_items
@@ -61,7 +56,7 @@ event :update_related_listed_by_card_on_content_update, :finalize,
 end
 
 event :update_related_listed_by_card_on_name_and_type_changes, :finalize,
-      on: :update, changed: [:name, :type_id] do
+      on: :update, changed: %i[name type_id] do
   update_all_items
 end
 
@@ -77,44 +72,41 @@ end
 
 def update_all_items
   current_items = item_keys
-  if db_content_was
-    old_items = item_keys(content: db_content_was)
+  if db_content_before_act
+    old_items = item_keys(content: db_content_before_act)
     update_listed_by_cache_for old_items
   end
   update_listed_by_cache_for current_items
 end
 
 def update_listed_by_cache_for item_keys, args={}
-  type_key = args[:type_key] || left.type_card.key
+  type_key = args[:type_key] || left&.type_card&.key
+  return unless type_key
 
   item_keys.each do |item_key|
     key = "#{item_key}+#{type_key}"
-    next unless Card::Cache[Card::Set::Type::ListedBy].exist? key
-    if (card = Card.fetch(key))
+    next unless Card::Cache[Card::Set::Type::MirrorList].exist? key
+    if (card = Card.fetch(key)) && card.left
       card.update_cached_list
       card.update_references_out
     else
-      Card::Cache[Card::Set::Type::ListedBy].delete key
+      Card::Cache[Card::Set::Type::MirrorList].delete key
     end
   end
 end
 
 def item_type
-  cardname.right
+  name.right
 end
 
 def item_type_name
-  cardname.right_name
+  name.right_name
 end
 
 def item_type_card
-  cardname.right
+  name.right
 end
 
 def item_type_id
   right.id
 end
-
-
-# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/standard/set/type/list.rb ~~
-end;end;end;end;

data/mod/pointer/set/type/pointer.rb

@@ -1,7 +1,7 @@
 include_set Abstract::Pointer
 
 format :html do
-  view :overview do
+  view :view_list do
     %i[info_bar bar box closed titled labeled].map do |view|
       voo.items[:view] = view
       wrap_with :p, [content_tag(:h3, "#{view} items"), render_content]

data/mod/pointer/spec/set/abstract/paging_params_spec.rb

@@ -0,0 +1,12 @@
+RSpec.describe Card::Set::Abstract::PagingParams do
+  describe "offset_param" do
+    it "doesn't allow anonymous users to use extremely high values" do
+      Card::Auth.current_id = Card::AnonymousID
+      with_params offset: 10_000 do
+        expect { Card[:all].format(:json).offset_param }
+          .to raise_error(Card::Error::PermissionDenied,
+                          "offset parameter exceeds maximum")
+      end
+    end
+  end
+end

data/mod/pointer/spec/set/type/link_list_spec.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Set::Type::LinkList do
+  specify "#item_names" do
+    card = Card.new name: "test", type_id: Card::LinkListID,
+                    content: "[[A|text]]\n[[+B]]\n{{C|title: t}}"
+    expect(card.item_names).to contain_exactly "A", "test+B", "C"
+  end
+
+  specify "#item_titles" do
+    card = Card.new name: "test", type_id: Card::LinkListID,
+                    content: "[[A|text]]\n[[+B]]\n{{C|title: t}}"
+    expect(card.item_titles).to contain_exactly "text", "test+B", "t"
+  end
+end

data/mod/pointer/spec/set/type/link_spec.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Set::Type::List do
+  it "handles references", aggregate_failures: true do
+    content = "A\n[[+B]]\n[[C]]"
+    card = create_list "test", content
+    refs = Card::Reference.where(referer_id: card.id).pluck(:referee_key, :ref_type)
+    expect(card.content).to eq content
+    expect(refs).to contain_exactly %w[a L], %w[b P], %w[c L], %w[test+b L]
+  end
+
+  specify "#item_names" do
+    card = Card.new name:"test", type_id: Card::ListID,
+                       content: "A\n[[+B]]\n[[C]]"
+    expect(card.item_names).to eq %w[A test+B C]
+  end
+end