card 1.103.2 → 1.104.1

data/lib/cardio/mod.rb

@@ -1,3 +1,5 @@
+require "cardio/mod/class_methods"
+
 module Cardio
   # A Card Mod (short for "module" or "modification") is a discrete piece of Decko
   # functionality. Mods are how the Decko community develops and shares code.
@@ -60,11 +62,13 @@ module Cardio
   #     or types of sets.
   #   - **file** for fixed initial card content
   class Mod
+    extend ClassMethods
+
     attr_reader :name, :path, :index
 
     def initialize name, path, index
       @name = Mod.normalize_name name
-      @path = path
+      @path = required_path path
       @index = index
     end
 
@@ -76,30 +80,34 @@ module Cardio
       "mod_#{name}"
     end
 
+    def subpath *parts
+      path = File.join [@path] + parts
+      path if File.exist? path
+    end
+
     def tmp_dir type
       File.join Cardio.paths["tmp/#{type}"].first,
                 "mod#{'%03d' % (@index + 1)}-#{@name}"
     end
 
-    def public_path
-      File.join @path, "public"
-    end
-
-    def assets_path
-      File.join @path, "assets"
-    end
-
-    def ensure_mod_installed
+    def ensure
       Card::Auth.as_bot do
-        card = ensure_mod_card
+        card = ensure_card
         card.ensure_mod_script_card
         card.ensure_mod_style_card
+        Card::Cache.reset_all
       end
     end
 
     private
 
-    def ensure_mod_card
+    def required_path path
+      return path if File.exist? path
+
+      raise Card::Error::NotFound, "mod not found: #{@name}"
+    end
+
+    def ensure_card
       if Card::Codename.exists? codename
         card = Card.fetch codename.to_sym
         card.update type: :mod unless card.type_code == :mod
@@ -108,73 +116,5 @@ module Cardio
         Card.create name: mod_card_name, type: :mod, codename: codename
       end
     end
-
-    class << self
-      def load
-        return if ENV["CARD_MODS"] == "none"
-
-        if Card.take
-          Loader.load_mods
-        else
-          Rails.logger.warn "empty database"
-        end
-      end
-
-      # @return an array of Rails::Path objects
-      def dirs
-        @dirs ||= Mod::Dirs.new(Cardio.paths["mod"].existent)
-      end
-
-      def dependencies name, nickname=true
-        return unless (spec = gem_spec name, nickname)
-
-        deps = spec&.dependencies || []
-        dep_names = deps.map { |dep| dependencies dep.name, false }
-        (dep_names << spec).flatten.compact.uniq
-      end
-
-      def each_path &block
-        each_simple_path(&block)
-        each_gem_path(&block)
-      end
-
-      # @return [Hash] in the form{ modname(String) => Gem::Specification }
-      def gem_specs
-        Bundler.definition.specs.each_with_object({}) do |gem_spec, h|
-          h[gem_spec.name] = gem_spec if gem_spec? gem_spec
-        end
-      end
-
-      def normalize_name name
-        name.to_s.sub(/^card-mod-/, "")
-      end
-
-      private
-
-      def gem_spec name, nickname=true
-        name = "card-mod-#{name}" if nickname && !name.match?(/^card-mod/)
-        spec = Gem::Specification.stubs_for(name)&.first
-        gem_spec?(spec) ? spec : nil
-      end
-
-      def each_simple_path &block
-        Cardio.paths["mod"].each do |mods_path|
-          Dir.glob("#{mods_path}/*").each(&block)
-        end
-      end
-
-      def each_gem_path
-        gem_specs.each_value do |spec|
-          yield spec.full_gem_path
-        end
-      end
-
-      # @return [True/False]
-      def gem_spec? spec
-        return unless spec
-
-        spec.name.match?(/^card-mod-/) || spec.metadata["card-mod"].present?
-      end
-    end
   end
 end

data/lib/cardio/railtie.rb

@@ -3,7 +3,6 @@ module Cardio
   class Railtie < Rails::Railtie
     # if you disable inline styles tinymce's formatting options stop working
     config.allow_inline_styles = true
-    config.delaying = nil
     config.token_expiry = 2.days
 
     config.recaptcha_public_key = nil  # deprecated; use recaptcha_site_key instead
@@ -15,6 +14,8 @@ module Cardio
     config.recaptcha_minimum_score = 0.5
 
     config.google_analytics_key = nil
+    config.google_analytics_tracker_key = nil
+    config.google_analytics_four_key = nil
 
     config.override_host = nil
     config.override_protocol = nil
