card 1.17.4 → 1.18.0

data/mod/01_core/spec/format/html_format_spec.rb

@@ -1,25 +1,29 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::HtmlFormat do
-
-  describe "views" do
-
-    it "content" do
+  describe 'views' do
+    it 'content' do
       result = render_card(:content, name: 'A+B')
-      assert_view_select result, 'div[class="card-slot content-view card-content ALL ALL_PLUS TYPE-basic RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b"]'
+      assert_view_select(
+        result,
+        'div[class="card-slot content-view card-content ALL ALL_PLUS ' \
+        'TYPE-basic RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b"]'
+      )
     end
 
-
-    it "inclusions in multi edit" do
+    it 'nests in multi edit' do
       c = Card.new name: 'ABook', type: 'Book'
-      rendered =  c.format.render( :edit )
+      rendered = c.format.render(:edit)
 
       assert_view_select rendered, 'fieldset' do
-        assert_select 'textarea[name=?][class~="tinymce-textarea card-content"]', 'card[subcards][+illustrator][content]'
+        assert_select(
+          'textarea[name=?][class~="tinymce-textarea card-content"]',
+          'card[subcards][+illustrator][content]'
+        )
       end
     end
 
-    it "titled" do
+    it 'titled' do
       result = render_card :titled, name: 'A+B'
       assert_view_select result, 'div[class~="titled-view"]' do
         assert_select 'div[class~="card-header"]' do
@@ -29,21 +33,19 @@ describe Card::HtmlFormat do
       end
     end
 
-    context "Cards with special views" do
-
+    context 'Cards with special views' do
     end
 
-    context "Simple page with Default Layout" do
+    context 'Simple page with Default Layout' do
       before do
         Card::Auth.as_bot do
           card = Card['A+B']
           @simple_page = card.format.render(:layout)
-          #warn "render sp: #{card.inspect} :: #{@simple_page}"
+          # warn "render sp: #{card.inspect} :: #{@simple_page}"
         end
       end
 
-
-      it "renders top menu" do
+      it 'renders top menu' do
         assert_view_select @simple_page, 'header' do
           assert_select 'a[class="internal-link"][href="/"]', 'Home'
           assert_select 'a[class="internal-link"][href="/:recent"]', 'Recent'
@@ -53,57 +55,64 @@ describe Card::HtmlFormat do
         end
       end
 
-      it "renders card header" do
+      it 'renders card header' do
         # lots of duplication here...
-        assert_view_select @simple_page, 'div[class="card-header panel-heading"]' do
+        assert_view_select @simple_page,
+                           'div[class="card-header panel-heading"]' do
           assert_select 'div[class="card-header-title panel-title"]'
         end
       end
 
-      it "renders card content" do
-        assert_view_select @simple_page, 'div[class="card-body panel-body card-content ALL ALL_PLUS TYPE-basic RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b"]', 'AlphaBeta'
+      it 'renders card content' do
+        assert_view_select(
+          @simple_page,
+          'div[class="card-body panel-body card-content ALL ALL_PLUS ' \
+          'TYPE-basic RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b"]',
+          'AlphaBeta'
+        )
       end
 
-      it "renders card credit" do
-        assert_view_select @simple_page, 'div[class~="SELF-Xcredit"]' do#, /Wheeled by/ do
+      it 'renders card credit' do
+        assert_view_select @simple_page, 'div[class~="SELF-Xcredit"]' do
           assert_select 'img'
           assert_select 'a', "Wagn v#{Card::Version.release}"
         end
       end
     end
 
-    context "layout" do
+    context 'layout' do
       before do
         Card::Auth.as_bot do
           @layout_card = Card.create name: 'tmp layout', type: 'Layout'
-          #warn "layout #{@layout_card.inspect}"
+          # warn "layout #{@layout_card.inspect}"
         end
-        c = Card['*all+*layout'] and c.content = '[[tmp layout]]'
+        c = Card['*all+*layout']
+        c.content = '[[tmp layout]]'
         @main_card = Card.fetch('Joe User')
         Card::Env[:main_name] = @main_card.name
 
