card 1.19.6 → 1.20.0

data/mod/standard/spec/chunk/link_spec.rb

@@ -68,7 +68,7 @@ describe Card::Content::Chunk::Link do
                 href: "http://google.com", text: "http://google.com"
   end
 
-  it "should escape spaces in cardnames with %20 (not +)" do
+  it "escapes spaces in cardnames with %20 (not +)" do
     assert_link '[[Marie "Mad Dog" Deatherage|Marie]]',
                 class: "wanted-card",
                 href: "/Marie_Mad_Dog_Deatherage" \

data/mod/standard/spec/set/all/error_spec.rb

@@ -2,7 +2,7 @@
 
 describe Card::Set::All::Error do
   describe "missing view" do
-    it "should prompt to add" do
+    it "prompts to add" do
       expect(render_content("{{+cardipoo|open}}").match(/Add \<span/)).not_to be_nil
     end
   end

data/mod/standard/spec/set/all/history_spec.rb

@@ -4,7 +4,7 @@ describe Card::Set::All::History do
     # before do
     #   Card.create! name: 'my histoer card'
     # end
-    it "should have a frame" do
+    it "has a frame" do
       history = render_card :history, name: "A"
       assert_view_select history, 'div[class~="card-frame"]'
     end
@@ -15,7 +15,7 @@ describe Card::Set::All::History do
         first.format.render_action_summary
       end
 
-      it "should have a summary" do
+      it "has a summary" do
         assert_view_select subject, 'del[class="diffdel diff-deleted"]',
                            text: "chicken"
         assert_view_select subject, 'ins[class="diffins diff-added"]',

data/mod/standard/spec/set/all/rich_html/form_spec.rb

@@ -6,7 +6,7 @@ describe Card::Set::All::RichHtml::Form do
       @card = Card["UserForm"]  # no cards with this type
     end
 
-    it "should get type options from type_field renderer method" do
+    it "gets type options from type_field renderer method" do
       expect(@card.format.type_field).to match(/<option [^>]*selected/)
       tf = @card.format.type_field(no_current_type: true)
       expect(tf).not_to match(/<option [^>]*selected/)
@@ -16,7 +16,7 @@ describe Card::Set::All::RichHtml::Form do
       expect(tf.scan(/<option /).length).to eq(29)
     end
 
-    it "should get type list" do
+    it "gets type list" do
       Card::Auth.as :anonymous do
         tf = @card.format.type_field(no_current_type: true)
         expect(tf).not_to match(/<option [^>]*selected/)
@@ -29,14 +29,14 @@ describe Card::Set::All::RichHtml::Form do
   end
 
   context "type and header" do
-    it "should render type without no-edit class when no cards of type" do
+    it "renders type without no-edit class when no cards of type" do
       card = Card["UserForm"]  # no cards with this type
       expect(card.format.render_type)
         .to match(/<a[^>]* class="([^"]*)?\bcardtype\b[^"]*"/)
       expect(card.format.render_type)
         .not_to match(/<a[^>]* class="([^"]*)?\bno-edit\b[^"]*"/)
     end
-    it "should render type header with no-edit class when cards of type exist" do
+    it "renders type header with no-edit class when cards of type exist" do
       no_edit_card = Card["cardtype a"]
       expect(no_edit_card.format.render_type)
         .to match(/<a[^>]* class="([^"]*)?\bcardtype\b[^"]*"/)

data/mod/standard/spec/set/all/rich_html/toolbar_spec.rb

@@ -0,0 +1,22 @@
+describe Card::Set::All::RichHtml::Toolbar do
+  context "show toolbar" do
+    subject do
+      render_content "{{A|edit}}"
+    end
+    it "renders toolbar" do
+      is_expected.to have_tag "div", with: { class: "SELF-a edit-view" } do
+        with_tag "nav", with: { class: "toolbar" }
+      end
+    end
+  end
+  context "hidden toolbar" do
+    subject do
+      render_content "{{A|edit; hide: toolbar}}"
+    end
+    it "hides toolbar" do
+      is_expected.to have_tag "div", with: { class: "SELF-a edit-view" } do
+        without_tag "nav", with: { class: "toolbar" }
+      end
+    end
+  end
+end

data/mod/standard/spec/set/all/rich_html/wrapper_spec.rb

