card 1.16.6 → 1.16.7

data/spec/lib/card/success_spec.rb

@@ -20,7 +20,7 @@ describe Card::Success do
 
     context 'initialized with hash' do
       before do
-        success_params :id=>home.id, :view=>'closed'
+        success_params id: home.id, view: 'closed'
       end
       it { is_expected.to eq home}
     end
@@ -59,7 +59,7 @@ describe Card::Success do
     context 'with params' do
       context 'using initilization' do
         before do
-          success_params :id=>home.id, :view=>'closed', :layout=>'my_layout'
+          success_params id: home.id, view: 'closed', layout: 'my_layout'
         end
         it { is_expected.to eq '/Home?layout=my_layout&view=closed' }
       end
@@ -80,7 +80,7 @@ describe Card::Success do
       context 'using <<' do
         before do
           success_params nil
-          @success << { :card=>home, :view=>'closed'}
+          @success << { card: home, view: 'closed'}
         end
         it { is_expected.to eq '/Home?view=closed' }
       end
@@ -95,7 +95,7 @@ describe Card::Success do
 
   describe '#soft_redirect?' do
     it 'returns true if soft_redirect parameter is true' do
-      success_params :soft_redirect=>true
+      success_params soft_redirect: true
       expect(@success.soft_redirect?).to be_truthy
     end
   end
@@ -128,14 +128,22 @@ describe Card::Success do
 
   describe 'params' do
     it 'returns params hash' do
-      success_params :name=>'Home', :view=>'View'
+      success_params name: 'Home', view: 'View'
       @success.layout = 'Layout'
-      @success.apply :script => 'Script'
-      @success << {:structure => 'Structure'}
+      @success.apply script: 'Script'
+      @success << { structure: 'Structure' }
       expect(@success.params.keys.sort).to eq [:layout, :script, :structure, :view]
     end
     it 'ignores "id", "name", "mark", "card"", target", and "redirect"' do
-      success_params :id=>5, :name=>'Home', :card=>Card['Home'], :mark=>'Home', :target=>'Home', :redirect=>false, :view=>'View'
+      success_params({
+        id: 5,
+        name: 'Home',
+        card: Card['Home'],
+        mark: 'Home',
+        target: 'Home',
+        redirect: false,
+        view: 'View'
+      })
       expect(@success.params.keys).to eq [:view]
     end
   end

data/spec/mailers/mailer_spec.rb

@@ -42,15 +42,15 @@ describe Card::Mailer do
   # describe "flexmail" do
   #   # FIXME: at least two tests should be here, with & w/o attachment.
   # end
-  
-  
-  
+
+
+
   # describe "cardmail" do
   #   before do
-  #     Card.gimme "mailtest", :content => "test"
+  #     Card.gimme "mailtest", content: "test"
   #   end
   #   it "renders email text" do
-  #     Card::Mailer.cardmail(:to => "sara@user.com").deliver
+  #     Card::Mailer.cardmail(to: "sara@user.com").deliver
   #     @mail = ActionMailer::Base.deliveries.last
   #     expect(@mail.body).to eq("test")
   #   end

data/spec/models/card/cardtype_spec.rb

@@ -9,11 +9,11 @@ end
 describe "Card (Cardtype)" do
 
   it "should not allow cardtype remove when instances present" do
-    Card.create :name=>'City', :type=>'Cardtype'
+    Card.create name: 'City', type: 'Cardtype'
     city = Card.fetch('City')
-    c1=Card.create :name=>'Sparta', :type=>'City'
-    c2=Card.create :name=>'Eugene', :type=>'City'
-    assert_equal ['Eugene','Sparta'], Card.search(:type=>'City').map(&:name).sort
+    c1=Card.create name: 'Sparta', type: 'City'
+    c2=Card.create name: 'Eugene', type: 'City'
+    assert_equal ['Eugene','Sparta'], Card.search(type: 'City').map(&:name).sort
     assert_raises ActiveRecord::RecordInvalid do
       city.delete!
     end
@@ -22,25 +22,25 @@ describe "Card (Cardtype)" do
   end
 
   it "remove cardtype" do
-    Card.create! :name=>'County', :type=>'Cardtype'
+    Card.create! name: 'County', type: 'Cardtype'
     c = Card['County']
     c.delete
   end
 
   it "cardtype creation and dynamic cardtype" do
 
