card 1.107.0 → 1.108.0

data/lib/card/subcards/add.rb

@@ -55,7 +55,7 @@ class Card
         card.supercard = @context_card
         card.update_superleft card.name
         @keys << card.key
-        Card.write_to_soft_cache card
+        Card.write_to_temp_cache card
         card.director = @context_card.director.subdirectors.add card
         card
       end

data/lib/card/subcards/remove.rb

@@ -26,7 +26,7 @@ class Card
           Director.deep_delete subcard.director
           subcard.current_action&.delete
         end
-        Card.cache.soft.delete key
+        Card.cache.temp.delete key
         subcard
       end
 

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

@@ -3,6 +3,13 @@ class Card
     module Cache
       # determine action to be used in #fetch
       module CacheAction
+        ACTIVE_CACHE_LEVEL =
+          { always: :cache_yield,
+            deep: :cache_yield,
+            default: :yield,
+            yes: :yield,
+            never: :stub }.freeze
+
         private
 
         # course of action based on config/status/options
@@ -58,7 +65,7 @@ class Card
 
         # @return [True/False]
         def free_cache_ok?
-          cache_setting != :never && clean_enough_to_cache?
+          !cache_setting.in?(%i[default never]) && clean_enough_to_cache?
         end
 
         # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -72,23 +79,36 @@ class Card
 
         # @return [True/False]
         def active_cache_ok?
-          return false unless parent && clean_enough_to_cache?
+          return false unless cacheable_card? && clean_enough_to_cache?
           return true if normalized_options[:skip_perms]
 
           active_cache_permissible?
         end
 
+        def cacheable_card?
+          return true if caching == :deep || parent.present?
+          # a parent voo means we're still in the same card
+
+          return unless (superformat_card = format.parent&.card)
+
+          superformat_card.name == card.name.left_name
+        end
+
         # apply any permission checks required by view.
         # (do not cache views with nuanced permissions)
         def active_cache_permissible?
           case view_perms
           when :none             then true
-          when parent.view_perms then true
+          when view_perm_context then true
           when *Permission::CRUD then format.anyone_can?(view_perms)
           else                        false
           end
         end
 
+        def view_perm_context
+          parent&.view_perms || format.parent&.voo&.view_perms
+        end
+
         # determine the cache action from the cache setting
         # (assuming cache status is "active")
         # @return [Symbol] cache action
@@ -97,15 +117,12 @@ class Card
           level || raise("unknown cache setting: #{cache_setting}")
         end
 
-        ACTIVE_CACHE_LEVEL =
-          { always: :cache_yield, standard: :yield, never: :stub }.freeze
-
         # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         # SHARED METHODS
 
         # @return [Symbol] :standard, :always, or :never
         def cache_setting
-          format.view_cache_setting requested_view
+          @cache_setting ||= format.view_cache_setting requested_view
         end
 
         # altered view requests and altered cards are not cacheable

data/lib/card/view/cache.rb

@@ -166,6 +166,8 @@ class Card
     # cached and retrieved even when it's rendered inside another cached view.
     #
     module Cache
+      EXPIRE_VALUES = %i[minute hour day week month].freeze
+
       require "card/view/cache/cache_action"
       require "card/view/cache/stub"
 
@@ -221,7 +223,7 @@ class Card
 
       # keep track of nested cache fetching
       def caching &block
-        self.class.caching(self, &block)
+        self.class.caching(cache_setting, &block)
       end
 
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -229,8 +231,24 @@ class Card
 
       def cache_key
         @cache_key ||= [
-          card_cache_key, format.class, format.nest_mode, options_for_cache_key
-        ].map(&:to_s).join "-"
+          format.symbol, nest_mode, timestamp, card_cache_key, options_for_cache_key
+        ].compact.map(&:to_s).join "-"
+      end
+
+      def nest_mode
+        mode = format.nest_mode
+        mode == :normal ? nil : mode
+      end
+
+      def timestamp
+        return unless (expire = format.view_setting :expire, requested_view)
+        raise "invalid expire setting: #{expire}" unless EXPIRE_VALUES.include? expire
+
+        Time.now.send("end_of_#{expire}").to_i
+      end
+
+      def cache_setting
+        @cache_setting ||= format.view_cache_setting requested_view
       end
 
       def card_cache_key
@@ -243,7 +261,7 @@ class Card
       end
 
       def options_for_cache_key
-        hash_for_cache_key(live_options) + hash_for_cache_key(viz_hash)
+        hash_for_cache_key(live_options) + ";" + hash_for_cache_key(viz_hash)
       end
 
       def hash_for_cache_key hash
@@ -283,11 +301,21 @@ class Card
           !@caching.nil?
         end
 
-        def caching voo
+        def caching setting, &block
+          return @caching unless block_given?
+
+          caching_mode setting, &block
+        end
+
+        private
+
+        def caching_mode setting
           old_caching = @caching
-          @caching = voo
+          # puts "OPEN CACHING from #{old_caching} to #{setting}" unless @caching == :deep
+          @caching = setting unless @caching == :deep
           yield
         ensure
+          # puts "CLOSE CACHING from #{@caching} to #{old_caching}"
           @caching = old_caching
         end
       end

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

@@ -103,7 +103,7 @@ class Card
         # symbols as keys, managing standard view inheritance, and special
         # handling for main_views.
         def normalize_options
-          @normalized_options = opts = options_to_hash @raw_options.clone
+          @normalized_options = opts = options_to_hash(@raw_options.clone)
           normalize_special_options! opts
           @optional = opts.delete(:optional) || false
           add_implicit_options!

data/lib/card/view.rb

@@ -68,6 +68,7 @@ class Card
     def process
       return if process_live_options == :hide
 
+      # Rails.logger.debug "processing #{card.name} / #{ok_view}"
       fetch { yield ok_view }
     end
 

data/lib/cardio/cli.rb

@@ -8,7 +8,7 @@ Cardio::ScriptLoader.script_name = "card"
 # the rest of this script is not run.
 Cardio::ScriptLoader.exec!
 
-require "rails/ruby_version_check"
+# require "rails/ruby_version_check"
 Signal.trap("INT") { exit(1) }
 
 require "cardio/command/application"

data/lib/cardio/command/rake_command.rb

@@ -1,10 +1,11 @@
 require File.expand_path("command_base", __dir__)
+require "shellwords"
 
 module Cardio
   class Command
     # enhance standard rake command with some decko/card -specific options
     class RakeCommand < CommandBase
-      def initialize gem, command, args={}
+      def initialize gem, command, args=[]
         @command = command
         @task = "#{gem}:#{command}"
         @args = [args].flatten
@@ -31,13 +32,20 @@ module Cardio
 
       def commands
         task_cmd = "bundle exec rake #{@task}"
-        task_cmd += " -- #{@args.join ' '}" unless @args.empty?
+        task_cmd += " -- #{escape_args(@args).join ' '}" unless @args.empty?
+        puts task_cmd
         return [task_cmd] if !@envs || @envs.empty?
 
         # @envs.map do |env|
         #   "env RAILS_ENV=#{env} #{task_cmd}"
         # end
       end
+
+      def escape_args args
+        args.map do |arg|
+          arg.start_with?("-") ? arg : arg.shellescape
+        end
+      end
     end
   end
 end

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

@@ -1,6 +1,8 @@
 # -*- encoding : utf-8 -*-
 
 require "optparse"
+require "cardio/mod"
+require "pry"
 
 module Cardio
   class Command
@@ -11,11 +13,6 @@ module Cardio
 
           #{Command.bin_name.upcase} ARGS
 
-          You don't have to give a full path for FILENAME; the basename is enough.
-          If FILENAME does not include '_spec', then rspec searches for the
-          corresponding spec file. The line number always refers to the example in the
-          spec file.
-
         MESSAGE
 
         RSPEC_BANNER = <<~BANNER.freeze
@@ -24,7 +21,8 @@ module Cardio
 
           RSPEC ARGS
 
-          See https://rspec.info/features/3-12/rspec-core/command-line/ or run card rspec -- -hbe
+          See https://rspec.info/features/3-12/rspec-core/command-line/ or 
+          run card rspec -- -hb
         BANNER
 
         DESC = {
@@ -36,7 +34,7 @@ module Cardio
             parser.banner = RSPEC_BANNER
             parser.separator RSPEC_PATH_MESSAGE
 
-            file_options parser, opts
+            # file_options parser, opts
             other_options parser, opts
             parser.separator "\n"
           end
@@ -51,13 +49,13 @@ module Cardio
         end
 
         def other_options parser, opts
-          parser.on("-s", "--[no-]simplecov", "Run with simplecov") do |s|
+          parser.on("-s", "--simplecov", "Run with simplecov") do |s|
             opts[:simplecov] = s
           end
-          parser.on("--rescue", "Run with pry-rescue") do
+          parser.on("--pry-rescue", "Run with pry-rescue") do
             process_rescue_opts opts
           end
-          parser.on("--[no-]spring", "Run with spring") do |spring|
+          parser.on("--spring", "Run with spring") do |spring|
             process_spring_opts spring, opts
           end
         end
@@ -90,7 +88,7 @@ module Cardio
           elsif (files = find_spec_file(filename, "mod"))&.present?
             files
           else
-            find_spec_file(file, "#{base_dir}/mod")
+            find_spec_file(filename, "#{base_dir}/mod")
           end
         end
 

data/lib/cardio/command/rspec_command.rb

@@ -1,4 +1,5 @@
 require File.expand_path("command_base", __dir__)
+require "cardio"
 
 module Cardio
   class Command
@@ -25,9 +26,12 @@ module Cardio
       end
 
       def coverage
-        "CARD_LOAD_STRATEGY=tmp_files" if @opts[:simplecov]
-        # # no coverage if rspec was started with file argument
-        # "CARD_SIMPLECOV=false" if @opts[:files] || @opts[:"no-simplecov"]
+        if @opts[:simplecov]
+          "CARD_LOAD_STRATEGY=tmp_files"
+        elsif @opts[:files]
+          # explicitly no coverage if rs pec was started with file argument
+          "CARD_SIMPLECOV=false"
+        end
       end
     end
   end

data/lib/cardio/generators/deck_helper.rb

@@ -59,13 +59,13 @@ module Cardio
           platypus? ? File.expand_path("#{repo_path}/decko/features/") : "mod/"
       end
 
-      def database_gem_and_version
-        entry = database_gemfile_entry
-        text = %("#{entry.name}")
-        text << %(, '#{entry.version}') if entry.version
-        # single quotes to prevent, eg: `gem "pg", ">= 0.18', '< 2.0"`
-        text
-      end
+      # def database_gem_and_version
+      #   entry = database_gemfile_entry
+      #   text = %("#{entry.name}")
+      #   text << %(, '#{[entry.version].flatten.join "', '"}') if entry.version
+      #   # single quotes to prevent, eg: `gem "pg", ">= 0.18', '< 2.0"`
+      #   text
+      # end
 
       def jasmine_yml prefix
         inside("javascripts/support") do

data/lib/cardio/migration/port.rb

@@ -0,0 +1,37 @@
+module Cardio
+  class Migration
+    # methods for porting migrations from old table to new table
+    module Port
+      def port_all
+        %i[schema transform].each do |type|
+          migration_class(type).port
+        end
+      end
+
+      def port
+        return unless lease_connection.table_exists? old_deck_table
+        rename_old_tables
+        lease_connection.execute "INSERT INTO #{table} (#{select_nonduplicate_versions})"
+        lease_connection.drop_table old_deck_table
+      end
+
+      private
+
+      def select_nonduplicate_versions
+        "SELECT * FROM #{old_deck_table} o WHERE NOT EXISTS " \
+          "(SELECT * FROM #{table} n WHERE o.version = n.version)"
+      end
+
+      def rename_old_tables
+        old_tables.each do |old_table_name|
+          next unless lease_connection.table_exists? old_table_name
+          lease_connection.rename_table old_table_name, table
+        end
+      end
+
+      def lease_connection
+        ActiveRecord::Base.lease_connection
+      end
+    end
+  end
+end

data/lib/cardio/migration.rb

@@ -4,6 +4,7 @@ module Cardio
   class Migration < ActiveRecord::Migration[6.1]
     include Assumption
     include Stamp
+    extend Port
 
     class << self
       attr_reader :migration_type, :old_tables, :old_deck_table
@@ -16,40 +17,11 @@ module Cardio
         migration_class(type).new
       end
 
-      def port_all
-        %i[schema transform].each do |type|
-          migration_class(type).port
-        end
-      end
-
-      def port
-        return unless connection.table_exists? old_deck_table
-        rename_old_tables
-        connection.execute "INSERT INTO #{table} (#{select_nonduplicate_versions})"
-        connection.drop_table old_deck_table
-      end
-
       private
 
-      def select_nonduplicate_versions
-        "SELECT * FROM #{old_deck_table} o WHERE NOT EXISTS " \
-          "(SELECT * FROM #{table} n WHERE o.version = n.version)"
-      end
-
-      def rename_old_tables
-        old_tables.each do |old_table_name|
-          next unless connection.table_exists? old_table_name
-          connection.rename_table old_table_name, table
-        end
-      end
-
       def table
         "#{migration_type}_migrations"
       end
-
-      def connection
-        ActiveRecord::Base.connection
-      end
     end
 
     def migration_type
@@ -74,7 +46,8 @@ module Cardio
 
     def context
       mode do |paths|
-        yield ActiveRecord::MigrationContext.new(paths, ActiveRecord::SchemaMigration)
+        migrations = ActiveRecord::SchemaMigration.new ActiveRecord::Base.connection_pool
+        yield ActiveRecord::MigrationContext.new(paths, migrations)
       end
     end
 
@@ -88,18 +61,14 @@ module Cardio
 
     private
 
-    def connection
-      Cardio::Migration.connection
-    end
-
     def with_migration_table
       yield
     end
 
     def table_name= table_name
       ActiveRecord::Base.schema_migrations_table_name = table_name
-      ActiveRecord::SchemaMigration.table_name = table_name
-      ActiveRecord::SchemaMigration.reset_column_information
+      # ActiveRecord::SchemaMigration.table_name = table_name
+      # ActiveRecord::SchemaMigration.reset_column_information
     end
   end
 end

data/lib/cardio/mod/class_methods.rb

@@ -78,6 +78,7 @@ module Cardio
         yield hash
         # puts "updating asset lists"
         Card[:all, :script].update! content: hash[:script].compact
+        Card::Auth.as_bot # FIXME: should not be necessary
         Card[:style_mods].update! content: hash[:style].compact
         # puts "refreshing assets"
         Card::Assets.refresh force: true

data/lib/cardio/mod.rb

@@ -74,7 +74,7 @@ module Cardio
     end
 
     def ensure_card
-      if Card::Codename.exists? codename
+      if Card::Codename.exist? codename
         card = Card.fetch codename.to_sym
         card.update type: :mod unless card.type_code == :mod
         card

data/lib/cardio/railtie.rb

@@ -21,16 +21,16 @@ module Cardio
 
     config.view_cache = false
 
-    config.request_logger = false
-    config.performance_logger = false
+    config.cache_log_level = nil
+
     config.sql_comments = false
 
     config.deck_origin = nil
 
     config.rich_text_editor = :tinymce
 
-    config.persistent_cache = true
-    config.prepopulate_cache = false
+    config.shared_cache = true
+    config.seed_cache_from_stash = false
     config.asset_refresh = :cautious
     config.compress_assets = true
 
@@ -76,6 +76,7 @@ module Cardio
 
             p["lib/graph_q_l/types/query.rb"] <<
               "#{mod_path}/lib/graph_q_l/types/query.rb"
+            p["config/environments"] << "#{mod_path}/config/environments"
             p["config/initializers"] << "#{mod_path}/config/early"
             p["late/initializers"] << "#{mod_path}/config/late"
             p["lib/tasks"] << "#{mod_path}/lib/tasks"

data/lib/cardio/utils.rb

@@ -42,7 +42,7 @@ module Cardio
       end
 
       def delete_files_with_id dir, file_id
-        raise Card::Error, t(:core_exception_almost_deleted) if Card.exists?(file_id)
+        raise Card::Error, t(:core_exception_almost_deleted) if Card.exist?(file_id)
 
         ::FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
       end

data/lib/generators/deck/deck_generator.rb

@@ -16,6 +16,10 @@ module Cardio
 
         source_root File.expand_path("templates", __dir__)
 
+        def self.databases
+          Rails::Generators::Database::DATABASES.join "/"
+        end
+
         # All but the first aliases should be considered deprecated
         class_option "monkey",
                      type: :boolean, aliases: %w[-M --mod-dev],
@@ -36,7 +40,7 @@ module Cardio
         class_option :database,
                      type: :string, aliases: %w[-D -d], default: "mysql",
                      desc: "Preconfigure for selected database " \
-                           "(options: #{DATABASES.join('/')})"
+                           "(options: #{databases})"
 
         class_option "interactive",
                      type: :boolean, aliases: %w[-I -i], default: false, group: :runtime,
@@ -128,16 +132,6 @@ module Cardio
       3. Run `#{prefix}decko server` to start your server"
           end
         end
-
-        protected
-
-        def database_gemfile_entry
-          return [] if options[:skip_active_record]
-
-          gem_name, gem_version = gem_for_database
-          msg = "Use #{options[:database]} as the database for Active Record"
-          GemfileEntry.version gem_name, gem_version, msg
-        end
       end
     end
   end

data/lib/generators/deck/templates/Gemfile.erb

@@ -6,7 +6,7 @@ gem "decko"<%= repo_path_constraint %>
 # DATABASE
 # Decko currently supports MySQL (best tested), PostgreSQL (well tested), and SQLite
 # (not well tested).
-gem <%= database_gem_and_version %>
+<%= database_gemfile_entry %>
 
 
 # WEBSERVER
@@ -43,7 +43,7 @@ gem "card-mod-defaults"<%= repo_path_constraint :mod %>
 <%= "# " if shark? %>gem "decko-cucumber", group: :cucumber<%= repo_path_constraint :support %>
 <%= "# " if shark? %>gem "decko-cypress", group: :cypress<%= repo_path_constraint :support %>
 <%= "# " if shark? %>gem "decko-profile", group: :profile<%= repo_path_constraint :support %>
-<%= "# " if shark? || !spring_install? %>gem "decko-spring"<%= repo_path_constraint :support %>
+<%# "# " if shark? || !spring_install? >gem "decko-spring"<%= repo_path_constraint :support %>
 
 <% if platypus? %>
 # PLATYPUSES

data/lib/generators/deck/templates/config/puma.rb

@@ -8,9 +8,3 @@ preload_app!
 # rackup      DefaultRackup
 port        ENV["PORT"]     || 3000
 environment ENV["RACK_ENV"] || "development"
-
-on_worker_boot do
-  # Worker specific setup for Rails 4.1+
-  # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
-  ActiveRecord::Base.establish_connection
-end

data/lib/generators/mod/mod_generator.rb

@@ -6,6 +6,7 @@ module Cardio
     class ModGenerator < ModBase
       def create_mod
         inside mod_path do
+          data_dir
           assets_dir
           config_dir
           set_dir
@@ -27,6 +28,12 @@ module Cardio
         end
       end
 
+      def data_dir
+        inside "data" do
+          create_file "real.yml"
+        end
+      end
+
       def set_dir
         inside "set" do
           %w[abstract all type type_plus_right right self].each do |pattern|

data/lib/generators/set/set_generator.rb

@@ -6,8 +6,9 @@ module Cardio
     class SetGenerator < ModBase
       source_root File.expand_path("templates", __dir__)
 
+      argument :name, type: :string, banner: "MOD"
       argument :set_pattern, required: true
-      argument :anchors, required: true, type: :array
+      argument :anchors, required: true, type: :array, banner: "[ANCHOR1] [ANCHOR2]"
 
       class_option "spec-only", type: :boolean,
                                 default: false, group: :runtime,

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

@@ -21,6 +21,7 @@ en:
   core_exception_almost_deleted: Narrowly averted deleting current file
   core_is_incomplete: is incomplete
   core_only_admins_codename: only admins can set codename
+  core_error_codename_special_characters: codenames cannot have special characters; only a-z and _.
   core_renaming: "Renaming"
   core_rename: "Rename"
   core_rename_confirm: "Are you sure you want to rename?"

data/mod/core/data/schema/20200805200729_add_unique_pair_indices.rb

@@ -36,6 +36,6 @@ class AddUniquePairIndices < Cardio::Migration::Schema
   end
 
   def connection
-    ActiveRecord::Base.connection
+    ActiveRecord::Base.lease_connection
   end
 end

data/mod/core/data/schema/20240628212556_add_trash_index.rb

@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+
+class AddTrashIndex < Cardio::Migration::Schema
+  def up
+    add_index :cards, :trash, name: "cards_trash_index"
+  end
+
+  def down
+    remove_index :cards, name: "cards_trash_index"
+  end
+end

data/mod/core/data/schema/20241017160402_unique_codename.rb

@@ -0,0 +1,13 @@
+# -*- encoding : utf-8 -*-
+
+class UniqueCodename < Cardio::Migration::Schema
+  def up
+    remove_index :cards, name: "cards_codename_index"
+    add_index :cards, :codename, name: "cards_codename_index", unique: true
+  end
+
+  def down
+    remove_index :cards, name: "cards_codename_index"
+    add_index :cards, :codename, name: "cards_codename_index"
+  end
+end