@@ -21,7 +21,7 @@ describe Card::Set::All::RichHtml::Wrapper do
     end
 
     it "has the appropriate attributes on closed" do
-      v = @ocslot.render(:closed)
+      v = @ocslot.render :closed
       assert_view_select(
         v, 'div[class="card-slot closed-view ALL TYPE-basic SELF-a"]'
       ) do
@@ -29,7 +29,8 @@ describe Card::Set::All::RichHtml::Wrapper do
           assert_select 'div[class="card-header panel-heading"]' do
             assert_select 'div[class="card-header-title panel-title"]'
           end
-          assert_select 'div[class~="closed-content card-content"]'
+          assert_select 'div[class~="card-body card-content"]'
+          assert_select 'div[class~="closed-content"]'
         end
       end
     end

data/mod/standard/spec/set/right/when_created_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::WhenCreated do
-  it "should produce a text date" do
+  it "produces a text date" do
     expect(render_card(:core, name: "A+*when created")).to match(/\w+ \d+/)
   end
 end

data/mod/standard/spec/set/right/when_last_edited_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::WhenLastEdited do
-  it "should produce a text date" do
+  it "produces a text date" do
     expect(render_card(:core, name: "A+*when last edited")).to match(/\w+ \d+/)
   end
 end

data/mod/standard/spec/set/rstar/rules_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Rstar::Rules do
-  it "should render setting view for a right set" do
+  it "renders setting view for a right set" do
     r = Card["*read+*right"].format.render_open
     expect(r).not_to match(/error/i)
     expect(r).not_to match("No Card!")
@@ -12,12 +12,11 @@ describe Card::Set::Rstar::Rules do
     end
   end
 
-  it "should render setting view for a *input rule" do
+  it "renders setting view for a *input rule" do
     Card::Auth.as_bot do
       r = Card.fetch("*read+*right+*input", new: {}).format.render_open_rule
       expect(r).not_to match(/error/i)
       expect(r).not_to match("No Card!")
-      # warn "r = #{r}"
       assert_view_select r, 'tr[class="card-slot open-rule edit-rule"]' do
         assert_select 'input[id="success_id"][name=?][type="hidden"]'\
                       '[value="*read+*right+*input"]', "success[id]"

data/mod/standard/spec/set/self/head_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Self::Head do
-  it "should have a javascript tag" do
+  it "has a javascript tag" do
     assert_view_select render_card(:raw, name: "*head"),
                        'script[type="text/javascript"]'
   end
@@ -10,7 +10,7 @@ describe Card::Set::Self::Head do
     before do
       @tiny_mce = Card[:tiny_mce]
     end
-    it "should handle tinyMCE configuration errors" do
+    it "handles tinyMCE configuration errors" do
     end
   end
 end

data/mod/standard/spec/set/self/navbox_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Self::Navbox do
-  it "should have a form" do
+  it "has a form" do
     assert_view_select render_card(:core, name: "*navbox"),
                        "form.navbox-form input.navbox"
   end

data/mod/standard/spec/set/self/now_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Self::Now do
-  it "should have a date" do
+  it "has a date" do
     expect(render_card(:raw, name: "*now").match(/\w+day, \w+ \d+, \d{4}/)).not_to be_nil
   end
 end

data/mod/standard/spec/set/type/date_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Date do
-  it "should have special editor" do
+  it "has special editor" do
     assert_view_select render_editor("Date"), 'input[class~="date-editor"]'
   end
 end

data/mod/standard/spec/set/type/email_template_spec.rb

@@ -185,7 +185,7 @@ describe Card::Set::Type::EmailTemplate do
         Card.create! name: "subject search+*right+*structure",
                      content: %({"referred_to_by":"_left+subject"}),
                      type: "Search"
-        update_field "*subject", content: "{{+subject search|core;item:core}}"
+        update_field "*subject", content: "{{+subject search|core|core}}"
         expect(subject[:subject]).to eq("a very nutty thang")
       end
 

data/mod/standard/spec/set/type/layout_type_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::LayoutType do
-  it "should include Html card methods" do
+  it "includes Html card methods" do
     expect(Card.new(type: "Layout").clean_html?).to be_falsey
   end
 end

data/mod/standard/spec/set/type/number_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Number do
-  it "should have special editor" do
+  it "has special editor" do
     assert_view_select render_editor("Number"), 'input[type="text"]'
   end
 end

