card 1.101.4 → 1.101.5

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

@@ -3,6 +3,7 @@
 event :validate_name, :validate, on: :save, changed: :name, when: :no_autoname? do
   validate_legality_of_name
   return if errors.any?
+
   Card.write_to_soft_cache self
   validate_uniqueness_of_name
 end
@@ -29,7 +30,7 @@ event :validate_legality_of_name do
   elsif !name.valid?
     errors.add :name, t(:core_error_banned_characters,
                         banned: Card::Name.banned_array * " ")
-  elsif changing_existing_tag_to_junction?
+  elsif changing_existing_tag_to_compound?
     errors.add :name, t(:core_error_name_tag, name: name)
   end
 end
@@ -44,6 +45,7 @@ end
 
 event :validate_renaming, :validate, on: :update, changed: :name, skip: :allowed do
   return if name_before_act&.to_name == name # just changing to new variant
+
   errors.add :content, t(:core_cannot_change_content) if content_is_changing?
   errors.add :type, t(:core_cannot_change_type) if type_is_changing?
   detect_illegal_compound_names
@@ -58,11 +60,13 @@ end
 event :rename_in_trash, after: :expire_old_name, on: :update do
   existing_card = Card.find_by_key_and_trash name.key, true
   return if !existing_card || existing_card == self
+
   existing_card.rename_as_trash_obstacle
 end
 
 event :prepare_left_and_right, :store, changed: :name, on: :save do
   return if name.simple?
+
   prepare_side :left
   prepare_side :right
 end
@@ -79,7 +83,7 @@ end
 protected
 
 def rename_as_trash_obstacle
-  self.name = name + "*trash"
+  self.name = "#{name}*trash"
   rename_in_trash_without_callbacks
   save!
 end
@@ -105,11 +109,13 @@ end
 
 def detect_illegal_compound_names
   return unless changed_from_simple_to_compound? && child_ids(:right).present?
+
   errors.add :name, "illegal name change; existing names end in +#{name_before_act}"
 end
 
-def changing_existing_tag_to_junction?
-  return false unless changing_name_to_junction?
+def changing_existing_tag_to_compound?
+  return false unless changing_name_to_compound?
+
   name_in_use_as_tag?
 end
 
@@ -117,8 +123,8 @@ def name_in_use_as_tag?
   !Card.where(right_id: id, trash: false).take.nil?
 end
 
-def changing_name_to_junction?
-  name.junction? && simple?
+def changing_name_to_compound?
+  name.compound? && simple?
 end
 
 def old_name_in_way? sidecard
@@ -150,6 +156,7 @@ end
 
 def prepare_obstructed_side side, side_id, sidename
   return unless side_id && side_id == id
+
   clear_name sidename
   send "#{side}_id=", add_subcard(sidename)
   true

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

@@ -7,6 +7,7 @@ end
 event :update_referer_content, :finalize, on: :update, when: :update_referers do
   referers.each do |card|
     next if card.structure
+
     card.skip_event! :validate_renaming, :check_permissions
     card.content = card.replace_references name_before_act, name
     attach_subcard card
@@ -58,6 +59,7 @@ private
 
 def replace_reference chunk, old_name, new_name
   return unless (old = chunk.referee_name) && (new = old.swap old_name, new_name)
+
   chunk.referee_name = chunk.replace_reference old_name, new_name
   update_reference old.key, new.key
 end

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

@@ -17,8 +17,8 @@ module ClassMethods
   def real? mark
     quick_fetch(mark).present?
   end
-  alias exist? real?
-  alias exists? real?
+  alias_method :exist?, :real?
+  alias_method :exists?, :real?
 
   def known? mark
     fetch(mark).present?
@@ -81,4 +81,4 @@ end
 
 def user_changes?
   actions.joins(:act).where("card_acts.actor_id != ?", WagnBotID).exists?
-end
+end

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

@@ -1,7 +1,7 @@
-
 event :reject_empty_subcards, :prepare_to_validate do
   subcards.each_with_key do |subcard, key|
     next unless subcard.new? && subcard.unfilled?
+
     remove_subcard(key)
     director.subdirectors.delete(subcard)
   end

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

@@ -36,6 +36,7 @@ module ClassMethods
 
   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
 
@@ -65,6 +66,7 @@ end
 
 def add_to_trash args
   return if new_card?
+
   yield args.merge trash: true
 end
 
@@ -77,6 +79,7 @@ end
 def pull_from_trash!
   return unless (id = Card::Lexicon.id key) # name is already known
   return unless (trashed_card = Card.where(id: id).take)&.trash
+
   # confirm name is actually in trash
 
   db_attributes["id"] = trashed_card.db_attributes["id"]
@@ -99,7 +102,7 @@ event :validate_delete, :validate, on: :delete do
     %w[default style layout create read update delete]
   # FIXME: HACK! should be configured in the rule
 
