card 1.102.0 → 1.103.0

data/db/seed/test/fixtures/schema_migrations_core_cards.yml

@@ -316,4 +316,24 @@ schema_migrations_core_cards_157:
 schema_migrations_core_cards_158:
   version: '20191118145629'
 schema_migrations_core_cards_159:
+  version: '20200804112345'
+schema_migrations_core_cards_160:
+  version: '20200804112346'
+schema_migrations_core_cards_161:
+  version: '20200804112347'
+schema_migrations_core_cards_162:
+  version: '20200804112348'
+schema_migrations_core_cards_163:
+  version: '20200805112346'
+schema_migrations_core_cards_164:
+  version: '20200806112346'
+schema_migrations_core_cards_165:
+  version: '20200809112346'
+schema_migrations_core_cards_166:
   version: '20200821231558'
+schema_migrations_core_cards_167:
+  version: '20201115133753'
+schema_migrations_core_cards_168:
+  version: '20201129140917'
+schema_migrations_core_cards_169:
+  version: '20210509141814'

data/db/test_seed.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 require "timecop"
+require "active_support/core_ext/numeric/time"
 
 # noinspection RubyResolve
 class SharedData
@@ -12,7 +13,7 @@ class SharedData
     "Big Brother", "Optic fan", "Sunglasses fan", "Narcissist"
   ].freeze
 
-  CARDTYPE_COUNT = 44
+  CARDTYPE_COUNT = 54
 
   class << self
     def create_user name, args
@@ -210,6 +211,10 @@ class SharedData
       create "Cardtype E+*type+*default"
     end
 
+    def future_stamp
+      Time.zone.local 2020, 1, 1, 0, 0, 0
+    end
+
     def notification_cards
       Timecop.freeze(Cardio.future_stamp - 1.day) do
         # fwiw Timecop is apparently limited by ruby Time object,

data/lib/card/auth/current.rb

@@ -76,7 +76,7 @@ class Card
       end
 
       def session_user_key
-        "user_#{Cardio.database_name.underscore}".to_sym
+        "user_#{Cardio.database.underscore}".to_sym
       end
 
       private

data/lib/card/cache.rb

@@ -107,7 +107,7 @@ class Card
       # (the non-standard caches)
       def reset_other
         Card::Codename.reset_cache
-        Cardio.delete_tmp_files!
+        Cardio::Utils.delete_tmp_files!
       end
 
       # generate a cache key from an object

data/lib/card/cache/persistent.rb

@@ -27,7 +27,7 @@ class Card
         @store = opts[:store]
         @klass = opts[:class]
         @class_key = @klass.to_s.to_name.key
-        @database = opts[:database] || Cardio.database_name
+        @database = opts[:database] || Cardio.database
       end
 
       # renew insures you're using the most current cache version by

data/lib/card/cache/persistent_class.rb

@@ -12,7 +12,7 @@ class Card
       end
 
       def stamp_key
-        "#{Cardio.database_name}-stamp"
+        "#{Cardio.database}-stamp"
       end
 
       def renew

data/lib/card/codename.rb

@@ -138,7 +138,7 @@ class Card
 
       def unknown_codename! mark
         raise Card::Error::CodenameNotFound,
-              Cardio.t(:lib_exception_unknown_codename, codename: mark)
+              ::I18n.t(:lib_exception_unknown_codename, codename: mark)
       end
 
       def id_constant codename, id=nil

data/lib/card/director/all.rb

@@ -23,19 +23,19 @@ class Card
         act(as_subcard: as_subcard) { super **args }
       end
 
-      def save *args
+      def save *_args
         act { super }
       end
 
-      def valid? *args
+      def valid? *_args
         act(validating: true) { super }
       end
 
-      def update *args
+      def update *_args
         act { super }
       end
 
-      def update! *args
+      def update! *_args
         act { super }
       end
 

data/lib/card/error.rb

@@ -22,7 +22,7 @@ class Card
     end
 
     def message_from_card
