card 1.109.0 → 1.110.0

data/lib/card/set/pattern/base.rb

@@ -4,6 +4,7 @@ class Card
       # class from which set patterns inherit
       class Base
         extend ClassMethods
+
         delegate :pattern_code, :pattern, :anchorless?, :assigns_type, to: :class
 
         def initialize card

data/lib/card/set/required_field.rb

@@ -45,7 +45,7 @@ class Card
       def field_test_name
         return unless event_test
 
-        "_when_left_#{event_test}".to_sym
+        :"_when_left_#{event_test}"
       end
 
       def event_test

data/lib/card/subcards.rb

@@ -58,10 +58,10 @@ class Card
       @keys.respond_to? method_name
     end
 
-    def method_missing method, *args
+    def method_missing(method, *)
       return unless respond_to_missing?(method)
 
-      @keys.send method, *args
+      @keys.send(method, *)
     end
 
     # fetch all cards first to avoid side effects
@@ -74,8 +74,8 @@ class Card
       end.compact
     end
 
-    def each_card &block
-      cards.each(&block)
+    def each_card(&)
+      cards.each(&)
     end
 
     alias_method :each, :each_card

data/lib/card/view/cache/cache_action.rb

@@ -6,6 +6,7 @@ class Card
         ACTIVE_CACHE_LEVEL =
           { always: :cache_yield,
             deep: :cache_yield,
+            force: :cache_yield,
             default: :yield,
             yes: :yield,
             never: :stub }.freeze
@@ -22,10 +23,10 @@ class Card
 
         def log_cache_action
           yield
-          # TODO: make configurable
-          # ...or better yet, integrate into performance logger...
-          # Rails.logger.warn "VIEW CACHE #{cache_active? ? '-->' : ''}[#{action}] "\
-          #                   "(#{card.name}##{requested_view})"
+          #   .tap do |action|
+          #   Rails.logger.warn "VIEW CACHE #{cache_active? ? '-->' : ''}[#{action}] "\
+          #                       "(#{card.name}##{requested_view})"
+          # end
         end
 
         # @return [Symbol] :off, :active, or :free
@@ -74,7 +75,15 @@ class Card
 
         # @return [Symbol]
         def active_cache_action
-          active_cache_ok? ? active_cache_action_from_setting : :stub
+          if caching == :force
+            :yield
+          elsif deep_caching? && cache_setting != :never
+            :yield
+          elsif active_cache_ok?
+            active_cache_action_from_setting
+          else
+            :stub
+          end
         end
 
         # @return [True/False]
@@ -86,7 +95,7 @@ class Card
         end
 
         def cacheable_card?
-          return true if caching == :deep || parent.present?
+          return true if deep_caching? || parent.present?
           # a parent voo means we're still in the same card
 
           return false unless (superformat_card = format.parent&.card)
@@ -119,8 +128,11 @@ class Card
 
         # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         # SHARED METHODS
+        def deep_caching?
+          caching.in? %i[deep force]
+        end
 
-        # @return [Symbol] :standard, :always, or :never
+        # @return [Symbol] :default, :yes, :deep, :force, :always, or :never
         def cache_setting
           @cache_setting ||= format.view_cache_setting requested_view
         end

data/lib/card/view/cache.rb

@@ -179,11 +179,11 @@ class Card
       # render or retrieve view (or stub) with current options
       # @param block [Block] code block to render
       # @return [rendered view or stub]
-      def fetch &block
+      def fetch(&)
         case cache_action
-        when :yield       then yield                # simple render
-        when :cache_yield then cache_render(&block) # render to/from cache
-        when :stub        then stub                 # render stub
+        when :yield       then yield           # simple render
+        when :cache_yield then cache_render(&) # render to/from cache
+        when :stub        then stub            # render stub
         end
       end
 
@@ -196,8 +196,8 @@ class Card
       # those stubs.
       #
       # @return [String (usually)] rendered view
-      def cache_render &block
-        cached_view = cache_fetch(&block)
+      def cache_render(&)
+        cached_view = cache_fetch(&)
         cache_active? ? cached_view : format.stub_render(cached_view)
       end
 
@@ -212,18 +212,27 @@ class Card
         deep_root? ? false : self.class.caching?
       end
 
+      # def cache_render?
+      #   cache_active? && !deep_caching?
+      # end
+
       # If view is cached, retrieve it.  Otherwise render and store it.
       # Uses the primary cache API.
       def cache_fetch &block
-        caching do
+        with_caching do
           ensure_cache_key
+          # Rails.logger.debug "Fetching:::  #{cache_key}"
           self.class.cache.fetch cache_key, &block
         end
       end
 
       # keep track of nested cache fetching
-      def caching &block
-        self.class.caching(cache_setting, &block)
+      def with_caching(&)
+        self.class.with_caching(cache_setting, &)
+      end
+
+      def caching
+        self.class.caching
       end
 
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -293,29 +302,23 @@ class Card
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       # cache-related Card::View class methods
       module ClassMethods
+        def caching
+          @caching
+        end
+
         def cache
           Card::Cache[Card::View]
         end
 
         def caching?
-          !@caching.nil?
+          !caching.nil?
         end
 
-        def caching setting, &block
-          return @caching unless block_given?
-
-          caching_mode setting, &block
-        end
-
-        private
-
-        def caching_mode setting
-          old_caching = @caching
-          # puts "OPEN CACHING from #{old_caching} to #{setting}" unless @caching == :deep
-          @caching = setting unless @caching == :deep
+        def with_caching setting
+          old_caching = caching
+          @caching = setting unless @caching.in? %i[deep force]
           yield
         ensure
-          # puts "CLOSE CACHING from #{@caching} to #{old_caching}"
           @caching = old_caching
         end
       end

data/lib/card/view/options/voo_api.rb

@@ -165,7 +165,7 @@ class Card
 
         # adds the wrappers assigned to ok_view in view definition
         def process_view_wrappers
-          view_wrappers = format.view_setting(:wrap, ok_view)
+          view_wrappers = format.view_setting(:wrap, ok_view) if requested_view
           return unless view_wrappers.present?
 
           @live_options[:wrap] = Array.wrap(@live_options[:wrap])

data/lib/card/view/options.rb

@@ -52,6 +52,7 @@ class Card
           :structure,      # overrides the content of the card
           :title,          # overrides the name of the card
           :variant,        # override the standard name with a different variant
+          :joint,          # what joins the parts of a compound name ("+" by default)
           :input_type,     # inline_nests makes a form within standard content (Symbol)
           :type,           # set the default type of new cards
           :size,           # set an image size

data/lib/card/view.rb

@@ -76,7 +76,7 @@ class Card
     # be overridden, eg for the main view (top view of the main card on a page)
     # @return [Symbol] view name
     def requested_view
-      @requested_view ||= View.normalize live_options[:view]
+      @requested_view ||= View.normalize(live_options[:view] || @raw_view)
     end
 
     # the final view.  can be different from @requested_view when there are

data/lib/cardio/command/rspec_command/parser.rb

@@ -21,7 +21,7 @@ module Cardio
 
           RSPEC ARGS
 
-          See https://rspec.info/features/3-12/rspec-core/command-line/ or 
+          See https://rspec.info/features/3-12/rspec-core/command-line/ or
           run card rspec -- -hb
         BANNER
 

data/lib/cardio/generators/deck_helper.rb

@@ -32,7 +32,7 @@ module Cardio
       def determine_repo_path
         @repo_path_determined ? (return nil) : (@repo_path_determined = true)
         path = options["repo-path"]
-        path = ENV["DECKO_REPO_PATH"] if path.blank?
+        path = ENV.fetch("DECKO_REPO_PATH", nil) if path.blank?
         path = prompt_for_repo_path if path.blank? && platypus?
         path.to_s
       end

data/lib/cardio/job.rb

@@ -1,5 +1,4 @@
 module Cardio
   class Job < ActiveJob::Base
-
   end
 end

data/lib/cardio/mod/dirs.rb

@@ -129,8 +129,8 @@ module Cardio
         end
       end
 
-      def each_subpath *subdirs, &block
-        subpaths(*subdirs).each(&block)
+      def each_subpath(*subdirs, &)
+        subpaths(*subdirs).each(&)
       end
 
       private

data/lib/cardio/mod/eat.rb

@@ -35,10 +35,10 @@ module Cardio
       private
 
       # if output mod given,
-      def handle_up &block
+      def handle_up(&)
         Card::Cache.reset_all
         Card::Mailer.perform_deliveries = false
-        Card::Auth.as_bot(&block)
+        Card::Auth.as_bot(&)
         :success
       rescue StandardError => e
         e.message
@@ -46,9 +46,6 @@ module Cardio
 
       def track edible
         rescuing edible do
-          # n = edible[:name]
-          # binding.pry if (n.is_a? Array) && n.first.to_s == "main_menu"
-          # puts "eating: #{edible}" if @verbose
           card = yield
           puts "eaten: #{card.name}".cyan if @verbose
         end
@@ -63,13 +60,13 @@ module Cardio
       end
 
       def current_user item_user
-        Card::Auth.current_id = item_user&.card_id || @user_id || Card::WagnBotID
+        Card::Auth.current_id = item_user&.card_id || @user_id || Card::DeckoBotID
       end
 
-      def time_machine value, &block
+      def time_machine(value, &)
         return yield unless value.present?
 
-        Timecop.freeze Time.at(time_integer(value)), &block
+        Timecop.freeze(Time.at(time_integer(value)), &)
       end
 
       def time_integer value

data/lib/cardio/mod/load_strategy/set_binding_magic.rb

@@ -21,7 +21,7 @@ module Cardio
           # Since module_eval doesn't take a binding argument, we have to
           # execute module_eval with eval.
           eval "#{set_module}.module_eval ::File.read('#{abs_path}'), '#{abs_path}'",
-               module_path_binding(set_module)
+               module_path_binding(set_module), __FILE__, __LINE__ - 1
         end
       end
 
@@ -40,7 +40,7 @@ module Cardio
           m, b =
             eval(
               "[ #{part} , #{part}.module_eval('binding') ]",  # [ History , History.module_eval('binding') ]
-              b
+              b, __FILE__, __LINE__ - 1
             )
         end
         raise "Module found at name path not same as specified module" unless m == mod

data/lib/cardio/mod/loader/set_loader.rb

@@ -7,7 +7,7 @@ module Cardio
       class SetLoader < Loader
         def initialize args={}
           @no_all = args.delete :no_all
-          super load_strategy: args[:load_strategy], mod_dirs: args[:mod_dirs]
+          super(load_strategy: args[:load_strategy], mod_dirs: args[:mod_dirs])
         end
 
         def load_strategy_class strategy

data/lib/cardio/mod/loader.rb

@@ -66,8 +66,8 @@ module Cardio
 
       private
 
-      def each_mod_dir module_type, &block
-        @mod_dirs.each module_type, &block
+      def each_mod_dir(module_type, &)
+        @mod_dirs.each(module_type, &)
       end
 
       def each_file_in_dir base_dir, subdir=nil

data/lib/cardio/mod/sow.rb

@@ -60,7 +60,7 @@ module Cardio
       end
 
       def target
-        @target ||= (old_data || nil)
+        @target ||= old_data || nil
       end
 
       def target_index new_item

data/lib/cardio/seed.rb

@@ -46,7 +46,7 @@ module Cardio
       private
 
       def update_seed?
-        ENV["CARD_UPDATE_SEED"]
+        ENV.fetch("CARD_UPDATE_SEED", nil)
       end
 
       # TODO: make this more robust. only handles simple case of extra seed tables
@@ -104,7 +104,7 @@ module Cardio
       end
 
       def author_id
-        Card::WagnBotID
+        Card::DeckoBotID
       end
     end
   end

data/lib/generators/deck/deck_generator.rb

@@ -123,7 +123,7 @@ module Cardio
 
         def seed_data
           if options["interactive"]
-            Interactive.new(destination_root, (monkey? || platypus?)).run
+            Interactive.new(destination_root, monkey? || platypus?).run
           else
             prefix = "bundle exec " if options["platypus"]
             puts "Now:

data/lib/generators/migration/migration_generator.rb

@@ -5,6 +5,7 @@ module Cardio
     # generate structure and card migrations
     class MigrationGenerator < ActiveRecord::Generators::Base
       extend ClassMethods
+
       source_root File.expand_path("templates", __dir__)
 
       argument :name, required: true

data/mod/core/config/locales/de.yml

@@ -8,7 +8,7 @@ de:
   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_structured: 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.

data/mod/core/config/locales/en.yml

@@ -9,7 +9,7 @@ en:
   core_error_cant_change_errors: "of %{name} can't be changed; errors creating new %{type_id}: %{error_messages}"
   core_error_code_in_use: codename %{codename} already in use
   core_codename_must_be_simple: only simple cards can have codenames
-  core_error_hard_templated: can't be changed because %{name} is hard templated to %{type_name}
+  core_error_structured: can't be changed because %{name} is structured as a %{type_name}
   core_error_indestructible: "%{name} is an indestructible rule"
   core_error_invalid_character_in_cardtype: "may not contain any of the following characters: %{banned}"
   core_error_name_exists: must be unique; '%{name}' already exists.

data/mod/core/data/fixtures/real/cards.yml

@@ -3,7 +3,7 @@ cards_001:
   id: 1
   name: Decko Bot
   key: decko_bot
-  codename: wagn_bot
+  codename: decko_bot
   creator_id: 1
   updater_id: 1
   read_rule_class: "*all"

data/mod/core/data/real.yml