@@ -31,6 +32,9 @@ module Cardio
     config.closed_search_limit = 10
     config.paging_limit = 20
 
+    config.delaying = false
+    config.active_job.queue_adapter = :delayed_job
+
     config.non_createable_types = %w[
       signup
       setting
@@ -38,6 +42,14 @@ module Cardio
       session
       bootswatch_skin
       customized_bootswatch_skin
+      local_folder_group
+      local_manifest_group
+      local_script_folder_group
+      local_script_manifest_group
+      local_style_folder_group
+      local_style_manifest_group
+      remote_manifest_group
+      mod
     ]
 
     config.view_cache = false
@@ -47,7 +59,7 @@ module Cardio
     config.encoding = "utf-8"
     config.request_logger = false
     config.performance_logger = false
-    config.sql_comments = true
+    config.sql_comments = false
 
     config.file_storage = :local
     config.file_buckets = {}
@@ -58,8 +70,8 @@ module Cardio
 
     config.persistent_cache = true
     config.prepopulate_cache = false
-    config.machine_refresh = :cautious
-    config.compress_javascript = true
+    config.asset_refresh = :cautious
+    config.compress_assets = true
 
     config.allow_irreversible_admin_tasks = false
     config.raise_all_rendering_errors = false
@@ -83,16 +95,18 @@ module Cardio
 
         c.paths.tap do |p|
           p["config/environments"].unshift "#{card_root}/config/environments"
-
           p["config/initializers"] << "#{card_root}/config/initializers"
           p.add "late/initializers", glob: "**/*.rb"
 
-          p["lib/tasks"] << "#{card_root}/lib/card/tasks"
+          p["lib/tasks"] << "#{card_root}/lib/tasks"
 
           p.add "mod", with: "#{card_root}/mod"
           p["mod"] << "mod"
           p.add "files"
 
+          p.add "lib/graph_q_l/types/query.rb"
+          p.add "mod-data"
+
           p.add "db", with: "#{card_root}/db"
           p.add "db/seeds.rb", with: "#{card_root}/db/seeds.rb"
           p.add "db/migrate", with: "#{card_root}/db/migrate"
@@ -105,9 +119,13 @@ module Cardio
             c.autoload_paths += Dir["#{mod_path}/lib"]
             c.watchable_dirs["#{mod_path}/set"] = %i[rb haml]
 
+            p["lib/graph_q_l/types/query.rb"] <<
+              "#{mod_path}/lib/graph_q_l/types/query.rb"
             p["config/initializers"] << "#{mod_path}/init/early"
             p["late/initializers"] << "#{mod_path}/init/late"
             p["config/locales"] << "#{mod_path}/locales"
+            p["lib/tasks"] << "#{mod_path}/lib/tasks"
+            p["mod-data"] << "#{mod_path}/data"
           end
 
           p["app/models"] = []

data/lib/cardio/schema.rb

@@ -1,9 +1,10 @@
 module Cardio
   module Schema
     class << self
-      def assume_migrated_upto_version type
-        mode type do |paths|
-          ActiveRecord::Schema.assume_migrated_upto_version version(type), paths
+      def assume_migrated_upto_version type, version=nil
+        mode type do |_paths|
+          version ||= version type
+          ActiveRecord::Schema.assume_migrated_upto_version version
         end
       end
 
@@ -53,6 +54,13 @@ module Cardio
         list.flatten
       end
 
+      def migration_context type
+        with_suffix type do
+          yield ActiveRecord::MigrationContext.new(migration_paths(type),
+                                                   ActiveRecord::SchemaMigration)
+        end
+      end
+
       private
 
       def deck_migration? type
@@ -82,13 +90,6 @@ module Cardio
         ActiveRecord::SchemaMigration.table_name = old_table_name
         ActiveRecord::SchemaMigration.reset_column_information
       end
-
-      def migration_context type
-        with_suffix type do
-          yield ActiveRecord::MigrationContext.new(migration_paths(type),
-                                                   ActiveRecord::SchemaMigration)
-        end
-      end
     end
   end
 end

data/lib/cardio/version.rb

@@ -0,0 +1,35 @@
+# -*- encoding : utf-8 -*-
+
+module Cardio
+  module Version
+    class << self
+      CARD_MINOR = { 0 => 90, 1 => 1000 }.freeze # can remove and hardcode after 1.0
+
+      def release
+        @version ||= File.read(File.expand_path("../../../card/VERSION", __dir__)).strip
+      end
+
+      def card_release
+        @card_release ||= [1, minor, point].compact.map(&:to_s).join "."
+      end
+
+      private
+
+      def bits
+        release.split(".").map(&:to_i)
+      end
+
+      def major
+        bits[0]
+      end
+
+      def minor
+        CARD_MINOR[major] + bits[1]
+      end
+
+      def point
+        bits[2]
+      end
+    end
+  end
+end

data/lib/cardio.rb

@@ -41,5 +41,9 @@ module Cardio
     def database
       @database ||= config.database_configuration.dig Rails.env, "database"
     end
+
+    def mods
+      Mod.dirs.mods
+    end
   end
 end

data/lib/generators/deck/deck_generator.rb

@@ -118,10 +118,11 @@ module Cardio
           if options["interactive"]
             Interactive.new(destination_root, (monkey? || platypus?)).run
           else
+            prefix = "bundle exec " if options["platypus"]
             puts "Now:
       1. Run `cd #{File.basename(destination_root)}` to enter your new deck directory
-      2. Run `decko seed` to seed your database (see config/database.yml).
-      3. Run `decko server` to start your server"
+      2. Run `#{prefix}decko seed` to seed your database (see config/database.yml).
+      3. Run `#{prefix}decko server` to start your server"
           end
         end
 

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

@@ -30,7 +30,7 @@ gem "card-mod-defaults"<%= repo_path_constraint :mod %>
 # BACKGROUND
 # A background gem is needed to run tasks like sending notifications in a background
 # process.
-# See https://github.com/decko-commons/decko/tree/master/card-mod-delayed_job
+# See https://github.com/decko-commons/decko/tree/main/card-mod-delayed_job
 # for additional configuration details.
 <%= "# " if shark? %>gem "card-mod-delayed_job"<%= repo_path_constraint :mod %>
 
@@ -50,7 +50,3 @@ gem "card-mod-defaults"<%= repo_path_constraint :mod %>
 # This mod is strongly recommended for platypuses – coders working on the decko core
 gem "card-mod-platypus"<%= repo_path_constraint :mod %>
 <% end %>
-
-# The following allows simple (non-gem) mods to specify gems via a Gemfile.
-# You may need to alter this code if you move such mods to an unconventional location.
-Dir.glob("mod/**/Gemfile").each { |gemfile| instance_eval File.read(gemfile) }

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

@@ -1,5 +1,9 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+# Add your own tasks in files ending in .rake a mod or deck's lib/tasks directory.
+#
+# Deck example:  mydeck/lib/tasks/mytasks.rake
+# Mod example    mydecko/mod/mymod/lib/tasks/mytasks.rake
+#
+# Tasks in these files will automatically be available to Rake.
 
 require File.expand_path("../config/application", __FILE__)
 

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

@@ -1,6 +1,6 @@
 --color
 --profile
 --backtrace
---format documentation
+// --format documentation
 --default-path '<%= File.expand_path spec_path %>'
 --require '<%= File.expand_path spec_helper_path %>'

data/lib/generators/deck/templates/simplecov.rb.erb

@@ -1,9 +1,11 @@
 
 if ENV["<%= 'REPO_' if platypus? %>TMPSETS"] && ENV["COVERAGE"] != "false"
   SimpleCov.start do
