card 1.101.3 → 1.101.4

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

@@ -1,103 +1,3 @@
-def field tag, opts={}
-  Card.fetch name.field(tag), opts
-end
-
-def subcard card_name
-  subcards.card card_name
-end
-
-def subfield field_name
-  subcards.field field_name
-end
-
-def field? tag
-  field(tag) || subfield(tag)
-end
-
-def subcards
-  @subcards ||= Card::Subcards.new self
-end
-
-def subcards?
-  subcards.present?
-end
-
-def expire_subcards
-  subcards.clear
-end
-
-# phase_method :attach_subcard, before: :store do |name_or_card, args=nil|
-# TODO: handle differently in different stages
-def add_subcard name_or_card, args={}
-  subcards.add name_or_card, args
-end
-alias_method :attach_subcard, :add_subcard
-
-def add_subcard! name_or_card, args={}
-  subcard = subcards.add name_or_card, args
-  subcard.director.reset_stage
-  subcard
-end
-alias_method :attach_subcard!, :add_subcard!
-
-# phase_method :attach_subfield, before: :approve do |name_or_card, args=nil|
-def attach_subfield name_or_card, args={}
-  subcards.add_field name_or_card, args
-end
-alias_method :add_subfield, :attach_subfield
-
-def attach_subfield! name_or_card, args={}
-  subcard = subcards.add_field name_or_card, args
-  subcard.director.reset_stage
-  subcard
-end
-
-def detach_subcard name_or_card
-  subcards.remove name_or_card
-end
-alias_method :remove_subcard, :detach_subcard
-
-def detach_subfield name_or_card
-  subcards.remove_field name_or_card
-end
-alias_method :remove_subfield, :detach_subfield
-
-def clear_subcards
-  subcards.clear
-end
-
-# ensures subfield is present
-# does NOT override subfield content if already present
-def ensure_subfield field_name, args={}
-  if subfield_present? field_name
-    subfield field_name
-  else
-    add_subfield field_name, args
-  end
-end
-
-def subfield_present? field_name
-  subfield(field_name)&.content&.present?
-end
-
-def deep_clear_subcards
-  subcards.deep_clear
-end
-
-def handle_subcard_errors
-  subcards.each do |subcard|
-    subcard.errors.each do |error|
-      subcard_error subcard, error
-    end
-    subcard.errors.clear
-  end
-end
-
-def subcard_error subcard, error
-  msg = error.message
-  msg = "#{error.attribute} #{msg}" unless %i[content abort].member? error.attribute
-  errors.add subcard.name.from(name), msg
-end
 
 event :reject_empty_subcards, :prepare_to_validate do
   subcards.each_with_key do |subcard, key|

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

@@ -29,15 +29,16 @@ module ClassMethods
     # TODO: handle cloud files
     return unless dir
 
-    trashed_card_ids = all_trashed_card_ids
-    file_ids = all_file_ids
-    file_ids.each do |file_id|
-      next unless trashed_card_ids.member?(file_id)
-      raise Card::Error, tr(:exception_almost_deleted) if Card.exists?(file_id)
-      ::FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
+    (all_trashed_card_ids & all_file_ids).each do |file_id|
+      delete_files_with_id file_id
     end
   end
 
+  def delete_files_with_id file_id
+    raise Card::Error, t(:core_exception_almost_deleted) if Card.exists?(file_id)
+    ::FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
+  end
+
   def all_file_ids
     dir = Card.paths["files"].existent.first
     Dir.entries(dir)[2..-1].map(&:to_i)
@@ -91,7 +92,7 @@ end
 
 event :validate_delete, :validate, on: :delete do
   unless codename.blank?
-    errors.add :delete, tr(:error_system_card, name: name, codename: codename)
+    errors.add :delete, t(:core_error_system_card, name: name, codename: codename)
   end
 
   undeletable_all_rules_tags =
@@ -100,19 +101,16 @@ event :validate_delete, :validate, on: :delete do
 
   if junction? && left&.codename == :all &&
      undeletable_all_rules_tags.member?(right.codename.to_s)
