card 1.103.2 → 1.104.1

data/mod/admin/set/self/admin_info.rb

@@ -1,12 +1,9 @@
-basket :warnings
-
+basket[:warnings] = [:no_email_delivery]
 # For each warning in the basket (eg :my_warning), the core view
 # will run a test by appending a question mark (eg #my_warning?).
 # If it fails it will generate a message by appending message
 # (eg #my_warning_message).
 
-add_to_basket :warnings, :no_email_delivery
-
 def no_email_delivery?
   Card.config.action_mailer.perform_deliveries == false
 end
@@ -17,7 +14,7 @@ end
 
 format :html do
   view :core do
-    warnings = card.warnings.map do |warning|
+    warnings = basket[:warnings].map do |warning|
       card.send("#{warning}?") ? send("#{warning}_message") : nil
     end
     warnings.compact!

data/mod/core/data/production.yml

@@ -0,0 +1,7 @@
+---
+- :name: Mod
+  :type: :cardtype
+  :codename: :mod
+- :name: Cardtype
+  :type: :cardtype
+  :codename: :cardtype

data/mod/core/data/test.yml

@@ -0,0 +1,30 @@
+- :name: Author
+  :type: :cardtype
+- :name: Fruit
+  :type: :cardtype
+- :name: self aware
+  :type: :cardtype
+- :name: Cardtype A
+  :type: :cardtype
+  :codename: :cardtype_a
+- :name: Cardtype B
+  :type: :cardtype
+  :codename: :cardtype_b
+- :name: Cardtype C
+  :type: :cardtype
+  :codename: :cardtype_c
+- :name: Cardtype D
+  :type: :cardtype
+  :codename: :cardtype_d
+- :name: Cardtype E
+  :type: :cardtype
+  :codename: :cardtype_e
+- :name: Cardtype F
+  :type: :cardtype
+  :codename: :cardtype_f
+- :name: UserForm
+  :type: :cardtype
+- :name: Book
+  :type: :cardtype
+- :name: Sample Cardtype
+  :type: :cardtype

data/mod/core/locales/de.yml

@@ -0,0 +1,28 @@
+de:
+  core_cannot_change_content: Inhalt kann nicht geändert werden, während der Name geändert wird
+  core_cannot_change_type: Typ kann nicht geändert werden, während der Name geändert wird
+  core_cards_exist: Sorry, diese Karten muss ein Kartentyp bleiben, solange es noch %{cardname}-Karten gibt.
+  core_error_banned_characters: "die folgenden Zeichen sind nicht erlaubt: %{banned}"
+  core_error_blank_key: darf nicht frei bleiben
+  core_error_blank_name: darf nicht frei bleiben
+  core_error_cant_alter: Typ kann nicht geändert werden; es gibt noch %{name} Karten
+  core_error_cant_change_errors: "von %{name} kann nicht geändert werden; Fehler beim Erstellen von neuen %{type_id}: %{error_messages}"
+  core_error_code_in_use: Codename %{codename} ist bereits vergeben
+  core_error_hard_templated: kann nicht geändert werden, weil %{name} ist eine Vorlage für %{type_name}
+  core_error_indestructible: "%{name} ist eine unzerstörbare Regel"
+  core_error_invalid_character_in_cardtype: "folgende Zeichen sind nicht erlaubt: %{banned}"
+  core_error_name_exists: muss eindeutig sein; '%{name}' gibt es bereits.
+  core_error_name_tag: "%{name} wird als Tag benutzt"
+  core_error_no_such_type: diesen Typ gibt es nicht
+  core_error_system_card: "%{name} ist eine Systemkarte. (%{codename})"
+  core_error_too_long: ist zu lang (%{length} Zeichen; erlaubt sind maximal 255)
+  core_error_user_edits: "Wurde bearbeitet mit %{name}s Account.\nLöschen würde den Verlauf durcheinander bringen."
+  core_error_wrong_key: falscher Schlüssel '%{key}' für Name %{name}
+  core_exception_almost_deleted: Löschen der aktuellen Datei knapp abgewendet
+  core_is_incomplete: ist unvollständig
+  core_only_admins_codename: nur Administratoren können Codenamen festlegen
+  core_renaming: "Wird umbenannt"
+  core_rename: "Umbenennen"
+  core_rename_confirm: "Sind Sie sicher, dass Sie die Karte umbenennen wollen?"
+  skip_update_referer_content:
+    Verweise auf diesen Namen nicht aktualisieren

