card 1.104.2 → 1.105.0

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

@@ -1,95 +1,11 @@
-module ClassMethods
-  def merge_list attribs, opts={}
-    unmerged = []
-    attribs.each do |row|
-      if merge row["name"], row, opts
-        Rails.logger.info "merged #{row['name']}"
-      else
-        unmerged.push row
-      end
-    end
 
-    if unmerged.empty?
-      Rails.logger.info "successfully merged all!"
-    else
-      unmerged_json = JSON.pretty_generate unmerged
-      report_unmerged_json unmerged_json, opts[:output_file]
-    end
-    unmerged
-  end
-
-  def report_unmerged_json unmerged_json, output_file
-    if output_file
-      ::File.open output_file, "w" do |f|
-        f.write unmerged_json
-      end
-    else
-      Rails.logger.info "failed to merge:\n\n#{unmerged_json}"
-    end
-  end
-
-  def merge name, attribs={}, opts={}
-    # puts "merging #{name}"
-    card = fetch name, new: {}
-    return unless mergeable? card, opts[:pristine]
-
-    resolve_file_attributes! attribs
-    card.safe_update! attribs
-  end
-
-  private
-
-  def resolve_file_attributes! attribs
-    %i[image file].each do |attach|
-      next unless attribs[attach].is_a?(String)
-
-      attribs[attach] = ::File.open(attribs[attach])
-    end
-  end
-
-  def mergeable? card, pristine_only
-    return true unless pristine_only
-
-    !card.pristine?
-  end
-end
-
-# separate name and other attributes
-def safe_update! attribs
-  separate_name_update! attribs.delete("name") unless new?
-  update! attribs if attribs.present?
-end
-
-def separate_name_update! new_name
-  return if new_name.to_s == name.to_s
-
-  update! name: new_name
-end
-
-# rubocop:disable Style/GlobalVars
-def measure desc
-  $times ||= {}
-  res = nil
-  t = Benchmark.measure do
-    res = yield
-  end
-  $times[desc] = $times.key?(desc) ? t + $times[desc] : t
-  puts "#{desc}: #{t}".red
-  res
-end
-# rubocop:enable Style/GlobalVars
-
-def mod_root modname
-  if (spec = Gem::Specification.find_by_name "card-mod-#{modname}")
-    spec.full_gem_path
-  else
-    "#{Cardio.gem_root}/mod/#{modname}"
-  end
+def mod_path modname
+  Cardio::Mod.dirs.path modname
 end
 
 delegate :t, to: ::I18n
 
 format do
   delegate :t, to: ::I18n
-  delegate :measure, to: :card
+  delegate :mod_path, to: :card
 end

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

@@ -1,3 +1,5 @@
+assign_type :phrase
+
 def history?
   false
 end

data/mod/core/set/self/admin/warning_alert.haml

@@ -0,0 +1,3 @@
+%h5
+  = t :core_admin_warn
+= list_tag warnings

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