-      Cardio.t :lib_exception_for_card, cardname: card.name, message: card_message_text
+      ::I18n.t :lib_exception_for_card, cardname: card.name, message: card_message_text
     end
 
     def backtrace

data/lib/card/format.rb

@@ -47,7 +47,7 @@ class Card
     def require_card_to_initialize!
       return if @card
 
-      raise Card::Error, Cardio.t(:lib_exception_init_without_card)
+      raise Card::Error, ::I18n.t(:lib_exception_init_without_card)
     end
 
     def include_set_format_modules

data/lib/card/format/error.rb

@@ -47,7 +47,7 @@ class Card
         if card&.name.present?
           safe_name
         else
-          Cardio.t :lib_no_cardname
+          ::I18n.t :lib_no_cardname
         end
       end
 

data/lib/card/format/nest/fetch.rb

@@ -24,7 +24,7 @@ class Card
         end
 
         def not_found_codename_error codename
-          Cardio.t :lib_exception_unknown_codename, codename: codename
+          ::I18n.t :lib_exception_unknown_codename, codename: codename
         end
 
         def new_card cardish

data/lib/card/model/save_helper.rb

@@ -60,7 +60,7 @@ class Card
 
         card = Card[name]
         card.update! codename: nil
-        card.delete!
+        card.delete! update_referers: true
       end
 
       # create if card doesn't exist

data/lib/card/model/save_helper/save_arguments.rb

@@ -86,7 +86,9 @@ class Card
         end
 
         def standard_changing_arg card, key, value
-          card.send(key) != value unless value.is_a? ::File
+          return true if value.is_a? ::File
+
+          card.send(key) != value
         end
       end
     end

data/lib/card/reference/all.rb

@@ -64,7 +64,7 @@ class Card
 
       # delete references from this card
       def delete_references_out
-        raise "id required to delete references" if id.nil?
+        return unless id.present?
 
         Reference.where(referer_id: id).delete_all
       end

data/lib/card/set/format/haml_paths.rb

@@ -3,6 +3,7 @@ class Card
     module Format
       # methods for handling paths to HAML templates
       module HamlPaths
+        CORE_MODS = ::Set.new %w[core admin].freeze
         TEMPLATE_DIR = %w[template set].freeze
 
         delegate :tmp_files?, to: Cardio::Mod::LoadStrategy
@@ -60,11 +61,11 @@ class Card
         end
 
         def source_mod_dir modname, carddir
-          if (m = modname.match(/^card-mod-(?<shortname>.*)/))
-            "/mod/#{m[:shortname]}/set/"
-          else
-            "#{carddir}/mod/#{modname}/set/"
-          end
+          # TODO: handle non-standard mod dirs
+          dir = "/mod/#{modname}/set/"
+          return dir unless modname.in? CORE_MODS
+
+          "#{carddir}/#{dir}/"
         end
 
         def try_haml_template_path template_path, view, source_dir, ext="haml"

data/lib/card/set/type.rb

@@ -33,7 +33,7 @@ class Card
       end
 
       def default_type_code card
-        card.rule_card(:default)&.type_code
+        card.rule_card(:default, skip_modules: true)&.type_code
       end
 
       def mods_exist_for_key? mod_key

data/lib/card/tasks/card.rake

@@ -102,22 +102,4 @@ namespace :card do
   task reset_cache: :environment do
     Card::Cache.reset_all
   end
-
-  desc "reset machine output"
-  task reset_machine_output: :environment do
-    Card.reset_all_machines
-  end
-
-  desc "refresh machine output"
-  task refresh_machine_output: :environment do
-    Card.reset_all_machines
-    Card::Auth.as_bot do
-      [%i[all script],
-       %i[all style],
-       %i[script_html5shiv_printshiv]].each do |name_parts|
-        Card[*name_parts].update_machine_output
-      end
-    end
-    Card::Cache.reset_all # should not be necessary but breaking without...
-  end
 end

data/lib/card/tasks/card/asset.rake

@@ -0,0 +1,22 @@
+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

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

@@ -1,7 +1,7 @@
 def run_card_migration core_or_deck
   prepare_migration
   verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-  Cardio.migrate core_or_deck, version, verbose
