card 1.91 → 1.92

data/spec/lib/card/mod/loader/set_loader_spec.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Mod::Loader::SetLoader do
+  let(:mod_dirs) do
+    path = File.expand_path "../../../../../support/test_mods", __FILE__
+    Card::Mod::Dirs.new path
+  end
+
+  it 'initializes the load strategy' do
+    expect(Card::Mod::LoadStrategy::Eval).to receive(:new).with(mod_dirs, instance_of(described_class))
+    described_class.new(:eval, mod_dirs)
+  end
+
+  it "load mods" do
+    described_class.new(:eval, mod_dirs).load
+    expect(Card::Set.const_defined?("All::TestSet")).to be_truthy
+    expect(Card.take.test_method).to eq "works"
+  end
+end

data/spec/lib/card/mod/loader/set_pattern_loader_spec.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Card::Mod::Loader::SetPatternLoader do
+  let(:mod_dirs) do
+    path = File.expand_path "../../../../../support/test_mods", __FILE__
+    puts path
+    Card::Mod::Dirs.new path
+  end
+
+  it 'initializes the load strategy' do
+    expect(Card::Mod::LoadStrategy::Eval).to receive(:new).with(mod_dirs, instance_of(described_class))
+    described_class.new :eval, mod_dirs
+  end
+
+  it "load mods" do
+    described_class.new(:eval, mod_dirs).load
+    expect(Card::Set.const_defined?("TestPattern")).to be_truthy
+  end
+end

data/spec/lib/card/name/fields_and_traits_spec.rb

@@ -0,0 +1,18 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Name do
+  describe "field_of?" do
+    it "should identify fields" do
+      expect("A+B"  .to_name.field_of? "A"  ).to be_truthy
+      expect("A+B"  .to_name.field_of? "B"  ).to be_falsey
+      expect("A+B"  .to_name.field_of? "A+B").to be_falsey
+      expect("A+B"  .to_name.field_of? "A+C").to be_falsey
+      expect("A+B+C".to_name.field_of? "A+B").to be_truthy
+      expect("+B"   .to_name.field_of? "A"  ).to be_truthy
+      expect("+B"   .to_name.field_of? "A+B").to be_truthy
+      expect("+B"   .to_name.field_of? ""   ).to be_truthy
+      expect("+B"   .to_name.field_of? nil  ).to be_truthy
+
+    end
+  end
+end

data/spec/lib/card/name_spec.rb

@@ -50,11 +50,11 @@ RSpec.describe Card::Name do
     end
   end
 
-  describe "#to_absolute" do
+  describe "#absolute" do
     it "does session user substitution" do
-      expect("_user".to_name.to_absolute("A")).to eq(Card::Auth.current.name)
+      expect("_user".to_name.absolute("A")).to eq(Card::Auth.current.name)
       Card::Auth.as_bot do
-        expect("_user".to_name.to_absolute("A")).to eq(Card::Auth.current.name)
+        expect("_user".to_name.absolute("A")).to eq(Card::Auth.current.name)
       end
     end
   end

data/spec/lib/card/query/sorting_spec.rb

@@ -25,7 +25,7 @@ describe Card::Query, "sorting" do
 
   it "plays nice with match" do
     @query = { match: "Z", type: "Basic", sort: "content" }
-    is_expected.to eq(%w(A B Z))
+    is_expected.to eq(%w(A B Z A+B+Y+Z))
   end
 
   it "sorts by plus card content" do

data/spec/lib/card/query_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe Card::Query do
   end
 
   describe "in" do
-    it "works for content options" do
+    example "content option" do
       @query = { in: %w(AlphaBeta Theta) }
       is_expected.to eq(%w(A+B T))
     end
@@ -55,19 +55,21 @@ RSpec.describe Card::Query do
       is_expected.to eq(%w(A+B T))
     end
 
-    it "works on types" do
+    example "type option" do
       @query = { type: [:in, "Cardtype E", "Cardtype F"] }
       is_expected.to eq(%w(type-e-card type-f-card))
     end
   end
 