-    assert Card.create( :name=>'BananaPudding', :type=>'Cardtype' ).type_id == Card::Codename[:cardtype]
+    assert Card.create( name: 'BananaPudding', type: 'Cardtype' ).type_id == Card::Codename[:cardtype]
     assert_instance_of Card, c=Card.fetch("BananaPudding")
 
     # you have to have a module to include or it's just a Basic (type_code fielde excepted)
-    cd = Card.create(:type=>'banana_pudding',:name=>"figgy" )
+    cd = Card.create(type: 'banana_pudding',name: "figgy" )
     assert cd.type_name == 'BananaPudding'
     assert Card.find_by_type_id(c.id)
   end
 
   describe "conversion to cardtype" do
     before do
-      @card = Card.create!(:type=>'Cardtype', :name=>'Cookie')
+      @card = Card.create!(type: 'Cardtype', name: 'Cookie')
       expect(@card.type_name).to eq('Cardtype')
     end
 
@@ -51,7 +51,7 @@ describe "Card (Cardtype)" do
       @card=Card['Cookie']
       assert_instance_of Card, @card
       expect(@card.type_code).to eq(nil) # :cookie
-      assert_equal 'Cookie', Card.create!( :name=>'Oreo', :type=>'Cookie' ).type_name
+      assert_equal 'Cookie', Card.create!( name: 'Oreo', type: 'Cookie' ).type_name
     end
   end
 
@@ -73,12 +73,12 @@ describe Card, "created without permission" do
   #  was to rewrite most of the permissions section as simple validations and i decided not to go down that rabbit hole.
   #
   #it "should not be valid" do
-  #  Card.new( :name=>'foo', :type=>'Cardtype').valid?.should_not be_true
+  #  Card.new( name: 'foo', type: 'Cardtype').valid?.should_not be_true
   #end
 
   it "should not create a new cardtype until saved" do
     expect {
-      Card.new( :name=>'foo', :type=>'Cardtype')
+      Card.new( name: 'foo', type: 'Cardtype')
     }.not_to change(Card, :count)
   end
 end
@@ -112,9 +112,9 @@ end
 describe Card, "Recreated Card" do
   before do
     Card::Auth.as_bot do
-    @ct = Card.create! :name=>'Species', :type=>'Cardtype'
+    @ct = Card.create! name: 'Species', type: 'Cardtype'
     @ct.delete!
-    @ct = Card.create! :name=>'Species', :type=>'Cardtype'
+    @ct = Card.create! name: 'Species', type: 'Cardtype'
     end
   end
 
@@ -128,7 +128,7 @@ end
 describe Card, "New Cardtype" do
   before do
     Card::Auth.as_bot do
-      @ct = Card.create! :name=>'Animal', :type=>'Cardtype'
+      @ct = Card.create! name: 'Animal', type: 'Cardtype'
     end
   end
 
@@ -144,7 +144,7 @@ end
 describe Card, "Wannabe Cardtype Card" do
   before do
     Card::Auth.as_bot do
-      @card = Card.create! :name=> 'convertible'
+      @card = Card.create! name: 'convertible'
       @card.type_id=Card::CardtypeID
       @card.save!
     end
@@ -159,7 +159,7 @@ 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]]'
+      Card.create name: 'Cardtype F+*type+*create', type: 'Pointer', content: '[[r3]]'
     end
 
     @ucard = Card::Auth.current
@@ -167,10 +167,10 @@ describe Card, "Joe User" do
   end
 
   it "should not have r3 permissions" do
-    expect(@ucard.fetch(:new=>{}, :trait=>:roles).item_names.member?(@r3.name)).to be_falsey
+    expect(@ucard.fetch(new: {}, trait: :roles).item_names.member?(@r3.name)).to be_falsey
   end
   it "should ponder 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
+    expect(Card.new(type: 'Cardtype F').ok?(:create)).to be_falsey
   end
   it "should not find Cardtype F on its list of createable cardtypes" do
     expect(@type_names.member?('Cardtype F')).to be_falsey
@@ -187,7 +187,7 @@ describe Card, "Cardtype with Existing Cards" do
     @ct = Card['Cardtype F']
   end
   it "should have existing cards of that type" do
-    expect(Card.search(:type=>@ct.name)).not_to be_empty
+    expect(Card.search(type: @ct.name)).not_to be_empty
   end
 
   it "should raise an error when you try to delete it" do
