card 1.16.6 → 1.16.7

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

@@ -5,9 +5,9 @@ describe Card::Set::All::Templating do
   describe "#structurees" do
     it "for User+*type+*structure should return all Users" do
       Card::Auth.as_bot do
-        c=Card.create(:name=>'User+*type+*structure')
+        c=Card.create(name: 'User+*type+*structure')
         users
-        
+
         expect(c.structuree_names.sort).to eq(["Big Brother", "Joe Admin", "Joe Camel", "Joe User", "John", "Narcissist", "No Count", "Optic fan", "Sample User", "Sara", "Sunglasses fan", "u1", "u2", "u3"])
       end
     end
@@ -21,9 +21,9 @@ describe Card::Set::All::Templating do
   describe "with right structure" do
     before do
       Card::Auth.as_bot do
-        @bt = Card.create! :name=>"birthday+*right+*structure", :type=>'Date', :content=>"Today!"
+        @bt = Card.create! name: "birthday+*right+*structure", type: 'Date', content: "Today!"
       end
-      @jb = Card.create! :name=>"Jim+birthday"
+      @jb = Card.create! name: "Jim+birthday"
     end
 
     it "should have default content" do
@@ -38,12 +38,12 @@ describe Card::Set::All::Templating do
       end
       jb = @jb.refresh force=true
       expect(jb.format.render(:raw)).to eq('Tomorrow')
-      expect(jb.type_id).to eq(Card::PhraseID)    
+      expect(jb.type_id).to eq(Card::PhraseID)
     end
-  
+
     it "should have type and content overridden by (new) type_plus_right set" do
       Card::Auth.as_bot do
-        Card.create! :name=>'Basic+birthday+*type plus right+*structure', :type=>'PlainText', :content=>'Yesterday'
+        Card.create! name: 'Basic+birthday+*type plus right+*structure', type: 'PlainText', content: 'Yesterday'
       end
       jb = @jb.refresh force=true
       expect(jb.raw_content).to eq('Yesterday')
@@ -55,10 +55,10 @@ describe Card::Set::All::Templating do
   describe "with right default" do
     before do
       Card::Auth.as_bot  do
-        @bt = Card.create! :name=>"birthday+*right+*default", :type=>'Date', :content=>"Today!"
+        @bt = Card.create! name: "birthday+*right+*default", type: 'Date', content: "Today!"
       end
-      @bb = Card.new :name=>'Bob+birthday'
-      @jb = Card.create! :name=>"Jim+birthday"
+      @bb = Card.new name: 'Bob+birthday'
+      @jb = Card.create! name: "Jim+birthday"
     end
 
     it "should have default cardtype" do
@@ -68,9 +68,9 @@ describe Card::Set::All::Templating do
     it "should have default content" do
       expect(Card['Jim+birthday'].content).to eq('Today!')
     end
-    
+
     it "should apply to new cards" do
-      pb = Card.new :name=>"Pete+birthday"
+      pb = Card.new name: "Pete+birthday"
       expect(pb.raw_content).to eq('Today!')
       expect(pb.content).to eq('Today!')
     end
@@ -79,33 +79,33 @@ describe Card::Set::All::Templating do
   describe "with type structure" do
     before do
       Card::Auth.as_bot do
-        @dt = Card.create! :name=>"Date+*type+*structure", :type=>'Basic', :content=>'Tomorrow'
+        @dt = Card.create! name: "Date+*type+*structure", type: 'Basic', content: 'Tomorrow'
       end
     end
-    
+
     it "should return templated content even if content is passed in" do
-      expect(Card.new(:type=>'Date', :content=>'').format._render(:raw)).to eq('Tomorrow')
+      expect(Card.new(type: 'Date', content: '').format._render(:raw)).to eq('Tomorrow')
     end
-    
+
     describe 'and right structure' do
       before do
         Card::Auth.as_bot do
