card 1.101.5 → 1.101.6

data/tmpsets/set/mod002-core/all/autoname.rb

@@ -0,0 +1,26 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class All
+# Set: All cards (Autoname)
+#
+module Autoname;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/autoname.rb"; end
+event :set_autoname, :prepare_to_store, on: :create, when: :autoname? do
+  self.name = autoname rule(:autoname)
+  autoname_card = rule_card :autoname
+  autoname_card.update_column :db_content, name
+  autoname_card.expire
+  pull_from_trash!
+  Card.write_to_soft_cache self
+end
+
+def no_autoname?
+  !autoname?
+end
+
+def autoname?
+  name.blank? &&
+    (@autoname_rule.nil? ? (@autoname_rule = rule(:autoname).present?) : @autoname_rule)
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/core/set/all/autoname.rb ~~

data/tmpsets/set/mod002-core/all/codename.rb

@@ -26,13 +26,14 @@ private
 def validate_codename_permission
   return if Auth.always_ok? || Auth.as_id == creator_id
 
-  errors.add :codename, tr(:only_admins_codename)
+  errors.add :codename, t(:core_only_admins_codename)
 end
 
 def validate_codename_uniqueness
   return (self.codename = nil) if codename.blank?
   return if errors.present? || !Card.find_by_codename(codename)
-  errors.add :codename, tr(:error_code_in_use, codename: codename)
+
+  errors.add :codename, t(:core_error_code_in_use, codename: codename)
 end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/core/set/all/codename.rb ~~

data/tmpsets/set/mod002-core/all/collection.rb

@@ -7,11 +7,9 @@ module Collection;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/collection.rb"; end
 module ClassMethods
-  def search spec, comment=nil
+  def search spec, comment=nil, &block
     results = ::Card::Query.run(spec, comment)
-    if block_given? && results.is_a?(Array)
-      results.each { |result| yield result }
-    end
+    results.each(&block) if block_given? && results.is_a?(Array)
     results
   end
 
@@ -21,11 +19,11 @@ module ClassMethods
     search spec.merge(return: "count")
   end
 
-  def find_each options={}
+  def find_each options={}, &block
     # this is a copy from rails (3.2.16) and is needed because this
     # is performed by a relation (ActiveRecord::Relation)
     find_in_batches(options) do |records|
-      records.each { |record| yield record }
+      records.each(&block)
     end
   end
 

data/tmpsets/set/mod002-core/all/content.rb

@@ -5,39 +5,77 @@ class Card; module Set; class All
 module Content;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/content.rb"; end
-def content= value
-  self.db_content = standardize_content(value)
+event :set_content, :store, on: :save do
+  self.db_content = prepare_db_content
+  @selected_action_id = @selected_content = nil
+  clear_drafts
+end
+
+event :save_draft, :store, on: :update, when: :draft? do
+  save_content_draft content
+  abort :success
+end
+
+event :set_default_content,
+      :prepare_to_validate,
+      on: :create, when: :use_default_content? do
+  self.db_content = template.db_content
+end
+
+def draft?
+  Env.params["draft"] == "true"
+end
+
+def clean_html?
+  true
+end
+
+def use_default_content?
+  !db_content_changed? && template && template.db_content.present?
+end
+
+def unfilled?
+  blank_content? && blank_comment? && !subcards?
 end
 
-def content
-  structured_content || standard_content
+def blank_comment?
+  comment.blank? || comment.strip.blank?
 end
-alias raw_content content #DEPRECATED!
 
-def content?
-  content.present?
+def prepare_db_content
+  cont = standard_db_content || "" # necessary?
+  clean_html? ? Card::Content.clean!(cont) : cont
 end
 
-def standard_content
-  db_content || (new_card? && template.db_content)
+def standard_db_content
+  if structure
+    # do not override db_content with content from structure
+    db_content
+  else
+    standard_content
+  end
 end
 
-def standardize_content value
-  value.is_a?(Array) ? value.join("\n") : value
+# seems like this should be moved to format so we can fall back on title
+# rather than name. (In fact, name, title, AND label is a bit much.
+# Trim to 2?)
+def label
+  name
 end
 
-def structured_content
-  structure && template.db_content
+def creator
+  Card[creator_id]
 end
 
