card 1.16.6 → 1.16.7

data/mod/05_standard/spec/set/right/account_spec.rb

@@ -7,7 +7,7 @@ describe Card::Set::Right::Account do
       #note - much of this is tested in account_request_spec
       before do
         Card::Auth.as_bot do
-          @user_card = Card.create! :name=>'TmpUser', :type_id=>Card::UserID, '+*account'=>{
+          @user_card = Card.create! name: 'TmpUser', type_id: Card::UserID, '+*account'=>{
             '+*email'=>'tmpuser@wagn.org', '+*password'=>'tmp_pass'
           }
         end
@@ -20,12 +20,12 @@ describe Card::Set::Right::Account do
     end
 
     it "should check accountability of 'accounted' card" do
-      @unaccountable = Card.create :name=>'BasicUnaccountable', '+*account'=>{ '+*email'=>'tmpuser@wagn.org', '+*password'=>'tmp_pass' }
+      @unaccountable = Card.create name: 'BasicUnaccountable', '+*account'=>{ '+*email'=>'tmpuser@wagn.org', '+*password'=>'tmp_pass' }
       expect(@unaccountable.errors['+*account'].first).to eq('not allowed on this card')
     end
 
     it "should require email" do
-      @no_email = Card.create :name=>'TmpUser', :type_id=>Card::UserID, '+*account'=>{ '+*password'=>'tmp_pass' }
+      @no_email = Card.create name: 'TmpUser', type_id: Card::UserID, '+*account'=>{ '+*password'=>'tmp_pass' }
       expect(@no_email.errors['+*account'].first).to match(/email required/)
     end
   end
@@ -87,12 +87,12 @@ describe Card::Set::Right::Account do
     end
 
     it 'should reset password' do
-      @user_card.account.password_card.update_attributes!(:content => 'new password')
+      @user_card.account.password_card.update_attributes!(content: 'new password')
       assert_equal @user_card.id, Card::Auth.authenticate('joe@user.com', 'new password')
     end
 
     it 'should not rehash password when updating email' do
-      @user_card.account.email_card.update_attributes!(:content => 'joe2@user.com')
+      @user_card.account.email_card.update_attributes!(content: 'joe2@user.com')
       assert_equal @user_card.id, Card::Auth.authenticate('joe2@user.com', 'joe_pass')
     end
   end
@@ -113,7 +113,7 @@ describe Card::Set::Right::Account do
       expect(@account.save).to eq(true)
       expect(Card::Auth.current_id).to eq(@account.left_id)
       @account = @account.refresh force=true
-      expect(@account.fetch(:trait => :token)).to be_nil
+      expect(@account.fetch(trait: :token)).to be_nil
       expect(@account.save).to be_falsey
     end
 
@@ -145,11 +145,11 @@ describe Card::Set::Right::Account do
     context 'denied access' do
       it 'excludes protected subcards' do
         skip
-        Card.create(:name=>"A+B+*self+*read", :type=>'Pointer', :content=>"[[u1]]")
-        u2 = Card.fetch 'u2+*following', :new=>{:type=>'Pointer'}
+        Card.create(name: "A+B+*self+*read", type: 'Pointer', content: "[[u1]]")
+        u2 = Card.fetch 'u2+*following', new: {type: 'Pointer'}
         u2.add_item "A"
         a = Card.fetch "A"
-        a.update_attributes( :content=> "new content", :subcards=>{'+B'=>{:content=>'hidden content'}})
+        a.update_attributes( content: "new content", subcards: {'+B'=>{content: 'hidden content'}})
       end
 
       it 'sends no email if changes not visible' do

data/mod/05_standard/spec/set/right/email_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Email do
-  
+
   context '<User>+*email' do
     before do
       @card = Card.fetch 'u1+*email'
@@ -25,30 +25,30 @@ describe Card::Set::Right::Email do
       expect(@format.render_raw).to match(/denied/)
     end
   end
-  
+
   context "+*account+*email" do
     context 'update' do
       before :each do
         @email_card = email_card = Card['u1'].account.email_card
       end
-      
+
       it 'should downcase email' do
         Card::Auth.as_bot do
-          @email_card.update_attributes! :content=>'QuIrE@example.com'
+          @email_card.update_attributes! content: 'QuIrE@example.com'
           expect(@email_card.content).to eq('quire@example.com')
         end
       end
 
       it 'should require valid email' do
-        @email_card.update_attributes :content=>'boop'
+        @email_card.update_attributes content: 'boop'
         expect(@email_card.errors[:content].first).to match(/must be valid address/)
       end
-      
+
       it 'should require unique email' do
-        @email_card.update_attributes :content=>'joe@user.com'
+        @email_card.update_attributes content: 'joe@user.com'
         expect(@email_card.errors[:content].first).to match(/must be unique/)
       end
-      
+
     end
   end
 

data/mod/05_standard/spec/set/right/password_spec.rb

@@ -5,22 +5,22 @@ describe Card::Set::Right::Password do
   before :each do
     @user_card = Card::Auth[ 'joe@user.com' ]
   end
-  
+
   describe '#update_attributes' do
 
     it 'should encrypt password' do
-      @user_card.account.password_card.update_attributes! :content => 'new password'
+      @user_card.account.password_card.update_attributes! content: 'new password'
       expect(@user_card.account.password).not_to eq('new password')
       assert_equal @user_card.id, Card::Auth.authenticate('joe@user.com', 'new password')
     end
 
     it 'should validate password' do
       password_card = @user_card.account.password_card
-      password_card.update_attributes :content => '2b'
+      password_card.update_attributes content: '2b'
       expect(password_card.errors[:password]).not_to be_empty
-      
+
     end
-    
+
     context 'blank password' do
       it "shouldn't change the password" do
         acct = @user_card.account
@@ -31,15 +31,15 @@ describe Card::Set::Right::Password do
         pw_card.save
         expect(original_pw).to eq(pw_card.refresh(force=true).content)
       end
-      
+
       it "shouldn't break email editing" do
-        @user_card.account.update_attributes! :subcards=>{'+*password'=>'', '+*email'=>'joe2@user.com'}
+        @user_card.account.update_attributes! subcards: {'+*password'=>'', '+*email'=>'joe2@user.com'}
         expect(@user_card.account.email).to eq('joe2@user.com')
         expect(@user_card.account.password).not_to be_empty
       end
     end
   end
-  
-  
+
+
 
 end

data/mod/05_standard/spec/set/right/stats_spec.rb

@@ -5,7 +5,7 @@ describe Card::Set::Right::Stats do
   context "core view" do
     it 'should have a table' do
       Card::Auth.as_bot do
-        @core = render_card :core, :name=>"A+*stats"
+        @core = render_card :core, name: "A+*stats"
         assert_view_select @core, 'table'
       end
     end

data/mod/05_standard/spec/set/right/when_created_spec.rb

@@ -2,6 +2,6 @@
 
 describe Card::Set::Right::WhenCreated do
   it 'should produce a text date' do
-    expect(render_card( :core, :name=>'A+*when created' )).to match(/\w+ \d+/)
+    expect(render_card( :core, name: 'A+*when created' )).to match(/\w+ \d+/)
   end
 end

data/mod/05_standard/spec/set/right/when_last_edited_spec.rb

@@ -2,6 +2,6 @@
 
 describe Card::Set::Right::WhenLastEdited do
   it 'should produce a text date' do
-    expect(render_card( :core, :name=>'A+*when last edited' )).to match(/\w+ \d+/)
+    expect(render_card( :core, name: 'A+*when last edited' )).to match(/\w+ \d+/)
   end
 end

data/mod/05_standard/spec/set/rstar/rules_spec.rb

@@ -7,13 +7,13 @@ describe Card::Set::Rstar::Rules do
      expect(r).not_to match('No Card!')
      #warn "r = #{r}"
      assert_view_select r, 'table[class="set-rules table"]' do
-       assert_select 'a[href~="/*read+*right+*read?view=open_rule"]', :text => 'read'
+       assert_select 'a[href~="/*read+*right+*read?view=open_rule"]', text: 'read'
      end
   end
 
   it "should render setting view for a *input rule" do
     Card::Auth.as_bot do
-      r = Card.fetch('*read+*right+*input',:new=>{}).format.render_open_rule
+      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}"