-          Card.create :name=>"Jim+birthday", :content=>'Yesterday'
-          @bt = Card.create! :name=>"birthday+*right+*structure", :type=>'Date', :content=>"Today"
+          Card.create name: "Jim+birthday", content: 'Yesterday'
+          @bt = Card.create! name: "birthday+*right+*structure", type: 'Date', content: "Today"
         end
       end
-      
+
       it "*right setting should override *type setting" do
         expect(Card['Jim+birthday'].raw_content).to eq('Today')
       end
 
       it "should defer to normal content when *structure rule's content is (exactly) '_self'" do
-        Card::Auth.as_bot { Card.create! :name=>'Jim+birthday+*self+*structure', :content=>'_self' }
+        Card::Auth.as_bot { Card.create! name: 'Jim+birthday+*self+*structure', content: '_self' }
         expect(Card['Jim+birthday'].raw_content).to eq('Yesterday')
       end
     end
   end
-  
+
 end
 
 

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

@@ -4,12 +4,12 @@
 module RenameMethods
   def name_invariant_attributes card
     {
-      :content     => card.content,
-      #:updater_id  => card.updater_id,
-      #:revisions   => card.actions.count,
-      :referencers => card.referencers.map(&:name).sort,
-      :referees => card.referees.map(&:name).sort,
-      :dependents  => card.dependents.map(&:id).sort
+      content:     card.content,
+      #updater_id:  card.updater_id,
+      #revisions:   card.actions.count,
+      referencers: card.referencers.map(&:name).sort,
+      referees:    card.referees.map(&:name).sort,
+      dependents:  card.dependents.map(&:id).sort
     }
   end
 
@@ -34,7 +34,7 @@ include RenameMethods
 
 
 describe Card::Set::All::TrackedAttributes do
-  
+
   describe '#extract_subcard_args!' do
     it "should move plus keys into subcard hash" do
       raw_args = { 'name'=>'test', 'subcards'=>{ '+*oldway'=>{'content'=>'old'},  }, '+*newway'=>{'content'=>'new'} }
@@ -43,13 +43,13 @@ describe Card::Set::All::TrackedAttributes do
       expect(subcards.keys.sort).to eq(['+*newway', '+*oldway'])
     end
   end
-  
-  
+
+
   describe 'set_name' do
 
 
     it "should handle case variants" do
-      @c = Card.create! :name=>'chump'
+      @c = Card.create! name: 'chump'
       expect(@c.name).to eq('chump')
       @c.name = 'Chump'
       @c.save!
@@ -57,20 +57,20 @@ describe Card::Set::All::TrackedAttributes do
     end
 
     it "should handle changing from plus card to simple" do
-      c = Card.create! :name=>'four+five'
+      c = Card.create! name: 'four+five'
       c.name = 'nine'
       c.save!
       expect(c.name).to eq('nine')
       expect(c.left_id).to eq(nil)
       expect(c.right_id).to eq(nil)
     end
-    
+
     #FIXME - following tests more about fetch than set_name.  this spec still needs lots of cleanup
 
     it "test fetch with new when present" do
-      Card.create!(:name=>"Carrots")
+      Card.create!(name: "Carrots")
       cards_should_be_added 0 do
-        c=Card.fetch "Carrots", :new=>{}
+        c=Card.fetch "Carrots", new: {}
         c.save
         expect(c).to be_instance_of(Card)
         expect(Card.fetch("Carrots")).to be_instance_of(Card)
@@ -80,7 +80,7 @@ describe Card::Set::All::TrackedAttributes do
     it "test_simple" do
       cards_should_be_added 1 do
         expect(Card['Boo!']).to be_nil
-        expect(Card.create(:name=>"Boo!")).to be_instance_of(Card)
+        expect(Card.create(name: "Boo!")).to be_instance_of(Card)
         expect(Card['Boo!']).to be_instance_of(Card)
       end
     end
@@ -88,7 +88,7 @@ describe Card::Set::All::TrackedAttributes do
 
     it "test fetch with new when not present" do
       cards_should_be_added 1 do