-    errors.add :delete, tr(:error_indestructible, name: name)
+    errors.add :delete, t(:core_error_indestructible, name: name)
   end
 
-  errors.add :delete, tr(:error_user_edits, name: name) if account && has_edits?
+  errors.add :delete, t(:core_error_user_edits, name: name) if account && has_edits?
 end
 
 event :validate_delete_children, after: :validate_delete, on: :delete do
   return if errors.any?
   each_child do |child|
-    next unless child
-    # prevents errors in cases where a child is deleted prior to this point
-    # and thus is not returned by the fetch in #children
-
+    child.include_set_modules
     delete_as_subcard child
     # next if child.valid?
     # child.errors.each do |field, message|

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

@@ -43,19 +43,17 @@ def type_id_from_template
 end
 
 event :validate_type_change, :validate, on: :update, changed: :type_id do
-  if (c = dup) && c.action == :create && !c.valid?
-    errors.add :type, tr(
-      :error_cant_change_errors,
-      name: name, type_id: type_id,
-      error_messages: c.errors.full_messages
-    )
-  end
+  return unless (c = dup) && c.action == :create && !c.valid?
+  errors.add :type, t(:core_error_cant_change_errors,
+                      name: name,
+                      type_id: type_id,
+                      error_messages: c.errors.full_messages)
 end
 
 event :validate_type, :validate, changed: :type_id, on: :save do
-  errors.add :type, tr(:error_no_such_type) unless type_name
+  errors.add :type, t(:core_error_no_such_type) unless type_name
 
   if (rt = structure) && rt.assigns_type? && type_id != rt.type_id
-    errors.add :type, tr(:error_hard_templated, name: name, type_name: rt.type_name)
+    errors.add :type, t(:core_error_hard_templated, name: name, type_name: rt.type_name)
   end
 end

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

@@ -87,6 +87,9 @@ def mod_root modname
   end
 end
 
+delegate :t, to: Cardio
+
 format do
+  delegate :t, to: Cardio
   delegate :measure, to: :card
 end

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

@@ -11,18 +11,18 @@ def was_cardtype?
 end
 
 event :check_for_cards_of_type, after: :validate_delete do
-  errors.add :cardtype, tr(:cards_exist, cardname: name) if cards_of_type_exist?
+  errors.add :cardtype, t(:core_cards_exist, cardname: name) if cards_of_type_exist?
 end
 
 event :check_for_cards_of_type_when_type_changed,
       :validate, changing: :type, when: :was_cardtype? do
   if cards_of_type_exist?
-    errors.add :cardtype, tr(:error_cant_alter, name: name_before_act)
+    errors.add :cardtype, t(:core_error_cant_alter, name: name_before_act)
   end
 end
 
 event :validate_cardtype_name, :validate, on: :save, changed: :name do
   if %r{[<>/]}.match?(name)
-    errors.add :name, tr(:error_invalid_character_in_cardtype, banned: "<, >, /")
+    errors.add :name, t(:core_error_invalid_character_in_cardtype, banned: "<, >, /")
   end
 end

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

@@ -13,5 +13,5 @@ def prototype_args _anchor
 end
 
 def pattern_applies? card
-  card.is_rule?
+  card.rule?
 end

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

@@ -1,4 +1,208 @@
 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)