-  if junction? && left&.codename == :all &&
+  if compound? && left&.codename == :all &&
      undeletable_all_rules_tags.member?(right.codename.to_s)
     errors.add :delete, t(:core_error_indestructible, name: name)
   end
@@ -109,6 +112,7 @@ end
 
 event :validate_delete_children, after: :validate_delete, on: :delete do
   return if errors.any?
+
   each_child do |child|
     child.include_set_modules
     delete_as_subcard child

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

@@ -1,4 +1,3 @@
-
 module ClassMethods
   def default_type_id
     @@default_type_id ||= Card[:all].fetch(:default, skip_modules: true).type_id
@@ -7,6 +6,7 @@ end
 
 def type_card
   return if type_id.nil?
+
   Card.quick_fetch type_id.to_i
 end
 
@@ -29,7 +29,7 @@ def type_cardname
 end
 
 def type= type_name
-  self.type_id = Card.fetch_id type_name
+  self.type_id = type_name.card_id
 end
 
 def type_id= card_or_id
@@ -38,12 +38,14 @@ end
 
 def type_id_from_template
   return unless name && (t = template)
+
   reset_patterns # still necessary even with new template handling?
   self.type_id = t.type_id
 end
 
 event :validate_type_change, :validate, on: :update, changed: :type_id do
   return unless (c = dup) && c.action == :create && !c.valid?