-        #warn "lay #{@layout_card.inspect}, #{@main_card.inspect}"
+        # warn "lay #{@layout_card.inspect}, #{@main_card.inspect}"
       end
 
-#      it "should default to core view when in layout mode" do
-#        @layout_card.content = "Hi {{A}}"
-#        Card::Auth.as_bot { @layout_card.save }
-#
-#        expect(@main_card.format.render(:layout)).to match('Hi Alpha')
-#      end
-
-#      it "should default to open view for main card" do
-#        @layout_card.content='Open up {{_main}}'
-#        Card::Auth.as_bot { @layout_card.save }
-#
-#        result = @main_card.format.render_layout
-#        expect(result).to match(/Open up/)
-#        expect(result).to match(/card-header/)
-#        expect(result).to match(/Joe User/)
-#      end
-
-      it "should render custom view of main" do
-        @layout_card.content='Hey {{_main|name}}'
+      #      it "should default to core view when in layout mode" do
+      #        @layout_card.content = "Hi {{A}}"
+      #        Card::Auth.as_bot { @layout_card.save }
+      #
+      #        expect(@main_card.format.render(:layout)).to match('Hi Alpha')
+      #      end
+
+      #      it "should default to open view for main card" do
+      #        @layout_card.content='Open up {{_main}}'
+      #        Card::Auth.as_bot { @layout_card.save }
+      #
+      #        result = @main_card.format.render_layout
+      #        expect(result).to match(/Open up/)
+      #        expect(result).to match(/card-header/)
+      #        expect(result).to match(/Joe User/)
+      #      end
+
+      it 'renders custom view of main' do
+        @layout_card.content = 'Hey {{_main|name}}'
         Card::Auth.as_bot { @layout_card.save }
 
         result = @main_card.format.render_layout
@@ -112,28 +121,34 @@ describe Card::HtmlFormat do
       end
 
       it "shouldn't recurse" do
-        @layout_card.content="Mainly {{_main|core}}"
+        @layout_card.content = 'Mainly {{_main|core}}'
         Card::Auth.as_bot { @layout_card.save }
 