+    actions_count_before = card.actions.count
+    old_name = card.name
+
+    update! card.name, name: new_name, update_referers: true
+    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)
+  end
+
+  def expect_old_name_cleared old_name
+    expect(Card.cache.read(old_name)).to eq(nil)
+  end
+
+  def expect_successful_rename card, attrs_before
+    expect(name_invariant_attributes(card)).to eq(attrs_before)
+    expect(Card[card.name]).to eq(card)
+  end
+
+  def card_to_rename card
+    return card unless card.is_a? String
+
+    Card[card].refresh || raise("Couldn't find card named #{card}")
+  end
+
+  it "renames simple card to its own child" do
+    assert_rename "F", "F+M"
+  end
+
+  it "disallows renaming simple to compound when simple is used as tag" do
+    expect { Card["A"].update! name: "A+M" }.to raise_error(/illegal name change/)
+  end
+
+  it "renames plus card to its own child" do
+    assert_rename "A+B", "A+B+T"
+  end
+
+  it "clears cache for old name" do
+    Card["A"]
+    Card["A+B"]
+    assert_rename "A", "AAA"
+    expect(Card.cache.read("a")).to be_nil
+    expect(Card.cache.read("a+b")).to be_nil
+  end
+
+  it "wipes old references by default" do
+    update "Menu", name: "manure"
+    expect(Card["manure"].references_in.size).to eq(0)
+  end
+
+  it "picks up new references" do
+    expect(Card["Z"].references_in.size).to eq(2)
+    assert_rename "Z", "Mister X"
+    expect(Card["Mister X"].references_in.size).to eq(3)
+  end
+
+  it "handles name variants" do
+    assert_rename "B", "b"
+  end
+
+  it "handles plus cards renamed to simple" do
+    assert_rename "A+B", "K"
+  end
+
+  it "handles flipped parts" do
+    assert_rename "A+B", "B+A"
+  end
+
+  it "fails if card exists" do
+    expect { update "T", name: "A+B" }.to raise_error(/Name must be unique/)
+  end
+
+  it "fails if used as tag" do
+    expect { update "B", name: "A+D" }.to raise_error(/Name must be unique/)
+  end
+
+  it "updates descendants" do
+    old_names = %w[One+Two One+Two+Three Four+One Four+One+Five]
+    new_names = %w[Uno+Two Uno+Two+Three Four+Uno Four+Uno+Five]
+    card_list = old_names.map { |name| Card[name] }
+
+    expect(card_list.map(&:name)).to eq old_names
+    update "One", name: "Uno"
+    expect(card_list.map(&:id).map(&:cardname)).to eq new_names
+  end
+
+  it "fails if name is invalid" do
+    expect { update "T", name: "" }
+      .to raise_error(/Name can't be blank/)
+  end
+
+  example "simple to simple" do
+    assert_rename "A", "Alephant"
+  end
+
+  example "simple to junction with create" do
+    assert_rename "T", "C+J"
+  end
+
+  example "reset key" do
+    c = Card["basicname"]
+    update "basicname", name: "banana card"
+    expect(c.key).to eq("banana_card")
+    expect(Card["Banana Card"]).not_to be_nil
+  end
+
+  it "does not fail when updating inaccessible referer" do
+    Card.create! name: "Joe Card", content: "Whattup"
+    Card::Auth.as "joe_admin" do
+      Card.create! name: "Admin Card", content: "[[Joe Card]]"
+    end
+
+    c = Card["Joe Card"]
+    c.update! name: "Card of Joe", update_referers: true
+    assert_equal "[[Card of Joe]]", Card["Admin Card"].content
+  end
+
+  it "test_rename_should_update_structured_referer" do
+    Card::Auth.as_bot do
+      c = Card.create! name: "Pit"
+      Card.create! name: "Orange", type: "Fruit", content: "[[Pit]]"
+      Card.create! name: "Fruit+*type+*structure", content: "this [[Pit]]"
+
+      assert_equal "this [[Pit]]", Card["Orange"].content
+      c.update! name: "Seed", update_referers: true
+      assert_equal "this [[Seed]]", Card["Orange"].content
+    end
+  end
+
+  it "handles plus cards that have children" do
+    assert_rename Card["a+b"], "e+f"
+  end
+
+  context "with self references" do
+    example "renaming card with self link should nothang" do
+      pre_content = Card["self_aware"].content
+      update "self aware", name: "buttah", update_referers: true
+      expect_card("Buttah").to have_content(pre_content)
+    end
+
+    it "renames card without updating references" do
+      pre_content = Card["self_aware"].content
+      update "self aware", name: "Newt", update_referers: false
+      expect_card("Newt").to have_content(pre_content)
+    end
+  end
+
+  context "with references" do
+    it "updates nests" do
+      update "Blue", name: "Red", update_referers: true
+      expect_card("blue includer 1").to have_content("{{Red}}")
+      expect_card("blue includer 2").to have_content("{{Red|closed;other:stuff}}")
+    end
+
+    it "updates nests when renaming to plus" do
+      update "Blue", name: "blue includer 1+color", update_referers: true
+      expect_card("blue includer 1").to have_content("{{blue includer 1+color}}")
+    end
+
+    it "reference updates on case variants" do
+      update "Blue", name: "Red", update_referers: true
+      expect_card("blue linker 1").to have_content("[[Red]]")
+      expect_card("blue linker 2").to have_content("[[Red]]")
+    end
+
+    it "handles link to and nest of same card" do
+      update "blue linker 1", content: "[[Blue]] is {{Blue|name}}"
+      update "Blue", name: "Red", update_referers: true
+      expect_card("blue linker 1").to have_content("[[Red]] is {{Red|name}}")
+    end
+
+    example "reference updates plus to simple" do
+      assert_rename Card["A+B"], "schmuck"
+      expect_card("X").to have_content("[[A]] [[schmuck]] [[T]]")
+    end
+
+    it "substitutes name part" do
+      c1 = Card["A+B"]
+      assert_rename Card["B"], "buck"
+      expect(Card.find(c1.id).name).to eq "A+buck"
+    end
+  end
+
   describe "event: set_name" do
     it "handles case variants" do
       c = Card.create! name: "chump"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.101.3
+  version: 1.101.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.1.3.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -144,14 +144,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -511,11 +511,15 @@ files:
 - lib/card/auth/setup.rb
 - lib/card/auth/token.rb
 - lib/card/cache.rb
+- lib/card/cache/all.rb
+- lib/card/cache/card_class.rb
 - lib/card/cache/persistent.rb
+- lib/card/cache/persistent_class.rb
 - lib/card/cache/prepopulate.rb
 - lib/card/cache/temporary.rb
 - lib/card/codename.rb
 - lib/card/content.rb
+- lib/card/content/all.rb
 - lib/card/content/chunk.rb
 - lib/card/content/chunk/abstract.rb
 - lib/card/content/clean.rb
@@ -527,6 +531,8 @@ files:
 - lib/card/content/truncate.rb
 - lib/card/director.rb
 - lib/card/director/act_direction.rb
+- lib/card/director/all.rb
+- lib/card/director/card_class.rb
 - lib/card/director/card_methods.rb
 - lib/card/director/event_delay.rb
 - lib/card/director/phases.rb
@@ -546,6 +552,8 @@ files:
 - lib/card/env/success/target.rb
 - lib/card/error.rb
 - lib/card/fetch.rb
+- lib/card/fetch/all.rb
+- lib/card/fetch/card_class.rb
 - lib/card/fetch/results.rb
 - lib/card/fetch/retrieve.rb
 - lib/card/fetch/store.rb
@@ -567,15 +575,14 @@ files:
 - lib/card/lexicon.rb
 - lib/card/mailer.rb
 - lib/card/mark.rb
-- lib/card/mod_inflector.rb
 - lib/card/model/save_helper.rb
 - lib/card/model/save_helper/save_arguments.rb
 - lib/card/model/save_helper/save_helper_helper.rb
 - lib/card/name.rb
 - lib/card/name/all.rb
-- lib/card/name/all/class_methods.rb
 - lib/card/name/all/descendants.rb
 - lib/card/name/all/parts.rb
+- lib/card/name/card_class.rb
 - lib/card/name/fields_and_traits.rb
 - lib/card/name/name_variants.rb
 - lib/card/query.rb
@@ -604,7 +611,9 @@ files:
 - lib/card/query/value.rb
 - lib/card/query/value/match_value.rb
 - lib/card/reference.rb
+- lib/card/reference/all.rb
 - lib/card/rule.rb
+- lib/card/rule/all.rb
 - lib/card/rule/cache.rb
 - lib/card/rule/preference_cache.rb
 - lib/card/rule/read_rule_cache.rb
@@ -615,9 +624,11 @@ files:
 - lib/card/set/basket.rb
 - lib/card/set/code_nest.rb
 - lib/card/set/event.rb
+- lib/card/set/event/all.rb
 - lib/card/set/event/callbacks.rb
 - lib/card/set/event/delayed_event.rb
 - lib/card/set/event/options.rb
+- lib/card/set/event/skip_and_trigger.rb
 - lib/card/set/format.rb
 - lib/card/set/format/abstract_format.rb
 - lib/card/set/format/abstract_format/haml_views.rb
@@ -631,6 +642,7 @@ files:
 - lib/card/set/inheritance.rb
 - lib/card/set/loader.rb
 - lib/card/set/pattern.rb
+- lib/card/set/pattern/all.rb
 - lib/card/set/pattern/base.rb
 - lib/card/set/pattern/class_methods.rb
 - lib/card/set/required_field.rb
@@ -639,6 +651,7 @@ files:
 - lib/card/setting.rb
 - lib/card/subcards.rb
 - lib/card/subcards/add.rb
+- lib/card/subcards/all.rb
 - lib/card/subcards/args.rb
 - lib/card/subcards/relate.rb
 - lib/card/subcards/remove.rb
@@ -716,24 +729,16 @@ files:
 - mod/admin/spec/set/self/admin_spec.rb
 - mod/admin/spec/set/self/trash_spec.rb
 - mod/core/set/all/abort.rb
-- mod/core/set/all/actify.rb
 - mod/core/set/all/assign_attributes.rb
-- mod/core/set/all/cache.rb
+- mod/core/set/all/autoname.rb
 - mod/core/set/all/codename.rb
 - mod/core/set/all/collection.rb
 - mod/core/set/all/content.rb
 - mod/core/set/all/contextual_content.rb
 - mod/core/set/all/debug.rb
-- mod/core/set/all/event_conditions.rb
-- mod/core/set/all/fetch.rb
-- mod/core/set/all/fetch_helper.rb
-- mod/core/set/all/i18n.rb
 - mod/core/set/all/initialize.rb
 - mod/core/set/all/name_events.rb
-- mod/core/set/all/pattern.rb
-- mod/core/set/all/references.rb
-- mod/core/set/all/rename.rb
-- mod/core/set/all/rules.rb
+- mod/core/set/all/reference_events.rb
 - mod/core/set/all/states.rb
 - mod/core/set/all/subcards.rb
 - mod/core/set/all/trash.rb
@@ -752,26 +757,14 @@ files:
 - mod/core/set_pattern/07_right.rb
 - mod/core/set_pattern/08_type_plus_right.rb
 - mod/core/set_pattern/09_self.rb
-- mod/core/spec/set/all/actify_spec.rb
 - mod/core/spec/set/all/assign_attributes_spec.rb
+- mod/core/spec/set/all/clean_me_spec.rb
 - mod/core/spec/set/all/codename_spec.rb
 - mod/core/spec/set/all/collection_spec.rb
-- mod/core/spec/set/all/content_spec.rb
-- mod/core/spec/set/all/event_conditions_spec.rb
 - mod/core/spec/set/all/export_spec.rb
-- mod/core/spec/set/all/fetch_helper_spec.rb
-- mod/core/spec/set/all/fetch_spec.rb
-- mod/core/spec/set/all/i18n_spec.rb
 - mod/core/spec/set/all/initialize_spec.rb
 - mod/core/spec/set/all/name_events_spec.rb
-- mod/core/spec/set/all/pattern_spec.rb
-- mod/core/spec/set/all/permissions/reader_rules_spec.rb
-- mod/core/spec/set/all/references_spec.rb
-- mod/core/spec/set/all/rename_spec.rb
-- mod/core/spec/set/all/rules2_spec.rb
-- mod/core/spec/set/all/rules_spec.rb
 - mod/core/spec/set/all/states_spec.rb
-- mod/core/spec/set/all/subcards_spec.rb
 - mod/core/spec/set/all/trash_spec.rb
 - mod/core/spec/set/all/type_spec.rb
 - mod/core/spec/set/all/utils_spec.rb