card 1.103.4 → 1.104.0

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

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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.103.4
+  version: 1.104.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -387,6 +401,7 @@ files:
 - db/migrate/20190929202325_rename_present_in_reference_table.rb
 - db/migrate/20200718051236_compound_names_do_not_store_name_and_key.rb
 - db/migrate/20200805200729_add_unique_pair_indeces.rb
+- db/migrate/20211128040849_virtuals_updated_at.rb
 - db/migrate_core_cards/20120611203506_rails_inflection_updates.rb
 - db/migrate_core_cards/20130411191151_renaming_for_menu.rb
 - db/migrate_core_cards/20130411211600_delete_old_related_tab_cards.rb
@@ -422,7 +437,6 @@ files:
 - db/migrate_core_cards/20150510031118_fix_skin_codenames.rb
 - db/migrate_core_cards/20150528084659_add_session_cardtype.rb
 - db/migrate_core_cards/20150601133433_add_recent_setting_session_card.rb
-- db/migrate_core_cards/20150605115802_add_performance_log_card.rb
 - db/migrate_core_cards/20150610171702_add_debugger_session_card.rb
 - db/migrate_core_cards/20150610180019_add_recaptcha_key_and_admin_info_cards.rb
 - db/migrate_core_cards/20150627205133_fix_script_bootstrap_card_type.rb
@@ -733,7 +747,6 @@ files:
 - lib/card/set/abstract.rb
 - lib/card/set/advanced_api.rb
 - lib/card/set/card_methods.rb
-- lib/card/set/code_nest.rb
 - lib/card/set/event.rb
 - lib/card/set/event/all.rb
 - lib/card/set/event/callbacks.rb
@@ -766,7 +779,6 @@ files:
 - lib/card/subcards/args.rb
 - lib/card/subcards/relate.rb
 - lib/card/subcards/remove.rb
-- lib/card/version.rb
 - lib/card/view.rb
 - lib/card/view/cache.rb
 - lib/card/view/cache/cache_action.rb
@@ -782,9 +794,9 @@ files:
 - lib/cardio/application.rb
 - lib/cardio/cli.rb
 - lib/cardio/commands.rb
-- lib/cardio/commands/USAGE
 - lib/cardio/commands/application.rb
 - lib/cardio/commands/command.rb
+- lib/cardio/commands/custom.rb
 - lib/cardio/commands/rake_command.rb
 - lib/cardio/commands/rake_command/parser.rb
 - lib/cardio/commands/rspec_command.rb
@@ -792,7 +804,6 @@ files:
 - lib/cardio/delaying.rb
 - lib/cardio/generators.rb
 - lib/cardio/generators/base.rb
-- lib/cardio/generators/class_methods.rb
 - lib/cardio/generators/deck_generator_loader.rb
 - lib/cardio/generators/deck_helper.rb
 - lib/cardio/generators/mod_base.rb
@@ -800,6 +811,7 @@ files:
 - lib/cardio/job.rb
 - lib/cardio/migration.rb
 - lib/cardio/migration/core.rb
+- lib/cardio/migration/deck.rb
 - lib/cardio/migration/deck_structure.rb
 - lib/cardio/migration/import.rb
 - lib/cardio/migration/import/import_data.rb
@@ -807,7 +819,10 @@ files:
 - lib/cardio/migration/import/import_data/card_content.rb
 - lib/cardio/migration/import/merger.rb
 - lib/cardio/mod.rb
+- lib/cardio/mod/class_methods.rb
 - lib/cardio/mod/dirs.rb
+- lib/cardio/mod/eat.rb
+- lib/cardio/mod/eat/edibles.rb
 - lib/cardio/mod/load_strategy.rb
 - lib/cardio/mod/load_strategy/eval.rb
 - lib/cardio/mod/load_strategy/pattern_tmp_files.rb
@@ -821,12 +836,14 @@ files:
 - lib/cardio/mod/modfile_api.rb
 - lib/cardio/mod/modfile_loader.rb
 - lib/cardio/mod/module_template.rb
+- lib/cardio/mod/poop.rb
 - lib/cardio/railtie.rb
 - lib/cardio/record.rb
 - lib/cardio/schema.rb
 - lib/cardio/script_loader.rb
 - lib/cardio/seed.rb
 - lib/cardio/utils.rb
+- lib/cardio/version.rb
 - lib/generators/deck/USAGE
 - lib/generators/deck/deck_generator.rb
 - lib/generators/deck/deck_generator/interactive.rb
@@ -879,10 +896,10 @@ files:
 - lib/generators/set/templates/set_spec_template.erb
 - lib/generators/set/templates/set_template.erb
 - lib/tasks/card.rake
-- lib/tasks/card/asset.rake
 - lib/tasks/card/create.rake
 - lib/tasks/card/migrate.rake
 - lib/tasks/card/mod.rake
+- mod/admin/locales/de.yml
 - mod/admin/locales/en.yml
 - mod/admin/set/all/admin.rb
 - mod/admin/set/self/admin.rb
@@ -890,6 +907,9 @@ files:
 - mod/admin/set/self/debugger.rb
 - mod/admin/spec/set/self/admin_info_spec.rb
 - mod/admin/spec/set/self/admin_spec.rb
+- mod/core/data/production.yml
+- mod/core/data/test.yml
+- mod/core/locales/de.yml
 - mod/core/locales/en.yml
 - mod/core/set/all/abort.rb
 - mod/core/set/all/assign_attributes.rb
@@ -921,10 +941,8 @@ files:
 - mod/core/set_pattern/08_type_plus_right.rb
 - mod/core/set_pattern/09_self.rb
 - mod/core/spec/set/all/assign_attributes_spec.rb