@@ -16,7 +16,7 @@
         [[http://decko.org/card_types|more]]
       </p>
 - :name: Decko Bot
-  :codename: wagn_bot
+  :codename: decko_bot
   :content: |-
     <p>
       This is the account that makes any automated updates &mdash; cards

data/mod/core/data/recode.yml

@@ -5,3 +5,4 @@ input: input_type
 options: content_options
 options_label: content_option_view
 token: api_key
+wagn_bot: decko_bot

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

@@ -30,7 +30,7 @@ namespace :card do
     desc "install all mods"
     task install: :environment do
       puts "installing mods"
-      Card::Auth.signin :wagn_bot.card
+      Card::Auth.signin :decko_bot.card
       # Cardio.config.compress_assets = true # should not be here, imo #efm
       Cardio::Mod.ensure_installed
     end

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

@@ -0,0 +1,8 @@
+namespace :card do
+  namespace :trash do
+    desc "empty trash"
+    task :empty do
+      Cardio::Utils.empty_trash
+    end
+  end
+end

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

@@ -13,24 +13,8 @@ namespace :card do
       ENV["NO_RAILS_CACHE"] = "true"
       run_tasks ["migrate:port", "migrate:schema", "migrate:recode",
                  :eat, "migrate:transform",
-                 "mod:uninstall", "mod:install", "mod:symlink", :reset] # , true
-    end
-  end
-
-  def run_tasks tasks, with_benchmark: false
-    if with_benchmark
-      require "benchmark"
-      Benchmark.bm do |x|
-        x.report("total") do
-          tasks.each do |task|
-            x.report(task) { Rake::Task["card:#{task}"].invoke }
-          end
-        end
-      end
-    else
-      tasks.each do |task|
-        Rake::Task["card:#{task}"].invoke
-      end
+                 "mod:uninstall", "mod:install", "mod:symlink", :reset]
+      # , with_benchmark: true
     end
   end
 
@@ -116,6 +100,23 @@ namespace :card do
     @options ||= {}
   end
 
+  def run_tasks tasks, with_benchmark: false
+    if with_benchmark
+      require "benchmark"
+      Benchmark.bm do |x|
+        x.report("total") do
+          tasks.each do |task|
+            x.report(task) { Rake::Task["card:#{task}"].invoke }
+          end
+        end
+      end
+    else
+      tasks.each do |task|
+        Rake::Task["card:#{task}"].invoke
+      end
+    end
+  end
+
   def rake_result task
     result = yield
     if result == :success

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

@@ -5,7 +5,7 @@ def assign_attributes args={}
 
   assign_with_subcards args do
     assign_with_set_modules args do
-      super prepare_assignment_params(args)
+      super(prepare_assignment_params(args))
     end
   end
 end
@@ -48,10 +48,10 @@ def prepare_assignment_args args
   args
 end
 
-def assign_with_set_modules args, &block
+def assign_with_set_modules(args, &)
   return yield unless args[:name] || args[:type_id]
 
-  refresh_set_modules(&block)
+  refresh_set_modules(&)
 end
 
 def assign_with_subcards args

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

@@ -8,7 +8,6 @@ event :reset_codename_cache, :integrate, changed: :codename do
   return if action == :create && codename.nil?
 
   Card::Codename.reset_cache
-  Card::Codename.generate_id_constants
 end
 
 private

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

@@ -4,7 +4,7 @@ JUNK_INIT_ARGS = %i[missing skip_virtual id].freeze
 module ClassMethods
   def new args={}, _options={}
     with_normalized_new_args args do |normalized_args|
-      super normalized_args
+      super(normalized_args)
     end
   end
 
@@ -37,7 +37,7 @@ def initialize args={}
 
   handle_set_modules args do
     handle_type args do
-      super args # ActiveRecord #initialize
+      super(args) # ActiveRecord #initialize
     end
   end
 end

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

@@ -85,15 +85,11 @@ end
 
 # has not been edited directly by human users.  bleep blorp.
 def pristine?
-  if new_card?
-    true
-  elsif subcards? && subcards.cards.find(&:altered?)
-    false
-  elsif (created_at == updated_at) && (creator_id == WagnBotID)
-    true
-  else
-    !user_changes?
-  end
+  return true if new_card?
+  return false if subcards? && subcards.cards.find(&:altered?)
+  return true if (created_at == updated_at) && (creator_id == DeckoBotID)
+
+  !user_changes?
 end
 
 def altered?
@@ -101,5 +97,5 @@ def altered?
 end
 
 def user_changes?
-  actions.joins(:act).where("card_acts.actor_id != ?", WagnBotID).exists?
+  actions.joins(:act).where("card_acts.actor_id != ?", DeckoBotID).exists?
 end

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

@@ -19,7 +19,7 @@ event :validate_type, :validate, changed: :type_id, on: :save do
 
   if structure&.assigns_type? && type_id != structure.type_id
     errors.add :type,
-               t(:core_error_hard_templated, name: name, type_name: structure.type_name)
+               t(:core_error_structured, name: name, type_name: structure.type_name)
   end
 end
 

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

@@ -29,9 +29,9 @@ format :html do
       card.all_admin_configs_grouped_by(:roles, :category).map do |(role, configs_by_cat)|
         output [
           content_tag(:h2, role.to_sym.cardname),
-          (configs_by_cat.map do |(cat, configs)|
+          configs_by_cat.map do |(cat, configs)|
             list_section cat, configs.map(&:codename)
-          end)
+          end
         ]
       end.join("<br/>")
     ]

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

@@ -26,7 +26,7 @@ RSpec.describe Card::Set::All::Admin do
                           "link_list",
                           "local_script_folder_group", "local_script_manifest_group",
                           "local_style_folder_group",
-                          "nest_list", "remote_manifest_group", "role",
+                          "nest_list", "role",
                           "local_style_manifest_group", "bootswatch_skin",
                           "date", "notification_template", "session", "basic",
                           "search_type", "signup")

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

@@ -178,9 +178,9 @@ end
 # NOT WORKING, BUT IT SHOULD
 # describe Card, "a part of an unremovable card" do
 #  before do
-#     Card::Auth.as(Card::WagnBotID)
+#     Card::Auth.as(Card::DeckoBotID)
 #     # this ugly setup makes it so A+Admin is the actual user with edits..
-#     Card["Wagn Bot"].update! name: "A+Wagn Bot"
+#     Card["Decko Bot"].update! name: "A+Decko Bot"
 #  end
 #  it "does not be removable" do
 #    @a = Card['A']