-        c=Card.fetch("Tomatoes", :new=>{})
+        c=Card.fetch("Tomatoes", new: {})
         c.save
         expect(c).to be_instance_of(Card)
         expect(Card.fetch("Tomatoes")).to be_instance_of(Card)
@@ -97,7 +97,7 @@ describe Card::Set::All::TrackedAttributes do
 
     it "test_create_junction" do
       cards_should_be_added 3 do
-        expect(Card.create(:name=>"Peach+Pear", :content=>"juicy")).to be_instance_of(Card)
+        expect(Card.create(name: "Peach+Pear", content: "juicy")).to be_instance_of(Card)
       end
       expect(Card["Peach"]).to be_instance_of(Card)
       expect(Card["Pear"]).to be_instance_of(Card)
@@ -133,16 +133,16 @@ describe Card::Set::All::TrackedAttributes do
       assert_rename Card['Menu'], 'manure'
       expect(Card['Menu']).to be_nil
     end
-  
+
     it "wipes old references by default" do
       c = Card['Menu']
       c.name = 'manure'
       c.save!
       expect(Card['manure'].references_from.size).to eq(0)
     end
-  
+
     it "picks up new references" do
-      Card.create :name=>'kinds of poop', :content=>'[[manure]]'
+      Card.create name: 'kinds of poop', content: '[[manure]]'
       assert_rename Card['Menu'], 'manure'
       expect(Card['manure'].references_from.size).to eq(2)
     end
@@ -154,7 +154,7 @@ describe Card::Set::All::TrackedAttributes do
     it "handles plus cards renamed to simple" do
       assert_rename card("A+B"), "K"
     end
-  
+
 
     it "handles flipped parts" do
       assert_rename card("A+B"), "B+A"
@@ -208,52 +208,52 @@ describe Card::Set::All::TrackedAttributes do
 
 
     it "test_rename_should_not_fail_when_updating_inaccessible_referencer" do
-      Card.create! :name => "Joe Card", :content => "Whattup"
+      Card.create! name: "Joe Card", content: "Whattup"
       Card::Auth.as :joe_admin do
-        Card.create! :name => "Admin Card", :content => "[[Joe Card]]"
+        Card.create! name: "Admin Card", content: "[[Joe Card]]"
       end
       c = Card["Joe Card"]
-      c.update_attributes! :name => "Card of Joe", :update_referencers => true
+      c.update_attributes! name: "Card of Joe", update_referencers: true
       assert_equal "[[Card of Joe]]", Card["Admin Card"].content
     end
 
     it "test_rename_should_update_structured_referencer" do
       Card::Auth.as_bot do
-        c=Card.create! :name => "Pit"
-        Card.create! :name => "Orange", :type=>"Fruit", :content => "[[Pit]]"
-        Card.create! :name => "Fruit+*type+*structure", :content=>"this [[Pit]]"
+        c=Card.create! name: "Pit"
+        Card.create! name: "Orange", type: "Fruit", content: "[[Pit]]"
+        Card.create! name: "Fruit+*type+*structure", content: "this [[Pit]]"
 
         assert_equal "this [[Pit]]", Card["Orange"].raw_content
-        c.update_attributes! :name => "Seed", :update_referencers => true
+        c.update_attributes! name: "Seed", update_referencers: true
         assert_equal "this [[Seed]]", Card["Orange"].raw_content
       end
     end
-    
+
     it 'should handle plus cards that have children' do
       Card::Auth.as_bot do
-        Card.create :name=>'a+b+c+d'
+        Card.create name: 'a+b+c+d'
         ab = Card['a+b']
         assert_rename ab, 'e+f'
       end
     end
-    
-    
+
+
     context "chuck" do
       before do
         Card::Auth.as_bot do
-          Card.create! :name => "chuck_wagn+chuck"
+          Card.create! name: "chuck_wagn+chuck"
         end
       end