@@ -0,0 +1,173 @@
+basket[:tasks].merge!(
+  clear_cache: {
+    mod: :core,
+    execute_policy: -> { Card::Cache.reset_all }
+  },
+  regenerate_assets: {
+    mod: :core,
+    execute_policy: -> { Card::Assets.refresh force: true }
+  }
+)
+
+basket[:warnings] = [:no_email_delivery]
+# For each warning in the basket (eg :my_warning), the core view
+# will run a test by appending a question mark (eg #my_warning?).
+# If it fails it will generate a message by appending message
+# (eg #my_warning_message).
+
+def no_email_delivery?
+  Card.config.action_mailer.perform_deliveries == false
+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
+  # when :repair_permissions   then Card.repair_all_permissions
+  # # when :regenerate_scripts   then Card::Assets.refresh_scripts
+  # when :clear_history
+  #   not_allowed "clear history" unless irreversibles_tasks_allowed?
+  #   Card::Action.delete_old
+
+  run_task_from_task_basket task, task_config
+  abort :success
+end
+
+def run_task_from_task_basket task, task_config
+  if !irreversibles_tasks_allowed? && task_config[:irreversible]
+    not_allowed t("#{task_config[:mod]}_task_#{task}_link_text")
+  else
+    task_config[:execute_policy]&.call
+  end
+end
+
+def not_allowed task
+  raise Card::Error::PermissionDenied,
+        "The admin task '#{task}' is disabled for security reasons.<br>"\
+        "You can enable it with the config option 'allow_irreversible_admin_tasks'"
+end
+
+def irreversibles_tasks_allowed?
+  Cardio.config.allow_irreversible_admin_tasks
+end
+
+format :html do
+  view :core, cache: :never do
+    table_content = basket[:tasks].map do |task, task_config|
+      task_row task, task_config[:mod]
+    end
+    table table_content, header: %w[Task Description]
+  end
+
+  def task_row task, mod
+    base = "#{mod}_task_#{task}"
+    [
+      link_to_card(:admin, t("#{base}_link_text"), path: { action: :update, task: task }),
+      t("#{base}_description")
+    ]
+  end
+
+  view :warning do
+    warnings = basket[:warnings].map do |warning|
+      card.send("#{warning}?") ? send("#{warning}_message") : nil
+    end
+    warnings.compact!
+    warnings.empty? ? "" : warning_alert(warnings)
+  end
+
+  def warning_alert warnings
+    # 'ADMINISTRATOR WARNING'
+    alert(:warning, true) { haml :warning_alert, warnings: warnings }
+  end
+
+  def no_email_delivery_message
+    # "Email delivery is turned off."
+    # "Change settings in config/application.rb to send sign up notifications."
+    t :core_admin_email_off, path: "config/application.rb"
+  end
+
+  # def card_stats
+  #   [
+  #     { title: "cards",
+  #       count: Card.where(trash: false) },
+  #     { title: "actions",
+  #       count: Card::Action },
+  #     #  link_text: "clear history",
+  #     #  task: "clear_history" },
+  #     { title: "references",
+  #       count: Card::Reference }
+  #     # link_text: "repair all",
+  #     # task: "repair_references" }
+  #   ]
+  # end
+
+  # def cache_stats
+  #   [
+  #     { 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",
+  #   #            count: Card::View,
+  #   #            link_text: "clear view cache",
+  #   #            task: "clear_view_cache" }
+  # end
+
+  # def memory_stats
+  #   oldmem = session[:memory]
+  #   session[:memory] = newmem = card.profile_memory
+  #   stats = [
+  #     { title: "memory now",
+  #       count: newmem, unit: "M",
+  #       link_text: "clear cache", task: "clear_cache" }
+  #   ]
+  #   return stats unless oldmem
+  #
+  #   stats << { title: "memory prev", count: oldmem, unit: "M" }
+  #   stats << { title: "memory diff", count: newmem - oldmem, unit: "M" }
+  #   stats
+  # end
+  #
+  # def stat_row args={}
+  #   res = [(args[:title] || "")]
+  #   res << "#{count(args[:count])}#{args[:unit]}"
+  #   return res unless args[:task]
+  #
+  #   res << link_to_card(:admin, (args[:link_text] || args[:task]),
+  #                       path: { action: :update, task: args[:task] })
+  #   res
+  # end
+  #
+  # def count counter
+  #   counter = counter.call if counter.is_a?(Proc)
+  #   counter.respond_to?(:count) ? counter.count : counter
+  # end
+
+  # def asset_input_cache_count
+  #   Card.where(right_id: AssetInputCacheID).count
+  # end
+  #
+  # def delete_sessions_link months
+  #   link_to_card :admin, months, path: { action: :update, months: months,
+  #                                        task: "delete_old_sessions" }
+  # end
+end
+
+# def current_memory_usage
+#   `ps -o rss= -p #{Process.pid}`.to_i
+# end
+#
+# def profile_memory &block
+#   before = current_memory_usage
+#   if block_given?
+#     instance_eval(&block)
+#   else
+#     before = 0
+#   end
+#   (current_memory_usage - before) / 1024.to_i
+# end

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

@@ -1,3 +1,5 @@
+basket[:non_createable_types] = [:mod]
+
 def cards_of_type_exist?
   !new_card? && Card.where(trash: false, type_id: id).exists?
 end

data/mod/core/set_pattern/02_all_plus.rb

@@ -1,4 +1,4 @@
-@@options = { junction_only: true }
+@@options = { compound_only: true }
 
 def label _name
   'All "+" cards'