+  Cardio::Schema.migrate core_or_deck, version, verbose
 end
 
 def prepare_migration
@@ -41,7 +41,7 @@ namespace :card do
     task structure: :environment do
       ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
       without_dumping do
-        Cardio.migrate :structure, version
+        Cardio::Schema.migrate :structure, version
       end
     end
 
@@ -62,7 +62,7 @@ namespace :card do
     def migrate_deck_structure
       require "cardio/migration/deck_structure"
       set_schema_path
-      Cardio.migrate :deck, version
+      Cardio::Schema.migrate :deck, version
       Rake::Task["db:_dump"].invoke # write schema.rb
       reset_column_information true
     end
@@ -87,18 +87,18 @@ namespace :card do
 
       ActiveRecord::Migration.verbose = verbose
       ActiveRecord::SchemaMigration.where(version: version.to_s).delete_all
-      Cardio.migrate :deck_cards, version
+      Cardio::Schema.migrate :deck_cards, version
     end
 
     # maybe we should move this to a method?
     desc "write the version to a file (not usually called directly)"
-    task :stamp, :type do |_t, args|
+    task :stamp, [:type] => [:environment] do |_t, args|
       ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
       Cardio.config.action_mailer.perform_deliveries = false
 
-      stamp_file = Cardio.schema_stamp_path(args[:type])
+      stamp_file = Cardio::Schema.stamp_path args[:type]
 
-      Cardio.schema_mode args[:type] do
+      Cardio::Schema.mode args[:type] do
         version = ActiveRecord::Migrator.current_version
         if version.to_i.positive? && (file = ::File.open(stamp_file, "w"))
           puts ">>  writing version: #{version} to #{stamp_file}"

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

@@ -0,0 +1,30 @@
+namespace :card do
+  namespace :mod do
+    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|
+        link = public_mod_dir mod
+        FileUtils.rm_rf link
+        FileUtils.ln_sf target, link
+      end
+    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
+    end
+
+    def public_mod_dir subdir=nil
+      parts = [Rails.public_path, "mod", subdir].compact
+      File.join(*parts)
+    end
+  end
+end

data/lib/cardio.rb

@@ -1,8 +1,7 @@
 # -*- encoding : utf-8 -*-
 
-require "active_support/core_ext/numeric/time"
-require "cardio/schema"
-require "cardio/utils"
+require "active_support"
+require "active_support/core_ext/module/delegation"
 require "cardio/delaying"
 
 ActiveSupport.on_load :after_card do
@@ -10,17 +9,14 @@ ActiveSupport.on_load :after_card do
 end
 
 module Cardio
-  extend Schema
-  extend Utils
   extend Delaying
-  CARD_GEM_ROOT = File.expand_path("..", __dir__)
 
   class << self
     delegate :application, :root, to: :Rails
     delegate :config, :paths, to: :application
 
     def gem_root
-      CARD_GEM_ROOT
+      @gem_root ||= File.expand_path "..", __dir__
     end
 
     def card_defined?
@@ -42,9 +38,8 @@ module Cardio
       @cache ||= ::Rails.cache
     end
 
-    def future_stamp
-      # # used in test data
-      @future_stamp ||= Time.zone.local 2020, 1, 1, 0, 0, 0
+    def database
+      @database ||= config.database_configuration.dig Rails.env, "database"
     end
   end
 end

data/lib/cardio/all.rb

@@ -11,6 +11,7 @@ require "cardio/mod"
   action_mailbox/engine
   rails/test_unit/railtie
   sprockets/railtie
+  cardio/railtie
 ].each do |railtie|
   require railtie
 end

data/lib/cardio/application.rb

@@ -2,140 +2,11 @@ require "cardio/all"
 
 Bundler.require :default, *Rails.groups
 
-# these two have railties and likely need to be loaded before application so they
-# don't override configuration later
+# these two have railties and need to be loaded before application
 require "haml"
 require "kaminari"
 
 require "bootstrap4-kaminari-views"
 