-      
+
       it "test_rename_name_substitution" do
         c1, c2 = Card["chuck_wagn+chuck"], Card["chuck"]
         assert_rename c2, "buck"
         assert_equal "chuck_wagn+buck", Card.find(c1.id).name
       end
-      
+
       it "test_reference_updates_plus_to_simple" do
          c1 = Card::Auth.as_bot do
-           Card.create! :name=>'Huck', :content=>"[[chuck wagn+chuck]]"
+           Card.create! name: 'Huck', content: "[[chuck wagn+chuck]]"
          end
          c2 = Card["chuck_wagn+chuck"]
          assert_rename c2, 'schmuck'
@@ -261,14 +261,14 @@ describe Card::Set::All::TrackedAttributes do
          assert_equal '[[schmuck]]', c1.content
       end
     end
-    
+
     context "dairy" do
       before do
         Card::Auth.as_bot do
-          Card.create! :type=>"Cardtype", :name=>"Dairy", :content => "[[/new/{{_self|name}}|new]]"
+          Card.create! type: "Cardtype", name: "Dairy", content: "[[/new/{{_self|name}}|new]]"
         end
       end
-      
+
       it "test_renaming_card_with_self_link_should_not_hang" do
         c = Card["Dairy"]
         c.name = "Buttah"
@@ -283,34 +283,34 @@ describe Card::Set::All::TrackedAttributes do
         assert_equal "[[/new/{{_self|name}}|new]]", Card["Newt"].content
       end
     end
-    
-    
+
+
     context "blues" do
       before do
         Card::Auth.as_bot do
-          Card.create! :name => "Blue"
-    
-          Card.create! :name => "blue includer 1", :content => "{{Blue}}"
-          Card.create! :name => "blue includer 2", :content => "{{blue|closed;other:stuff}}"
-    
-          Card.create! :name => "blue linker 1", :content => "[[Blue]]"
-          Card.create! :name => "blue linker 2", :content => "[[blue]]"
+          Card.create! name: "Blue"
+
+          Card.create! name: "blue includer 1", content: "{{Blue}}"
+          Card.create! name: "blue includer 2", content: "{{blue|closed;other:stuff}}"
+
+          Card.create! name: "blue linker 1", content: "[[Blue]]"
+          Card.create! name: "blue linker 2", content: "[[blue]]"
         end
       end
-      
-      
+
+
       it "test_updates_inclusions_when_renaming" do
         c1,c2,c3 = Card["Blue"], Card["blue includer 1"], Card["blue includer 2"]
-        c1.update_attributes :name => "Red", :update_referencers => true
-        assert_equal "{{Red}}", Card.find(c2.id).content                     
+        c1.update_attributes name: "Red", update_referencers: true
+        assert_equal "{{Red}}", Card.find(c2.id).content
         # NOTE these attrs pass through a hash stage that may not preserve order
         assert_equal "{{Red|closed;other:stuff}}", Card.find(c3.id).content
       end
 
       it "test_updates_inclusions_when_renaming_to_plus" do
         c1,c2 = Card["Blue"], Card["blue includer 1"]
-        c1.update_attributes :name => "blue includer 1+color", :update_referencers => true
-        assert_equal "{{blue includer 1+color}}", Card.find(c2.id).content                     
+        c1.update_attributes name: "blue includer 1+color", update_referencers: true
+        assert_equal "{{blue includer 1+color}}", Card.find(c2.id).content
       end
 
       it "test_reference_updates_on_case_variants" do
@@ -324,5 +324,5 @@ describe Card::Set::All::TrackedAttributes do
     end
 
   end
-  
+
 end

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

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Trash do
-  
+
   it "certain 'all rules' should be indestructable" do
     Card::Auth.as_bot do
       name = '*all+*default'
@@ -11,7 +11,7 @@ describe Card::Set::All::Trash do
       expect(Card[name]).to be
     end
   end
