card 1.103.3 → 1.104.2

data/lib/generators/mod/USAGE

@@ -31,3 +31,4 @@ Example:
                 right/
                 self/
             README.md
+

data/lib/tasks/card/migrate.rake

@@ -19,10 +19,12 @@ end
 #   in mods in the deck
 def reset_column_information mod=false
   Rails.application.eager_load!
-  load_mod_lib if mod
+  load_mod_lib if mod && !ENV["NO_CARD_LOAD"]
   Cardio::Record.descendants.each(&:reset_column_information)
 end
 
+# FIXME: too general
+# intent is to find Record classes; this gets a lot more.
 def load_mod_lib
   Dir.glob(Cardio.root.join("mod/*/lib/*.rb")).sort.each { |x| require x }
 end
@@ -33,6 +35,44 @@ def without_dumping
 end
 
 namespace :card do
+  desc "migrate structure and cards"
+  task migrate: :environment do
+    ENV["NO_RAILS_CACHE"] = "true"
+    ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
+
+    stamp = ENV["STAMP_MIGRATIONS"]
+
+    puts "migrating structure"
+    Rake::Task["card:migrate:structure"].invoke
+    Rake::Task["card:migrate:stamp"].invoke :structure if stamp
+
+    puts "migrating deck structure"
+    Rake::Task["card:migrate:deck_structure"].execute
+    if stamp
+      Rake::Task["card:migrate:stamp"].reenable
+      Rake::Task["card:migrate:stamp"].invoke :core_cards
+    end
+
+    puts "migrating core cards"
+    Card::Cache.reset_all
+    # not invoke because we don't want to reload environment
+    Rake::Task["card:migrate:core_cards"].execute
+    if stamp
+      Rake::Task["card:migrate:stamp"].reenable
+      Rake::Task["card:migrate:stamp"].invoke :core_cards
+    end
+
+    puts "migrating deck cards"
+    # not invoke because we don't want to reload environment
+    Rake::Task["card:migrate:deck_cards"].execute
+    if stamp
+      Rake::Task["card:migrate:stamp"].reenable
+      Rake::Task["card:migrate:stamp"].invoke :deck_cards
+    end
+
+    Card::Cache.reset_all
+  end
+
   namespace :migrate do
     desc "migrate cards"
     task cards: %i[core_cards deck_cards]

data/lib/tasks/card/mod.rake

@@ -1,25 +1,32 @@
 namespace :card do
   namespace :mod do
+    task list: :environment do
+      Cardio.mods.each { |m| puts "#{m.name}: #{m.path}".green }
+    end
+
     desc "symlink from deck public/{modname} to mod's public directory"
     task symlink: :environment do
       FileUtils.rm_rf public_mod_dir
       FileUtils.mkdir_p public_mod_dir
-      Cardio::Mod.dirs.each_public_path do |mod, target|
+      Cardio::Mod.dirs.each_subpath "public" do |mod, target|
         link = public_mod_dir mod
         FileUtils.rm_rf link
         FileUtils.ln_sf target, link
       end
     end
 
+    task missing: :environment do
+      Cardio::Mod.missing.each { |m| puts m.modname.yellow }
+    end
+
+    task uninstall: :environment do
+      Cardio::Mod.ensure_uninstalled
+    end
+
     desc "install all mods"
     task install: :environment do
-      Card::Machine.reset_script
-      Card::Cache.reset_all
-      puts "installing card mods".green
-      Cardio::Mod.dirs.mods.each do |mod|
-        mod.ensure_mod_installed
-        Card::Cache.reset_all
-      end
+      Cardio.config.compress_assets = true
+      Cardio::Mod.ensure_installed
     end
 
     def public_mod_dir subdir=nil

data/lib/tasks/card.rake