-module Cardio
-  # handles config and path defaults
-  class Application < Rails::Application
-    def self.card_environment_initializer
-      initializer "card.load_environment_config",
-                  before: :load_environment_config, group: :all do
-        paths["card/config/environments"].existent.each do |environment|
-          require environment
-        end
-      end
-    end
-    card_environment_initializer
-
-    def config
-      @config ||= super.tap do |config|
-        simple_configs config
-        coded_configs config
-      end
-    end
-
-    private
-
-    def simple_configs config
-      config_from_yaml.each_pair do |setting, value|
-        config.send "#{setting}=", *value
-      end
-    end
-
-    # TODO: many of these defaults should be in mods!
-    def config_from_yaml
-      YAML.load_file File.expand_path("defaults.yml", __dir__)
-    end
-
-    def coded_configs config
-      config.autoloader = :zeitwerk
-      config.i18n.enforce_available_locales = true
-      config.read_only = !ENV["DECKO_READ_ONLY"].nil?
-      config.load_strategy = (ENV["REPO_TMPSETS"] || ENV["TMPSETS"] ? :tmp_files : :eval)
-      config.autoload_paths += Dir["#{Cardio.gem_root}/lib"]
-      Paths.new(config).assign
-      Cardio::Mod.each_path do |mod_path|
-        config.autoload_paths += Dir["#{mod_path}/lib"]
-        config.watchable_dirs["#{mod_path}/set"] = %i[rb haml]
-      end
-    end
-
-    class Paths
-      attr_reader :config, :paths
-
-      def initialize config
-        @config = config
-        @paths = config.paths
-      end
-
-      def assign
-        add_tmppaths
-        add_path "mod"        # add card gem's mod path
-        paths["mod"] << "mod" # add deck's mod path
-        paths.add "files"
-
-        add_db_paths
-        add_initializer_paths
-        add_mod_initializer_paths
-        add_gem_environment_path
-
-        paths["app/models"] = []
-        paths["app/mailers"] = []
-        paths["app/controllers"] = []
-      end
-
-      def add_tmppaths
-        %w[set set_pattern].each do |dir|
-          opts = tmppath_opts dir
-          add_path "tmp/#{dir}", opts if opts
-        end
-      end
-
-      def tmppath_opts dir
-        if ENV["REPO_TMPSETS"]
-          { with: "tmpsets/#{dir}" }
-        elsif ENV["TMPSETS"]
-          { root: config.root }
-        end
-      end
-
-      def add_db_paths
-        add_path "db"
-        add_path "db/migrate"
-        add_path "db/migrate_core_cards"
-        add_path "db/migrate_deck", root: config.root, with: "db/migrate"
-        add_path "db/migrate_deck_cards", root: config.root, with: "db/migrate_cards"
-        add_path "db/seeds.rb", with: "db/seeds.rb"
-      end
-
-      def add_initializer_paths
-        add_path "config/initializers", glob: "**/*.rb"
-        add_initializers config.root
-        Cardio::Mod.each_path do |mod_path|
-          add_initializers mod_path, false, "core_initializers"
-        end
-      end
-
-      def add_mod_initializer_paths
-        add_path "mod/config/initializers", glob: "**/*.rb"
-        Cardio::Mod.each_path do |mod_path|
-          add_initializers mod_path, true
-        end
-      end
-
-      def add_initializers base_dir, mod=false, init_dir="initializers"
-        Dir.glob("#{base_dir}/config/#{init_dir}").each do |initializers_dir|
-          path_mark = mod ? "mod/config/initializers" : "config/initializers"
-          paths[path_mark] << initializers_dir
-        end
-      end
-
-      def add_gem_environment_path
-        add_path "card/config/environments",
-                 glob: "#{Rails.env}.rb",
-                 with: "config/environments"
-      end
-
-      def add_path path, options={}
-        root = options.delete(:root) || Cardio.gem_root
-        options[:with] = File.join(root, (options[:with] || path))
-        paths.add path, options
-      end
-    end
-  end
-end
+# The application class from which card applications inherit
+Cardio::Application = Rails::Application