@@ -203,7 +203,7 @@ describe Card::Set::Type::Cardtype do
 
   it "should handle changing away from Cardtype" do
     Card::Auth.as_bot do
-      ctg = Card.create! :name=>"CardtypeG", :type=>"Cardtype"
+      ctg = Card.create! name: "CardtypeG", type: "Cardtype"
       ctg.type_id = Card::BasicID
       ctg.save!
       ctg = Card["CardtypeG"]

data/spec/models/card/create_spec.rb

@@ -3,7 +3,7 @@
 # FIXME this shouldn't be here
 describe Card::Set::Type::Cardtype, ".create with :codename" do
   it "should work" do
-    expect(Card.create!(:name=>"Foo Type", :codename=>"foo", :type=>'Cardtype').type_code).to eq(:cardtype)
+    expect(Card.create!(name: "Foo Type", codename: "foo", type: 'Cardtype').type_code).to eq(:cardtype)
   end
 end
 
@@ -13,14 +13,14 @@ end
 describe Card, "created by Card.new " 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
 
   it "should 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]]"
+      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
   end
@@ -31,7 +31,7 @@ end
 describe Card, "created by Card.create with valid attributes" do
   before(:each) do
     Card::Auth.as_bot do
-      @b = Card.create :name=>"New Card", :content=>"Great Content"
+      @b = Card.create name: "New Card", content: "Great Content"
       @c = Card.find(@b.id)
     end
   end
@@ -54,7 +54,7 @@ end
 
 describe Card, "create junction" do
   before(:each) do
-    @c = Card.create! :name=>"Peach+Pear", :content=>"juicy"
+    @c = Card.create! name: "Peach+Pear", content: "juicy"
   end
 
   it "should not have errors" do

data/spec/models/card/trash_spec.rb

@@ -11,7 +11,7 @@ describe Card, "deleting card" do
       expect(a.errors[:permission_denied]).not_to be_empty
       expect(Card['a'].trash).to eq(false)
     end
-    
+
   end
 end
 
@@ -27,7 +27,7 @@ describe Card, "deleted card" do
   end
   it "should come out of the trash when a plus card is created" do
     Card::Auth.as_bot do
-      Card.create(:name=>'A+*acct')
+      Card.create(name: 'A+*acct')
       c = Card[ 'A' ]
       expect(c.trash).to be_falsey
     end
@@ -36,8 +36,8 @@ end
 
 describe Card, "in trash" do
   it "should be retrieved by fetch with new" do
-    Card.create(:name=>"Betty").delete
-    c=Card.fetch "Betty", :new=>{}
+    Card.create(name: "Betty").delete
+    c=Card.fetch "Betty", new: {}
     c.save
     expect(Card["Betty"]).to be_instance_of(Card)
   end
@@ -47,7 +47,7 @@ end
 describe Card, "plus cards" do
   it "should be deleted when root is" do
     Card::Auth.as :joe_admin do
-      c = Card.create! :name=>'zz+top'
+      c = Card.create! name: 'zz+top'
       root = Card['zz']
       root.delete
 #      Rails.logger.info "ERRORS = #{root.errors.full_messages*''}"
@@ -69,7 +69,7 @@ describe Card do
   context "without revisions" do
     before do
       Card::Auth.as_bot do
-        @c = Card.create! :name=>'User Must Die', :type=>'User'
+        @c = Card.create! name: 'User Must Die', type: 'User'
       end
     end
     it "should be removable" do
@@ -86,7 +86,7 @@ end
 #  before do
 #     Card::Auth.as(Card::WagnBotID)
 #     # this ugly setup makes it so A+Admin is the actual user with edits..
-#     Card["Wagn Bot"].update_attributes! :name=>"A+Wagn Bot"
+#     Card["Wagn Bot"].update_attributes! name: "A+Wagn Bot"
 #  end
 #  it "should not be removable" do
 #    @a = Card['A']
@@ -117,8 +117,8 @@ describe Card, "rename to trashed name" do
       @b = Card["B"]
       @a.delete!  #trash
       Rails.logger.info "\n\n~~~~~~~deleted~~~~~~~~\n\n\n"
-      
-      @b.update_attributes! :name=>"A", :update_referencers=>true
+
+      @b.update_attributes! name: "A", update_referencers: true
     end
   end
 