-    def add_mod_group modname
-      mod_dir = /(card-mod-)?#{Regexp.escape modname}/
-      add_group "Mod: #{modname}", %r{(^|card-mod-|mod/|/tmp.*/.*/mod\d{3}-)#{mod_dir}}
+    def add_mod_groups dir_pattern
+      Dir[dir_pattern].each do |path|
+        modname = File.basename path
+        add_group "Mod: #{modname}", %r{(mod/|mod\d{3}-)#{modname}}
+      end
     end
     <% if platypus? %>
     root "<%= expanded_repo_path %>"
@@ -16,15 +18,9 @@ if ENV["<%= 'REPO_' if platypus? %>TMPSETS"] && ENV["COVERAGE"] != "false"
     add_group "Cardname", "cardname"
     add_group "Decko", "decko"
 
-    Dir["#{root}/{card/mod/*,card-mod-*}"].each do |path|
-      match = path.match %r{/card[-/]mod[-/](?<modname>.*)$}
-      add_mod_group match[:modname]
-    end
+    add_mod_groups "#{root}/{card/,}/mod/*"
     <% else %>
-    Dir["mod/*"].each do |path|
-      modname = path.gsub "mod/", ""
-      add_mod_group modname
-    end
+    add_mod_groups "mod/*"
     <% end %>
     add_filter "/spec/"
     add_filter "/features/"

data/lib/generators/deck/templates/spec/javascripts/support/decko_jasmine.yml.erb

@@ -37,7 +37,6 @@ src_files:
  - jquery.iframe-transport.js
  - jquery_ujs.js
  - script_ace.js
- - script_prosemirror.js
  #- "**/*.{js.coffee,js,coffee}"
 
 # list of file expressions to include as css files

data/lib/generators/mod/USAGE

@@ -31,3 +31,4 @@ Example:
                 right/
                 self/
             README.md
+

data/lib/{card/tasks → tasks}/card/migrate.rake

@@ -19,10 +19,12 @@ end
 #   in mods in the deck
 def reset_column_information mod=false
   Rails.application.eager_load!
-  load_mod_lib if mod
+  load_mod_lib if mod && !ENV["NO_CARD_LOAD"]
   Cardio::Record.descendants.each(&:reset_column_information)
 end
 
+# FIXME: too general
+# intent is to find Record classes; this gets a lot more.
 def load_mod_lib
   Dir.glob(Cardio.root.join("mod/*/lib/*.rb")).sort.each { |x| require x }
 end
@@ -33,6 +35,44 @@ def without_dumping
 end
 
 namespace :card do
+  desc "migrate structure and cards"
+  task migrate: :environment do
+    ENV["NO_RAILS_CACHE"] = "true"
+    ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
+
+    stamp = ENV["STAMP_MIGRATIONS"]
+
+    puts "migrating structure"
+    Rake::Task["card:migrate:structure"].invoke
+    Rake::Task["card:migrate:stamp"].invoke :structure if stamp
+
+    puts "migrating deck structure"
+    Rake::Task["card:migrate:deck_structure"].execute
+    if stamp
+      Rake::Task["card:migrate:stamp"].reenable
+      Rake::Task["card:migrate:stamp"].invoke :core_cards
+    end
+
+    puts "migrating core cards"
+    Card::Cache.reset_all
+    # not invoke because we don't want to reload environment
+    Rake::Task["card:migrate:core_cards"].execute
+    if stamp
+      Rake::Task["card:migrate:stamp"].reenable
+      Rake::Task["card:migrate:stamp"].invoke :core_cards
+    end
+
+    puts "migrating deck cards"
+    # not invoke because we don't want to reload environment
+    Rake::Task["card:migrate:deck_cards"].execute
+    if stamp
+      Rake::Task["card:migrate:stamp"].reenable
+      Rake::Task["card:migrate:stamp"].invoke :deck_cards
+    end
+
+    Card::Cache.reset_all
+  end
+
   namespace :migrate do
     desc "migrate cards"
     task cards: %i[core_cards deck_cards]

data/lib/{card/tasks → tasks}/card/mod.rake

@@ -1,25 +1,32 @@
 namespace :card do
   namespace :mod do
+    task list: :environment do
+      Cardio.mods.each { |m| puts "#{m.name}: #{m.path}".green }
+    end
+
     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|
+      Cardio::Mod.dirs.each_subpath "public" do |mod, target|
         link = public_mod_dir mod
         FileUtils.rm_rf link
         FileUtils.ln_sf target, link
       end
     end
 
+    task missing: :environment do
+      Cardio::Mod.missing.each { |m| puts m.modname.yellow }
+    end
+
+    task uninstall: :environment do
+      Cardio::Mod.ensure_uninstalled
+    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
+      Cardio.config.compress_assets = true
+      Cardio::Mod.ensure_installed
     end
 
     def public_mod_dir subdir=nil

data/lib/tasks/card.rake

@@ -0,0 +1,65 @@
+require "optparse"
+
+namespace :card do
+  desc "ingest card data from mod yaml"
+  task eat: :environment do
+    parse_options :eat do
+      add_opt :m, :mod, "only merge cards in given mod"
+      add_opt :e, :env, "environment of yaml source (default is current env)"
+      add_opt :u, :user, "user to credit unless specified (otherwise uses Decko Bot)"
+      flag_opt :v, :verbose, "progress info and error backtraces"
+    end
+    Cardio::Mod::Eat.new(**options).up
+    exit 0
+  end
+
+  desc "export card data to mod yaml"
+  task poop: :environment do
+    parse_options :poop do
+      add_opt :n, :name, "export card with name/mark (handles : and ~ prefixes)"
+      flag_opt :i, :items, "also export card items (with -n)"
+      flag_opt :o, :only_items, "also export card items (with -n)", items: :only
+      add_opt :c, :cql, "export cards found by CQL (in JSON format)"
+      add_opt :m, :mod, "output yaml to data/environment.yml file in mod"
+      add_opt :e, :env, "environment to dump to (default is current env)"
+      add_opt :t, :field_tags, "comma-separated list of field tag marks"
+    end
+    result = Cardio::Mod::Poop.new(**options).out
+    exit 0 if result == :success
+
+    puts "ERROR in card:poop\n  #{result}".red
+    exit 1
+  end
+
+  desc "reset cache"
+  task reset_cache: :environment do
+    Card::Cache.reset_all
+  end
+
+  def options
+    @options ||= {}
+  end
+
+  def flag_opt letter, key, desc, hash=nil
+    hash ||= { key => true }
+    op.on("-#{letter}", "--#{key.to_s.tr '_', '-'}", desc) { options.merge! hash }
+  end
+
+  def add_opt letter, key, desc
+    op.on "-#{letter}", "--#{key.to_s.tr '_', '-'} #{key.to_s.upcase}", desc do |val|
+      options[key] = val
+    end
+  end
+
+  def op
+    @op ||= OptionParser.new
+  end
+
+  def parse_options task
+    op.banner = "Usage: rake card:#{task} -- [options]"
+    yield if block_given?
+    args = op.order!(ARGV) {}
+    # args << "-h" if args.empty?
+    op.parse! args
+  end
+end

data/mod/admin/locales/de.yml

@@ -0,0 +1,4 @@
+de:
+  admin_warn: ADMINISTRATOR WARNUNG
+  admin_email_off:
+    E-Mail-Versand ist ausgeschaltet. Ändere die Einstellungen in %{path}, damit Benachrichtigungen verschickt werden, wenn sich neue Nutzer registrieren.

data/mod/admin/set/all/admin.rb

@@ -0,0 +1,16 @@
+
+basket[:tasks] = []
+
+# to add an admin task:
+#
+# basket[:tasks] << {
+#   name: NAME,
+#   irreversible: TRUE/FALSE,
+#   execute_policy: -> { TASK_CODE },
+#   stats: {
+#     title: TITLE_STRING,
+#     count: -> { COUNT_CODE },
+#     link_text: LINK_STRING,
+#     task:
+#   }
+# }

data/mod/admin/set/self/admin.rb

@@ -1,10 +1,6 @@
-# collect arrays of the form
-# [task symbol, { execute_policy: block, stats_policy: block }]
-basket :tasks
-
 def run_task_from_task_basket task
   task = task.to_sym
-  task_data = tasks.find { |h| h[:name].to_sym == task.to_sym }
+  task_data = basket[:tasks].find { |h| h[:name].to_sym == task.to_sym }
   if !irreversibles_tasks_allowed? && task_data[:irreversible]
     not_allowed task_data[:stats][:link_text]
   elsif task_data
@@ -21,8 +17,8 @@ event :admin_tasks, :initialize, on: :update do
   when :repair_references    then Card::Reference.repair_all
   when :repair_permissions   then Card.repair_all_permissions
   when :clear_solid_cache    then Card.clear_solid_cache
-  when :clear_machine_cache  then Card::Machine.reset_all
-  when :clear_script_cache   then Card::Machine.reset_script
+  when :regenerate_assets    then Card::Assets.refresh_assets force: true
+  # when :regenerate_scripts   then Card::Assets.refresh_scripts
   when :clear_history
     not_allowed "clear history" unless irreversibles_tasks_allowed?
     Card::Action.delete_old
@@ -47,7 +43,7 @@ format :html do
     stats = card_stats
     stats += cache_stats
     stats += memory_stats
-    card.tasks.each do |task|
+    basket[:tasks].each do |task|
       stats += Array.wrap task[:stats]
     end
     table_content = stats.map { |args| stat_row(args) }
@@ -75,10 +71,12 @@ format :html do
         count: solid_cache_count, unit: " cards",
         link_text: "clear solid cache",
         task: "clear_solid_cache" },
-      { title: "machine cache",
-        count: machine_cache_count, unit: " cards",
-        link_text: "clear machine cache",
-        task: "clear_machine_cache" }
+      { title: "style assets",
+        link_text: "regenerate styles and scripts",
+        task: "regenerate_assets" } # ,
+      # { title: "script assets",
+      #   link_text: "regenerate scripts",
+      #   task: "regenerate_scripts" }
     ]
     # return stats unless Card.config.view_cache#
     # stats << { title: "view cache",
@@ -121,8 +119,8 @@ format :html do
     Card.search right: { codename: "solid_cache" }, return: "count"
   end
 
-  def machine_cache_count
-    Card::Virtual.where(right_id: MachineCacheID).count
+  def asset_input_cache_count
+    Card.where(right_id: AssetInputCacheID).count
   end
 
   def delete_sessions_link months