data/mod/core/locales/en.yml

@@ -21,10 +21,9 @@ en:
   core_exception_almost_deleted: Narrowly averted deleting current file
   core_is_incomplete: is incomplete
   core_only_admins_codename: only admins can set codename
-  core_rename_and_update: "Rename and Update"
   core_renaming: "Renaming"
   core_rename: "Rename"
-  core_rename_confirm: "Are you sure you want to rename"
-  core_rename_reference_confirm:
-    This name is referred to at least %{count} time(s). You may choose to <em>update</em>
-    those references to use the new name."
+  core_rename_confirm: "Are you sure you want to rename?"
+
+  skip_update_referer_content:
+    do not update references to this name

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

@@ -38,6 +38,7 @@ def prepare_assignment_params args
 end
 
 def prepare_assignment_args args
+  @set_specific = {}
   return {} unless args
 
   args = args.symbolize_keys
@@ -66,44 +67,11 @@ def refresh_set_modules
 end
 
 def stash_set_specific_attributes args
-  @set_specific = {}
   Card.set_specific_attributes.each do |key|
     set_specific[key] = args.delete(key) if args.key?(key)
   end
 end
 
-def normalize_type_attributes args
-  new_type_id = extract_type_id! args unless args.delete(:type_lookup) == :skip
-  args[:type_id] = new_type_id if new_type_id
-end
-
-def extract_type_id! args={}
-  case
-  when (type_id = args.delete(:type_id)&.to_i)
-    type_id.zero? ? nil : type_id
-  when (type_code = args.delete(:type_code)&.to_sym)
-    type_id_from_codename type_code
-  when (type_name = args.delete :type)
-    type_id_from_cardname type_name
-  end
-end
-
-def type_id_from_codename type_code
-  type_id_or_error(type_code) { Card::Codename.id type_code }
-end
-
-def type_id_from_cardname type_name
-  type_id_or_error(type_name) { type_name.card_id }
-end
-
-def type_id_or_error val
-  type_id = yield
-  return type_id if type_id
-
-  errors.add :type, "#{val} is not a known type."
-  nil
-end
-
 # 'set' refers to the noun not the verb
 def set_specific
   @set_specific ||= {}

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

@@ -1,5 +1,5 @@
 event :set_content, :store, on: :save do
-  self.db_content = prepare_db_content
+  self.content = prepare_db_content
   @selected_action_id = @selected_content = nil
   clear_drafts
 end
@@ -37,6 +37,8 @@ end
 
 def prepare_db_content
   cont = standard_db_content || "" # necessary?
+
+  # TODO: move this html-specific code somewhere more appropriate
   clean_html? ? Card::Content.clean!(cont) : cont
 end
 

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

@@ -39,7 +39,6 @@ def initialize args={}
       super args # ActiveRecord #initialize
     end
   end
-  self
 end
 
 def handle_set_modules args
@@ -49,11 +48,9 @@ def handle_set_modules args
 end
 
 def handle_type args
-  type_lookup = args[:type_lookup]
   @supercard = args.delete :supercard
-
   yield
-  type_id_from_template if type_lookup == :force || (!type_id && type_lookup != :skip)
+  ensure_type_id args[:type_lookup]
 end
 
 def initial_name name

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

@@ -76,10 +76,6 @@ event :update_lexicon, :finalize, changed: :name, on: :save do
   Card::Lexicon.send lexicon_action, self
 end
 
-event :cascade_name_changes, :finalize, on: :update, changed: :name do
-  each_descendant { |d| d.rename_as_descendant update_referers }
-end
-
 protected
 
 def rename_as_trash_obstacle
@@ -88,15 +84,6 @@ def rename_as_trash_obstacle
   save!
 end
 
-def rename_as_descendant referers=true
-  self.action = :update
-  referers ? update_referer_content : update_referer_references_out
-  refresh_references_in
-  refresh_references_out
-  expire
-  Card::Lexicon.update self
-end
-
 private
 
 def name_incomplete?
@@ -114,9 +101,7 @@ def detect_illegal_compound_names
 end
 
 def changing_existing_tag_to_compound?