-def refresh_content
-  self.content = Card.find(id)&.db_content
+def updater
+  Card[updater_id]
 end
 
 module Format; module_parent.send :register_set_format, Card::Format, self; extend Card::Set::AbstractFormat
   ONE_LINE_CHARACTER_LIMIT = 60
 
-  def chunk_list # override to customize by set
+  # override to customize by set
+  def chunk_list
     :default
   end
 
@@ -87,7 +125,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
     if text.size <= limit
       text
     else
-      text[0..(limit - 3)] + "..."
+      "#{text[0..(limit - 3)]}..."
     end
   end
 
@@ -101,87 +139,5 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     hidden_field :content, class: "d0-card-content"
   end
 end
-
-# seems like this should be moved to format so we can fall back on title
-# rather than name. (In fact, name, title, AND label is a bit much.
-# Trim to 2?)
-def label
-  name
-end
-
-def creator
-  Card[creator_id]
-end
-
-def updater
-  Card[updater_id]
-end
-
-def save_content_draft _content
-  clear_drafts
-end
-
-def clear_drafts
-  drafts.created_by(Card::Auth.current_id).each(&:delete)
-end
-
-def last_draft_content
-  drafts.last.card_changes.last.value
-end
-
-event :set_content, :store, on: :save do
-  self.db_content = prepare_db_content
-  @selected_action_id = @selected_content = nil
-  clear_drafts
-end
-
-event :save_draft, :store, on: :update, when: :draft? do
-  save_content_draft content
-  abort :success
-end
-
-event :set_default_content,
-      :prepare_to_validate,
-      on: :create, when: :use_default_content? do
-  self.db_content = template.db_content
-end
-
-def draft?
-  Env.params["draft"] == "true"
-end
-
-def prepare_db_content
-  cont = standard_db_content || "" # necessary?
-  clean_html? ? Card::Content.clean!(cont) : cont
-end
-
-def standard_db_content
-  if structure
-    # do not override db_content with content from structure
-    db_content
-  else
-    standard_content
-  end
-end
-
-def clean_html?
-  true
-end
-
-def use_default_content?
-  !db_content_changed? && template && template.db_content.present?
-end
-
-def unfilled?
-  blank_content? && blank_comment? && !subcards?
-end
-
-def blank_content?
-  content.blank? || content.strip.blank?
-end
-
-def blank_comment?
-  comment.blank? || comment.strip.blank?
-end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/core/set/all/content.rb ~~

data/tmpsets/set/mod002-core/all/contextual_content.rb

@@ -22,10 +22,8 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
     card.context_card
   end
 
-  def with_context context_card
-    card.with_context context_card do
-      yield
-    end
+  def with_context context_card, &block
+    card.with_context context_card, &block
   end
 
   def contextual_content context_card, options={}

data/tmpsets/set/mod002-core/all/debug.rb

@@ -10,21 +10,19 @@ def to_s
 end
 
 def inspect
-  tags = []
-  tags << "trash"    if trash
-  tags << "new"      if new_card?
-  tags << "frozen"   if frozen?
-  tags << "readonly" if readonly?
-  tags << "virtual"  if @virtual
-  tags << "set_mods_loaded" if @set_mods_loaded
-
   error_messages = errors.any? ? "<E*#{errors.full_messages * ', '}*>" : ""
-
-  "#<Card##{id}[#{debug_type}](#{name})#{error_messages}{#{tags * ','}}"
+  "#<Card##{id}[#{debug_type}](#{name})#{error_messages}{#{inspect_tags * ','}}"
 end
 
 private
 
+def inspect_tags
+  # trash
+  %w[new frozen readonly virtual set_mods_loaded].map do |tag|
+    tag if send "#{tag}?"
+  end.compact
+end
+
 def debug_type
   "#{type_code || ''}:#{type_id}"
 end

data/tmpsets/set/mod002-core/all/initialize.rb

@@ -5,7 +5,7 @@ class Card; module Set; class All
 module Initialize;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/initialize.rb"; end
-JUNK_INIT_ARGS = %w[missing skip_virtual id].freeze
+JUNK_INIT_ARGS = %i[missing skip_virtual id].freeze
 
 module ClassMethods
   def new args={}, _options={}
@@ -15,7 +15,7 @@ module ClassMethods
   end
 
   def with_normalized_new_args args={}
-    args = (args || {}).stringify_keys
+    args = (args || {}).symbolize_keys
     delete_junk_args args
     normalize_type_args args
     normalize_content_args args
