card 1.107.0 → 1.108.1

data/mod/core/data/transform/20140317035504_account_requests_to_signups.rb

@@ -3,7 +3,7 @@
 class AccountRequestsToSignups < Cardio::Migration::Transform
   def up
     newname = "Sign up"
-    newname = "*signup" if Card.exists? newname
+    newname = "*signup" if Card.exist? newname
 
     # get old codename and name out of the way
     old_signup = Card[:signup]
@@ -18,9 +18,8 @@ class AccountRequestsToSignups < Cardio::Migration::Transform
     new_signup.save!
 
     # move old "*signup+*thanks" to "Sign up+*type+*thanks"
-    thanks = Card[:thanks]
-    if (signup_thanks = Card["#{old_signup.name}+#{thanks.name}"])
-      signup_thanks.name = "#{new_signup.name}+#{Card[:type].name}+#{thanks.name}"
+    if (signup_thanks = [old_signup, :thanks].card)
+      signup_thanks.name = [new_signup, :type, :thanks].cardname
       signup_thanks.save!
     end
 
@@ -28,8 +27,7 @@ class AccountRequestsToSignups < Cardio::Migration::Transform
     old_signup.delete! unless Card.search(return: :id, left_id: old_signup.id).first
 
     # turn captcha off by default on signup
-    rulename = %i[signup type captcha].map { |code| Card[code].name } * "+"
-    captcha_rule = Card.fetch rulename, new: {}
+    captcha_rule = Card.fetch %i[signup type captcha].cardname, new: {}
     captcha_rule.content = "0"
     captcha_rule.save!
   end

data/mod/core/data/transform/20150724123438_update_file_and_image_cards.rb

@@ -76,7 +76,7 @@ class UpdateFileAndImageCards < Cardio::Migration::Transform
        journal_skin lumen_skin paper_skin readable_skin sandstone_skin
        simplex_skin slate_skin spacelab_skin superhero_skin united_skin
        yeti_skin].each do |name|
-      next unless (Card::Codename.exists?(name) && (card = name.to_sym.card))
+      next unless (Card::Codename.exist?(name) && (card = name.to_sym.card))
 
       card.update! codename: nil
       if (card = Card.fetch name, :image)

data/mod/core/data/transform/20190320091257_upgrade_recaptcha_to_v3.rb

@@ -15,12 +15,12 @@ class UpgradeRecaptchaToV3 < Cardio::Migration::Transform
       next unless Card::Codename[codename]
 
       update_card! codename,
-                   name: "#{Card[:recaptcha_settings].name}+#{new_name} key",
+                   name: [:recaptcha_settings, "#{new_name} key"].cardname,
                    codename: "recaptcha_#{new_name}_key"
     end
 
-    Card.ensure name: [Card[:recaptcha_settings].name, "minimum score"],
+    Card.ensure name: [:recaptcha_settings, "minimum score"].cardname,
                 codename: "recaptcha_minimum_score",
-                type_id: Card::NumberID
+                type: :number
   end
 end

data/mod/core/data/transform/20190502130029_add_shark_and_help_desk_role.rb

@@ -28,7 +28,7 @@ class AddSharkAndHelpDeskRole < Cardio::Migration::Transform
 
   def delete_right_read_permissions
     %i[machine_output head script style solid_cache].each do |n|
-      next unless Card::Codename.exists? n
+      next unless Card::Codename.exist? n
       delete_card [n, :right, :read]
     end
   end

data/mod/core/data/transform/20190822093633_move_help_text_to_code.rb

@@ -17,7 +17,7 @@ class MoveHelpTextToCode < Cardio::Migration::Transform
   def remove_search_help_rules
     %i[created edited children includes refers_to links_to included_by linked_to_by
        referred_to_by mates editors follow].each do |trait|
-      next unless Card::Codename.exists? trait
+      next unless Card::Codename.exist? trait
       delete_card [trait, :right, :help]
     end
   end
@@ -32,7 +32,7 @@ class MoveHelpTextToCode < Cardio::Migration::Transform
 
   def remove_self_help_rules *anchors
     anchors.each do |a|
-      next unless Card::Codename.exists? a
+      next unless Card::Codename.exist? a
       delete_card [a, :self, :help]
     end
   end

data/mod/core/data/transform/20190829205148_remove_add_help.rb