-- mod/core/spec/set/all/clean_me_spec.rb
 - mod/core/spec/set/all/codename_spec.rb
 - mod/core/spec/set/all/collection_spec.rb
-- mod/core/spec/set/all/export_spec.rb
 - mod/core/spec/set/all/initialize_spec.rb
 - mod/core/spec/set/all/name_events_spec.rb
 - mod/core/spec/set/all/states_spec.rb
@@ -934,21 +952,12 @@ files:
 - mod/core/spec/set/self/trash_spec.rb
 - mod/core/spec/set/self/version_spec.rb
 - mod/core/spec/set/type/cardtype_spec.rb
-- mod/standard/file/favicon/image-icon.png
-- mod/standard/file/favicon/image-large.png
-- mod/standard/file/favicon/image-medium.png
-- mod/standard/file/favicon/image-original.png
-- mod/standard/file/favicon/image-small.png
-- mod/standard/file/logo/image-original.svg
-- tmpsets/set_pattern/100-all.rb
-- tmpsets/set_pattern/101-all_plus.rb
-- tmpsets/set_pattern/102-type.rb
-- tmpsets/set_pattern/103-star.rb
-- tmpsets/set_pattern/104-rstar.rb
-- tmpsets/set_pattern/105-rule.rb
-- tmpsets/set_pattern/106-right.rb
-- tmpsets/set_pattern/107-type_plus_right.rb
-- tmpsets/set_pattern/108-self.rb
+- mod/standard/data/files/favicon/image-icon.png
+- mod/standard/data/files/favicon/image-large.png
+- mod/standard/data/files/favicon/image-medium.png
+- mod/standard/data/files/favicon/image-original.png
+- mod/standard/data/files/favicon/image-small.png
+- mod/standard/data/files/logo/image-original.svg
 homepage: https://decko.org
 licenses:
 - GPL-3.0
@@ -973,7 +982,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: a simple engine for emergent data structures

data/db/migrate_core_cards/20150605115802_add_performance_log_card.rb

@@ -1,7 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-class AddPerformanceLogCard < Cardio::Migration::Core
-  def up
-    Card.create! name: "*performance log", type_code: :pointer, codename: :performance_log
-  end
-end

data/lib/card/set/code_nest.rb

@@ -1,15 +0,0 @@
-# TODO: work in progress
-class Card
-  module Set
-    # ActiveCard support: accessing plus cards as attributes
-    module CodeNest
-      def nest *args
-        args.each do |arg|
-          add_nest arg
-        end
-      end
-
-      def add_nest args; end
-    end
-  end
-end

data/lib/card/version.rb

@@ -1,11 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-class Card
-  module Version
-    class << self
-      def release
-        @@version ||= File.read(File.expand_path("../../VERSION", __dir__)).strip
-      end
-    end
-  end
-end

data/lib/cardio/commands/USAGE

@@ -1,28 +0,0 @@
-  Usage: decko COMMAND [ARGS]
-
-  The most common decko commands are:
-   new         Create a new Decko deck. "decko new my_deck" creates a
-               new deck called MyDeck in "./my_deck"
-   seed        Create and seed the database specified in config/database.yml
-
-   server      Start the Rails server (short-cut alias: "s")
-   console     Start the Rails console (short-cut alias: "c")
-   dbconsole   Start a console for the database specified in config/database.yml
-               (short-cut alias: "db")
-
-  For core developers
-   cucumber     Run cucumber features (short-cut alias: "cc")
-   rspec        Run rspec tests (short-cut alias: "rs")
-   update       Run card migrations
-   load         Load bootstrap data into database
-
-  In addition to those, there are the standard rails commands:
-   generate     Generate new code (short-cut alias: "g")
-   application  Generate the Rails application code
-   destroy      Undo code generated with "generate" (short-cut alias: "d")
-   benchmarker  See how fast a piece of code runs
-   profiler     Get profile information from a piece of code
-   plugin       Install a plugin
-   runner       Run a piece of code in the application environment (short-cut alias: "r")
-
-  All commands can be run with -h (or --help) for more information.

data/lib/cardio/generators/class_methods.rb

@@ -1,35 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-module Cardio
-  module Generators
-    # methods shared across Generator bases (which inherit from Rails generator classes)
-    module ClassMethods
-      def source_root path=nil
-        if path
-          @_card_source_root = path
-        else
-          @_card_source_root ||= File.expand_path(
-            "../../../generators/#{generator_name}/templates", __FILE__
-          )
-        end
-      end
-
-      # Override Rails default banner (using card/decko for the command name).
-      def banner
-        usage_arguments = arguments.map(&:usage).join " "
-        text = "#{banner_command} generate #{namespace} #{usage_arguments} [options]"
-        text.gsub(/\s+/, " ")
-      end
-
-      def banner_command
-        "card"
-      end
-
-      # Override Rails namespace handling so we can put generators in `module Cardio`
-      def namespace name=nil
-        return super if name
-        @namespace ||= super.sub(/cardio:/, "")
-      end
-    end
-  end
-end

data/lib/tasks/card/asset.rake

@@ -1,22 +0,0 @@
-namespace :card do
-  namespace :asset do
-    desc "reset style and script machine outputs"
-    task reset: :environment do
-      Card::Machine.reset_all
-    end
-
-    desc "refresh style and script machine output (regenerate if needed)"
-    task refresh: :environment do
-      Card::Cache.reset_all
-      Card::Machine.refresh_assets
-      Card::Cache.reset_all # should not be necessary but breaking without...
-    end
-
-    desc "refresh style and script machine output (regenerate if needed)"
-    task refresh!: :environment do
-      Card::Cache.reset_all
-      Card::Machine.refresh_assets!
-      Card::Cache.reset_all # should not be necessary but breaking without...
-    end
-  end
-end