@@ -29,17 +29,17 @@ module ClassMethods
   end
 
   def normalize_type_args args
-    %w[type type_code].each { |k| args.delete(k) if args[k].blank? }
+    %i[type type_code].each { |k| args.delete(k) if args[k].blank? }
   end
 
   def normalize_content_args args
-    args.delete("content") if args["attach"] # should not be handled here!
-    args["db_content"] = args.delete "content" if args["content"]
+    args.delete(:content) if args[:attach] # should not be handled here!
+    args[:db_content] = args.delete :content if args[:content]
   end
 end
 
 def initialize args={}
-  args["name"] = initial_name args["name"]
+  args[:name] = initial_name args[:name]
 
   handle_set_modules args do
     handle_type args do
@@ -50,14 +50,14 @@ def initialize args={}
 end
 
 def handle_set_modules args
-  skip_modules = args.delete "skip_modules"
+  skip_modules = args.delete :skip_modules
   yield
   include_set_modules unless skip_modules
 end
 
 def handle_type args
-  type_lookup = args["type_lookup"]
-  @supercard = args.delete "supercard"
+  type_lookup = args[:type_lookup]
+  @supercard = args.delete :supercard
 
   yield
   type_id_from_template if type_lookup == :force || (!type_id && type_lookup != :skip)
@@ -78,6 +78,10 @@ def include_set_modules
   self
 end
 
+def set_mods_loaded?
+  @set_mods_loaded == true
+end
+
 def uncacheable?
   @uncacheable == true
 end

data/tmpsets/set/mod002-core/all/name_events.rb

@@ -10,121 +10,119 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/name
 event :validate_name, :validate, on: :save, changed: :name, when: :no_autoname? do
   validate_legality_of_name
   return if errors.any?
+
   Card.write_to_soft_cache self
   validate_uniqueness_of_name
 end
 
+# called by validate_name
 event :validate_uniqueness_of_name, skip: :allowed do
-  # validate uniqueness of name
-
   return unless (existing_id = Card::Lexicon.id key) && existing_id != id
   # The above is a fast check but cannot detect if card is in trash
 
   # TODO: perform the following as a remote-only fetch (not yet supported)
   return unless (existing_card = Card.where(id: existing_id, trash: false).take)
 
-  errors.add :name, tr(:error_name_exists, name: existing_card.name)
+  errors.add :name, t(:core_error_name_exists, name: existing_card.name)
 end
 
+# called by validate_name
 event :validate_legality_of_name do
   if name.length > 255
-    errors.add :name, tr(:error_too_long, length: name.length)
+    errors.add :name, t(:core_error_too_long, length: name.length)
   elsif name.blank?
-    errors.add :name, tr(:error_blank_name)
+    errors.add :name, t(:core_error_blank_name)
   elsif name_incomplete?
-    errors.add :name, tr(:is_incomplete)
+    errors.add :name, t(:core_is_incomplete)
   elsif !name.valid?
-    errors.add :name, tr(:error_banned_characters, banned: Card::Name.banned_array * " ")
-  elsif changing_existing_tag_to_junction?
-    errors.add :name, tr(:error_name_tag, name: name)
+    errors.add :name, t(:core_error_banned_characters,
+                        banned: Card::Name.banned_array * " ")
+  elsif changing_existing_tag_to_compound?
+    errors.add :name, t(:core_error_name_tag, name: name)
   end
 end
 
 event :validate_key, after: :validate_name, on: :save, when: :no_autoname? do
   if key.empty?
-    errors.add :key, tr(:error_blank_key) if errors.empty?
+    errors.add :key, t(:core_error_blank_key) if errors.empty?
   elsif key != name.key
-    errors.add :key, tr(:error_wrong_key, key: key, name: name)
+    errors.add :key, t(:core_error_wrong_key, key: key, name: name)
   end
 end
 
-# STAGE: store
+event :validate_renaming, :validate, on: :update, changed: :name, skip: :allowed do
+  return if name_before_act&.to_name == name # just changing to new variant
 
-event :set_autoname, :prepare_to_store, on: :create, when: :autoname? do
-  self.name = autoname rule(:autoname)
-  rule_card(:autoname).update_column :db_content, name
-  pull_from_trash!
-  Card.write_to_soft_cache self
+  errors.add :content, t(:core_cannot_change_content) if content_is_changing?
+  errors.add :type, t(:core_cannot_change_type) if type_is_changing?
+  detect_illegal_compound_names
 end
 