@@ -1,105 +1,65 @@
-namespace :card do
-  def importer
-    @importer ||= Cardio::Migration::Import.new Cardio::Migration.data_path
-  end
-
-  desc "merge import card data that was updated since the last push into " \
-       "the the database"
-  task merge: :environment do
-    importer.merge
-  end
-
-  desc "merge all import card data into the the database"
-  task merge_all: :environment do
-    importer.merge all: true
-  end
-
-  desc "add card to import data"
-  task pull: :environment do
-    pull_card
-  end
+require "optparse"
 
-  desc "add card and all nested cards to import data"
-  task deep_pull: :environment do
-    pull_card deep: true
+namespace :card do
+  desc "ingest card data from mod yaml"
+  task eat: :environment do
+    parse_options :eat do
+      add_opt :m, :mod, "only merge cards in given mod"
+      add_opt :e, :env, "environment of yaml source (default is current env)"
+      add_opt :u, :user, "user to credit unless specified (otherwise uses Decko Bot)"
+      flag_opt :v, :verbose, "progress info and error backtraces"
+    end
+    Cardio::Mod::Eat.new(**options).up
+    exit 0
   end
 
-  desc "add nested cards to import data (not the card itself)"
-  task deep_pull_items: :environment do
-    pull_card items_only: true
-  end
+  desc "export card data to mod yaml"
+  task poop: :environment do
+    parse_options :poop do
+      add_opt :n, :name, "export card with name/mark (handles : and ~ prefixes)"
+      flag_opt :i, :items, "also export card items (with -n)"
+      flag_opt :o, :only_items, "also export card items (with -n)", items: :only
+      add_opt :c, :cql, "export cards found by CQL (in JSON format)"
+      add_opt :m, :mod, "output yaml to data/environment.yml file in mod"
+      add_opt :e, :env, "environment to dump to (default is current env)"
+      add_opt :t, :field_tags, "comma-separated list of field tag marks"
+    end
+    result = Cardio::Mod::Poop.new(**options).out
+    exit 0 if result == :success
 
-  # be rake card:pull_export from=live
-  desc "add items of the export card to import data"
-  task pull_export: :environment do
-    importer.pull "export", items_only: true, remote: ENV["from"]
+    puts "ERROR in card:poop\n  #{result}".red
+    exit 1
   end
 
-  desc "add a new card to import data"
-  task add: :environment do
-    _task, name, type, codename = ARGV
-    importer.add_card name: name, type: type || "Basic", codename: codename
-    exit
+  desc "reset cache"
+  task reset_cache: :environment do
+    Card::Cache.reset_all
   end
 
-  desc "register remote for importing card data"
-  task add_remote: :environment do
-    _task, name, url = ARGV
-    raise "no name given" unless name.present?
-    raise "no url given" unless url.present?
-
-    importer.add_remote name, url
-    exit
+  def options
+    @options ||= {}
   end
 
-  def pull_card opts={}
-    _task, card = ARGV
-    raise "no card given" unless card.present?
-
-    importer.pull card, opts.merge(remote: ENV["from"])
-    exit # without exit the card argument is treated as second rake task
+  def flag_opt letter, key, desc, hash=nil
+    hash ||= { key => true }
+    op.on("-#{letter}", "--#{key.to_s.tr '_', '-'}", desc) { options.merge! hash }
   end
 
-  desc "migrate structure and cards"
-  task migrate: :environment do
-    ENV["NO_RAILS_CACHE"] = "true"
-    ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
-
-    stamp = ENV["STAMP_MIGRATIONS"]
-
-    puts "migrating structure"
-    Rake::Task["card:migrate:structure"].invoke
-    Rake::Task["card:migrate:stamp"].invoke :structure if stamp
-
-    puts "migrating deck structure"
-    Rake::Task["card:migrate:deck_structure"].execute
-    if stamp
-      Rake::Task["card:migrate:stamp"].reenable
-      Rake::Task["card:migrate:stamp"].invoke :core_cards
-    end
-
-    puts "migrating core cards"
-    Card::Cache.reset_all
-    # not invoke because we don't want to reload environment
-    Rake::Task["card:migrate:core_cards"].execute
-    if stamp
-      Rake::Task["card:migrate:stamp"].reenable
-      Rake::Task["card:migrate:stamp"].invoke :core_cards
-    end
-
-    puts "migrating deck cards"
-    # not invoke because we don't want to reload environment
-    Rake::Task["card:migrate:deck_cards"].execute
-    if stamp
-      Rake::Task["card:migrate:stamp"].reenable
-      Rake::Task["card:migrate:stamp"].invoke :deck_cards
+  def add_opt letter, key, desc
+    op.on "-#{letter}", "--#{key.to_s.tr '_', '-'} #{key.to_s.upcase}", desc do |val|
+      options[key] = val
     end
+  end
 
-    Card::Cache.reset_all
+  def op
+    @op ||= OptionParser.new
   end
 
-  desc "reset cache"
-  task reset_cache: :environment do
-    Card::Cache.reset_all
+  def parse_options task
+    op.banner = "Usage: rake card:#{task} -- [options]"
+    yield if block_given?
+    args = op.order!(ARGV) {}
+    # args << "-h" if args.empty?
+    op.parse! args
   end
 end

data/mod/admin/locales/de.yml

@@ -0,0 +1,4 @@
+de:
+  admin_warn: ADMINISTRATOR WARNUNG
+  admin_email_off:
+    E-Mail-Versand ist ausgeschaltet. Ändere die Einstellungen in %{path}, damit Benachrichtigungen verschickt werden, wenn sich neue Nutzer registrieren.

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

@@ -17,8 +17,8 @@ event :admin_tasks, :initialize, on: :update do
   when :repair_references    then Card::Reference.repair_all
   when :repair_permissions   then Card.repair_all_permissions
   when :clear_solid_cache    then Card.clear_solid_cache
-  when :clear_machine_cache  then Card::Machine.reset_all
-  when :clear_script_cache   then Card::Machine.reset_script
+  when :regenerate_assets    then Card::Assets.refresh_assets force: true
+  # when :regenerate_scripts   then Card::Assets.refresh_scripts
   when :clear_history
     not_allowed "clear history" unless irreversibles_tasks_allowed?
     Card::Action.delete_old
@@ -71,10 +71,12 @@ format :html do
         count: solid_cache_count, unit: " cards",
         link_text: "clear solid cache",
         task: "clear_solid_cache" },
-      { title: "machine cache",
-        count: machine_cache_count, unit: " cards",
-        link_text: "clear machine cache",
-        task: "clear_machine_cache" }
+      { title: "style assets",
+        link_text: "regenerate styles and scripts",
+        task: "regenerate_assets" } # ,
+      # { title: "script assets",
+      #   link_text: "regenerate scripts",
+      #   task: "regenerate_scripts" }
     ]
     # return stats unless Card.config.view_cache#
     # stats << { title: "view cache",
@@ -117,8 +119,8 @@ format :html do
     Card.search right: { codename: "solid_cache" }, return: "count"
   end
 
-  def machine_cache_count
-    Card::Virtual.where(right_id: MachineCacheID).count
+  def asset_input_cache_count
+    Card.where(right_id: AssetInputCacheID).count
   end
 
   def delete_sessions_link months

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/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 !skip_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,12 +1,12 @@
+# 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, changed: :name, skip: :allowed 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
+  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
@@ -24,41 +24,42 @@ event :refresh_references_in, :finalize, changed: :name, on: :save do
   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 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_reference chunk, old_name, new_name
-  return unless (old = chunk.referee_name) && (new = old.swap old_name, new_name)
+def replace_references old_name, new_name
+  self.content_quietly = swap_names(old_name, new_name) unless structure
+end
+
+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

@@ -18,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.
@@ -128,5 +127,5 @@ end
 
 def delete_as_subcard subcard
   subcard.trash = true
-  add_subcard subcard
+  subcard subcard
 end