@@ -4,7 +4,7 @@ class RemoveAddHelp < Cardio::Migration::Transform
   def up
     Card.search(right: { codename: "add_help" },
                 left: { type_id: Card::SetID }).each do |card|
-      next if Card.exists? [card.left, :help]
+      next if Card.exist? [card.left, :help]
 
       Card.ensure name: [card.left, :help], content: card.content
     end

data/mod/core/lib/tasks/card/migrate.rake

@@ -15,10 +15,7 @@ namespace :card do
       puts "running schema migrations"
 
       interpret_env_schema
-      without_dumping do
-        run_migration :schema
-      end
-      Rake::Task["db:_dump"].invoke # write schema.rb
+      without_dumping { run_migration :schema }
       reset_column_information true
     end
 
@@ -49,10 +46,12 @@ namespace :card do
     end
 
     task port: :environment do
+      puts "porting"
       Cardio::Migration.port_all
     end
 
     task recode: :environment do
+      puts "recoding"
       Cardio::Mod.dirs.subpaths("data", "recode.yml").each_value do |path|
         YAML.load_file(path).each do |oldcode, newcode|
           Card::Codename.recode oldcode, newcode
@@ -114,6 +113,8 @@ def load_mod_lib
 end
 
 def without_dumping
-  ActiveRecord::Base.dump_schema_after_migration = false
+  unless ENV["DECKO_DUMP_SCHEMA"] == "true"
+    ActiveRecord.dump_schema_after_migration = false
+  end
   yield
 end

data/mod/core/lib/tasks/card/mod.rake

@@ -23,11 +23,14 @@ namespace :card do
 
     desc "uninstall leftover mods"
     task uninstall: :environment do
+      puts "uninstalling unconfigured mods"
       Cardio::Mod.ensure_uninstalled
     end
 
     desc "install all mods"
     task install: :environment do
+      puts "installing mods"
+      Card::Auth.signin :wagn_bot.card
       # Cardio.config.compress_assets = true # should not be here, imo #efm
       Cardio::Mod.ensure_installed
     end

data/mod/core/lib/tasks/card/seed.rake

@@ -17,6 +17,7 @@ namespace :card do
 
     # desc "finalize seed data with migrations, installations, asset coding, and cleaning"
     task polish: :environment do
+      ENV["DECKO_DUMP_SCHEMA"] = "true"
       ENV["STAMP_MIGRATIONS"] = "true"
 
       invoke_card_tasks %w[update assets:code]

data/mod/core/lib/tasks/card.rake

@@ -13,8 +13,7 @@ namespace :card do
       ENV["NO_RAILS_CACHE"] = "true"
       # Benchmark.bm do |x|
       ["migrate:port", "migrate:schema", "migrate:recode", :eat, "migrate:transform",
-       :reset,
-       "mod:uninstall", "mod:install", "mod:symlink"].each do |task|
+       "mod:uninstall", "mod:install", "mod:symlink", :reset].each do |task|
         Rake::Task["card:#{task}"].invoke
       end
     end
@@ -22,6 +21,7 @@ namespace :card do
 
   desc "Ingests card data from mod yaml"
   task eat: :environment do
+    puts "eating"
     parse_options :eat do
       add_opt :m, :mod, "only eat cards in given mod"
       add_opt :n, :name, "only eat card with name (handles : for codenames)"
@@ -48,6 +48,7 @@ namespace :card do
 
   desc "Exports card data to mod yaml"
   task sow: :environment do
+    puts "sowing"
     parse_options :sow do
       add_opt :n, :name, "export card with name/mark (handles : and ~ prefixes)"
       flag_opt :i, :items, "also export card items (with -n)"
@@ -66,6 +67,9 @@ namespace :card do
 
   desc "Clears both cache and tmpfiles"
   task reset: :environment do
+    puts "resetting"
+    Card::Cache.shared_on!
+
     parse_options :reset do
       flag_opt :c, :cache, "cache only"
       flag_opt :t, :tmpfiles, "tmpfiles only"

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

@@ -4,7 +4,7 @@ event :set_autoname, :prepare_to_store, on: :create, when: :autoname? do
   autoname_card.update_column :db_content, name
   autoname_card.expire
   pull_from_trash!
-  Card.write_to_soft_cache self
+  Card.write_to_temp_cache self
 end
 
 def no_autoname?

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