data/mod/05_standard/spec/set/self/account_links_spec.rb

@@ -2,8 +2,8 @@
 
 describe Card::Set::Self::AccountLinks do
   it "has a 'my card' link" do
-    assert_view_select render_card(:core, :name=>'*account links'), 'span[id="logging"]' do  # 'ul[class="nav navbar-nav navbar-right"]'
-      assert_select 'a[id="my-card-link"]', :text => 'Joe User'
+    assert_view_select render_card(:core, name: '*account links'), 'span[id="logging"]' do  # 'ul[class="nav navbar-nav navbar-right"]'
+      assert_select 'a[id="my-card-link"]', text: 'Joe User'
     end
   end
 end

data/mod/05_standard/spec/set/self/all_spec.rb

@@ -2,35 +2,33 @@
 
 describe Card::Set::Self::All do
   before do
-    
     @all = Card[:all]
-    
   end
-  
+
   context '#update' do
     it 'should trigger empty trash (with right params)' do
       Card::Auth.as_bot do
         Card['A'].delete!
-        expect(Card.where( :trash=>true )).not_to be_empty
+        expect(Card.where(trash: true)).not_to be_empty
         Card::Env.params[:task] = :empty_trash
         @all.update_attributes({})
-        expect(Card.where( :trash=>true )).to be_empty
+        expect(Card.where(trash: true)).to be_empty
       end
     end
 
     it 'should trigger deleting old revisions (with right params)' do
       Card::Auth.as_bot do
         a = Card['A']