@@ -160,8 +160,8 @@ describe Card, "revived from trash" do
   before do
     Card::Auth.as_bot do
       Card["basicname"].delete!
-      
-      @c = Card.create! :name=>'basicname', :content=>'revived content'
+
+      @c = Card.create! name: 'basicname', content: 'revived content'
     end
   end
 
@@ -186,13 +186,13 @@ end
 describe Card, "recreate trashed card via new" do
 #  before do
 #    Card::Auth.as(Card::WagnBotID)
-#    @c = Card.create! :type=>'Basic', :name=>"BasicMe"
+#    @c = Card.create! type: 'Basic', name: "BasicMe"
 #  end
 
 #  this test is known to be broken; we've worked around it for now
 #  it "should delete and recreate with a different cardtype" do
 #    @c.delete!
-#    @re_c = Card.new :type=>"Phrase", :name=>"BasicMe", :content=>"Banana"
+#    @re_c = Card.new type: "Phrase", name: "BasicMe", content: "Banana"
 #    @re_c.save!
 #  end
 
@@ -201,9 +201,9 @@ end
 describe Card, "junction revival" do
   before do
     Card::Auth.as_bot do
-      @c = Card.create! :name=>"basicname+woot", :content=>"basiccontent"
+      @c = Card.create! name: "basicname+woot", content: "basiccontent"
       @c.delete!
-      @c = Card.create! :name=>"basicname+woot", :content=>"revived content"
+      @c = Card.create! name: "basicname+woot", content: "revived content"
     end
   end
 
@@ -239,18 +239,18 @@ describe "remove tests" do
   end
 
   it "test_recreate_plus_card_name_variant" do
-    Card.create( :name => "rta+rtb" ).delete
-    Card["rta"].update_attributes :name=> "rta!"
-    c = Card.create! :name=>"rta!+rtb"
+    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?
   end
 
   it "test_multiple_trash_collision" do
-    Card.create( :name => "alpha" ).delete
+    Card.create( name: "alpha" ).delete
     3.times do
-      b = Card.create( :name => "beta" )
+      b = Card.create( name: "beta" )
       b.name = "alpha"
       assert b.save!
       b.delete

data/spec/models/card/type_transition_spec.rb

@@ -4,7 +4,7 @@ class Card
   cattr_accessor :count
 
   module Set::Type
-  
+
     module CardtypeA
       extend Card::Set
 
@@ -42,7 +42,7 @@ end
 describe Card, "with role" do
   before do
     Card::Auth.as_bot do
-      @role = Card.search(:type=>'Role')[0]
+      @role = Card.search(type: 'Role')[0]
     end
   end
 
@@ -132,7 +132,7 @@ end
 describe Card, "type transition create callback" do
   before do
     Card::Auth.as_bot do
-      Card.create(:name=>'Basic+*type+*delete', :type=>'Pointer', :content=>"[[Anyone Signed in]]")
+      Card.create(name: 'Basic+*type+*delete', type: 'Pointer', content: "[[Anyone Signed in]]")
     end
     @c = change_card_to_type("basicname", :cardtype_f)
   end

data/spec/models/card/validation_spec.rb

@@ -3,30 +3,30 @@
 describe Card, "validate name" do
 
   it "should error on name with /" do
-    @c = Card.create :name=>"testname/"
+    @c = Card.create name: "testname/"
     expect(@c.errors[:name]).not_to be_blank
   end
 
   it "should error on junction name  with /" do
-    @c = Card.create :name=>"jasmin+ri/ce"
+    @c = Card.create name: "jasmin+ri/ce"
     expect(@c.errors[:name]).not_to be_blank
   end
 
   it "shouldn't create any new cards when name invalid" do
     original_card_count = Card.count
-    @c = Card.create :name=>"jasmin+ri/ce"
+    @c = Card.create name: "jasmin+ri/ce"
     expect(Card.count).to eq(original_card_count)
   end
 
   it "should not allow empty name" do
-    @c = Card.new :name=>""
+    @c = Card.new name: ""
     expect(@c.valid?).to eq(false)
     expect(@c.errors[:name]).not_to be_blank
   end
 
   # maybe the @c.key= should just throw an error, but now it doesn't take anyway
   it "should not allow mismatched name and key" do
-    @c = Card.new :name=>"Test"
+    @c = Card.new name: "Test"
     @c.key="foo"
     #@c.key.should == 'test'
     expect(@c.valid?).to eq(false)