data/mod/core/set_pattern/05_rstar.rb

@@ -1,4 +1,4 @@
-@@options = { junction_only: true }
+@@options = { compound_only: true }
 
 def label _name
   'All "+*" cards'

data/mod/core/set_pattern/06_rule.rb

@@ -1,4 +1,4 @@
-@@options = { junction_only: true }
+@@options = { compound_only: true }
 
 def label _name
   "All rule cards"

data/mod/core/set_pattern/07_right.rb

@@ -1,5 +1,5 @@
 @@options = {
-  junction_only: true,
+  compound_only: true,
   assigns_type: true
 }
 

data/mod/core/set_pattern/08_type_plus_right.rb

@@ -1,7 +1,7 @@
 # Patterned field names on a specific type
 
 @@options = {
-  junction_only: true,
+  compound_only: true,
   assigns_type: true,
   anchor_parts_count: 2
 }

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

@@ -31,10 +31,10 @@ RSpec.describe Card::Set::All::AssignAttributes do
     expect(card).to have_type(:cardtype).and have_codename :foo
   end
 
-  it "assigns subfields" do
-    card = Card.new name: "#name", subfields: { default: { content: "subcontent" } }
+  it "assigns fields" do
+    card = Card.new name: "#name", fields: { default: { content: "subcontent" } }
     expect(card.subcards.first).to eq "name+*default"
-    subcard = card.subfield :default
+    subcard = card.field :default
     expect(subcard).to be_a(Card)
     expect(subcard.name).to eq "#name+*default"
     expect(subcard.content).to eq "subcontent"

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

@@ -0,0 +1,25 @@
+RSpec.describe Card::Set::All::Autoname do
+  describe "event: set_autoname" do
+    before do
+      Card::Auth.as_bot { Card.create! name: "Book+*type+*autoname", content: "b1" }
+    end
+
+    it "handles cards without names" do
+      c = Card.create! type: "Book"
+      expect(c.name).to eq("b1")
+    end
+
+    it "increments again if name already exists" do
+      _b1 = Card.create! type: "Book"
+      b2 = Card.create! type: "Book"
+      expect(b2.name).to eq("b2")
+    end
+
+    it "handles trashed names" do
+      b1 = Card.create! type: "Book"
+      Card::Auth.as_bot { b1.delete }
+      b1 = Card.create! type: "Book"
+      expect(b1.name).to eq("b1")
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 RSpec.describe Card::Set::All::Codename do
   describe "codename" do
-    let(:card) { Card["a"] }
+    let(:card) { Card["c"] }
 
     it "requires admin permission" do
       card.update codename: "structure"

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

@@ -1,19 +1,6 @@
 RSpec.describe Card::Set::All::NameEvents do
   include CardExpectations
 
-  def name_invariant_attributes card
-    descendant_ids = []
-    card.each_descendant { |d| descendant_ids << d.id }
-    {
-      content: card.db_content,
-      # updater_id:  card.updater_id,
-      # revisions:   card.actions.count,
-      referers: card.referers.map(&:name).sort,
-      referees: card.referees.map(&:name).sort,
-      descendants: descendant_ids.sort
-    }
-  end
-
   def assert_rename card, new_name
     card = card_to_rename card
     attrs_before = name_invariant_attributes(card)
@@ -21,28 +8,36 @@ RSpec.describe Card::Set::All::NameEvents do
     old_name = card.name
 
     update! card.name, name: new_name
-    expect_action_added card, actions_count_before
-    expect_old_name_cleared old_name
-    expect_successful_rename card, attrs_before
-  end
 
-  def expect_action_added card, actions_count_before
-    expect(card.actions.count).to eq(actions_count_before + 1)
+    expect(name_invariant_attributes(card)).to eq(attrs_before)
+    expect_successful_rename old_name, card, (actions_count_before + 1)
   end
 
-  def expect_old_name_cleared old_name
+  private
+
+  def expect_successful_rename old_name, card, num_actions
+    expect(card.actions.count).to eq(num_actions)
     expect(Card.cache.read(old_name)).to eq(nil)
+    expect(card.name.card).to eq(card)
   end
 
