card 1.108.0 → 1.109.0

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]
@@ -33,6 +34,7 @@ namespace :card do
 
     # desc "dump db to fixtures"
     task dump: :environment do
+      puts "dumping".green
       Card::Cache.reset_all
       Cardio::Seed.dump
     end
@@ -53,7 +55,7 @@ namespace :card do
     end
 
     def invoke_card_task task
-      puts "invoking: #{task}".green
+      puts "invoking: #{task}"
       Rake::Task["card:#{task}"].invoke
     end
   end

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

@@ -11,9 +11,24 @@ namespace :card do
   task :update do
     failing_loudly "decko update" do
       ENV["NO_RAILS_CACHE"] = "true"
-      # Benchmark.bm do |x|
-      ["migrate:port", "migrate:schema", "migrate:recode", :eat, "migrate:transform",
-       "mod:uninstall", "mod:install", "mod:symlink", :reset].each do |task|
+      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
     end
@@ -21,8 +36,7 @@ namespace :card do
 
   desc "Ingests card data from mod yaml"
   task eat: :environment do
-    puts "eating"
-    parse_options :eat do
+    run_with_options :eat, Cardio::Mod::Eat, "eating" do
       add_opt :m, :mod, "only eat cards in given mod"
       add_opt :n, :name, "only eat card with name (handles : for codenames)"
       add_opt :u, :user, "user to credit unless specified (default is Decko Bot)"
@@ -31,26 +45,46 @@ namespace :card do
       add_opt :e, :env, "environment (test, production, etc)"
       flag_opt :v, :verbose, "output progress info and error backtraces"
     end
+  end
 
-    adjust_environment options, :eat do
-      rake_result(:eat) { Cardio::Mod::Eat.new(**options).up }
-    end
+  def args_without_env_arg
+    env_index = ARGV.find_index { |entry| %w[-e --env].include?(entry) }
+    args =
+      if env_index
+        ARGV[1..].select.with_index do |_, index|
+          (index != env_index - 1) && (index != env_index)
+        end
+      else
+        ARGV[1..]
+      end
+    args&.join " "
   end
 
-  def adjust_environment options, task
+  def adjust_environment options, args_without_env, task, task_message
     if (env = options.delete(:env))
-      task_options = options.map { |k, v| "--#{k}=#{v}" }.join(" ")
-      system "env RAILS_ENV=#{env} bundle exec rake card:#{task} #{task_options}"
+      command = "env RAILS_ENV=#{env} bundle exec rake card:#{task} #{args_without_env}"
+      puts command.yellow
+      success = system command
+      exit success # to avoid that rake tries to run the arguments as rake tasks
     else
+      puts task_message
       yield
     end
   end
 
+  def run_with_options task_name, task_class, start_message, &block
+    args_without_env = args_without_env_arg
+    parse_options task_name, &block
+    adjust_environment options, args_without_env, task_name, start_message do
+      rake_result(task_name) { task_class.new(**options).run }
+    end
+  end
+
   desc "Exports card data to mod yaml"
   task sow: :environment do
-    puts "sowing"
-    parse_options :sow do
+    run_with_options :sow, Cardio::Mod::Sow, "sowing" do
       add_opt :n, :name, "export card with name/mark (handles : and ~ prefixes)"
+      add_opt :r, :remote, "export card from remote deck (with -n)"
       flag_opt :i, :items, "also export card items (with -n)"
       flag_opt :o, :only_items, "only export card items (with -n)", items: :only
       add_opt :c, :cql, "export cards found by CQL (in JSON format)"
@@ -60,9 +94,6 @@ namespace :card do
       add_opt :t, :field_tags, "comma-separated list of field tag marks"
       add_opt :e, :env, "environment (test, production, etc)"
     end
-    adjust_environment options, :sow do
-      rake_result(:sow) { Cardio::Mod::Sow.new(**options).out }
-    end
   end
 
   desc "Clears both cache and tmpfiles"

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