-        a.update_attributes! :content=>'a new day'
-        a.update_attributes! :content=>'another day'
+        a.update_attributes! content: 'a new day'
+        a.update_attributes! content: 'another day'
         expect(a.actions.count).to eq(3)
         Card::Env.params[:task] = :delete_old_revisions
         @all.update_attributes({})
-        expect(a.actions.count).to eq(1)        
+        expect(a.actions.count).to eq(1)
       end
     end
 
-=begin    
+=begin
     it 'should be trigger reference repair' do
       Card::Auth.as_bot do
         a = Card['A']
@@ -39,10 +37,9 @@ describe Card::Set::Self::All do
         puts a.references_to.count
         @all.update_attributes({})
         puts a.references_to.count
-        
+
       end
     end
 =end
-    
   end
 end

data/mod/05_standard/spec/set/self/head_spec.rb

@@ -2,7 +2,7 @@
 
 describe Card::Set::Self::Head do
   it "should have a javascript tag" do
-    assert_view_select render_card(:raw, :name=>'*head'), 'script[type="text/javascript"]'
+    assert_view_select render_card(:raw, name: '*head'), 'script[type="text/javascript"]'
   end
 
   context 'tinyMCE config' do

data/mod/05_standard/spec/set/self/navbox_spec.rb

@@ -2,6 +2,6 @@
 
 describe Card::Set::Self::Navbox do
   it "should have a form" do
-    assert_view_select render_card(:core, :name=>'*navbox'), 'form.navbox-form input.navbox'
+    assert_view_select render_card(:core, name: '*navbox'), 'form.navbox-form input.navbox'
   end
 end

data/mod/05_standard/spec/set/self/now_spec.rb

@@ -2,6 +2,6 @@
 
 describe Card::Set::Self::Now do
   it "should have a date" do
-    expect(render_card(:raw, :name=>'*now').match(/\w+day, \w+ \d+, \d{4}/ )).not_to be_nil
+    expect(render_card(:raw, name: '*now').match(/\w+day, \w+ \d+, \d{4}/ )).not_to be_nil
   end
 end

data/mod/05_standard/spec/set/self/stats_spec.rb

@@ -3,7 +3,7 @@
 describe Card::Set::Self::Stats do
   before do
     Card::Auth.as_bot do
-      @core = render_card :core, :name=>:stats
+      @core = render_card :core, name: :stats
     end
   end
   it "should render a table" do

data/mod/05_standard/spec/set/self/version_spec.rb

@@ -2,6 +2,6 @@
 
 describe Card::Set::Self::Version do
   it "should have an X.X.X version" do
-    expect(render_card(:raw, :name=>'*version') =~ (/\d\.\d+\.\w+/ )).to be_truthy
+    expect(render_card(:raw, name: '*version') =~ (/\d\.\d+\.\w+/ )).to be_truthy
   end
 end

data/mod/05_standard/spec/set/type/email_template_spec.rb

@@ -14,13 +14,13 @@ describe Card::Set::Type::EmailTemplate do
   end
 
   def create_field name, args={}