data/mod/standard/spec/set/type/phrase_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Phrase do
-  it "should have special editor" do
+  it "has special editor" do
     assert_view_select render_editor("Phrase"), 'input[type="text"][class~="card-content"]'
   end
 end

data/mod/standard/spec/set/type/search_type_spec.rb

@@ -3,11 +3,11 @@
 describe Card::Set::Type::SearchType do
   it "wraps search items with correct view class" do
     Card.create type: "Search", name: "Asearch", content: %({"type":"User"})
-    c = render_content("{{Asearch|core;item:name}}")
+    c = render_content("{{Asearch|core|name}}")
     expect(c).to match("search-result-item item-name")
     expect(render_content("{{Asearch|core}}")
              .scan("search-result-item item-closed").size).to eq(14)
-    expect(render_content("{{Asearch|core;item:open}}")
+    expect(render_content("{{Asearch|core|open}}")
              .scan("search-result-item item-open").size).to eq(14)
     expect(render_content("{{Asearch|core|titled}}")
              .scan("search-result-item item-titled").size).to eq(14)

data/mod/standard/spec/set/type/set_spec.rb

@@ -2,7 +2,7 @@
 
 describe Card::Set::Type::Set do
   describe :junction_only? do
-    it "should identify sets that only apply to plus cards" do
+    it "identifies sets that only apply to plus cards" do
       expect(Card.fetch("*all").junction_only?).to be_falsey
       expect(Card.fetch("*all plus").junction_only?).to be_truthy
       expect(Card.fetch("Book+*type").junction_only?).to be_falsey
@@ -13,7 +13,7 @@ describe Card::Set::Type::Set do
   end
 
   describe :inheritable? do
-    it "should identify sets that can inherit rules" do
+    it "identifies sets that can inherit rules" do
       expect(Card.fetch("A+*self").inheritable?).to be_falsey
       expect(Card.fetch("A+B+*self").inheritable?).to be_truthy
       expect(Card.fetch("Book+*to+*type plus right").inheritable?).to be_truthy

data/mod/standard/spec/set/type/toggle_spec.rb

@@ -1,11 +1,11 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Toggle do
-  it "should have special editor" do
+  it "has special editor" do
     assert_view_select render_editor("Toggle"), 'input[type="checkbox"]'
   end
 
-  it "should have yes/no as processed content" do
+  it "has yes/no as processed content" do
     expect(render_card(:core, type: "Toggle", content: "0")).to eq("no")
     expect(render_card(:closed_content, type: "Toggle", content: "1"))
       .to eq("yes")

data/mod/standard/spec/set/type/uri_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Uri do
-  it "should have special editor" do
+  it "has special editor" do
     assert_view_select render_editor("Uri"),
                        'input[type="text"][class~="card-content"]'
   end
@@ -20,6 +20,8 @@ describe Card::Set::Type::Uri do
   it "renders core view links with title arg" do
     card = Card.create(type: "URI", name: "A URI card",
                        content: "http://wagn.org/Home")
+
+
     assert_view_select(
       card.format.render("core", title: "My Title"),
       'a[class="external-link"][href="http://wagn.org/Home"]'

data/mod/tinymce_editor/set/abstract/tinymce_editor.rb

@@ -1,5 +1,5 @@
 format :html do
-  view :editor do |_args|
+  view :editor do
     text_area :content, rows: 3, class: "tinymce-textarea card-content",
                         id: unique_id
   end

data/spec/config/initializers/core_extensions_spec.rb

@@ -1,17 +1,47 @@
 # -*- encoding : utf-8 -*-
 
-describe Hash do
-  describe "new_nested" do
-    it "creates nested hashes" do
-      nested_hash = Hash.new_nested Hash, Hash
-      expect(nested_hash[:a]).to be_instance_of Hash
-      expect(nested_hash[:a][:b]).to be_instance_of Hash
-      expect(nested_hash[:d][:c]).to be_instance_of Hash
+describe CoreExtensions do
+  context Hash do
+    describe "#new_nested" do
+      it "creates nested hashes" do
+        nested_hash = Hash.new_nested Hash, Hash
+        expect(nested_hash[:a]).to be_instance_of Hash
+        expect(nested_hash[:a][:b]).to be_instance_of Hash
+        expect(nested_hash[:d][:c]).to be_instance_of Hash
+      end
+
+      it "creates set in hash" do
+        nested_hash = Hash.new_nested ::Set
+        expect(nested_hash[:a]).to be_instance_of ::Set
+      end
     end
+  end
+
+  context CoreExtensions::PersistentIdentifier do
+    describe "#cardname" do
+      subject { :wagn_bot.cardname }
+      it "converts into a cardname" do
+        is_expected.to be_instance_of Card::Name
+        expect(subject.s).to eq "Wagn Bot"
+      end
+    end
+
+    describe "#card" do
+      context "called on Integer" do
+        subject { Card::LogoID.card }
+        it "converts into a card" do
+          is_expected.to be_instance_of Card
+          expect(subject.id).to eq Card::LogoID
+        end
+      end
 
-    it "creates set in hash" do
-      nested_hash = Hash.new_nested ::Set
-      expect(nested_hash[:a]).to be_instance_of ::Set
+      context "called on Symbol" do
+        subject { :logo.card }
+        it "converts into a card" do
+          is_expected.to be_instance_of Card
+          expect(subject.key).to eq(:logo.cardname.key)
+        end
+      end
     end
   end
 end

data/spec/lib/card/auth_spec.rb

@@ -6,32 +6,32 @@ describe Card::Auth do
     @joeuserid = Card["Joe User"].id
   end
 
-  it "should authenticate user" do
+  it "authenticates user" do
     authenticated = Card::Auth.authenticate "joe@user.com", "joe_pass"
     expect(authenticated.left_id).to eq(@joeuserid)
   end
 
-  it "should authenticate user despite whitespace" do
+  it "authenticates user despite whitespace" do
     authenticated = Card::Auth.authenticate " joe@user.com ", " joe_pass "
     expect(authenticated.left_id).to eq(@joeuserid)
   end
 
-  it "should authenticate user with weird email capitalization" do
+  it "authenticates user with weird email capitalization" do
     authenticated = Card::Auth.authenticate "JOE@user.com", "joe_pass"
     expect(authenticated.left_id).to eq(@joeuserid)
   end
 
-  it "should set current directly from email" do
+  it "sets current directly from email" do
     Card::Auth.current= "joe@user.com"
     expect(Card::Auth.current_id).to eq(@joeuserid)
   end
 
-  it "should set current directly from id when mark is id" do
+  it "sets current directly from id when mark is id" do
     Card::Auth.current= @joeuserid
     expect(Card::Auth.current_id).to eq(@joeuserid)
   end
 
-  it "should set current directly from id when mark is id" do
+  it "sets current directly from id when mark is id" do
     Card::Auth.current= @joeuserid
     expect(Card::Auth.current_id).to eq(@joeuserid)
   end
@@ -45,12 +45,12 @@ describe Card::Auth do
       end
     end
 
-    it "should set current from token" do
+    it "sets current from token" do
       Card::Auth.set_current_from_token @token
       expect(Card::Auth.current_id).to eq(@joeadmin.id)
     end
 
-    it "should set arbitrary current from token on authorized account" do
+    it "sets arbitrary current from token on authorized account" do
       Card::Auth.set_current_from_token @token, @joeuserid
       expect(Card::Auth.current_id).to eq(@joeuserid)
     end

data/spec/lib/card/cache_spec.rb

@@ -7,7 +7,7 @@ describe Card::Cache do
     end
 
     describe "#basic operations" do
-      it "should work" do
+      it "works" do
         @cache.write("a", "foo")
         expect(@cache.read("a")).to eq("foo")
         @cache.fetch("b") { "bar" }
@@ -90,7 +90,7 @@ describe Card::Cache do
     end
 
     describe "#basic operations with special symbols" do
-      it "should work" do
+      it "works" do
         @cache.write('%\\/*:?"<>|', "foo")
         cache2 = Card::Cache.new store: @hard, prefix: "prefix"
         expect(cache2.read('%\\/*:?"<>|')).to eq("foo")
@@ -99,7 +99,7 @@ describe Card::Cache do
     end
 
     describe "#basic operations with non-latin symbols" do
-      it "should work" do
+      it "works" do
         @cache.write("(汉语漢語 Hànyǔ; 华语華語 Huáyǔ; 中文 Zhōngwén", "foo")
         @cache.write("русский", "foo")
         cache3 = Card::Cache.new store: @hard, prefix: "prefix"