@@ -1,4 +1,3 @@
-
 basket[:tasks] = {}
 basket[:config_title] = {
   basic: "Basic configuration",
@@ -59,7 +58,7 @@ def all_admin_configs_of_category category
 end
 
 def config_codenames_grouped_by_title configs
-  configs&.group_by { |c| c.title }&.map do |title, grouped_configs|
+  configs&.group_by(&:title)&.map do |title, grouped_configs|
     [title, grouped_configs.map { |config| config.codename.to_sym }]
   end
 end

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

@@ -18,6 +18,7 @@ end
 
 protected
 
+# extends Card Class
 module ClassMethods
   def assign_or_newish name, attributes, fetch_opts={}
     if (known_card = Card.fetch(name, fetch_opts))
@@ -47,10 +48,10 @@ def prepare_assignment_args args
   args
 end
 
-def assign_with_set_modules args
+def assign_with_set_modules args, &block
   return yield unless args[:name] || args[:type_id]
 
-  refresh_set_modules { yield }
+  refresh_set_modules(&block)
 end
 
 def assign_with_subcards args

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

@@ -1,6 +1,7 @@
 event :validate_codename, :validate, on: :update, changed: :codename do
   validate_codename_permission
   validate_codename_uniqueness
+  validate_codename_simplicity
 end
 
 event :reset_codename_cache, :integrate, changed: :codename do
@@ -30,3 +31,9 @@ def validate_codename_uniqueness
 
   errors.add :codename, t(:core_error_code_in_use, codename: codename)
 end
+
+def validate_codename_simplicity
+  return if name.simple?
+
+  errors.add :codename, t(:core_codename_must_be_simple)
+end

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

@@ -10,9 +10,9 @@ end
 private
 
 def inspect_tags
-  %w[trash new frozen readonly virtual set_mods_loaded].map do |tag|
-    tag if send "#{tag}?"
-  end.compact
+  %w[trash new frozen readonly virtual set_mods_loaded].select do |tag|
+    send "#{tag}?"
+  end
 end
 
 def debug_type

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

@@ -1,5 +1,6 @@
 JUNK_INIT_ARGS = %i[missing skip_virtual id].freeze
 
+# extends Card Class
 module ClassMethods
   def new args={}, _options={}
     with_normalized_new_args args do |normalized_args|

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

@@ -13,6 +13,7 @@
 # - *known* cards are either _real_ or _virtual_
 # - *new* (or *unreal*) cards are either _unknown_ or _virtual_
 
+# extends Card Class
 module ClassMethods
   def real? mark
     quick_fetch(mark).present?
@@ -28,10 +29,9 @@ end
 # @return [Symbol] :real, :virtual, or :unknown
 def state anti_fishing=true
   case
-  when !known?                     then :unknown
-  when anti_fishing && !ok?(:read) then :unknown
-  when real?                       then :real
-  when virtual?                    then :virtual
+  when !known? || (anti_fishing && !ok?(:read)) then :unknown
+  when real?                                    then :real
+  when virtual?                                 then :virtual
   else :wtf
   end
 end
@@ -68,8 +68,9 @@ end
 
 # @return [True/False]
 def new?
-  new_record? ||       # not yet in db (from ActiveRecord)
-    !@from_trash.nil?  # in process of restoration from trash
+  (new_record? ||         # not yet in db (from ActiveRecord) or
+    !@from_trash.nil?) && # in process of restoration from trash, but
+    !trash?               # not in trash
 end
 alias_method :new_card?, :new?
 alias_method :unreal?, :new?

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

@@ -1,3 +1,4 @@
+# extends Card Class
 module ClassMethods
   def default_type_id
     @default_type_id ||= Card.fetch_type_id %i[all default]
@@ -66,6 +67,7 @@ end
 
 def type_id_from_code
   return if simple?
+
   each_type_assigning_module_key do |module_key|
     type_id = Card::Set::Type.assignment[module_key]&.card_id
     return type_id if type_id

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

@@ -1,4 +1,3 @@
-
 def mod_path modname
   Cardio::Mod.dirs.path modname
 end

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

@@ -23,6 +23,7 @@ end
 
 event :admin_tasks, :initialize, on: :update do
   return unless (task = Env.params[:task]&.to_sym) && (task_config = basket[:tasks][task])
+
   raise Card::Error::PermissionDenied, self unless Auth.always_ok?
 
   # when :repair_references    then Card::Reference.repair_all
@@ -46,7 +47,7 @@ end
 
 def not_allowed task
   raise Card::Error::PermissionDenied,
-        "The admin task '#{task}' is disabled for security reasons.<br>"\
+        "The admin task '#{task}' is disabled for security reasons.<br>" \
         "You can enable it with the config option 'allow_irreversible_admin_tasks'"
 end
 

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

@@ -1,3 +1,3 @@
 setting_opts group: :templating, position: 4,
-             help_text: "Autogenerate name for new cards by incrementing this value. "\
+             help_text: "Autogenerate name for new cards by incrementing this value. " \
                         "[[http://decko.org/autonaming|more]]"

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

@@ -1,13 +1,13 @@
 include_set Abstract::List
 
-def item_codenames
+def item_codes
   Cardio.mods.map do |mod|
     "#{mod}_mod"
   end
 end
 
 def content
-  item_codenames.map(&:cardname).compact.to_pointer_content
+  item_codes.map(&:cardname).compact.to_pointer_content
 end
 
 format :html do
@@ -18,7 +18,7 @@ format :html do
         card.all_admin_configs_grouped_by(:category, :mod)[view_name.to_s]
             .map do |(mod, configs)|
           list_section(mod.name, configs.map { |c| c.codename.to_sym })
-        end.join("<br\>")
+        end.join("<br/>")
       ]
     end
   end