-        rendered = expect(@layout_card.format.render(:layout)).to eq(
-          %{Mainly <div id="main"><div class="CodeRay">\n  <div class="code"><pre>Mainly {{_main|core}}</pre></div>\n</div>\n</div>\n<div class="modal fade" role="dialog" id="modal-main-slot"><div class="modal-dialog"><div class="modal-content"></div></div></div>}
+        expect(@layout_card.format.render(:layout)).to eq(
+          "Mainly <div id=\"main\"><div class=\"CodeRay\">\n  " \
+          "<div class=\"code\"><pre>Mainly {{_main|core}}</pre></div>\n" \
+          "</div>\n</div>\n" \
+          '<div class="modal fade" role="dialog" id="modal-main-slot">' \
+          '<div class="modal-dialog"><div class="modal-content">' \
+          '</div></div></div>'
         )
-          #probably better to check that it matches "Mainly" exactly twice.
+        # probably better to check that it matches "Mainly" exactly twice.
       end
 
-
-      it "should handle nested _main references" do
+      it 'handles nested _main references' do
         Card::Auth.as_bot do
-          @layout_card.content="{{outer space|core}}"
+          @layout_card.content = '{{outer space|core}}'
           @layout_card.save!
-          Card.create name: "outer space", content: "{{_main|name}}"
+          Card.create name: 'outer space', content: '{{_main|name}}'
         end
 
-        expect(@layout_card.format.render(:layout)).to eq(%{Joe User\n<div class="modal fade" role="dialog" id="modal-main-slot"><div class="modal-dialog"><div class="modal-content"></div></div></div>})
+        expect(@layout_card.format.render(:layout)).to eq(
+          "Joe User\n" \
+          '<div class="modal fade" role="dialog" id="modal-main-slot">' \
+          '<div class="modal-dialog"><div class="modal-content">' \
+          '</div></div></div>'
+        )
       end
     end
-
-
   end
-
 end

data/mod/01_core/spec/set/all/collection_spec.rb

@@ -1,83 +1,96 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Collection do
-  describe "#item_names" do
-    it "returns item for each line of basic content" do
-      expect(Card.new( name: "foo", content: "X\nY" ).item_names).to eq(["X","Y"])
+  describe '#item_names' do
+    subject do
+      item_names_args = @context ? { context: @context } : {}
+      Card.new(@args).item_names(item_names_args)
+    end
+    it 'returns item for each line of basic content' do
+      @args = { name: 'foo', content: "X\nY" }
+      is_expected.to eq(%w(X Y))
     end
 
-    it "returns list of card names for search" do
-      card = Card.new( name: "foo", type: "Search", content: %[{"name":"Z"}])
-      expect(card.item_names).to eq(["Z"])
+    it 'returns list of card names for search' do
+      @args = { name: 'foo', type: 'Search', content: '{"name":"Z"}' }
+      is_expected.to eq(['Z'])
     end
 
-    it "handles searches relative to context card" do
+    it 'handles searches relative to context card' do
       # note: A refers to 'Z'
-      expect(Card.new(name: "foo", type: "Search", content: %[{"referred_to_by":"_self"}]).item_names( context: 'A' )).to eq(["Z"])
+      @context = 'A'
+      @args = { name: 'foo', type: 'Search',
+                content: '{"referred_to_by":"_self"}' }
+      is_expected.to eq(['Z'])
     end
   end
 
-  describe "#extended_list" do
+  describe '#extended_list' do
     it "returns item's content for pointer setting" do
-      c = Card.new(name: "foo", type: "Pointer", content: "[[Z]]")
+      c = Card.new(name: 'foo', type: 'Pointer', content: '[[Z]]')
       expect(c.extended_list).to eq(["I'm here to be referenced to"])
     end
   end
 
-  describe "#extended_item_cards" do
+  describe '#extended_item_cards' do
     it "returns the 'leaf cards' of a tree of pointer cards" do
       Card::Auth.as_bot do
-        Card.create!(name: "node", type: "Pointer", content: "[[Z]]")
+        Card.create!(name: 'node', type: 'Pointer', content: '[[Z]]')
       end
-      c = Card.new(name: "foo", type: "Pointer", content: "[[node]]\n[[A]]")
-      expect(c.extended_item_cards).to eq([Card.fetch("Z"),Card.fetch("A")],)
+      c = Card.new(name: 'foo', type: 'Pointer', content: "[[node]]\n[[A]]")
+      expect(c.extended_item_cards).to eq([Card.fetch('Z'), Card.fetch('A')])
     end
   end
 
-  describe "#extended_item_contents" do
+  describe '#extended_item_contents' do
     it "returns the content of the 'leaf cards' of a tree of pointer cards" do
       Card::Auth.as_bot do
-        Card.create!(name: "node", type: "Pointer", content: "[[Z]]")
+        Card.create!(name: 'node', type: 'Pointer', content: '[[Z]]')
       end
-      c = Card.new(name: "foo", type: "Pointer", content:  "[[node]]\n[[T]]")
-      expect(c.extended_item_contents).to eq(["I'm here to be referenced to", "Theta"])
+      c = Card.new(name: 'foo', type: 'Pointer', content:  "[[node]]\n[[T]]")
+      expect(c.extended_item_contents)
+        .to eq(["I'm here to be referenced to", 'Theta'])
     end
   end
 
-  describe "#contextual_content" do
-
-    it "processes inclusions relative to context card" do
-      context_card = Card["A"] # refers to 'Z'
-      c = Card.new(name: "foo", content: "{{_self+B|core}}")
-      expect(c.contextual_content( context_card )).to eq("AlphaBeta")
+  describe '#contextual_content' do
+    it 'processes nests relative to context card' do
+      context_card = Card['A'] # refers to 'Z'
+      c = Card.new(name: 'foo', content: '{{_self+B|core}}')
+      expect(c.contextual_content(context_card)).to eq('AlphaBeta')
     end
 
-    it "returns content even when context card is hard templated" do #why the heck is this good?  -efm
-      context_card = Card["A"] # refers to 'Z'
+    # why the heck is this good?  -efm
+    it 'returns content even when context card is hard templated' do
+      context_card = Card['A'] # refers to 'Z'
 
       Card::Auth.as_bot do
-        Card.create! name: "A+*self+*structure", content: "Banana"
+        Card.create! name: 'A+*self+*structure', content: 'Banana'
       end
-      c = Card.new( name: "foo", content: "{{_self+B|core}}" )
-      expect(c.contextual_content( context_card )).to eq("AlphaBeta")
+      c = Card.new name: 'foo', content: '{{_self+B|core}}'
+      expect(c.contextual_content(context_card)).to eq('AlphaBeta')
     end
   end
 
   describe '#map_nests' do
     before do
       Card::Auth.as_bot do
-        @list = Card.create! name: 'mixed list', content: "[[A]]\n{{B}}\n[[C|link C]]\n{{D|name;title:nest D}}"
+        @list = Card.create!(
+          name: 'mixed list',
+          content: "[[A]]\n{{B}}\n[[C|link C]]\n{{D|name;title:nest D}}"
+        )
       end
     end
     it 'handles links and nest arguments' do
-      result = @list.format.map_references_with_args do |name,args|
+      result = @list.format.map_references_with_args do |name, args|
         [name, args]
       end
       expect(result).to eq [
-        ['A', {view: :closed}],
-        ['B', {view: :closed, inc_name: "B", inc_syntax: "B"}],
-        ['C', {view: :closed, title: 'link C'}],
-        ['D', {view: "name", title: "nest D", inc_name: "D", inc_syntax: "D|name;title:nest D"}]
+        ['A', { view: :closed }],
+        ['B', { view: :closed, inc_name: 'B', inc_syntax: 'B' }],
+        ['C', { view: :closed, title: 'link C' }],
+        ['D', { view: 'name', title: 'nest D', inc_name: 'D',
+                inc_syntax: 'D|name;title:nest D' }]
       ]
     end
   end
@@ -101,7 +114,8 @@ describe Card::Set::All::Collection do
 
     it 'handles relative names' do
       Card::Auth.as_bot do
-        Card.create! name: 'G', content: "[[+B]]", type: 'pointer', subcards: {'+B'=>'GammaBeta'}
+        Card.create! name: 'G', content: '[[+B]]', type: 'pointer',
+                     subcards: { '+B' => 'GammaBeta' }
       end
       tabs = Card.fetch('G').format.render_tabs
       assert_view_select tabs, 'div[role=tabpanel]' do
@@ -118,24 +132,30 @@ describe Card::Set::All::Collection do
 
     it 'handles item params' do
       tabs = render_content '{{Fruit+*type+*create|tabs|name;structure:Home}}'
-      path = "/Anyone?#{ {slot: {structure: 'Home'},view: :name}.to_param}"
+      params = { slot: { structure: 'Home' }, view: :name }.to_param
+      path = "/Anyone?#{params}"
       assert_view_select tabs, 'div[role=tabpanel]' do
-        assert_select %{li > a[data-toggle="tab"][data-url="#{path}"]}
+        assert_select %(li > a[data-toggle="tab"][data-url="#{path}"])
       end
     end
     it 'handles nests as items' do
-      tabs = render_card :tabs, name: 'tab_test', type_id: Card::PlainTextID, content: "{{A|type;title:my tab title}}"
+      tabs = render_card :tabs, name: 'tab_test', type_id: Card::PlainTextID,
+                                content: '{{A|type;title:my tab title}}'
       assert_view_select tabs, 'div[role=tabpanel]' do
-        assert_select 'li > a[data-toggle=tab][href="#tab_test-a"]', 'my tab title'
+        assert_select 'li > a[data-toggle=tab][href="#tab_test-a"]',
+                      'my tab title'
         assert_select 'div.tab-pane#tab_test-a', 'Basic'
       end
     end
 
     it 'works with search cards' do
-      Card.create type: 'Search', name: 'Asearch', content: %{{"type":"User"}}
-      tabs=render_content("{{Asearch|tabs;item:name}}")
+      Card.create type: 'Search', name: 'Asearch', content: '{"type":"User"}'
+      tabs = render_content('{{Asearch|tabs;item:name}}')
       assert_view_select tabs, 'div[role=tabpanel]' do
-        assert_select 'li > a[data-toggle=tab][href="#asearch-joe_admin"] span.card-title', 'Joe Admin'
+        assert_select(
+          'li > a[data-toggle=tab][href="#asearch-joe_admin"] span.card-title',
+          'Joe Admin'
+        )
       end
     end
   end

data/mod/01_core/spec/set/all/content_spec.rb

@@ -3,13 +3,13 @@
 describe Card::Set::All::Content do
   describe 'save_content_draft' do
     it 'should store a draft revision' do
-      @card = Card.create! name: "mango", content: "foo"
-      @card.save_content_draft("bar")
+      @card = Card.create! name: 'mango', content: 'foo'
+      @card.save_content_draft('bar')
       expect(@card.drafts.length).to eq 1
-      @card.save_content_draft("booboo")
+      @card.save_content_draft('booboo')
       @card.reload
       expect(@card.drafts.length).to eq 1
-      expect(@card.drafts[0].new_values[:content]).to eq "booboo"
+      expect(@card.drafts[0].new_values[:content]).to eq 'booboo'
     end
   end
 end

data/mod/01_core/spec/set/all/fetch_spec.rb

@@ -55,6 +55,14 @@ describe Card::Set::All::Fetch do
       expect(Card.fetch('A+virtual')).not_to be_nil
     end
 
+    it 'fetches virtual set cards' do
+      aself = Card.fetch('A+*self')
+      Card::Cache.reset_all
+      Card.fetch 'A+*self'
+
+      expect(aself.set_names).to include('Set+*type')
+    end
+
     it 'handles name variants of cached cards' do
       expect(Card.fetch('yomama+*self').name).to eq('yomama+*self')
       expect(Card.fetch('YOMAMA+*self').name).to eq('YOMAMA+*self')
@@ -121,8 +129,9 @@ describe Card::Set::All::Fetch do
       end
 
       it 'prefers db cards to pattern virtual cards' do
-        c1=Card.create!(name: 'y+*right+*structure', content: 'Formatted Content')
-        c2=Card.create!(name: 'a+y', content: 'DB Content')
+        Card.create! name: 'y+*right+*structure',
+                     content: 'Formatted Content'
+        Card.create! name: 'a+y', content: 'DB Content'
         card = Card.fetch('a+y')
         expect(card.virtual?).to be_falsey
         expect(card.rule(:structure)).to eq('Formatted Content')
@@ -141,7 +150,7 @@ describe Card::Set::All::Fetch do
 
       it 'should recognize pattern overrides' do
         # ~~~ create right rule
-        tc=Card.create!(name: 'y+*right+*structure', content: 'Right Content')
+        Card.create!(name: 'y+*right+*structure', content: 'Right Content')
         card = Card.fetch('a+y')
         expect(card.virtual?).to be
         expect(card.raw_content).to eq('Right Content')

data/mod/01_core/spec/set/all/name_spec.rb

@@ -8,18 +8,18 @@ describe Card::Set::All::Name do
       end
     end
 
-    it "should handle cards without names" do
+    it 'should handle cards without names' do
       c = Card.create! type: 'Book'
       expect(c.name).to eq('b1')
     end
 
-    it "should increment again if name already exists" do
+    it 'should increment again if name already exists' do
       b1 = Card.create! type: 'Book'
       b2 = Card.create! type: 'Book'
       expect(b2.name).to eq('b2')
     end
 
-    it "should handle trashed names" do
+    it 'should handle trashed names' do
       b1 = Card.create! type: 'Book'
       Card::Auth.as_bot { b1.delete }
       b1 = Card.create! type: 'Book'
@@ -43,7 +43,6 @@ describe Card::Set::All::Name do
         expect(@card.errors[:codename].first).to match(/already in use/)
       end
     end
-
   end
 
   describe 'repair_key' do