card 1.16.6 → 1.16.7

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

@@ -5,13 +5,13 @@ describe Card::HtmlFormat do
   describe "views" do
 
     it "content" do
-      result = render_card(:content, :name=>'A+B')
+      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"]'
     end
 
 
     it "inclusions in multi edit" do
-      c = Card.new :name => 'ABook', :type => 'Book'
+      c = Card.new name: 'ABook', type: 'Book'
       rendered =  c.format.render( :edit )
 
       assert_view_select rendered, 'fieldset' do
@@ -20,7 +20,7 @@ describe Card::HtmlFormat do
     end
 
     it "titled" do
-      result = render_card :titled, :name=>'A+B'
+      result = render_card :titled, name: 'A+B'
       assert_view_select result, 'div[class~="titled-view"]' do
         assert_select 'div[class~="card-header"]' do
           assert_select 'span[class~="card-title"]'
@@ -75,7 +75,7 @@ describe Card::HtmlFormat do
     context "layout" do
       before do
         Card::Auth.as_bot do
-          @layout_card = Card.create :name=>'tmp layout', :type=>'Layout'
+          @layout_card = Card.create name: 'tmp layout', type: 'Layout'
           #warn "layout #{@layout_card.inspect}"
         end
         c = Card['*all+*layout'] and c.content = '[[tmp layout]]'
@@ -126,7 +126,7 @@ describe Card::HtmlFormat do
         Card::Auth.as_bot do
           @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>})

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

@@ -4,7 +4,7 @@
 #   context "new card" do
 #     before(:each) do
 #       Card::Auth.as_bot do
-#         @c = Card.new :name=>"New Card", :content=>"Great Content"
+#         @c = Card.new name: "New Card", content: "Great Content"
 #       end
 #     end
 #

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

@@ -3,23 +3,23 @@
 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"])
+      expect(Card.new( name: "foo", content: "X\nY" ).item_names).to eq(["X","Y"])
     end
 
     it "returns list of card names for search" do
-      card = Card.new( :name=>"foo", :type=>"Search", :content => %[{"name":"Z"}])
+      card = Card.new( name: "foo", type: "Search", content: %[{"name":"Z"}])
       expect(card.item_names).to eq(["Z"])
     end
 
     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"])
+      expect(Card.new(name: "foo", type: "Search", content: %[{"referred_to_by":"_self"}]).item_names( context: 'A' )).to eq(["Z"])
     end
   end
 
   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
@@ -27,9 +27,9 @@ describe Card::Set::All::Collection 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]]")
+      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
@@ -37,9 +37,9 @@ describe Card::Set::All::Collection 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]]")
+      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
@@ -48,7 +48,7 @@ describe Card::Set::All::Collection 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}}")
+      c = Card.new(name: "foo", content: "{{_self+B|core}}")
       expect(c.contextual_content( context_card )).to eq("AlphaBeta")
     end
 
@@ -56,9 +56,9 @@ describe Card::Set::All::Collection 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}}" )
+      c = Card.new( name: "foo", content: "{{_self+B|core}}" )
       expect(c.contextual_content( context_card )).to eq("AlphaBeta")
     end
   end
@@ -66,7 +66,7 @@ describe Card::Set::All::Collection do
   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
@@ -74,24 +74,24 @@ describe Card::Set::All::Collection do
         [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
 
   describe 'tabs view' do
     it 'renders tab panel' do
-      tabs = render_card :tabs, :content=>"[[A]]\n[[B]]\n[[C]]", :type=>'pointer'
+      tabs = render_card :tabs, content: "[[A]]\n[[B]]\n[[C]]", type: 'pointer'
       assert_view_select tabs, 'div[role=tabpanel]' do
         assert_select 'li > a[data-toggle=tab]'
       end
     end
 
     it 'loads only the first tab pane' do
-      tabs = render_card :tabs, :content=>"[[A]]\n[[B]]\n[[C]]", :type=>'pointer'
+      tabs = render_card :tabs, content: "[[A]]\n[[B]]\n[[C]]", type: 'pointer'
       assert_view_select tabs, 'div[role=tabpanel]' do
         assert_select 'div.tab-pane#tempo_rary-a  .card-slot#A'
         assert_select 'li > a.load[data-toggle=tab][href="#tempo_rary-b"]'
@@ -101,7 +101,7 @@ 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,13 +118,13 @@ 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}"
+      path = "/Anyone?#{ {slot: {structure: 'Home'},view: :name}.to_param}"
       assert_view_select tabs, 'div[role=tabpanel]' do
         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 'div.tab-pane#tab_test-a', 'Basic'
@@ -132,7 +132,7 @@ describe Card::Set::All::Collection do
     end
 
     it 'works with search cards' do
-      Card.create :type=>'Search', :name=>'Asearch', :content=>%{{"type":"User"}}
+      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'

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

@@ -3,7 +3,7 @@
 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 = Card.create! name: "mango", content: "foo"
       @card.save_content_draft("bar")
       expect(@card.drafts.length).to eq 1
       @card.save_content_draft("booboo")

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

@@ -48,20 +48,20 @@ describe Card::Set::All::Fetch do
       expect(Card['A+*self']).to be_nil
       expect(Card.fetch( 'A+*self' )).not_to be_nil
     end
-    
+
 
     it "fetches newly virtual cards" do
       expect(Card.fetch( 'A+virtual')).to be_nil
-      Card::Auth.as_bot { Card.create :name=>'virtual+*right+*structure' }
+      Card::Auth.as_bot { Card.create name: 'virtual+*right+*structure' }
       expect(Card.fetch( 'A+virtual')).not_to be_nil
     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')
-      expect(Card.fetch('yomama', :new=>{}).name).to eq('yomama')
-      expect(Card.fetch('YOMAMA', :new=>{}).name).to eq('YOMAMA')
-      expect(Card.fetch('yomama!', :new=>{ :name=>'Yomama'} ).name).to eq('Yomama')
+      expect(Card.fetch('yomama', new: {}).name).to eq('yomama')
+      expect(Card.fetch('YOMAMA', new: {}).name).to eq('YOMAMA')
+      expect(Card.fetch('yomama!', new: { name: 'Yomama'} ).name).to eq('Yomama')
     end
 
     it "does not recurse infinitely on template templates" do
@@ -76,10 +76,10 @@ describe Card::Set::All::Fetch do
       Card::Auth.as_bot do
         a = Card.fetch("A")
         expect(a).to be_instance_of(Card)
-        
+
         # expires the saved card
         expect(Card.cache).to receive(:delete).with('a').and_call_original
-        expect(Card.cache).to receive(:delete).with(/~\d+/).at_least(12)  
+        expect(Card.cache).to receive(:delete).with(/~\d+/).at_least(12)
         # expires plus cards
         expect(Card.cache).to receive(:delete).with('c+a')
         expect(Card.cache).to receive(:delete).with('d+a')
@@ -103,8 +103,8 @@ 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")
+        c1=Card.create!(name: "y+*right+*structure", content: "Formatted Content")
+        c2=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")
@@ -112,10 +112,10 @@ describe Card::Set::All::Fetch do
       end
 
       it "prefers a pattern virtual card to trash cards" do
-        Card.create!(:name => "y+*right+*structure", :content => "Formatted Content")
-        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.fetch("a+y").delete!
-        
+
         card = Card.fetch("a+y")
         expect(card.virtual?).to be
         expect(card.raw_content).to eq("Formatted Content")
@@ -123,13 +123,13 @@ 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")
+        tc=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")
-        
+
 #        warn "creating template"
-        tpr = Card.create!(:name => "Basic+y+*type plus right+*structure", :content => "Type Plus Right Content")
+        tpr = Card.create!(name: "Basic+y+*type plus right+*structure", content: "Type Plus Right Content")
         card = Card.fetch("a+y")
         expect(card.virtual?).to be
         expect(card.raw_content).to eq("Type Plus Right Content")
@@ -144,46 +144,46 @@ describe Card::Set::All::Fetch do
 
       it "should not hit the database for every fetch_virtual lookup" do
         card_double = class_double("Card")
-        Card.create!(:name => "y+*right+*structure", :content => "Formatted Content")
+        Card.create!(name: "y+*right+*structure", content: "Formatted Content")
         Card.fetch("a+y")
         expect(card_double).not_to receive(:find_by_key)
         Card.fetch("a+y")
       end
 
       it "should not be a new_record after being saved" do
-        Card.create!(:name=>'growing up')
+        Card.create!(name: 'growing up')
         card = Card.fetch('growing up')
         expect(card.new_record?).to be_falsey
       end
     end
   end
 
-  describe "#fetch :new=>{ ... }" do
+  describe "#fetch new: { ... }" do
     it "returns a new card if it doesn't find one" do
-      new_card = Card.fetch "Never Seen Me Before", :new=>{}
+      new_card = Card.fetch "Never Seen Me Before", new: {}
       expect(new_card).to be_instance_of(Card)
       expect(new_card.new_record?).to be_truthy
     end
 
     it "returns a card if it finds one" do
-      new_card = Card.fetch "A+B", :new=>{}
+      new_card = Card.fetch "A+B", new: {}
       expect(new_card).to be_instance_of(Card)
       expect(new_card.new_record?).to be_falsey
     end
 
     it "takes a second hash of options as new card options" do
-      new_card = Card.fetch "Never Before", :new=>{ :type => "Image" }
+      new_card = Card.fetch "Never Before", new: { type: "Image" }
       expect(new_card).to be_instance_of(Card)
       expect(new_card.type_code).to eq(:image)
       expect(new_card.new_record?).to be_truthy
-      expect(Card.fetch( 'Never Before', :new=>{} ).type_id).to eq(Card::BasicID)
+      expect(Card.fetch( 'Never Before', new: {} ).type_id).to eq(Card::BasicID)
     end
   end
 
   describe "#fetch_virtual" do
     it "should find cards with *right+*structure specified" do
       Card::Auth.as_bot do
-        Card.create! :name=>"testsearch+*right+*structure", :content=>'{"plus":"_self"}', :type => 'Search'
+        Card.create! name: "testsearch+*right+*structure", content: '{"plus":"_self"}', type: 'Search'
       end
       c = Card.fetch("A+testsearch".to_name)
       assert c.virtual?

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

@@ -9,23 +9,23 @@ describe Card::Set::All::Initialize do
     end
 
     it "handles nil name" do
-      c = Card.new :name => nil
+      c = Card.new name: nil
       expect(c).to be_instance_of(Card)
       expect(c.name).to eq('')
     end
-    
+
     it 'handles legit name' do
-      c = Card.new :name => 'Ceee'
+      c = Card.new name: 'Ceee'
       expect(c).to be_instance_of(Card)
       expect(c.name).to eq('Ceee')
-    end    
+    end
   end
-  
-  
+
+
   describe "module inclusion" do
     context '(search)' do
       before do
-        @c = Card.new :type=>'Search', :name=>'Module Inclusion Test Card'
+        @c = Card.new type: 'Search', name: 'Module Inclusion Test Card'
       end
 
       it "happens after new" do
@@ -47,11 +47,11 @@ describe Card::Set::All::Initialize do
 
     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').respond_to?(:add_item)).to be_truthy
       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').respond_to?(:add_item)).to be_truthy
       end
     end
   end

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

@@ -4,25 +4,25 @@ describe Card::Set::All::Name do
   describe 'autoname' do
     before do
       Card::Auth.as_bot do
-        @b1 = Card.create! :name=>'Book+*type+*autoname', :content=>'b1'
+        @b1 = Card.create! name: 'Book+*type+*autoname', content: 'b1'
       end
     end
 
     it "should handle cards without names" do
-      c = Card.create! :type=>'Book'
+      c = Card.create! type: 'Book'
       expect(c.name).to eq('b1')
     end
 
     it "should increment again if name already exists" do
-      b1 = Card.create! :type=>'Book'
-      b2 = Card.create! :type=>'Book'
+      b1 = Card.create! type: 'Book'
+      b2 = Card.create! type: 'Book'
       expect(b2.name).to eq('b2')
     end
 
     it "should handle trashed names" do
-      b1 = Card.create! :type=>'Book'
+      b1 = Card.create! type: 'Book'
       Card::Auth.as_bot { b1.delete }
-      b1 = Card.create! :type=>'Book'
+      b1 = Card.create! type: 'Book'
       expect(b1.name).to eq('b1')
     end
   end
@@ -33,13 +33,13 @@ describe Card::Set::All::Name do
     end
 
     it 'should require admin permission' do
-      @card.update_attributes :codename=>'structure'
+      @card.update_attributes codename: 'structure'
       expect(@card.errors[:codename].first).to match(/only admins/)
     end
 
     it 'should check uniqueness' do
       Card::Auth.as_bot do
-        @card.update_attributes :codename=>'structure'
+        @card.update_attributes codename: 'structure'
         expect(@card.errors[:codename].first).to match(/already in use/)
       end
     end

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

@@ -5,7 +5,7 @@ describe Card::Set::All::Pattern do
   describe :set_names do
     it "returns self, type, all for simple cards" do
       Card::Auth.as_bot do
-        card = Card.new( :name => "AnewCard" )
+        card = Card.new( name: "AnewCard" )
         expect(card.set_names).to eq([ "Basic+*type","*all"])
         card.save!
         card = Card.fetch("AnewCard")
@@ -23,7 +23,7 @@ describe Card::Set::All::Pattern do
 
     it "returns set names for junction cards" do
       Card::Auth.as_bot do
-        expect(Card.new( :name=>"Iliad+author" ).set_names).to eq([
+        expect(Card.new( name: "Iliad+author" ).set_names).to eq([
           "Book+author+*type plus right","author+*right","Basic+*type","*all plus","*all"
         ])
       end
@@ -31,12 +31,12 @@ describe Card::Set::All::Pattern do
 
     it "returns set names for compound star cards" do
       Card::Auth.as_bot do
-        expect(Card.new( :name=>"Iliad+*to" ).set_names).to eq([
+        expect(Card.new( name: "Iliad+*to" ).set_names).to eq([
           "Book+*to+*type plus right","*to+*right","*rstar","Pointer+*type","*all plus","*all"
         ])
       end
     end
-    
+
     it "handles type plus right prototypes properly" do #right place for this?  really need more prototype tests...
       Card::Auth.as_bot do
         expect(Card.fetch('Fruit+flavor+*type plus right').prototype.set_names.include?('Fruit+flavor+*type plus right')).to be_truthy
@@ -44,19 +44,19 @@ describe Card::Set::All::Pattern do
     end
   end
 
-  
+
   describe :rule_set_keys do
     it "returns correct set names for new cards" do
-      card = Card.new :name => "AnewCard"
+      card = Card.new name: "AnewCard"
       expect(card.rule_set_keys).to eq([ "#{Card::BasicID}+type", "all"])
     end
-    
+
   end
 
   describe :safe_set_keys do
     it "returns css names for simple star cards" do
       Card::Auth.as_bot do
-        card = Card.new( :name => "*AnewCard")
+        card = Card.new( name: "*AnewCard")
         expect(card.safe_set_keys).to eq("ALL TYPE-basic STAR")
         card.save!
         card = Card.fetch("*AnewCard")
@@ -65,7 +65,7 @@ describe Card::Set::All::Pattern do
     end
 
     it "returns set names for junction cards" do
-      card=Card.new( :name=>"Iliad+author" )
+      card=Card.new( name: "Iliad+author" )
       expect(card.safe_set_keys).to eq("ALL ALL_PLUS TYPE-basic RIGHT-author TYPE_PLUS_RIGHT-book-author")
       card.save!
       card = Card.fetch("Iliad+author")
@@ -75,7 +75,7 @@ describe Card::Set::All::Pattern do
 
   describe :label do
     it "returns label for name" do
-      expect(Card.new(:name=>'address+*right').label).to eq(%{All "+address" cards})
+      expect(Card.new(name: 'address+*right').label).to eq(%{All "+address" cards})
     end
   end
 end