-    Card.create! args.merge(:name=>"#{email_name}+#{name}")
+    Card.create! args.merge(name: "#{email_name}+#{name}")
   end
 
   before do
     Card::Auth.current_id = Card::WagnBotID
     chunk_test = "Url(wagn.org) Link([[http://wagn.org|Wagn]]) Inclusion({{B|name}}) Card link([[A]])"
-    Card.create! :name => email_name, :type=>:email_template, :subcards=>{
+    Card.create! name: email_name, type: :email_template, subcards: {
       "+*to"           =>  "joe@user.com",
       "+*from"         =>  "from@user.com",
       "+*subject"      =>  "*subject #{chunk_test}",
@@ -31,7 +31,7 @@ describe Card::Set::Type::EmailTemplate do
 
   describe "mail view" do
     let(:content_type) do
-      card = Card.create!(:name => 'content type test', :type=>:email_template, :subcards=>@fields)
+      card = Card.create!(name: 'content type test', type: :email_template, subcards: @fields)
       email = card.format.render_mail
       email[:content_type].value
     end
@@ -66,34 +66,34 @@ describe Card::Set::Type::EmailTemplate do
       end
 
       it 'handles pointer values' do
-        create_field '*cc', :content => "[[joe@user.com]]", :type=>'Pointer'
+        create_field '*cc', content: "[[joe@user.com]]", type: 'Pointer'
         expect( mailconfig[:cc] ).to eq 'joe@user.com'
       end
 
 
       #it 'handles email syntax in pointer values' do
-      #  create_field '*cc', :content => "[[Joe User <joe@user.com>]]", :type=>'Pointer'
+      #  create_field '*cc', content: "[[Joe User <joe@user.com>]]", type: 'Pointer'
       #  expect( mailconfig[:cc] ).to eq 'Joe User <joe@user.com>'
       #end
 
       it 'handles link to email card' do
-        create_field '*cc', :content => "[[Joe User+*email]]", :type=>'Pointer'
+        create_field '*cc', content: "[[Joe User+*email]]", type: 'Pointer'
         expect( mailconfig[:cc] ).to eq 'joe@user.com'
       end
 
       # it 'handles link with valid email address' do
-      #   create_field '*cc', :content => "[[joe@admin.com|Joe]]", :type=>'Phrase'
+      #   create_field '*cc', content: "[[joe@admin.com|Joe]]", type: 'Phrase'
       #   expect( mailconfig[:cc] ).to eq 'Joe<joe@user.com>'
       # end
 
       it 'handles search card' do
-        create_field '*bcc', :content => '{"name":"Joe Admin","append":"*email"}', :type=>'Search'
+        create_field '*bcc', content: '{"name":"Joe Admin","append":"*email"}', type: 'Search'
         expect( mailconfig[:bcc] ).to eq 'joe@admin.com'
       end
 
       # it 'handles invalid email address' do  #TODO not obvious how to deal with that.
                                               #      we can't decided whether a email address like [[_left]] is valid; depends on the context
-      #   Card.fetch("a mail template+*to").update_attributes(:content=>"invalid mail address")
+      #   Card.fetch("a mail template+*to").update_attributes(content: "invalid mail address")
       # end
     end
 
@@ -159,46 +159,46 @@ describe Card::Set::Type::EmailTemplate do
      context 'with context card' do
        let(:context_card) do
          Card.create(
-           :name    => "Banana",
-           :content => "data content [[A]]",
-           :subcards=> {
-             '+email'      => {:content=>'gary@gary.com'},
-             '+subject'    => {:type=>'Pointer', :content=>'[[default subject]]'},
-             '+attachment' => {:type=>'File', :content=>"notreally.txt" }
+           name:    "Banana",
+           content: "data content [[A]]",
+           subcards: {
+             '+email'      => {content: 'gary@gary.com'},
+             '+subject'    => {type: 'Pointer', content: '[[default subject]]'},
+             '+attachment' => {type: 'File', content: "notreally.txt" }
            }
          )
        end
        subject {  mailconfig( context: context_card ) }
 
        it 'handles contextual name in address search' do
-         update_field '*from', :content => '{"left":"_self", "right":"email"}', :type=>'Search'
-         update_field '*from', :content => '{"left":"_self", "right":"email"}'                  #FIXME: have to do this twice to get the right content.
+         update_field '*from', content: '{"left":"_self", "right":"email"}', type: 'Search'
+         update_field '*from', content: '{"left":"_self", "right":"email"}'                  #FIXME: have to do this twice to get the right content.
                                                                                                 #       After the first update the content is empty
          expect(subject[:from]).to eq "gary@gary.com"
        end
 
        it 'handles contextual names and structure rules in subject' do
-         Card.create! :name => 'default subject', :content=>'a very nutty thang', :type=>'Phrase'
-         Card.create! :name => "subject search+*right+*structure", :content => %{{"referred_to_by":"_left+subject"}}, :type=>'Search'
-         update_field '*subject', :content => "{{+subject search|core;item:core}}"
+         Card.create! name: 'default subject', content: 'a very nutty thang', type: 'Phrase'
+         Card.create! name: "subject search+*right+*structure", content: %{{"referred_to_by":"_left+subject"}}, type: 'Search'
+         update_field '*subject', content: "{{+subject search|core;item:core}}"
          expect(subject[:subject]).to eq("a very nutty thang")
        end
 
        it 'handles _self in html message' do
-          update_field '*html message', :content => "Triggered by {{_self|name}}"
+          update_field '*html message', content: "Triggered by {{_self|name}}"
           expect(subject[:html_message]).to  include("Triggered by Banana")
        end
 
        it 'handles _left in html message' do
-         update_field '*html_message', :content => "Nobody expects {{_left+surprise|core}}"
-         Card.create :name=>'Banana+surprise', :content=>"the Spanish Inquisition"
-         c = Card.create :name => "Banana+emailtest", :content => "data content"
+         update_field '*html_message', content: "Nobody expects {{_left+surprise|core}}"
+         Card.create name: 'Banana+surprise', content: "the Spanish Inquisition"
+         c = Card.create name: "Banana+emailtest", content: "data content"
          expect( mailconfig( context: c )[:html_message] ).to include 'Nobody expects the Spanish Inquisition'
 
        end
 
        it 'handles contextual name for attachments' do
-         create_field '*attach', :type=>"Pointer", :content => "[[_self+attachment]]"
+         create_field '*attach', type: "Pointer", content: "[[_self+attachment]]"
          expect(subject[:attach]).to eq ['Banana+attachment'.to_name]
        end
      end

data/mod/05_standard/spec/set/type/file_spec.rb

@@ -5,7 +5,7 @@ describe Card::Set::Type::File do
   context "new file card" do
     before do
       Card::Auth.as_bot do
-        Card.create :name => "file card", :type_code=>'file', :file=>File.new( File.join FIXTURES_PATH, 'file1.txt' )
+        Card.create name: "file card", type_code: 'file', file: File.new( File.join FIXTURES_PATH, 'file1.txt' )
       end
     end
     subject { Card['file card'] }
@@ -43,7 +43,7 @@ describe Card::Set::Type::File do
 
     context "updated file card" do
       before do
-        subject.update_attributes! :file=>File.new( File.join FIXTURES_PATH, 'file2.txt' )
+        subject.update_attributes! file: File.new( File.join FIXTURES_PATH, 'file2.txt' )
       end
       it "updates file" do
         expect(subject.file.read.strip).to eq "file2"
@@ -60,7 +60,7 @@ describe Card::Set::Type::File do
 
     context 'subcards' do
       it 'handles file subcards' do
-        Card.create! :name=>'new card with file', :subcards=>{'+my file'=>{:content=>'ignore content', :type_id=>Card::FileID, :file=> File.open(File.join(FIXTURES_PATH, 'file1.txt'))}}
+        Card.create! name: 'new card with file', subcards: {'+my file'=>{content: 'ignore content', type_id: Card::FileID, file: File.open(File.join(FIXTURES_PATH, 'file1.txt'))}}
         expect(Card['new card with file+my file'].file.file.read.strip).to eq 'file1'
       end
 
@@ -69,7 +69,7 @@ describe Card::Set::Type::File do
 
   it 'handles urls' do
     url = 'http://wagn.org/files/bruce_logo-large-122798.png'
-    Card.create! :name=>'url test', :type_id=>Card::FileID, :remote_file_url=> url
+    Card.create! name: 'url test', type_id: Card::FileID, remote_file_url: url
     expect(Card['url test'].file.size).to be > 0
     expect(Card['url test'].file.url).to match /\.png$/
   end