-  def expect_successful_rename card, attrs_before
-    expect(name_invariant_attributes(card)).to eq(attrs_before)
-    expect(Card[card.name]).to eq(card)
+  def name_invariant_attributes card
+    descendant_ids = []
+    card.each_descendant { |d| descendant_ids << d.id }
+    {
+      content: card.db_content,
+      # updater_id:  card.updater_id,
+      # revisions:   card.actions.count,
+      referers: card.referers.map(&:name).sort,
+      referees: card.referees.map(&:name).sort,
+      descendants: descendant_ids.sort
+    }
   end
 
   def card_to_rename card
     return card unless card.is_a? String
 
-    Card[card].refresh || raise("Couldn't find card named #{card}")
+    Card[card]&.refresh || raise("Couldn't find card named #{card}")
   end
 
   it "renames simple card to its own child" do
@@ -107,8 +102,7 @@ RSpec.describe Card::Set::All::NameEvents do
   end
 
   it "fails if name is invalid" do
-    expect { update "T", name: "" }
-      .to raise_error(/Name can't be blank/)
+    expect { update "T", name: "" }.to raise_error(/Name can't be blank/)
   end
 
   example "simple to simple" do
@@ -154,7 +148,7 @@ RSpec.describe Card::Set::All::NameEvents do
   end
 
   context "with self references" do
-    example "renaming card with self link should nothang" do
+    example "renaming card with self link should not hang" do
       pre_content = Card["self_aware"].content
       update "self aware", name: "buttah"
       expect_card("Buttah").to have_content(pre_content)
@@ -232,45 +226,35 @@ RSpec.describe Card::Set::All::NameEvents do
   end
 
   describe "event: prepare_left_and_right" do
-    context "when creating junctions" do
-      before do
-        Card.create! name: "Peach+Pear", content: "juicy"
-      end
-
-      it "creates left card" do
-        expect(Card["Peach"]).to be_a(Card)
-      end
+    it "creates left card, right card, and compound card for 2-part names" do
+      Card.create! name: "Peach+Pear", content: "juicy"
+      expect("Peach".card).to be_a(Card)
+      expect("Pear".card).to be_a(Card)
+      expect("Peach+Pear".card).to be_a(Card)
+    end
 
-      it "creates right card" do
-        expect(Card["Pear"]).to be_a(Card)
-      end
+    it "creates all cards for three-part names" do
+      sugar_milk_flour = Card.create! name: "Sugar+Milk+Flour", content: "tasty"
+      sugar_milk = "Sugar+Milk".card
+      expect(sugar_milk_flour.left_id).to eq(sugar_milk.id)
+      expect(sugar_milk_flour.right_id).to eq("Flour".card_id)
+      expect(sugar_milk.left_id).to eq("Sugar".card_id)
+      expect(sugar_milk.right_id).to eq("Milk".card_id)
     end
   end
 
-  describe "event: autoname" do
-    before do
-      Card::Auth.as_bot do
-        @b1 = Card.create! name: "Book+*type+*autoname", content: "b1"
-      end
-    end
+  specify "event: rename_in_trash", as_bot: true do
+    a = "a".card
+    a.delete!
 
-    it "handles cards without names" do
-      c = Card.create! type: "Book"
-      expect(c.name).to eq("b1")
-    end
+    b = "b".card
+    b.update! name: "A"
 
-    it "increments again if name already exists" do
-      _b1 = Card.create! type: "Book"
-      b2 = Card.create! type: "Book"
-      expect(b2.name).to eq("b2")
-    end
+    trashed_a = Card.find a.id
 
-    it "handles trashed names" do
-      b1 = Card.create! type: "Book"
-      Card::Auth.as_bot { b1.delete }
-      b1 = Card.create! type: "Book"
-      expect(b1.name).to eq("b1")
-    end
+    expect(b.name).to eq("A")
+    expect(trashed_a.name).to eq("A*trash")
+    expect(trashed_a.key).to eq("a*trash")
   end
 
   describe "event: escape_name" do
@@ -291,11 +275,4 @@ RSpec.describe Card::Set::All::NameEvents do
         .to raise_error(/wrong key/)
     end
   end
-
-  describe "reset_codename_cache" do
-    it "resets codename cache when codename is updated" do
-      card = Card.create! name: "Codename Haver", codename: :codename_haver
-      expect(Card::Codename.id(:codename_haver)).to eq(card.id)
-    end
-  end
 end