+# STAGE: store
+
 event :expire_old_name, :store, changed: :name, on: :update do
   Director.expirees << name_before_act
 end
 
-event :update_lexicon_on_create, :finalize, changed: :name, on: :create do
-  Card::Lexicon.add self
-end
+event :rename_in_trash, after: :expire_old_name, on: :update do
+  existing_card = Card.find_by_key_and_trash name.key, true
+  return if !existing_card || existing_card == self
 
-event :update_lexicon_on_rename, :finalize, changed: :name, on: :update do
-  Card::Lexicon.update self
-end
-
-def lex
-  simple? ? name : [left_id, right_id]
-end
-
-def old_lex
-  if (old_left_id = left_id_before_act)
-    [old_left_id, right_id_before_act]
-  else
-    name_before_act
-  end
+  existing_card.rename_as_trash_obstacle
 end
 
 event :prepare_left_and_right, :store, changed: :name, on: :save do
   return if name.simple?
+
   prepare_side :left
   prepare_side :right
 end
 
-def prepare_side side
-  side_id = send "#{side}_id"
-  sidename = name.send "#{side}_name"
-  prepare_obstructed_side(side, side_id, sidename) ||
-    prepare_new_side(side, side_id, sidename)
+event :update_lexicon, :finalize, changed: :name, on: :save do
+  lexicon_action = @action == :create ? :add : :update
+  Card::Lexicon.send lexicon_action, self
 end
 
-def prepare_new_side side, side_id, sidename
-  return unless side_id == -1 || !Card[side_id]&.real?
+event :cascade_name_changes, :finalize, on: :update, changed: :name do
+  each_descendant { |d| d.rename_as_descendant update_referers }
+end
 
-  sidecard = Director.card(sidename) || add_subcard(sidename)
-  send "#{side}_id=", sidecard
+protected
+
+def rename_as_trash_obstacle
+  self.name = "#{name}*trash"
+  rename_in_trash_without_callbacks
+  save!
 end
 
-def prepare_obstructed_side side, side_id, sidename
-  return unless side_id && side_id == id
-  clear_name sidename
-  send "#{side}_id=", add_subcard(sidename)
-  true
+def rename_as_descendant referers=true
+  self.action = :update
+  referers ? update_referers : update_referer_references_out
+  refresh_references_in
+  refresh_references_out
+  expire
+  Card::Lexicon.update self
 end
 
+private
+
 def name_incomplete?
   name.parts.include?("") && !superleft&.autoname?
 end
 
-def no_autoname?
-  !autoname?
+def changed_from_simple_to_compound?
+  name.compound? && name_before_act.to_name.simple?
 end
 
-def autoname?
-  name.blank? &&
-    (@autoname_rule.nil? ? (@autoname_rule = rule(:autoname).present?) : @autoname_rule)
+def detect_illegal_compound_names
+  return unless changed_from_simple_to_compound? && child_ids(:right).present?
+
+  errors.add :name, "illegal name change; existing names end in +#{name_before_act}"
 end
 
-private
+def changing_existing_tag_to_compound?
+  return false unless changing_name_to_compound?
 
-def changing_existing_tag_to_junction?
-  return false unless changing_name_to_junction?
   name_in_use_as_tag?
 end
 
@@ -132,8 +130,8 @@ def name_in_use_as_tag?
   !Card.where(right_id: id, trash: false).take.nil?
 end
 
-def changing_name_to_junction?
-  name.junction? && simple?
+def changing_name_to_compound?
+  name.compound? && simple?
 end
 
 def old_name_in_way? sidecard
@@ -148,5 +146,27 @@ def clear_name name
   Card::Lexicon.cache.reset # probably overkill, but this for an edge case...
   # Card::Lexicon.delete id, key
 end
+
+def prepare_side side
+  side_id = send "#{side}_id"
+  sidename = name.send "#{side}_name"
+  prepare_obstructed_side(side, side_id, sidename) ||
+    prepare_new_side(side, side_id, sidename)
+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)
+  send "#{side}_id=", sidecard
+end
+
+def prepare_obstructed_side side, side_id, sidename
+  return unless side_id && side_id == id
+
+  clear_name sidename
+  send "#{side}_id=", add_subcard(sidename)
+  true
+end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card/mod/core/set/all/name_events.rb ~~