@@ -33,7 +33,7 @@ format :html do
             list_section cat, configs.map(&:codename)
           end)
         ]
-      end.join("<br\>")
+      end.join("<br/>")
     ]
   end
 end

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

@@ -37,7 +37,7 @@ format :html do
                   btn_type: :default,
                   path: { mark: :admin, action: :update, task: :empty_trash,
                           success: { mark: "~#{card.id}" } },
-                  "data-confirm" => "Are you sure you want to delete "\
+                  "data-confirm" => "Are you sure you want to delete " \
                                     "all cards in the trash?")
     )
   end

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

@@ -53,17 +53,20 @@ format :html do
   view :styles do
     style = card.fetch :style
     return unless style
+
     section "Styles", nest(style, view: :core)
   end
 
   view :scripts do
     style = card.fetch :script
     return unless style
+
     section "Scripts", nest(style, view: :core)
   end
 
   view :gem_info do
     return unless card.mod&.spec
+
     properties =
       %w[name summary version authors description email homepage].map do |property|
         "#{property}: #{card.mod.spec.send(property)}"
@@ -113,7 +116,7 @@ def scripts?
 end
 
 def depends_on?
-  mod&.spec&.dependencies.present?
+  depends_on.present?
 end
 
 def description?
@@ -125,10 +128,7 @@ def views?
 end
 
 def depends_on
-  mod&.spec&.dependencies
-    &.map { |dep| dep.name }
-    &.select { |name| name.starts_with? "card-mod" }
-    &.map { |name| "mod_#{name[8..-1]}" }
+  @depends_on ||= card_mods { mod&.spec&.dependencies }
 end
 
 def tasks
@@ -138,9 +138,7 @@ end
 def settings
   return unless admin_config
 
-  admin_config["settings"]&.map do |setting|
-    setting.to_sym
-  end
+  admin_config["settings"]&.map(&:to_sym)
 end
 
 def configurations
@@ -162,12 +160,9 @@ def views
 end
 
 def description
-  default = if mod&.spec&.description.present?
-              mod&.spec&.description
-            else
-              mod&.spec&.summary
-            end
-  t("#{modname}_mod_description", default: default)
+  spec = mod&.spec
+  default = spec&.description.present? ? spec&.description : spec&.summary
+  t "#{modname}_mod_description", default: default
 end
 
 def modname
@@ -205,8 +200,10 @@ end
 
 def load_admin_config
   return unless admin_config_exists?
+
   admin_config = YAML.load_file admin_config_path
   return {} unless admin_config # blank manifest
+
   # validate_manifest manifest
   admin_config
 end
@@ -222,6 +219,12 @@ end
 
 private
 
+def card_mods
+  yield&.map(&:name)
+       &.select { |name| name.starts_with? "card-mod" }
+       &.map { |name| "mod_#{name[8..]}" }
+end
+
 def read_admin_yml
-  YAML.safe_load File.read(filename), [Symbol] if File.exist? filename
+  YAML.safe_load_file filename, permitted_classes: [Symbol] if File.exist? filename
 end

data/mod/core/set_pattern/09_self.rb

@@ -21,3 +21,7 @@ end
 def anchor_id card
   card.id
 end
+
+def anchor_parts_count anchor_name=nil
+  anchor_name&.part_names&.size || 1
+end

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

@@ -12,7 +12,7 @@ RSpec.describe Card::Set::All::Trash do
   it "deletes account of user", as_bot: true do
     expect(Card["Sample User", :account]).to be_a Card
     Card["Sample User"].delete!
-    expect(Card["Sample User", :account]).not_to be
+    expect(Card["Sample User", :account]).to be_nil
   end
 
   describe "event: validate_delete" do
@@ -98,15 +98,15 @@ RSpec.describe Card::Set::All::Trash do
       create! "#{book1}+value"
       create! "#{book2}+value"
 
-      expect(Card["CA"]).to be
+      expect(Card["CA"]).to be_truthy
 
       Card["CA"].delete!
 
-      expect(Card["CA"]).not_to be
-      expect(Card[book1]).not_to be
-      expect(Card["#{book1}+value"]).not_to be
-      expect(Card[book2]).not_to be
-      expect(Card["#{book2}+value"]).not_to be
+      expect(Card["CA"]).to be_nil
+      expect(Card[book1]).to be_nil
+      expect(Card["#{book1}+value"]).to be_nil
+      expect(Card[book2]).to be_nil
+      expect(Card["#{book2}+value"]).to be_nil
     end
 
     it "handles compound cards", as_bot: true do