-  
+
   it 'does not delete account with edits' do
     Card::Auth.as_bot do
       name = 'Joe User'
@@ -21,11 +21,11 @@ describe Card::Set::All::Trash do
       expect(Card[name]).to be
     end
   end
-  
+
   it 'deletes account without edits' do
     Card::Auth.as_bot do
       name = 'born to die'
-      card = Card.create! :name=>name, :type_code=>:user
+      card = Card.create! name: name, type_code: :user
       card.delete
       expect(Card[name]).not_to be
     end

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

@@ -4,28 +4,28 @@ describe Card::Set::All::Type do
 
   describe 'get_type_id (#new)' do
     it "should accept cardtype name and casespace variant as type" do
-      expect(Card.new( :type=>'Phrase'   ).type_id).to eq(Card::PhraseID)
-      expect(Card.new( :type=>'PHRASE'   ).type_id).to eq(Card::PhraseID)
-      expect(Card.new( :type=>'phrase'   ).type_id).to eq(Card::PhraseID)
-      expect(Card.new( :type=>'phrase??' ).type_id).to eq(Card::PhraseID)
+      expect(Card.new( type: 'Phrase'   ).type_id).to eq(Card::PhraseID)
+      expect(Card.new( type: 'PHRASE'   ).type_id).to eq(Card::PhraseID)
+      expect(Card.new( type: 'phrase'   ).type_id).to eq(Card::PhraseID)
+      expect(Card.new( type: 'phrase??' ).type_id).to eq(Card::PhraseID)
     end
 
     it 'should accept type_code' do
-      expect(Card.new( :type_code=>'phrase'   ).type_id).to eq(Card::PhraseID)
-      expect(Card.new( :type_code=>:phrase    ).type_id).to eq(Card::PhraseID)
+      expect(Card.new( type_code: 'phrase'   ).type_id).to eq(Card::PhraseID)
+      expect(Card.new( type_code: :phrase    ).type_id).to eq(Card::PhraseID)
     end
 
     it 'should accept type_id' do
-      expect(Card.new( :type_id=>Card::PhraseID   ).type_code).to eq(:phrase)
+      expect(Card.new( type_id: Card::PhraseID   ).type_code).to eq(:phrase)
     end
   end
 
   describe 'card with wagneered type' do
     before do
       Card::Auth.as_bot do
-        @type = Card.create! :name=>'Hat', :type=>'Cardtype'
+        @type = Card.create! name: 'Hat', type: 'Cardtype'
       end
-      @hat =  Card.new :type=>'Hat'
+      @hat =  Card.new type: 'Hat'
     end
 
     it 'should have a type_name' do
@@ -50,20 +50,20 @@ describe Card::Set::All::Type do
   describe 'card with structured type' do
     before do
       Card::Auth.as_bot do
-        Card.create! :name=>'Topic', :type=>'Cardtype'
-        Card.create! :name=>'Topic+*type+*structure', :content=>'{{+results}}'
-        Card.create! :name=>'Topic+results+*type plus right+*structure', :type=>'Search', :content=>'{}'
+        Card.create! name: 'Topic', type: 'Cardtype'
+        Card.create! name: 'Topic+*type+*structure', content: '{{+results}}'
+        Card.create! name: 'Topic+results+*type plus right+*structure', type: 'Search', content: '{}'
       end
     end
 
     it "should clear cache of structured nested card after saving" do
       Card::Auth.as_bot do
-        expect(Card.fetch('t1+results', :new=>{}).type_name).to eq('Basic')
+        expect(Card.fetch('t1+results', new: {}).type_name).to eq('Basic')
 
-        topic1 = Card.new :type=>'Topic', :name=>'t1'
+        topic1 = Card.new type: 'Topic', name: 't1'
         topic1.format._render_new
         topic1.save!
-        expect(Card.fetch('t1+results', :new=>{}).type_name).to eq('Search')
+        expect(Card.fetch('t1+results', new: {}).type_name).to eq('Search')
       end
     end
   end