card 1.92.2 → 1.93.0

data/mod/standard/set/rstar/rules_editor.rb

@@ -55,7 +55,7 @@ format :html do
 
   def show_rule_set set
     wrap_with :div, class: "rule-set" do
-      %(<label>Applies to</label> #{link_to_card set.cardname, set.label}:)
+      %(<label>Applies to</label> #{link_to_card set.name, set.label}:)
     end
   end
 
@@ -103,14 +103,14 @@ format :html do
   end
 
   def link_to_open_rule
-    setting_title = card.cardname.tag.tr "*", ""
+    setting_title = card.name.tag.tr "*", ""
     link_to_view :open_rule, setting_title, class: "edit-rule-link slotter"
   end
 
   def closed_rule_content rule_card
     return "" unless rule_card
     nest rule_card, view: :closed_content,
-                    set_context: card.cardname.trunk_name
+                    set_context: card.name.trunk_name
   end
 
   def open_rule_setting_links
@@ -160,7 +160,7 @@ format :html do
   end
 
   def edit_rule_success
-    { id:   @rule_context.cardname.url_key,
+    { id:   @rule_context.name.url_key,
       view: "open_rule",
       item: "view_rule" }
   end
@@ -290,7 +290,7 @@ format :html do
   end
 
   def current_set_key
-    card.new_card? ? Card.quick_fetch(:all).cardname.key : card.rule_set_key
+    card.new_card? ? Card.quick_fetch(:all).name.key : card.rule_set_key
   end
 
   def related_set_formgroup

data/mod/standard/set/type/cardtype.rb

@@ -44,7 +44,7 @@ format :html do
       end
     end
     path_args[:action] = "new"
-    page_path card.cardname, path_args
+    page_path card.name, path_args
   end
 end
 

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

@@ -9,7 +9,7 @@ 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
+    next unless item_card.type_name.key != item_type_name.key
     errors.add :name,
                "name conflicts with list items' type; " \
                "delete content first"
@@ -19,10 +19,10 @@ 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
+    next unless item_card.type_name.key != item_type_name.key
     errors.add :content,
                "#{item_card.name} has wrong cardtype; " \
-               "only cards of type #{cardname.right} are allowed"
+               "only cards of type #{name.right} are allowed"
   end
 end
 
@@ -97,15 +97,15 @@ def update_listed_by_cache_for item_keys, args={}
 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

data/mod/standard/set/type/listed_by.rb

@@ -13,39 +13,44 @@ event :validate_listed_by_content, :validate,
     errors.add(
       :content,
       "#{item_card.name} has wrong cardtype; " \
-      "only cards of type #{cardname.right} are allowed"
+      "only cards of type #{name.right} are allowed"
     )
   end
 end
 
 event :update_content_in_list_cards, :prepare_to_validate,
       on: :save, changed: :content do
-  if content.present?
-    new_items = item_keys(content: content)
-    old_items = item_keys
-    removed_items = old_items - new_items
-    added_items   = new_items - old_items
-    removed_items.each do |item|
-      if (lc = list_card(item))
-        lc.drop_item cardname.left
-        subcards.add lc
-      end
-    end
-    added_items.each do |item|
-      if (lc = list_card(item))
-        lc.add_item cardname.left
-        subcards.add lc
-      else
-        subcards.add(
-          name: "#{Card[item].name}+#{left.type_name}", type: "list",
-          content: "[[#{cardname.left}]]"
-        )
-      end
+  return unless db_content.present?
+  new_items = item_keys(content: db_content)
+  old_items = item_keys(content: db_content_was)
+  remove_items(old_items - new_items)
+  add_items(new_items - old_items)
+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 raw_content
+
+
+def content
   Card::Cache[Card::Set::Type::ListedBy].fetch(key) do
     generate_content
   end
@@ -60,7 +65,7 @@ end
 def listed_by
   Card.search(
     { type: "list", right: trunk.type_name,
-      left: { type: cardname.tag }, refer_to: cardname.trunk, return: :name }, "listed_by" # better wql comment would be...better
+      left: { type: name.tag }, refer_to: name.trunk, return: :name }, "listed_by" # better wql comment would be...better
   )
 end
 

data/mod/standard/set/type/session.rb

@@ -26,8 +26,4 @@ format :html do
   def default_core_args args
     args[:items] = { view: :name }
   end
-
-  def editor
-    :text_field
-  end
 end

data/mod/standard/set/type/set.rb

@@ -16,9 +16,9 @@ format :html do
     @selected_rule_navbar_view = selected_view
     wrap do
       [
-        _optional_render_set_label,
-        _optional_render_rule_navbar,
-        _optional_render_set_navbar,
+        _render_set_label,
+        _render_rule_navbar,
+        _render_set_navbar,
         yield
       ]
     end
@@ -35,7 +35,7 @@ format :html do
       wrap_with :div, class: "panel-group", id: "accordion",
                       role: "tablist", "aria-multiselectable" => "true" do
         Card::Setting.groups.keys.map do |group_key|
-          _optional_render group_key
+          _render group_key
         end
       end
     end
@@ -106,7 +106,7 @@ format :html do
   end
 
   def group_collapse_id group_key
-    "collapse-#{card.cardname.safe_key}-#{group_key}"
+    "collapse-#{card.name.safe_key}-#{group_key}"
   end
 
   def group_tabpanel group_key
@@ -115,7 +115,7 @@ format :html do
     settings = card.visible_settings group_key
     wrap_with :div, id: collapse_id, class: "panel-collapse collapse",
                     role: "tabpanel", "aria-labelledby" => heading_id do
-      wrap_with :div, class: "card-block" do
+      wrap_with :div, class: "card-body" do
         rules_table settings.map(&:codename)
       end
     end
@@ -183,13 +183,13 @@ format :html do
   end
 
   view :set_navbar do |_args|
-    id = "set-navbar-#{card.cardname.safe_key}-#{voo.home_view}"
+    id = "set-navbar-#{card.name.safe_key}-#{voo.home_view}"
     related_sets = card.related_sets(true)
     return "" if related_sets.size <= 1
     navbar id, brand: "Set", toggle_align: :right,
-               class: "slotter toolbar navbar-toggleable-md",
+               class: "slotter toolbar navbar-expand-md",
                navbar_type: "inverse",
-               collapsed_content: close_link("pull-right hidden-sm-up") do
+               collapsed_content: close_link("float-right d-sm-none") do
       set_navbar_content related_sets
     end
   end
@@ -199,10 +199,10 @@ format :html do
   end
 
   view :rule_navbar do
-    navbar "rule-navbar-#{card.cardname.safe_key}-#{voo.home_view}",
+    navbar "rule-navbar-#{card.name.safe_key}-#{voo.home_view}",
            brand: 'Rules', toggle_align: :right,
-           class: "slotter toolbar navbar-toggleable-md", navbar_type: "inverse",
-           collapsed_content: close_link("pull-right hidden-sm-up") do
+           class: "slotter toolbar navbar-expand-md", navbar_type: "inverse",
+           collapsed_content: close_link("float-right d-sm-none") do
       rule_navbar_content
     end
   end
@@ -259,8 +259,8 @@ end
 
 def inheritable?
   return true if junction_only?
-  cardname.trunk_name.junction? &&
-    cardname.tag_name.key == Card::Set::Self.pattern.key
+  name.trunk_name.junction? &&
+    name.tag_name.key == Card::Set::Self.pattern.key
 end
 
 def subclass_for_set
@@ -280,7 +280,7 @@ end
 
 def label
   if (klass = subclass_for_set)
-    klass.label cardname.left
+    klass.label name.left
   else
     ""
   end
@@ -295,22 +295,19 @@ end
 
 def follow_label
   if (klass = subclass_for_set)
-    klass.follow_label cardname.left
+    klass.follow_label name.left
   else
     ""
   end
 end
 
 def follow_rule_name user=nil
-  if user
-    if user.is_a? String
-      "#{name}+#{user}+#{Card[:follow].name}"
-    else
-      "#{name}+#{user.name}+#{Card[:follow].name}"
-    end
-  else
-    "#{name}+#{Card[:all].name}+#{Card[:follow].name}"
-  end
+  follower = case user
+             when nil    then :all.cardname
+             when String then user
+             else             user.name
+             end
+  [name, follower, :follow.cardname].join "+"
 end
 
 def all_user_ids_with_rule_for setting_code
@@ -373,7 +370,7 @@ def broader_sets
 end
 
 def prototype
-  opts = subclass_for_set.prototype_args cardname.trunk_name
+  opts = subclass_for_set.prototype_args name.trunk_name
   Card.fetch opts[:name], new: opts
 end
 

data/mod/standard/set/type/toggle.rb

@@ -3,7 +3,7 @@ def checked?
 end
 
 view :core do
-  case card.raw_content.to_i
+  case card.content.to_i
   when 1 then tr(:yes)
   when 0 then tr(:no)
   else
@@ -25,6 +25,6 @@ format :html do
   end
 
   def toggle_label
-    label :content, card.cardname.tag
+    label :content, card.name.tag
   end
 end

data/mod/standard/spec/set/all/history_spec.rb

@@ -64,6 +64,7 @@ RSpec.describe Card::Set::All::History do
 
       context "when updated" do
         it "adds no act if nothing changed" do
+          pending "act handling upgrade"
           @card.update_attributes name: "single card", content: content
           expect(Card::Act.count).to eq(act_start_cnt + 1)
         end

data/mod/standard/spec/set/all/rich_html/editing_spec.rb

@@ -7,7 +7,7 @@ describe Card::Set::All::RichHtml::Editing do
 
   def assert_active_toolbar_pill view, content, related_view=false
     view_selector = related_view ? "related" : view
-    assert_view_select @mycard.render(view),
+    assert_view_select @mycard.render!(view),
                        "div[class~='card-slot #{view_selector}-view']" do
       assert_select 'nav[class="slotter toolbar navbar navbar-inverse"]' do
         assert_select 'ul[class="nav navbar-nav nav-pills"]' do

data/mod/standard/spec/set/all/rich_html/wrapper_spec.rb

@@ -8,7 +8,7 @@ describe Card::Set::All::RichHtml::Wrapper do
 
     it "has the appropriate attributes on open" do
       assert_view_select(
-        @ocslot.render(:open),
+        @ocslot.render!(:open),
         'div[class="card-slot open-view ALL TYPE-basic SELF-a"]'
       ) do
         assert_select 'div[class="d0-card-frame card"]' do
@@ -21,7 +21,7 @@ describe Card::Set::All::RichHtml::Wrapper do
     end
 
     it "has the appropriate attributes on closed" do
-      v = @ocslot.render :closed
+      v = @ocslot.render! :closed
       assert_view_select(
         v, 'div[class="card-slot closed-view ALL TYPE-basic SELF-a"]'
       ) do

data/mod/standard/spec/set/type/list_spec.rb

@@ -79,9 +79,11 @@ describe Card::Set::Type::List do
     # if content is invalid then fail
     context "when Stam Broker+books changes to Stam Broker+poems" do
       it "raises error because content is invalid" do
+        # FIXME: - bad description; content is not changed
         expect do
           Card["Stam Broker+books"].update_attributes! name: "Stam Broker+poems"
-        end.to raise_error
+        end.to raise_error(ActiveRecord::RecordInvalid,
+                           /Name must have a cardtype name as right part/)
       end
     end
     context "when Stam Broker+books changes to Stam Broker+not a type" do
@@ -90,7 +92,8 @@ describe Card::Set::Type::List do
           Card["Stam Broker+books"].update_attributes!(
             name: "Stam Broker+not a type"
           )
-        end.to raise_error
+        end.to raise_error(ActiveRecord::RecordInvalid,
+                           /Name must have a cardtype name as right part/)
       end
     end
 
@@ -106,7 +109,8 @@ describe Card::Set::Type::List do
           Card["Parry Hotter+authors"].update_attributes!(
             name: "Parry Hotter+basics"
           )
-        end.to raise_error
+        end.to raise_error(ActiveRecord::RecordInvalid,
+                           /Name name conflicts with list items/)
       end
     end
   end

data/mod/standard/spec/set/type/listed_by_spec.rb

@@ -22,7 +22,8 @@ describe Card::Set::Type::ListedBy do
       Card["Parry Hotter+authors"].update_attributes!(
         name: "Parry Hotter+hidden"
       )
-    end.to raise_error
+    end.to raise_error(ActiveRecord::RecordInvalid,
+                       /Name must have a cardtype name as right part/)
   end
 
   context 'when Darles Chickens is in the author list of \
@@ -131,7 +132,7 @@ describe Card::Set::Type::ListedBy do
         it "raises error" do
           expect do
             Card["Darles Chickens"].update_attributes! type_id: Card::BasicID
-          end.to raise_error
+          end.to raise_error(ActiveRecord::RecordInvalid, /Type can\'t be changed/)
         end
       end
       context "when the name of Darles Chickens+books changed" do

data/mod/standard/spec/set/type/uri_spec.rb

@@ -10,7 +10,7 @@ describe Card::Set::Type::Uri do
     card = Card.create(type: "URI", name: "A URI card",
                        content: "http://wagn.org/Home")
     assert_view_select(
-      card.format.render("core"),
+      card.format.render!("core"),
       'a[class="external-link"][href="http://wagn.org/Home"]'
     ) do
       assert_select 'span[class="card-title"]', text: "A URI card"
@@ -22,7 +22,7 @@ describe Card::Set::Type::Uri do
                        content: "http://wagn.org/Home")
 
     assert_view_select(
-      card.format.render("core", title: "My Title"),
+      card.format.render!("core", title: "My Title"),
       'a[class="external-link"][href="http://wagn.org/Home"]'
     ) do
       assert_select 'span[class="card-title"]', text: "My Title"
@@ -31,15 +31,15 @@ describe Card::Set::Type::Uri do
 
   it "renders title view in a plain formatter" do
     card = Card["A"]
-    expect(card.format(:text).render("title", title: "My Title"))
+    expect(card.format(:text).render!("title", title: "My Title"))
       .to eq "My Title"
-    expect(card.format(:text).render("title")).to eq "A"
+    expect(card.format(:text).render!("title")).to eq "A"
   end
 
   it "renders url_link for regular cards" do
     card = Card["A"]
-    expect(card.format(:text).render("url_link")).to eq "/A"
-    assert_view_select card.format.render("url_link"),
+    expect(card.format(:text).render!("url_link")).to eq "/A"
+    assert_view_select card.format.render!("url_link"),
                        'a[class="internal-link"][href="/A"]',
                        text: "/A"
   end
@@ -47,9 +47,9 @@ describe Card::Set::Type::Uri do
   it "renders a url_link view" do
     card = Card.create(type: "URI", name: "A URI card",
                        content: "http://wagn.org/Home")
-    assert_view_select card.format.render("url_link"),
+    assert_view_select card.format.render!("url_link"),
                        'a[class="external-link"]',
                        text: "http://wagn.org/Home"
-    expect(card.format(:text).render("url_link")).to eq "http://wagn.org/Home"
+    expect(card.format(:text).render!("url_link")).to eq "http://wagn.org/Home"
   end
 end