-  describe "member_of/member" do
-    it "member_of should find members" do
+  describe "member_of" do
+    it "finds members" do
       @query = { member_of: "r1" }
       is_expected.to eq(%w(u1 u2 u3))
     end
+  end
 
-    it "member should find roles" do
+  describe "member" do
+    it "finds roles" do
       @query = { member: { match: "u1" } }
       is_expected.to eq(%w(r1 r2 r3))
     end
@@ -136,7 +138,7 @@ RSpec.describe Card::Query do
   describe "edited_by/editor_of" do
     it "finds card edited by joe using subquery" do
       @query = { edited_by: { match: "Joe User" } }
-      is_expected.to eq(%w(JoeLater JoeNow))
+      is_expected.to include("JoeLater", "JoeNow")
     end
 
     it "finds card edited by Wagn Bot" do
@@ -159,7 +161,7 @@ RSpec.describe Card::Query do
       c.content = "test3"
       c.save!
       @query = { edited_by: "Joe User" }
-      is_expected.to eq(%w(JoeLater JoeNow))
+      is_expected.to include("JoeLater", "JoeNow")
     end
 
     it "finds joe user among card's editors" do
@@ -254,11 +256,16 @@ RSpec.describe Card::Query do
     end
   end
 
-  describe "cgi_params" do
-    it "matchs content from cgi" do
+  describe "vars" do
+    it "replace placeholders" do
       @query = { match: "$keyword", vars: { keyword: "two" } }
       is_expected.to eq(CARDS_MATCHING_TWO)
     end
+
+    it "replace placeholders in nested queries" do
+      @query = { and: { match: "$keyword" }, vars: { keyword: "two" } }
+      is_expected.to eq(CARDS_MATCHING_TWO)
+    end
   end
 
   describe "content equality" do

data/spec/lib/card/reference_spec.rb

@@ -27,8 +27,7 @@ describe Card::Reference do
       tmpl.content = "{{+monkey}} {{+banana}} {{+fruit}}"
       tmpl.save!
       Card["JoeForm"].format.render(:core)
-      assert_equal ["joe_form+banana", "joe_form+fruit", "joe_form+monkey"],
-                   Card["JoeForm"].includees.map(&:key).sort
+      expect(Card["JoeForm"].includees.map(&:key)).to contain_exactly("joe_form+banana", "joe_form+fruit", "joe_form+monkey")
     end
   end
 
@@ -90,9 +89,9 @@ describe Card::Reference do
   end
 
   it "does not update references when not requested" do
-    watermelon = create! "watermelon", "mmmm"
-    watermelon_seeds = create! "watermelon+seeds", "black"
-    lew = create!("Lew", "likes [[watermelon]] and [[watermelon+seeds|seeds]]")
+    watermelon = create "watermelon", "mmmm"
+    watermelon_seeds = create "watermelon+seeds", "black"
+    lew = create("Lew", "likes [[watermelon]] and [[watermelon+seeds|seeds]]")
 
     assert_equal [watermelon.id, watermelon_seeds.id],
                  lew.references_out.order(:id).map(&:referee_id),
@@ -107,7 +106,7 @@ describe Card::Reference do
     expect(lew.reload.content).to eq(correct_content)
 
     ref_types = lew.references_out.order(:id).map(&:ref_type)
-    assert_equal ref_types, %w(L L P), "need partial references!"
+    expect(ref_types).to eq(%w(L L P)), "need partial references!"
     actual_referee_ids = lew.references_out.order(:id).map(&:referee_id)
     assert_equal actual_referee_ids, [nil, nil, Card.fetch_id("seed")],
                  'only partial reference to "seeds" should have referee_id'

data/spec/lib/card/set_pattern_spec.rb

@@ -9,6 +9,10 @@ def it_generates opts
 end
 
 describe Card::Set::Pattern do
+  specify ".in_load_order" do
+    expect(Card::Set::Pattern.in_load_order)
+      .to eq(%i[abstract all all_plus type star rstar right type_plus_right self])
+  end
 end
 
 # FIXME: - these should probably be in pattern-specific specs,

data/spec/lib/card/view_cache_spec.rb

@@ -7,4 +7,21 @@ describe Card::View do
     Card::Cache.reset_all
     expect(Card::View.cache.exist? "testkey").to be_falsey
   end
+
+  def html_message_for user
+    Card["follower notification email"].format(:email_html)
+      .render_mail(context: Card["All Eyes On Me"],
+                   to: "#{user}@user.com",
+                   follower: user,
+                   followed_set: "All Eyes On Me+*self",
+                   follow_option: "*always")
+      .html_part.body.raw_source
+  end
+
+  example "email templates" do
+    html_message_for "John"
+    msg = html_message_for "Sara"
+    expect(msg).to include("update/Sara+*follow")
+               .and not_include "John"
+  end
 end

data/spec/models/card/create_spec.rb

@@ -1,14 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-# FIXME: this shouldn't be here
-describe Card::Set::Type::Cardtype, ".create with :codename" do
-  it "works" do
-    card = Card.create! name: "Foo Type", codename: "foo",
-                        type: "Cardtype"
-    expect(card.type_code).to eq(:cardtype)
-  end
-end
-
 describe Card, "created by Card.new" do
   before(:each) do
     Card::Auth.as_bot do
@@ -16,12 +7,16 @@ describe Card, "created by Card.new" do
     end
   end
 
-  it "does not override explicit content with default content" do
-    Card::Auth.as_bot do
-      Card.create! name: "blue+*right+*default", content: "joe", type: "Pointer"
-      c = Card.new name: "Lady+blue", content: "[[Jimmy]]"
-      expect(c.content).to eq("[[Jimmy]]")
-    end
+  it "does not create a new card until saved" do
+    expect do
+      Card.new(name: "foo", type: "Cardtype")
+    end.not_to increase_card_count
+  end
+
+  it "does not override explicit content with default content", as_bot: true do
+    create "blue+*right+*default", content: "joe", type: "Pointer"
+    c = Card.new name: "Lady+blue", content: "[[Jimmy]]"
+    expect(c.content).to eq("[[Jimmy]]")
   end
 end
 
@@ -39,7 +34,7 @@ describe Card, "created by Card.create with valid attributes" do
   it "has the right class" do
     expect(@c.class).to eq(Card)
   end
-  it "has the right key"  do
+  it "has the right key" do
     expect(@c.key).to eq("new_card")
   end
   it "has the right name" do
@@ -50,11 +45,11 @@ describe Card, "created by Card.create with valid attributes" do
   end
 
   it "has the right content" do
-    @c.db_content == "Great Content"
+    expect(@c.db_content).to eq "Great Content"
   end
 
   it "is findable by name" do
-    expect(Card["New Card"].class).to eq(Card)
+    expect(Card["New Card"]).to be_a Card
   end
 end
 
@@ -68,15 +63,15 @@ describe Card, "create junction two parts" do
   end
 
   it "creates junction card" do
-    expect(Card["Peach+Pear"].class).to eq(Card)
+    expect(Card["Peach+Pear"]).to be_a(Card)
   end
 
   it "creates trunk card" do
-    expect(Card["Peach"].class).to eq(Card)
+    expect(Card["Peach"]).to be_a(Card)
   end
 
   it "creates tag card" do
-    expect(Card["Pear"].class).to eq(Card)
+    expect(Card["Pear"]).to be_a(Card)
   end
 end
 
@@ -97,5 +92,28 @@ describe Card, "create junction three parts" do
   end
 end
 
-describe Card, "types" do
+
+describe Card, "Joe User" do
+  before do
+    Card::Auth.as_bot do
+      @r3 = Card["r3"]
+      Card.create name: "Cardtype F+*type+*create", type: "Pointer", content: "[[r3]]"
+    end
+
+    @ucard = Card::Auth.current
+    @type_names = Card::Auth.createable_types
+  end
+
+  it "does not have r3 permissions" do
+    expect(@ucard.fetch(new: {}, trait: :roles).item_names.member?(@r3.name)).to be_falsey
+  end
+  it "ponders creating a card of Cardtype F, but find that he lacks create permissions" do
+    expect(Card.new(type: "Cardtype F").ok?(:create)).to be_falsey
+  end
+  it "does not find Cardtype F on its list of createable cardtypes" do
+    expect(@type_names.member?("Cardtype F")).to be_falsey
+  end
+  it "finds Basic on its list of createable cardtypes" do
+    expect(@type_names.member?("Basic")).to be_truthy
+  end
 end

data/spec/models/card/trash_spec.rb

@@ -14,25 +14,6 @@ describe Card, "deleting card" do
   end
 end
 
-describe Card, "deleted card" do
-  before do
-    Card::Auth.as_bot do
-      @c = Card["A"]
-      @c.delete!
-    end
-  end
-  it "is in the trash" do
-    expect(@c.trash).to be_truthy
-  end
-  it "comes out of the trash when a plus card is created" do
-    Card::Auth.as_bot do
-      Card.create(name: "A+*acct")
-      c = Card["A"]
-      expect(c.trash).to be_falsey
-    end
-  end
-end
-
 describe Card, "in trash" do
   it "is retrieved by fetch with new" do
     Card.create(name: "Betty").delete
@@ -55,27 +36,6 @@ describe Card, "plus cards" do
   end
 end
 
-# FIXME: these user tests should probably be in a set of cardtype specific tests somewhere..
-describe Card do
-  context "with revisions" do
-    before { Card::Auth.as_bot { @c = Card["Wagn Bot"] } }
-    it "does not be removable" do
-      expect(@c.delete).not_to be_truthy
-    end
-  end
-
-  context "without revisions" do
-    before do
-      Card::Auth.as_bot do
-        @c = Card.create! name: "User Must Die", type: "User"
-      end
-    end
-    it "is removable" do
-      expect(@c.delete!).to be_truthy
-    end
-  end
-end
-
 # NOT WORKING, BUT IT SHOULD
 # describe Card, "a part of an unremovable card" do
 #  before do
@@ -89,30 +49,12 @@ end
 #  end
 # end
 
-describe Card, "dependent removal" do
-  before do
-    @a = Card["A"]
-    @a.delete!
-    @c = Card.find_by_key "A+B+C".to_name.key
-  end
-
-  it "is trash" do
-    expect(@c.trash).to be_truthy
-  end
-
-  it "does not be findable by name" do
-    expect(Card["A+B+C"]).to eq(nil)
-  end
-end
-
 describe Card, "rename to trashed name" do
   before do
     Card::Auth.as_bot do
       @a = Card["A"]
       @b = Card["B"]
       @a.delete!  # trash
-      Rails.logger.info "\n\n~~~~~~~deleted~~~~~~~~\n\n\n"
-
       @b.update_attributes! name: "A", update_referers: true
     end
   end
@@ -200,7 +142,7 @@ describe Card, "junction revival" do
     end
   end
 
-  it "does not be trash" do
+  it "isn't trash" do
     expect(@c.trash).to eq(false)
   end
 
@@ -218,28 +160,24 @@ describe Card, "junction revival" do
 end
 
 describe "remove tests" do
-  before do
-    @a = Card["A"]
-  end
-
   # I believe this is here to test a bug where cards with certain kinds of references
   # would fail to delete.  probably less of an issue now that delete is done through
   # trash.
   it "test_remove" do
-    assert @a.delete!, "card should be deleteable"
+    assert Card["A"].delete!, "card should be deleteable"
     assert_nil Card["A"]
   end
 
-  it "test_recreate_plus_card_name_variant" do
+  example "recreate plus card name variant" do
     Card.create(name: "rta+rtb").delete
     Card["rta"].update_attributes name: "rta!"
-    c = Card.create! name: "rta!+rtb"
-    assert Card["rta!+rtb"]
-    assert !Card["rta!+rtb"].trash
-    assert Card.find_by_key("rtb*trash").nil?
+    Card.create! name: "rta!+rtb"
+    expect(Card["rta!+rtb"]).to be_a Card
+    expect(Card["rta!+rtb"].trash).to be_falsey
+    expect(Card.find_by_key("rtb*trash")).to be_nil
   end
 
-  it "test_multiple_trash_collision" do
+  example "multiple trash collision" do
     Card.create(name: "alpha").delete
     3.times do
       b = Card.create(name: "beta")