-  return false unless changing_name_to_compound?
-
-  name_in_use_as_tag?
+  changing_name_to_compound? && name_in_use_as_tag?
 end
 
 def name_in_use_as_tag?
@@ -150,7 +135,7 @@ end
 def prepare_new_side side, side_id, sidename
   return unless side_id == -1 || !Card[side_id]&.real?
 
-  sidecard = Director.card(sidename) || add_subcard(sidename)
+  sidecard = Director.card(sidename) || subcard(sidename)
   send "#{side}_id=", sidecard
 end
 
@@ -158,6 +143,6 @@ def prepare_obstructed_side side, side_id, sidename
   return unless side_id && side_id == id
 
   clear_name sidename
-  send "#{side}_id=", add_subcard(sidename)
+  send "#{side}_id=", subcard(sidename)
   true
 end

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

@@ -1,17 +1,12 @@
-# test for updating referer content
-event :prepare_referer_update, :validate, on: :update, changed: :name do
-  self.update_referers = ![nil, false, "false"].member?(update_referers)
+# when content changes, update references to other cards
+event :refresh_references_out, :finalize, on: :save, changed: :content do
+  update_references_out
 end
 
 # on rename, update names in cards that refer to self by name (as directed)
-event :update_referer_content, :finalize, on: :update, when: :update_referers do
-  referers.each do |card|
-    next if card.structure
-
-    card.skip_event! :validate_renaming, :check_permissions
-    card.content = card.replace_references name_before_act, name
-    attach_subcard card
-  end
+event :update_referer_content, :finalize, on: :update, changed: :name, skip: :allowed do
+  referers.each { |r| r.replace_references name_before_act, name }
+  each_descendant { |d| d.rename_as_descendant !skip_update_referers? }
 end
 
 # on rename, when NOT updating referer content, update references to ensure
@@ -19,51 +14,52 @@ end
 # eg.  A links to X+Y.  if X+Y is renamed and we're not updating the link in A,
 # then we need to be sure that A has a partial reference
 event :update_referer_references_out, :finalize,
-      changed: :name, on: :update, when: :not_update_referers do
+      changed: :name, on: :update, when: :skip_update_referers? do
   referers.map(&:update_references_out)
 end
 
 # when name changes, update references to card
 event :refresh_references_in, :finalize, changed: :name, on: :save do
-  Reference.unmap_referees id if action == :update && !update_referers
+  Reference.unmap_referees id if action == :update && skip_update_referers?
   Reference.map_referees key, id
 end
 
-# when content changes, update references to other cards
-event :refresh_references_out, :finalize, on: :save, changed: :content do
-  update_references_out
-end
-
 # clean up reference table when card is deleted
 event :clear_references, :finalize, on: :delete do
   delete_references_out
   Reference.unmap_referees id
 end
 
-# replace references in card content
-def replace_references old_name, new_name
-  cont = content_object
-  cont.find_chunks(:Reference).each do |chunk|
-    next unless replace_reference chunk, old_name, new_name
-  end
-  cont.to_s
-end
-
 protected
 
-def not_update_referers
-  !update_referers
+def skip_update_referers?
+  skip_event? :update_referer_content
 end
 
-private
+def rename_as_descendant referers=true
+  self.action = :update
+  referers ? update_referer_content : update_referer_references_out
+  # refresh_references_in
+  # refresh_references_out
+  expire
+  Card::Lexicon.update self
+end
+
+def replace_references old_name, new_name
+  self.content_quietly = swap_names(old_name, new_name) unless structure
+end
 
-def replace_reference chunk, old_name, new_name
-  return unless (old = chunk.referee_name) && (new = old.swap old_name, new_name)
+def content_quietly= new_content
+  self.content = new_content
+  return unless db_content_changed? # prevents loops
 
-  chunk.referee_name = chunk.replace_reference old_name, new_name
-  update_reference old.key, new.key
+  update_column :db_content, db_content
+  update_references_out
 end
 
-def update_reference old_key, new_key
-  Reference.where(referee_key: old_key).update_all referee_key: new_key
+private
+
+# delete references from this card
+def delete_references_out
+  Reference.where(referer_id: id).delete_all if id.present?
 end

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

@@ -1,8 +1,12 @@
+def card
+  self
+end
+
 event :reject_empty_subcards, :prepare_to_validate do
   subcards.each_with_key do |subcard, key|
-    next unless subcard.new? && subcard.unfilled?
+    next unless subcard.new? && subcard.unfilled? && !trigger.present?
 
-    remove_subcard(key)
+    drop_subcard(key)
     director.subdirectors.delete(subcard)
   end
 end

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

@@ -1,5 +1,4 @@
-Self::Admin.add_to_basket(
-  :tasks,
+basket[:tasks] << {
   name: :empty_trash,
   irreversible: true,
   execute_policy: -> { Card.empty_trash },
@@ -9,7 +8,7 @@ Self::Admin.add_to_basket(
     link_text: "empty trash",
     task: "empty_trash"
   }
-)
+}
 
 module ClassMethods
   def empty_trash
@@ -19,8 +18,7 @@ module ClassMethods
     Card::Action.delete_cardless
     Card::Change.delete_actionless
     Card::Act.delete_actionless
-    Card::Reference.unmap_if_referee_missing
-    Card::Reference.delete_if_referer_missing
+    Card::Reference.clean
   end
 
   # deletes any file not associated with a real card.
@@ -129,5 +127,5 @@ end
 
 def delete_as_subcard subcard
   subcard.trash = true
-  add_subcard subcard
+  subcard subcard
 end

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

@@ -1,13 +1,29 @@
 module ClassMethods
   def default_type_id
-    @@default_type_id ||= Card[:all].fetch(:default, skip_modules: true).type_id
+    @default_type_id ||= Card.fetch_type_id %i[all default]
   end
 end
 
-def type_card
-  return if type_id.nil?
+event :validate_type_change, :validate, on: :update, changed: :type_id do
+  return unless (c = dup) && c.action == :create && !c.valid?
 
-  Card.quick_fetch type_id.to_i
+  errors.add :type, t(:core_error_cant_change_errors,
+                      name: name,
+                      type_id: type_id,
+                      error_messages: c.errors.full_messages)
+end
+
+event :validate_type, :validate, changed: :type_id, on: :save do
+  errors.add :type, t(:core_error_no_such_type) unless type_name
+
+  if structure&.assigns_type? && type_id != structure.type_id
+    errors.add :type,
+               t(:core_error_hard_templated, name: name, type_name: structure.type_name)
+  end
+end
+
+def type_card
+  Card.quick_fetch type_id.to_i unless type_id.nil?
 end
 
 def type_code
@@ -36,26 +52,59 @@ def type_id= card_or_id
   write_card_or_id :type_id, card_or_id
 end
 
-def type_id_from_template
-  return unless name && (t = template)
+private
+
+def ensure_type_id lookup
+  return if lookup == :skip || (type_id && (lookup != :force))
+
+  old_type_id = type_id
+  new_type_id = type_id_from_code || type_id_from_template
 
-  reset_patterns # still necessary even with new template handling?
-  self.type_id = t.type_id
+  reset_patterns if new_type_id != old_type_id
+  self.type_id = new_type_id
 end
 
-event :validate_type_change, :validate, on: :update, changed: :type_id do
-  return unless (c = dup) && c.action == :create && !c.valid?
+def type_id_from_code
+  return if simple?
+  each_type_assigning_module_key do |module_key|
+    type_id = Card::Set::Type.assignment[module_key]
+    return type_id if type_id
+  end
+  nil
+end
 
-  errors.add :type, t(:core_error_cant_change_errors,
-                      name: name,
-                      type_id: type_id,
-                      error_messages: c.errors.full_messages)
+def type_id_from_template
+  name && template&.type_id
 end
 
-event :validate_type, :validate, changed: :type_id, on: :save do
-  errors.add :type, t(:core_error_no_such_type) unless type_name
+def normalize_type_attributes args
+  new_type_id = extract_type_id! args unless args.delete(:type_lookup) == :skip
+  args[:type_id] = new_type_id if new_type_id
+end
 
-  if (rt = structure) && rt.assigns_type? && type_id != rt.type_id
-    errors.add :type, t(:core_error_hard_templated, name: name, type_name: rt.type_name)
+def extract_type_id! args={}
+  case
+  when (type_id = args.delete(:type_id)&.to_i)
+    type_id.zero? ? nil : type_id
+  when (type_code = args.delete(:type_code)&.to_sym)
+    type_id_from_codename type_code
+  when (type_name = args.delete :type)
+    type_id_from_cardname type_name
   end
 end
+
+def type_id_from_codename type_code
+  type_id_or_error(type_code) { Card::Codename.id type_code }
+end
+
+def type_id_from_cardname type_name
+  type_id_or_error(type_name) { type_name.card_id }
+end
+
+def type_id_or_error val
+  type_id = yield
+  return type_id if type_id
+
+  errors.add :type, "#{val} is not a known type."
+  nil
+end

data/mod/core/set/self/version.rb

@@ -5,5 +5,5 @@ def ok_to_read
 end
 
 def content
-  Card::Version.release
+  Cardio::Version.release
 end

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

@@ -20,7 +20,7 @@ RSpec.describe Card::Set::All::NameEvents do
     actions_count_before = card.actions.count
     old_name = card.name
 
-    update! card.name, name: new_name, update_referers: true
+    update! card.name, name: new_name
     expect_action_added card, actions_count_before
     expect_old_name_cleared old_name
     expect_successful_rename card, attrs_before
@@ -66,7 +66,7 @@ RSpec.describe Card::Set::All::NameEvents do
   end
 
   it "wipes old references by default" do
-    update "Menu", name: "manure"
+    update "Menu", name: "manure", skip: :update_referer_content
     expect(Card["manure"].references_in.size).to eq(0)
   end
 
@@ -133,7 +133,7 @@ RSpec.describe Card::Set::All::NameEvents do
     end
 
     c = Card["Joe Card"]
-    c.update! name: "Card of Joe", update_referers: true
+    c.update! name: "Card of Joe"
     assert_equal "[[Card of Joe]]", Card["Admin Card"].content
   end
 
@@ -144,7 +144,7 @@ RSpec.describe Card::Set::All::NameEvents do
       Card.create! name: "Fruit+*type+*structure", content: "this [[Pit]]"
 
       assert_equal "this [[Pit]]", Card["Orange"].content
-      c.update! name: "Seed", update_referers: true
+      c.update! name: "Seed"
       assert_equal "this [[Seed]]", Card["Orange"].content
     end
   end
@@ -156,38 +156,38 @@ RSpec.describe Card::Set::All::NameEvents do
   context "with self references" do
     example "renaming card with self link should nothang" do
       pre_content = Card["self_aware"].content
-      update "self aware", name: "buttah", update_referers: true
+      update "self aware", name: "buttah"
       expect_card("Buttah").to have_content(pre_content)
     end
 
     it "renames card without updating references" do
       pre_content = Card["self_aware"].content
-      update "self aware", name: "Newt", update_referers: false
+      update "self aware", name: "Newt"
       expect_card("Newt").to have_content(pre_content)
     end
   end
 
   context "with references" do
     it "updates nests" do
-      update "Blue", name: "Red", update_referers: true
+      update "Blue", name: "Red"
       expect_card("blue includer 1").to have_content("{{Red}}")
       expect_card("blue includer 2").to have_content("{{Red|closed;other:stuff}}")
     end
 
     it "updates nests when renaming to plus" do
-      update "Blue", name: "blue includer 1+color", update_referers: true
+      update "Blue", name: "blue includer 1+color"
       expect_card("blue includer 1").to have_content("{{blue includer 1+color}}")
     end
 
     it "reference updates on case variants" do
-      update "Blue", name: "Red", update_referers: true
+      update "Blue", name: "Red"
       expect_card("blue linker 1").to have_content("[[Red]]")
       expect_card("blue linker 2").to have_content("[[Red]]")
     end
 
     it "handles link to and nest of same card" do
       update "blue linker 1", content: "[[Blue]] is {{Blue|name}}"
-      update "Blue", name: "Red", update_referers: true
+      update "Blue", name: "Red"
       expect_card("blue linker 1").to have_content("[[Red]] is {{Red|name}}")
     end
 

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

@@ -79,7 +79,7 @@ RSpec.describe Card::Set::All::Trash do
   end
 
   describe "event: validate_delete" do
-    it "certain 'all rules' should be indestructable" do
+    it "certain 'all rules' should be indestructible" do
       rule = "*all+*default"
       expect { Card[rule].delete! }
         .to raise_error(/is an indestructible rule/)

data/mod/core/spec/set/self/trash_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Self::Trash do
+RSpec.describe Card::Set::Self::Trash do
   specify "view core" do
     expect_view(:core).to have_tag("table")
   end