@@ -1,11 +1,3 @@
-def codename
-  super&.to_sym
-end
-
-def codename?
-  codename.present?
-end
-
 event :validate_codename, :validate, on: :update, changed: :codename do
   validate_codename_permission
   validate_codename_uniqueness
@@ -20,6 +12,12 @@ end
 
 private
 
+def validate_codename_characters
+  return unless codename.to_s.match?(/[^a-z_]/)
+
+  errors.add :codename, t(:core_error_codename_special_characters)
+end
+
 def validate_codename_permission
   return if Auth.always_ok? || Auth.as_id == creator_id
 

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

@@ -4,13 +4,13 @@ event :validate_name, :validate, on: :save, changed: :name, when: :no_autoname?
   validate_legality_of_name
   return if errors.any?
 
-  Card.write_to_soft_cache self
+  Card.write_to_temp_cache self
   validate_uniqueness_of_name
 end
 
 # called by validate_name
 event :validate_uniqueness_of_name, skip: :allowed do
-  return unless (existing_id = Card::Lexicon.id key) && existing_id != id
+  return unless (existing_id = 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)
@@ -71,9 +71,11 @@ event :prepare_left_and_right, :store, changed: :name, on: :save do
   prepare_side :right
 end
 
-event :update_lexicon, :finalize, changed: :name, on: :save do
-  lexicon_action = @action == :create ? :add : :update
-  Card::Lexicon.send lexicon_action, self
+# as soon as the name has an id, we have to update the lexicon.
+# (the after_store callbacks are called _right_ after the storage)
+event :update_lexicon, :store, changed: :name do
+  lexicon_action = @action == :create ? :add : @action
+  director.after_store { |card| Lexicon.send lexicon_action, card }
 end
 
 protected

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

@@ -54,7 +54,7 @@ def abort_success
     @supercard.subcards.remove key
     @supercard.director.subdirectors.delete self
   end
-  expire :soft
+  expire :temp
   true
 end
 

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

@@ -57,10 +57,8 @@ event :delete_children, after: :validate_delete, on: :delete do
 end
 
 def pull_from_trash!
-  return unless (id = Card::Lexicon.id key) # name is already known
-  return unless (trashed_card = Card.where(id: id).take)&.trash
-
-  # confirm name is actually in trash
+  query = Lexicon.lex_query(lex).merge trash: true
+  return unless (trashed_card = Card.where(query).take)
 
   db_attributes["id"] = trashed_card.db_attributes["id"]
   # id_in_database returns existing card id

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

@@ -37,7 +37,7 @@ end
 alias_method :type, :type_name
 
 def type_name_or_default
-  type_card.try(:name) || Card.quick_fetch(Card.default_type_id).name
+  type_card.try(:name) || Card.default_type_id.cardname
 end
 
 def type_cardname

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

@@ -28,7 +28,7 @@ format :html do
       content_tag(:h1, "Roles"),
       card.all_admin_configs_grouped_by(:roles, :category).map do |(role, configs_by_cat)|
         output [
-          content_tag(:h2, Card[role.to_sym].name),
+          content_tag(:h2, role.to_sym.cardname),
           (configs_by_cat.map do |(cat, configs)|
             list_section cat, configs.map(&:codename)
           end)

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

@@ -16,7 +16,7 @@ format :html do
     [
       card.name,
       "#{time_ago_in_words(card.updated_at)} ago",
-      Card[card.updater_id].name,
+      card.updater_id.cardname,
       "#{history_link(card)} | #{restore_link(card)}"
     ]
   end

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

@@ -73,7 +73,7 @@ RSpec.describe Card::Set::All::Trash do
       create! "born to die"
       create! "born to die+slowly"
       create! "slowly+born to die"
-      create! "born to die+slowly+without regrets"
+      bsw = create! "born to die+slowly+without regrets"
 
       Card["born to die"].delete!
 
@@ -84,8 +84,8 @@ RSpec.describe Card::Set::All::Trash do
       expect(Card["slowly"]).to be_a Card
       expect(Card["without regrets"]).to be_a Card
 
-      trashed_dependant = Card.find Card::Lexicon.id("born to die+slowly+without regrets")
-      expect(trashed_dependant.trash).to be_truthy
+      trashed_dependent = Card.find bsw.id
+      expect(trashed_dependent.trash).to be_truthy
     end
 
     # TODO: explain what this adds to testing above or remove test.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.107.0
+  version: 1.108.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-11-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.17.0
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -270,98 +270,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: actionmailbox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: '7.1'
 description: Cards are wiki-inspired data atoms.Card "Sharks" use links, nests, types,
   patterned names, queries, views, events, and rules to create rich structures.
 email:
@@ -383,12 +383,14 @@ files:
 - config/i18n-tasks.yml
 - config/initializers/01_core_extensions/array.rb
 - config/initializers/01_core_extensions/hash.rb
+- config/initializers/01_core_extensions/integer.rb
 - config/initializers/01_core_extensions/kernel.rb
 - config/initializers/01_core_extensions/match_data.rb
 - config/initializers/01_core_extensions/module.rb
 - config/initializers/01_core_extensions/object.rb
-- config/initializers/01_core_extensions/persistent_identifiers.rb
+- config/initializers/01_core_extensions/persistent_identifier.rb
 - config/initializers/01_core_extensions/string.rb
+- config/initializers/01_core_extensions/symbol.rb
 - config/initializers/02_patches/active_job.rb
 - config/initializers/02_patches/active_record.rb
 - config/initializers/02_patches/active_support.rb
@@ -420,9 +422,10 @@ files:
 - lib/card/cache.rb
 - lib/card/cache/all.rb
 - lib/card/cache/card_class.rb
-- lib/card/cache/persistent.rb
-- lib/card/cache/persistent_class.rb
-- lib/card/cache/prepopulate.rb
+- lib/card/cache/class_methods.rb
+- lib/card/cache/populate.rb
+- lib/card/cache/shared.rb
+- lib/card/cache/shared_class.rb
 - lib/card/cache/temporary.rb
 - lib/card/codename.rb
 - lib/card/content.rb
@@ -594,6 +597,7 @@ files:
 - lib/cardio/job.rb
 - lib/cardio/migration.rb
 - lib/cardio/migration/assumption.rb
+- lib/cardio/migration/port.rb
 - lib/cardio/migration/schema.rb
 - lib/cardio/migration/stamp.rb
 - lib/cardio/migration/transform.rb
@@ -710,6 +714,8 @@ files:
 - mod/core/data/schema/20200805200729_add_unique_pair_indices.rb
 - mod/core/data/schema/20211128040849_virtuals_updated_at.rb
 - mod/core/data/schema/20221031182227_remove_referee_key_requirement.rb
+- mod/core/data/schema/20240628212556_add_trash_index.rb
+- mod/core/data/schema/20241017160402_unique_codename.rb
 - mod/core/data/test.yml
 - mod/core/data/test/cardtype.yml
 - mod/core/data/test/sample.yml
@@ -803,7 +809,7 @@ files:
 - mod/core/spec/shared_examples/mod_admin_config.rb
 homepage: https://decko.org
 licenses:
-- GPL-3.0
+- GPL-3.0-or-later
 metadata:
   source_code_uri: https://github.com/decko-commons/decko
   homepage_uri: https://decko.org

data/lib/card/cache/prepopulate.rb

@@ -1,48 +0,0 @@
-class Card
-  class Cache
-    # pre-populate cache for testing purposes
-    module Prepopulate
-      def restore
-        reset_soft
-        prepopulate
-      end
-
-      private
-
-      def prepopulate?
-        Cardio.config.prepopulate_cache
-      end
-
-      def prepopulate
-        return unless prepopulate?
-
-        prepopulate_rule_caches
-        # prepopulate_lexicon_caches
-      end
-
-      def prepopulate_cache variable
-        @prepopulated ||= {}
-        value = @prepopulated[variable] ||= yield
-        Card.cache.soft.write variable, value.clone
-      end
-
-      # def prepopulate_lexicon_caches
-      # end
-
-      def prepopulate_rule_caches
-        prepopulate_cache("RULES") { Card::Rule.rule_cache }
-        prepopulate_cache("READRULES") { Card::Rule.read_rule_cache }
-        prepopulate_cache("PREFERENCES") { Card::Rule.preference_cache }
-      end
-
-      # def prepopulate_card_cache
-      #   prepopulate_cache "ALL_CARDS" do
-      #     Card.find_each do |card|
-      #       Card.write_to_cache card
-      #     end
-      #     true
-      #   end
-      # end
-    end
-  end
-end