+
   errors.add :type, t(:core_error_cant_change_errors,
                       name: name,
                       type_id: type_id,

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

@@ -41,7 +41,7 @@ module ClassMethods
 
   def resolve_file_attributes! attribs
     %i[image file].each do |attach|
-      next unless attribs[attach] && attribs[attach].is_a?(String)
+      next unless attribs[attach].is_a?(String)
 
       attribs[attach] = ::File.open(attribs[attach])
     end

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

@@ -2,7 +2,8 @@
 
 RSpec.describe Card::Set::All::AssignAttributes do
   it "assigns attributes" do
-    card = Card.new name: "#name", type: :basic, content: "#content", codename: "#codename"
+    card = Card.new name: "#name", type: :basic, content: "#content",
+                    codename: "#codename"
     expect(card.attributes).to include(
       "name" => "#name",
       "db_content" => "#content",
@@ -31,18 +32,18 @@ RSpec.describe Card::Set::All::AssignAttributes do
   end
 
   it "assigns subfields" do
-      card = Card.new name: "#name", subfields: { default: { content: "subcontent" } }
-      expect(card.subcards.first).to eq "name+*default"
-      subcard = card.subfield :default
-      expect(subcard).to be_a(Card)
-      expect(subcard.name).to eq "#name+*default"
-      expect(subcard.content).to eq "subcontent"
-    end
+    card = Card.new name: "#name", subfields: { default: { content: "subcontent" } }
+    expect(card.subcards.first).to eq "name+*default"
+    subcard = card.subfield :default
+    expect(subcard).to be_a(Card)
+    expect(subcard.name).to eq "#name+*default"
+    expect(subcard.content).to eq "subcontent"
+  end
 
   describe "set specific attributes" do
     example "file card with set specfic attribute" do
       card = Card.new name: "empty", type: :file, empty_ok: true
-      expect(card.empty_ok?).to be_truthy
+      expect(card).to be_empty_ok
     end
   end
 end

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

@@ -19,13 +19,13 @@ RSpec.describe Card do
   context "when there is a general toc rule of 2" do
     before do
       Card::Auth.as_bot do
-        create [:basic, :type, :table_of_contents], "2"
+        create %i[basic type table_of_contents], "2"
       end
     end
 
     specify do
       expect(c1.type_id).to eq(Card::BasicID)
-      expect(rule_card).to be_a Card
+      expect(rule_card).to be_a described_class
     end
 
     describe ".rule" do
@@ -39,9 +39,11 @@ RSpec.describe Card do
       it "does not render for 'Onne Heading'" do
         expect(c1).not_to have_toc
       end
+
       it "renders for 'Twwo Heading'" do
         expect(c2).to have_toc
       end
+
       it "renders for 'Three Heading'" do
         expect(c3).to have_toc
       end
@@ -52,6 +54,7 @@ RSpec.describe Card do
         sets = described_class["A"].related_sets.map { |s| s[0] }
         expect(sets).to eq(["A+*right"])
       end
+
       it "has 2 sets (type, and right) for a cardtype card" do
         sets = described_class["Cardtype A"].related_sets.map { |s| s[0] }
         expect(sets).to eq(["Cardtype A+*type", "Cardtype A+*right"])
@@ -71,6 +74,7 @@ RSpec.describe Card do
       #   sets.should == ['Cardtype A+*self', 'Cardtype A+*type',
       #     'Cardtype A+*right', 'RichText+Cardtype A+*type plus right']
       # end
+
       it "is empty for a non-simple card" do
         sets = described_class["A+B"].related_sets.map { |s| s[0] }
         expect(sets).to eq([])
@@ -99,9 +103,11 @@ RSpec.describe Card do
       it "does not render toc for 'Onne Heading'" do
         expect(c1).to have_toc
       end
+
       it "renders toc for 'Twwo Heading'" do
         expect(c2).to have_toc
       end
+
       it "does not render for 'Twwo Heading' when changed to 3" do
         rule_card.content = "3"
         expect(c2.rule(:table_of_contents)).to eq("3")
@@ -140,9 +146,11 @@ RSpec.describe Card do
       it "does not render for 'Onne Heading'" do
         expect(@c1).not_to have_toc
       end
+
       it "renders for 'Twwo Heading'" do
         expect(@c2).not_to have_toc
       end
+
       it "renders for 'Three Heading'" do
         expect(@c3).not_to have_toc
       end
@@ -173,8 +181,10 @@ RSpec.describe Card do
         described_class.create! name: "RichText+*type+*table of contents", content: "2"
         @c1 = described_class.create! name: "toc1", type: "CardtypeE",
                                       content: described_class["Onne Heading"].content
-        @c2 = described_class.create! name: "toc2", content: described_class["Twwo Heading"].content
-        @c3 = described_class.create! name: "toc3", content: described_class["Three Heading"].content
+        @c2 = described_class.create! name: "toc2",
+                                      content: described_class["Twwo Heading"].content
+        @c3 = described_class.create! name: "toc3",
+                                      content: described_class["Three Heading"].content
         expect(@c1.type_name).to eq("Cardtype E")
         @rule_card = @c1.rule_card(:table_of_contents)
 
@@ -190,6 +200,7 @@ RSpec.describe Card do
         end
       end
     end
+
     it "takes on new setting value" do
       c = described_class["toc1"]
       expect(c.rule_card(:table_of_contents).name)
@@ -201,10 +212,12 @@ RSpec.describe Card do
       it "does not render for 'Onne Heading'" do
         expect(@c1).not_to have_toc
       end
+
       it "renders for 'Twwo Heading'" do
         expect(@c2.rule(:table_of_contents)).to eq("2")
         expect(@c2).to have_toc
       end
+
       it "renders for 'Three Heading'" do
         expect(@c3).to have_toc
       end
@@ -231,9 +244,11 @@ RSpec.describe Card do
       it "does not render toc for 'Onne Heading'" do
         expect(c1).to have_toc
       end
+
       it "renders toc for 'Twwo Heading'" do
         expect(c2).to have_toc
       end
+
       it "does not render for 'Twwo Heading' when changed to 3" do
         rule_card.content = "3"
         expect(c2).not_to have_toc

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

@@ -18,7 +18,7 @@ RSpec.describe Card::Set::All::Collection do
     end
 
     it "handles searches relative to context card" do
-      # note: A refers to 'Z'
+      # NOTE: A refers to 'Z'
       @context = "A"
       @args = { name: "foo", type: "Search",
                 content: '{"referred_to_by":"_self"}' }

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

@@ -23,6 +23,7 @@ RSpec.describe Card::Set::All::Export do
           a_hash_including(name: "A+B", type: "RichText", content: "AlphaBeta")
         )
       end
+
       it "handles multi levels pointer cards" do
         inner_pointer = create "inner pointer", type: :pointer, content: "T"
         expect(export_pointer([inner_pointer.name, "A+B"])).to include(

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

@@ -54,34 +54,34 @@ describe Card::Set::All::Initialize do
 
   describe "module inclusion" do
     context "(search)" do
-      before do
-        @c = Card.new type: "Search", name: "Module Inclusion Test Card"
+      let :c do
+        Card.new type: "Search", name: "Module Inclusion Test Card"
       end
 
       it "happens after new" do
-        expect(@c.respond_to?(:query)).to be_truthy
+        expect(c).to respond_to(:query)
       end
 
       it "happens after save" do
-        expect(@c.respond_to?(:query)).to be_truthy
-        @c.save!
-        expect(@c.respond_to?(:query)).to be_truthy
+        expect(c).to respond_to(:query)
+        c.save!
+        expect(c).to respond_to(:query)
       end
 
       it "happens after fetch" do
-        @c.save!
-        c = Card.fetch(@c.name)
-        expect(c.respond_to?(:query)).to be_truthy
+        c.save!
+        f = Card.fetch(c.name)
+        expect(f).to respond_to(:query)
       end
     end
 
     context "(pointer)" do
       it "happens with explicit pointer setting" do
-        expect(Card.new(type: "Pointer").respond_to?(:add_item)).to be_truthy
+        expect(Card.new(type: "Pointer")).to respond_to(:add_item)
       end
 
       it "happens with implicit pointer setting (from template)" do
-        expect(Card.new(name: "Home+*cc").respond_to?(:add_item)).to be_truthy
+        expect(Card.new(name: "Home+*cc")).to respond_to(:add_item)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.101.4
+  version: 1.101.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement