card 1.16.6 → 1.16.7

data/mod/05_email/spec/set/all/follow_spec.rb

@@ -2,7 +2,7 @@
 
 describe "Card::Set::All::Follow" do
   def follow_view card_name
-    render_card :follow_link, :name=>card_name
+    render_card :follow_link, name: card_name
   end
 
   describe "follower_ids" do
@@ -57,7 +57,7 @@ describe "Card::Set::All::Follow" do
     end
 
     def assert_following_view name, args
-      assert_follow_view name, args.reverse_merge(:following => true, :text=>"unfollow" )
+      assert_follow_view name, args.reverse_merge(following: true, text: "unfollow" )
     end
 
 #  href="/card/update/Home+*self+philipp+*follow?card%5Bcontent%5D=%5B%5Bnever%5D%5D&success%5Bid%5D=Home&success%5Bview%5D=follow"
@@ -83,51 +83,51 @@ describe "Card::Set::All::Follow" do
 
     context "when not following" do
       it 'renders follow link' do
-        assert_follow_view 'No One Sees Me', :add_set=>'No One Sees Me+*self'
+        assert_follow_view 'No One Sees Me', add_set: 'No One Sees Me+*self'
       end
     end
 
     context "when following *self" do
       it 'renders following link' do
-        assert_following_view 'Look At Me', :add_set=>'Look at me+*self'
+        assert_following_view 'Look At Me', add_set: 'Look at me+*self'
       end
     end
 
     context "when following *type" do
       it 'renders following link' do
-        assert_following_view 'Sunglasses', :add_set=>'Sunglasses+*self'
+        assert_following_view 'Sunglasses', add_set: 'Sunglasses+*self'
       end
     end
 
     context "when following cardtype card" do
       it 'renders following all link' do
-        assert_following_view 'Optic', :add_set=>'Optic+*type', :text=>'unfollow'
+        assert_following_view 'Optic', add_set: 'Optic+*type', text: 'unfollow'
       end
     end
 
     context "when not following cardtype card" do
       it "renders 'follow all' link" do
-        assert_follow_view 'Basic', :add_set=>'Basic+*type', :text=>'follow'
+        assert_follow_view 'Basic', add_set: 'Basic+*type', text: 'follow'
       end
     end
 
     context "when following *right" do
       it "renders following link" do
-        assert_following_view 'Magnifier+lens', :add_set=>'Magnifier+lens+*self'
+        assert_following_view 'Magnifier+lens', add_set: 'Magnifier+lens+*self'
       end
     end
 
     context 'when following content I created' do
       before { Card::Auth.current_id = Card['Narcissist'].id }
       it "renders following link" do
-        assert_following_view 'Sunglasses', :add_set=>'Sunglasses+*self', :user=>'Narcissist'
+        assert_following_view 'Sunglasses', add_set: 'Sunglasses+*self', user: 'Narcissist'
       end
     end
 
     context 'when following content I edited' do
       before { Card::Auth.current_id = Card['Narcissist'].id }
       it "renders following link" do
-        assert_following_view 'Magnifier+lens', :add_set=>'Magnifier+lens+*self', :user=>'Narcissist'
+        assert_following_view 'Magnifier+lens', add_set: 'Magnifier+lens+*self', user: 'Narcissist'
       end
     end
   end

data/mod/05_email/spec/set/all/notify_spec.rb

@@ -4,18 +4,18 @@ shared_examples_for 'notifications' do
   describe '#list_of_changes' do
     name = 'subedit notice'
     content = 'new content'
-    
+
     before do
-      @card = Card.create!(:name=>name, :content=>content)
+      @card = Card.create!(name: name, content: content)
     end
-    subject { @card.format(:format=>format).render_list_of_changes }
-    
+    subject { @card.format(format: format).render_list_of_changes }
+
     context 'for a new card' do
       it { is_expected.to include "content: #{content}" }
       it { is_expected.to include 'cardtype: Basic' }
     end
     context 'for a updated card' do
-      before { @card.update_attributes!(:name=>'bnn card', :type=>:pointer, :content=>'changed content') }
+      before { @card.update_attributes!(name: 'bnn card', type: :pointer, content: 'changed content') }
       it { is_expected.to include 'new content: [[changed content]]' }
       it { is_expected.to include 'new cardtype: Pointer' }
       it { is_expected.to include 'new name: bnn card' }
@@ -24,25 +24,25 @@ shared_examples_for 'notifications' do
       before { @card.delete }
       it { is_expected.to be_empty }
     end
-    
+
     context 'for a given action' do
       subject do
         action = @card.last_action
-        @card.update_attributes!(:name=>'bnn card', :type=>:pointer, :content=>'changed content')
-        @card.format(:format=>format).render_list_of_changes(:action=>action)
+        @card.update_attributes!(name: 'bnn card', type: :pointer, content: 'changed content')
+        @card.format(format: format).render_list_of_changes(action: action)
       end
       it { is_expected.to include "content: #{content}" }
     end
     context 'for a given action id' do
       subject do
         action_id = @card.last_action.id
-        @card.update_attributes!(:name=>'bnn card', :type=>:pointer, :content=>'changed content')
-        @card.format(:format=>format).render_list_of_changes(:action_id=>action_id)
+        @card.update_attributes!(name: 'bnn card', type: :pointer, content: 'changed content')
+        @card.format(format: format).render_list_of_changes(action_id: action_id)
       end
       it { is_expected.to include "content: #{content}" }
     end
   end
-  
+
   describe 'subedit_notice' do
     def list_of_changes_for card
       card.db_content
@@ -50,27 +50,27 @@ shared_examples_for 'notifications' do
     name = 'subedit notice card'
     content = 'new content'
     before do
-      @card = Card.create!(:name=>name, :content=>content)
+      @card = Card.create!(name: name, content: content)
     end
-    subject { @card.format(:format=>format).render_subedit_notice }
-    
+    subject { @card.format(format: format).render_subedit_notice }
+
     context 'for a new card' do
       it { is_expected.to include name }
       it { is_expected.to include 'created' }
       it { is_expected.to include list_of_changes_for @card }
     end
-    
+
     context 'for a updated card' do
       changed_name = 'changed subedit notice'
       changed_content = 'changed content'
-      before { @card.update_attributes!(:name=>changed_name, :content=>changed_content) }
+      before { @card.update_attributes!(name: changed_name, content: changed_content) }
       it { is_expected.to include changed_name }
       it { is_expected.to include 'updated' }
       it { is_expected.to include list_of_changes_for @card }
     end
-    
+
     context 'for a deleted card' do
-      before { @card.delete } 
+      before { @card.delete }
       it { is_expected.to include name }
       it { is_expected.to include 'deleted' }
     end
@@ -79,7 +79,7 @@ end
 
 
 describe Card::Set::All::Notify do
-  
+
   describe 'content of notification email' do
     context 'for new card with subcards' do
       name = "another card with subcards"
@@ -88,21 +88,21 @@ describe Card::Set::All::Notify do
       sub2_content = 'new content of subcard 2'
       before do
         Card::Auth.as_bot do
-          @card = Card.create!(:name=>name, :content=>content,
-                               :subcards=>{ '+s1'=>{:content=>sub1_content},
-                                            '+s2'=>{:content=>sub2_content} })
+          @card = Card.create!(name: name, content: content,
+                               subcards: { '+s1'=>{content: sub1_content},
+                                           '+s2'=>{content: sub2_content} })
         end
       end
-      subject { 
+      subject {
         Card[:follower_notification_email].format.render_mail(
-          :context   => @card.refresh(true),
-          :to        => Card['Joe User'].email,
-          :follower  => Card['Joe User'].name, 
-          :followed_set  => "#{@card.name}+*self",
-          :follow_option => '*always'
+          context:   @card.refresh(true),
+          to:        Card['Joe User'].email,
+          follower:  Card['Joe User'].name,
+          followed_set:  "#{@card.name}+*self",
+          follow_option: '*always'
         ).text_part.body.raw_source
       }
-       
+
       it { is_expected.to include content }
       it { is_expected.to include sub1_content }
       it { is_expected.to include sub2_content }
@@ -110,7 +110,7 @@ describe Card::Set::All::Notify do
       context 'and missing permissions' do
         context 'for subcard' do
           before do
-            Card.create_or_update! "#{name}+s1+*self+*read",:type=>'Pointer',:content=>'[[Administrator]]'
+            Card.create_or_update! "#{name}+s1+*self+*read", type: 'Pointer', content: '[[Administrator]]'
           end
           it "excludes subcard content" do
             is_expected.not_to include sub1_content
@@ -118,18 +118,18 @@ describe Card::Set::All::Notify do
           end
         end
         context 'for main card' do
-          subject { 
+          subject {
             Card[:follower_notification_email].format.render_mail(
-                :context   => @card.refresh(true),
-                :to        => Card['Joe User'].email,
-                :follower  => Card['Joe User'].name, 
-                :followed_set  => @card.name+"+s1+*self",
-                :follow_option => '*always'
+                context:   @card.refresh(true),
+                to:        Card['Joe User'].email,
+                follower:  Card['Joe User'].name,
+                followed_set:  @card.name+"+s1+*self",
+                follow_option: '*always'
               ).text_part.body.raw_source
           }
           before do
-            Card.create_or_update! "#{name}+*self+*read",:type=>'Pointer',:content=>'[[Administrator]]'
-            Card.create_or_update! "#{name}+s1+*self+*read",:type=>'Pointer',:content=>'[[Anyone]]'
+            Card.create_or_update! "#{name}+*self+*read",type: 'Pointer',content: '[[Administrator]]'
+            Card.create_or_update! "#{name}+s1+*self+*read",type: 'Pointer',content: '[[Anyone]]'
           end
           it 'includes subcard content' do
             is_expected.to include sub1_content
@@ -141,9 +141,9 @@ describe Card::Set::All::Notify do
         end
         context 'for all parts' do
           before do
-            Card.create_or_update! "#{name}+s1+*self+*read",:type=>'Pointer',:content=>'[[Administrator]]'
-            Card.create_or_update! "#{name}+s2+*self+*read",:type=>'Pointer',:content=>'[[Administrator]]'
-            Card.create_or_update! "#{name}+*self+*read",:type=>'Pointer',:content=>'[[Administrator]]'
+            Card.create_or_update! "#{name}+s1+*self+*read",type: 'Pointer',content: '[[Administrator]]'
+            Card.create_or_update! "#{name}+s2+*self+*read",type: 'Pointer',content: '[[Administrator]]'
+            Card.create_or_update! "#{name}+*self+*read",type: 'Pointer',content: '[[Administrator]]'
           end
           it { is_expected.not_to include content }
           it { is_expected.not_to include sub1_content }
@@ -155,8 +155,8 @@ describe Card::Set::All::Notify do
       end
     end
   end
-  
-  
+
+
   describe 'html format' do
     include_examples 'notifications' do
       let(:format) { 'email_html' }
@@ -174,16 +174,16 @@ describe Card::Set::All::Notify do
       sub1_content = 'new content of subcard 1'
       sub2_content = 'new content of subcard 2'
       Card::Auth.as_bot do
-        @card = Card.create!(:name=>name, :content=>content,
-                             :subcards=>{ '+s1'=>{:content=>sub1_content},
-                                          '+s2'=>{:content=>sub2_content} })
+        @card = Card.create!(name: name, content: content,
+                             subcards: { '+s1'=>{content: sub1_content},
+                                          '+s2'=>{content: sub2_content} })
       end
       result =  Card[:follower_notification_email].format.render_mail(
-        :context   => @card,
-        :to        => Card['Joe User'].email,
-        :follower  => Card['Joe User'].name, 
-        :followed_set  => "#{@card.name}+*self",
-        :follow_option => '*always'
+        context:   @card,
+        to:        Card['Joe User'].email,
+        follower:  Card['Joe User'].name,
+        followed_set:  "#{@card.name}+*self",
+        follow_option: '*always'
       ).text_part.body.raw_source
       expect(result).to eq(%{"another card with subcards" was just created by Joe User.
 
@@ -214,7 +214,7 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
 })
     end
   end
-  
+
 
   describe "#notify_followers" do
     def expect_user user_name
@@ -224,16 +224,16 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
     def be_notified
       receive(:send_change_notice)
     end
-    
+
     def be_notified_of set_name, option_name='*always'
       receive(:send_change_notice).with(kind_of(Card::Act), set_name, option_name)
     end
-  
+
     def update card_name, new_content='updated content'
-      Card[card_name].update_attributes! :content=>new_content
+      Card[card_name].update_attributes! content: new_content
     end
-    
-    
+
+
 
     it "sends notifications of edits" do
       expect_user("Big Brother").to be_notified_of "All Eyes On Me+*self"
@@ -245,7 +245,7 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
       expect_user("Big Brother").not_to be_notified
       update "Google glass"
     end
-    
+
     it "sends only one notification per user"  do
       expect_user("Big Brother").to receive(:send_change_notice).exactly(1)
       update "Google glass"
@@ -255,16 +255,16 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
       expect_user("Big Brother").not_to be_notified
       update "No One Sees Me"
     end
-    
-    
-    
+
+
+
     context "when following *type sets" do
       before do
         Card::Auth.current_id = Card['joe admin'].id
       end
-      
+
       it "sends notifications of new card" do
-        new_card = Card.new :name => "Microscope", :type => "Optic"
+        new_card = Card.new name: "Microscope", type: "Optic"
         expect_user("Optic fan").to be_notified_of "Optic+*type", "*always"
         new_card.save!
       end
@@ -274,14 +274,14 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
         update "Sunglasses"
       end
     end
-  
+
     context 'when following *right sets' do
       it "sends notifications of new card" do
-        new_card = Card.new :name=>"Telescope+lens"
+        new_card = Card.new name: "Telescope+lens"
         expect_user("Big Brother").to be_notified_of "lens+*right", '*always'
         new_card.save!
       end
-    
+
       it "sends notifications of update" do
         expect_user("Big Brother").to be_notified_of "lens+*right", '*always'
         update "Magnifier+lens"
@@ -294,7 +294,7 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
         update 'Sunglasses'
       end
     end
-    
+
     context 'when following "content I edited"' do
       it 'sends notifications of update' do
         expect_user('Narcissist').to be_notified_of '*all', '*edited'
@@ -306,46 +306,46 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
       context "when following ascendant" do
         it "doesn't sends notification of arbitrary subcards" do
           expect_user('Sunglasses fan').not_to be_notified
-          Card.create :name=>'Sunglasses+about'
+          Card.create name: 'Sunglasses+about'
         end
-        
+
         context 'and follow fields rule contains subcards' do
           it 'sends notification of new subcard' do
-            new_card = Card.new :name=>'Sunglasses+producer'
+            new_card = Card.new name: 'Sunglasses+producer'
             expect_user('Sunglasses fan').to be_notified_of 'Sunglasses+*self', '*always'
             new_card.save!
           end
-        
+
           it 'sends notification of updated subcard' do
             expect_user('Sunglasses fan').to be_notified_of 'Sunglasses+*self', '*always'
             update 'Sunglasses+price'
           end
         end
-    
+
         context "and follow fields rule contains *include" do
           it "sends notification of new included card" do
-            new_card =  Card.new :name=>'Sunglasses+lens'
+            new_card =  Card.new name: 'Sunglasses+lens'
             expect_user("Sunglasses fan").to be_notified_of "Sunglasses+*self"
             new_card.save!
           end
-        
+
           it "sends notification of updated included card" do
             expect_user("Sunglasses fan").to be_notified_of "Sunglasses+*self"
             update 'Sunglasses+tint'
           end
-        
+
           it "doesn't send notification of not included card" do
-            new_card = Card.new :name=>'Sunglasses+frame'
+            new_card = Card.new name: 'Sunglasses+frame'
             expect_user("Sunglasses fan").not_to be_notified
             new_card.save!
-          end      
+          end
         end
-    
+
         context "and follow fields rule doesn't contain *include" do
           it "doesn't send notification of included card" do
             expect_user('Big Brother').not_to be_notified
-            Card.create! :name=>'Google glass+price'
-          end 
+            Card.create! name: 'Google glass+price'
+          end
         end
       end
       context 'when following a set' do
@@ -353,9 +353,9 @@ Use this link to unfollow /update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+
           expect_user('Optic fan').to be_notified_of 'Optic+*type'
           update 'Sunglasses+tint'
         end
-        
+
         it 'sends notification of subcard mentioned in follow fields rule' do
-          expect_user('Optic fan').to be_notified_of 'Optic+*type' 
+          expect_user('Optic fan').to be_notified_of 'Optic+*type'
           update 'Sunglasses+price'
         end
       end

data/mod/05_email/spec/set/all/observer_spec.rb

@@ -3,48 +3,48 @@
 describe Card::Set::Type::EmailTemplate do
   before :each do
     Card::Auth.as_bot do
-      Card.create! :name=>"mail template",  :type_code=>'email_template', :subcards=>{'+*html message'=>{content: 'Hi Joe! My name is {{_self|name}}'},
+      Card.create! name: "mail template",  type_code: 'email_template', subcards: {'+*html message'=>{content: 'Hi Joe! My name is {{_self|name}}'},
                                                                                       '+*to'=>{content: 'joe@user.com'},
                                                                                       '+*from'=>{content: 'from@user.com'} }
     end
   end
   it 'sends email on update' do
     Card::Auth.as_bot do
-      Card.create! :name=>"mail test+*self+*on update", type_code: :pointer, content: "[[mail template]]"
+      Card.create! name: "mail test+*self+*on update", type_code: :pointer, content: "[[mail template]]"
     end
     card = Card.fetch "mail test"
     expect { Card::Auth.as_bot { card.update_attributes(content: "test") } }.to change { Mail::TestMailer.deliveries.count }.by(1)
   end
-  
+
   it 'sends email on delete' do
     Card::Auth.as_bot do
-      Card.create! :name=>"mail test+*self+*on delete", type_code: :pointer, content: "[[mail template]]"
+      Card.create! name: "mail test+*self+*on delete", type_code: :pointer, content: "[[mail template]]"
     end
     card = Card.fetch "mail test"
     expect { Card::Auth.as_bot { card.delete } }.to change { Mail::TestMailer.deliveries.count }.by(1)
   end
-  
+
   it 'sends email on create' do
     Card::Auth.as_bot do
-      Card.create! :name=>"Cardtype A+*type+*on create", type_code: :pointer, content: "[[mail template]]"
+      Card.create! name: "Cardtype A+*type+*on create", type_code: :pointer, content: "[[mail template]]"
     end
-    expect { Card::Auth.as_bot { Card.create! :name=>"mail test", type_code: :cardtype_a} }.to change { ActionMailer::Base.deliveries.count }.by(1)
+    expect { Card::Auth.as_bot { Card.create! name: "mail test", type_code: :cardtype_a} }.to change { ActionMailer::Base.deliveries.count }.by(1)
   end
-  
+
   describe '#send_action_mails' do
     before do
       Card::Auth.as_bot do
-        Card.create! :name=>"another mail template",  :type_code=>'email_template', :subcards=>{'+*html message'=>{content: 'Hi Joe! My name is {{_self|name}}'},
+        Card.create! name: "another mail template",  type_code: 'email_template', subcards: {'+*html message'=>{content: 'Hi Joe! My name is {{_self|name}}'},
                                                                                         '+*to'=>{content: 'joe@user.com'},
                                                                                         '+*from'=>{content: 'from@user.com'} }
-        Card.create! :name=>"mail test+*self+*on update", type_code: :pointer, content: "[[mail template]]\n[[another mail template]]"
-        Card.create! :name=>"mail test+*self+*on delete", type_code: :pointer, content: "[[mail template]]\n[[another mail template]]"
+        Card.create! name: "mail test+*self+*on update", type_code: :pointer, content: "[[mail template]]\n[[another mail template]]"
+        Card.create! name: "mail test+*self+*on delete", type_code: :pointer, content: "[[mail template]]\n[[another mail template]]"
       end
-      card = Card.fetch "mail test"      
+      card = Card.fetch "mail test"
       ActionMailer::Base.deliveries = []
-      card.send_action_mails :on=>:update
+      card.send_action_mails on: :update
     end
-    
+
     it 'delivers all emails for given action' do
       expect(ActionMailer::Base.deliveries.size).to eq(2)
     end
@@ -52,12 +52,12 @@ describe Card::Set::Type::EmailTemplate do
       expect(ActionMailer::Base.deliveries.last.body.raw_source).to include('My name is mail test')
     end
   end
-  
+
   # describe '#send_timer_mails' do
  #    before do
  #      ActionMailer::Base.deliveries = []
  #      Card::Auth.as_bot do
- #        Card.create! :name=>"A+*hourly", :type_code=>'email_template',  :subcards=>{'+*message'=>{content: 'hourly update name:{{_self|name}}'},
+ #        Card.create! name: "A+*hourly", type_code: 'email_template',  subcards: {'+*message'=>{content: 'hourly update name:{{_self|name}}'},
  #                                                                                      '+*to'=>{content: 'joe@user.com'},
  #                                                                                      '+*from'=>{content: 'from@user.com'}}
  #      end