card 1.16.8 → 1.16.9

data/mod/05_standard/set/type/user.rb

@@ -4,41 +4,53 @@ include Basic
 attr_accessor :email
 
 format :html do
-
-  view :setup, tags: :unknown_ok, perms: lambda { |r| Auth.needs_setup? } do |args|
-    help_text = '<h3>To get started, set up an account.</h3>'
-    if Card.config.action_mailer.perform_deliveries == false
-      help_text += '<br>WARNING: Email delivery is turned off. Change settings in config/application.rb to send sign up notifications.'
+  view :setup, tags: :unknown_ok,
+               perms: lambda { |_r| Auth.needs_setup? } do |args|
+    account = card.fetch trait: :account, new: {}
+    Auth.as_bot do
+      frame_and_form :create, args do
+        [
+          _render_name_formgroup(help: 'usually first and last name'),
+          subformat(account)._render(:content_formgroup, structure: true),
+          _render_button_formgroup(args)
+        ]
+      end
     end
-    args.merge!( {
+  end
+
+  def default_setup_args args
+    args.merge!(
       title: 'Welcome, Wagneer!',
       optional_help: :show,
       optional_menu: :never,
       help_text: help_text,
-      buttons: button_tag( 'Set up', disable_with: 'Setting up', situation: 'primary' ),
+      buttons: setup_button,
       hidden: {
         success: "REDIRECT: #{ Card.path_setting '/' }",
         'card[type_id]' => Card.default_accounted_type_id,
-        'setup'=>true
+        'setup' => true
       }
-    } )
-
-    account = card.fetch trait: :account, new: {}
+    )
+  end
 
-    Auth.as_bot do
-      frame_and_form :create, args do
-        [
-          _render_name_formgroup( help: 'usually first and last name' ),
-          subformat(account)._render( :content_formgroup, structure: true ),
-          _render_button_formgroup( args )
-        ]
-      end
+  def help_text
+    text = '<h3>To get started, set up an account.</h3>'
+    if Card.config.action_mailer.perform_deliveries == false
+      text += <<-HTML
+        <br>WARNING: Email delivery is turned off.
+        Change settings in config/application.rb to send sign up notifications.'
+      HTML
     end
+    text
   end
-end
 
+  def setup_button
+    button_tag 'Set up', disable_with: 'Setting up', situation: 'primary'
+  end
+end
 
-event :setup_as_bot, before: :check_permissions, on: :create, when: proc{ |c| Card::Env.params[:setup] } do
+event :setup_as_bot, before: :check_permissions, on: :create,
+                     when: proc { Card::Env.params[:setup] } do
   abort :failure unless Auth.needs_setup?
   Auth.as_bot
   # we need bot authority to set the initial administrator roles
@@ -46,27 +58,24 @@ event :setup_as_bot, before: :check_permissions, on: :create, when: proc{ |c| Ca
   # flexibility and security when configuring initial setups
 end
 
-event :setup_first_user, before: :process_subcards, on: :create, when: proc{ |c| Card::Env.params[:setup] } do
-  subcards['signup alert email+*to'] = name
-  subcards['+*roles'] = { content: Card[:administrator].name }
-
-  email, password = subcards.delete('+*account+*email'), subcards.delete('+*account+*password')
-  subcards['+*account'] = { '+*email'=>email, '+*password'=>password }
+event :setup_first_user, before: :process_subcards, on: :create,
+                         when: proc { Card::Env.params[:setup] } do
+  add_subcard 'signup alert email+*to', content: name
+  add_subfield :roles, content: Card[:administrator].name
 end
 
-event :signin_after_setup, before: :extend, on: :create, when: proc{ |c| Card::Env.params[:setup] } do
-  Card.cache.delete Auth::NEED_SETUP_KEY
+event :signin_after_setup, before: :extend, on: :create,
+                           when: proc { Card::Env.params[:setup] } do
   Auth.signin id
 end
 
-def follow follow_name, option = '*always'
-  if (card = Card.fetch(follow_name)) && (set_card = card.default_follow_set_card)
-    if (follow_rule = Card.fetch(set_card.follow_rule_name(name), new: {}))
-      follow_rule.drop_item "*never"
-      follow_rule.add_item option
-      follow_rule.save!
-    end
-  end
+def follow follow_name, option='*always'
+  return unless
+    (card = Card.fetch follow_name) &&
+    (set_card = card.default_follow_set_card) &&
+    (follow_rule_name = set_card.follow_rule_name(name)) &&
+    (follow_rule = Card.fetch follow_rule_name, new: {})
+  follow_rule.drop_item '*never'
+  follow_rule.add_item option
+  follow_rule.save!
 end
-
-

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

@@ -73,7 +73,7 @@ describe Card::Set::All::Account do
       ja_email = jadmin.account.email
 
       Card::Env[:params] = { email: {subject: 'Hey Joe!', message: 'Come on in.'} }
-      Card.create name: 'Joe New', type_id: Card::UserID, '+*account'=>{ '+*email'=> 'joe@new.com' }
+      Card.create! name: 'Joe New', type_id: Card::UserID, '+*account'=>{ '+*email'=> 'joe@new.com' }
 
       c = Card['Joe New']
       u = Card::Auth[ 'joe@new.com' ]

data/mod/05_standard/spec/set/all/rich_html/form_spec.rb

@@ -10,10 +10,10 @@ describe Card::Set::All::RichHtml::Form do
       expect(@card.format.type_field).to match(/<option [^>]*selected/)
       tf=@card.format.type_field(no_current_type: true)
       expect(tf).not_to match(/<option [^>]*selected/)
-      expect(tf.scan(/<option /).length).to eq(26)
+      expect(tf.scan(/<option /).length).to eq(29)
       tf=@card.format.type_field
       expect(tf).to match(/<option [^>]*selected/)
-      expect(tf.scan(/<option /).length).to eq(26)
+      expect(tf.scan(/<option /).length).to eq(29)
     end
 
     it "should get type list" do

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

@@ -1,73 +1,69 @@
 # -*- encoding : utf-8 -*-
 
-#FIXME need more specific assertions
+# FIXME: need more specific assertions
 
 describe Card::Set::Self::Signin do
-  
   before :each do
     @card = Card[:signin]
   end
-  
+
   it 'open view should have email and password fields' do
     open_view = @card.format.render_open
     expect(open_view).to match(/email/)
     expect(open_view).to match(/password/)
-    
   end
-  
+
   it 'edit view should prompt for forgot password' do
     edit_view = @card.format.render_edit
     expect(edit_view).to match(/email/)
     expect(edit_view).to match(/reset_password/)
   end
-  
+
   it 'password reset success view should prompt to check email' do
     rps_view = @card.format.render_reset_password_success
     expect(rps_view).to match(/Check your email/)
   end
-  
+
   it 'delete action should sign out account' do
     expect(Card::Auth.current_id).to eq(Card['joe_user'].id)
     @card.delete
     expect(Card::Auth.current_id).to eq(Card::AnonymousID)
   end
-  
-  context "#update" do
-    it 'should trigger signin with valid credentials' do
-      @card.update_attributes! '+*email'=>'joe@admin.com', '+*password'=>'joe_pass'
+
+  context '#update' do
+    it 'triggerk signin with valid credentials' do
+      @card.update_attributes! '+*email' => 'joe@admin.com',
+                               '+*password' => 'joe_pass'
       expect(Card::Auth.current).to eq(Card['joe admin'])
     end
 
-
-    it 'should not trigger signin with bad email' do
-      @card.update_attributes! '+*email'=>'schmoe@admin.com', '+*password'=>'joe_pass'
+    it 'does not trigger signin with bad email' do
+      @card.update_attributes! '+*email' => 'schmoe@admin.com',
+                               '+*password' => 'joe_pass'
       expect(@card.errors[:signin].first).to match(/Unrecognized email/)
     end
-    
-    it 'should not trigger signin with bad password' do
-      @card.update_attributes! '+*email'=>'joe@admin.com', '+*password'=>'joe_fail'
+
+    it 'does not trigger signin with bad password' do
+      @card.update_attributes! '+*email' => 'joe@admin.com',
+                               '+*password' => 'joe_fail'
       expect(@card.errors[:signin].first).to match(/Wrong password/)
     end
-    
-    
   end
-  
+
   context '#reset password' do
     before :each do
       Card::Env.params[:reset_password] = true
     end
-    
+
     it 'should be triggered by an update' do
-      #Card['joe admin'].account.token.should be_nil FIXME - this should be t
-      @card.update_attributes! '+*email'=>'joe@admin.com'
+      # Card['joe admin'].account.token.should be_nil FIXME - this should be t
+      @card.update_attributes! '+*email' => 'joe@admin.com'
       expect(Card['joe admin'].account.token).not_to be_nil
     end
-    
+
     it 'should return an error if email is not found' do
-      @card.update_attributes '+*email'=>'schmoe@admin.com'
+      @card.update_attributes '+*email' => 'schmoe@admin.com'
       expect(@card.errors[:email].first).to match(/not recognized/)
     end
   end
-  
 end
-

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

@@ -172,8 +172,6 @@ describe Card::Set::Type::EmailTemplate do
 
        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.
-                                                                                                #       After the first update the content is empty
          expect(subject[:from]).to eq "gary@gary.com"
        end
 

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

@@ -0,0 +1,140 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::Type::List do
+  subject { Card.fetch('Parry Hotter+authors').item_names.sort }
+  before do
+    Card::Auth.as_bot do
+      Card.create! name: 'Stam Broker+books', type: 'listed by'
+      Card.create!(
+        name: 'Parry Hotter+authors',
+        content: "[[Darles Chickens]]\n[[Stam Broker]]",
+        type: 'list'
+      )
+    end
+  end
+  describe 'Parry Hotter+authors' do
+    context "when 'Parry Hotter' is added to Joe-Ann Rolwings's books" do
+      before do
+        Card.create! name: 'Joe-Ann Rolwing', type: 'author'
+        Card.create!(
+          name: 'Joe-Ann Rolwing+books', type: 'listed by',
+          content: '[[Parry Hotter]]'
+        )
+      end
+      it do
+        is_expected.to eq(
+          ['Darles Chickens', 'Joe-Ann Rolwing', 'Stam Broker']
+        )
+      end
+    end
+
+    context "when 'Parry Hotter' is dropped from Stam Brokers's books" do
+      before do
+        Card::Auth.as_bot do
+          Card['Stam Brokers+books'].update_attributes!(
+            content: '[[50 grades of shy]]'
+          )
+        end
+      end
+      it { is_expected.to eq ['Darles Chickens'] }
+    end
+    context 'when Stam Broker is deleted' do
+      before do
+        Card['Stam Broker'].delete
+      end
+      it { is_expected.to eq ['Darles Chickens', 'Stam Broker'] }
+    end
+    context 'when the cardtype of Stam Broker changed' do
+      it 'raises an error' do
+        @card = Card['Stam Broker']
+        @card.update_attributes type_id: Card::BasicID
+        expect(@card.errors[:type].first).to match(
+          /can't be changed because .+ is referenced by list/
+        )
+      end
+    end
+    context 'when the name of Parry Hotter changed to Parry Moppins' do
+      before do
+        Card['Parry Hotter'].update_attributes! name: 'Parry Moppins'
+      end
+      subject do
+        Card.fetch('Parry Moppins+authors').item_names.sort
+      end
+      it { is_expected.to eq ['Darles Chickens', 'Stam Broker'] }
+    end
+
+    context 'when the name of Stam Broker changed to Stam Trader' do
+      before do
+        Card['Stam Broker'].update_attributes!(
+          name: 'Stam Trader', update_referencers: true
+        )
+      end
+      it { is_expected.to eq ['Darles Chickens', 'Stam Trader'] }
+    end
+
+    # if content is invalid then fail
+    context 'when Stam Broker+books changes to Stam Broker+poems' do
+      it 'raises error because content is invalid' do
+        expect do
+          Card['Stam Broker+books'].update_attributes! name: 'Stam Broker+poems'
+        end.to raise_error
+      end
+    end
+    context 'when Stam Broker+books changes to Stam Broker+not a type' do
+      it 'raises error because name needs cardtype name as right part' do
+        expect do
+          Card['Stam Broker+books'].update_attributes!(
+            name: 'Stam Broker+not a type'
+          )
+        end.to raise_error
+      end
+    end
+
+    context 'when the cartype of Parry Hotter changed' do
+      before do
+        Card['Parry Hotter'].update_attributes! type_id: Card::BasicID
+      end
+      it { is_expected.to eq ['Darles Chickens', 'Stam Broker'] }
+    end
+    context 'when Parry Hotter+authors to Parry Hotter+basics' do
+      it 'raises error because content is invalid' do
+        expect do
+          Card['Parry Hotter+authors'].update_attributes!(
+            name: 'Parry Hotter+basics'
+          )
+        end.to raise_error
+      end
+    end
+  end
+
+  describe "'listed by' entry added that doesn't have a list" do
+    context "when '50 grades of shy is added to Stam Broker's books" do
+      before do
+        Card['Stam Broker+books'].add_item! '50 grades of shy'
+      end
+      it "creates '50 grades of shy+authors" do
+        authors = Card['50 grades of shy+authors']
+        expect(authors).to be_truthy
+        expect(authors.item_names).to eq ['Stam Broker']
+      end
+    end
+  end
+
+  context 'when the name of the cardtype books changed' do
+    before do
+      Card['book'].update_attributes!(
+        type_id: Card::BasicID, update_referencers: true
+      )
+    end
+    it { is_expected.to eq ['Darles Chickens', 'Stam Broker'] }
+  end
+
+  context 'when the name of the cardtype authors changed' do
+    before do
+      Card['author'].update_attributes!(
+        type_id: Card::BasicID, update_referencers: true
+      )
+    end
+    it { is_expected.to eq ['Darles Chickens', 'Stam Broker'] }
+  end
+end

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

@@ -0,0 +1,157 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::Type::ListedBy do
+  let(:listed_by) { Card.fetch('Darles Chickens+books').item_names.sort }
+  before do
+    Card::Auth.as_bot do
+      Card.create!(
+        name: 'Parry Hotter+authors',
+        content: '[[Darles Chickens]]',
+        type: 'list'
+      )
+      Card.create!(
+        name: '50 grades of shy+authors',
+        content: "[[Darles Chickens]]\n[[Stam Broker]]",
+        type: 'list'
+      )
+    end
+  end
+  it "doesn't allow non-cardtype as right part" do
+    expect do
+      Card['Parry Hotter+authors'].update_attributes!(
+        name: 'Parry Hotter+hidden'
+      )
+    end.to raise_error
+  end
+
+  context 'when Darles Chickens is in the author list of \
+           "Parry Hotter" and "50 grades of shy"' do
+    describe 'Darles Chickens+books' do
+      subject { listed_by }
+      it { is_expected.to eq ['50 grades of shy', 'Parry Hotter'] }
+
+      it 'is recorded in the reference table' do
+        search_result = Card.search(
+          right_plus: ['books', link_to: '50 grades of shy'],
+          return: :name
+        )
+        expect(search_result.sort).to eq ['Darles Chickens', 'Stam Broker']
+      end
+
+      context "when Darles Chickens is removed from Parry Hotter's list" do
+        before do
+          Card['Parry Hotter+authors'].update_attributes!(
+            content: '[[Stam Broker]]'
+          )
+        end
+        it { is_expected.to eq ['50 grades of shy'] }
+      end
+      context 'when Parry Hotter is deleted' do
+        before do
+          Card['Parry Hotter'].delete
+        end
+        it { is_expected.to eq ['50 grades of shy'] }
+      end
+      context 'when a new book is created that lists Darles Chickens' do
+        before do
+          Card::Auth.as_bot do
+            Card.create!(
+              name: 'Adventures of Buckleharry Finn',
+              type: 'book',
+              subcards: {
+                '+authors' => { content: '[[Darles Chickens]]', type: 'list' }
+              }
+            )
+          end
+        end
+        it do
+          is_expected.to eq(
+            ['50 grades of shy', 'Adventures of Buckleharry Finn', 'Parry Hotter']
+          )
+        end
+      end
+      context "when Darles Chickens is added to a book's list" do
+        before do
+          Card::Auth.as_bot do
+            Card.create!(
+              name: 'Adventures of Buckleharry Finn',
+              type: 'book',
+              subcards: {
+                '+authors' => { content: '[[Stam Broker]]', type: 'list' }
+              }
+            )
+            Card.fetch('Adventures of Buckleharry Finn+authors')
+              .update_attributes!(content: '[[Darles Chickens]]')
+          end
+        end
+        it do
+          is_expected.to eq(
+            [
+              '50 grades of shy',
+              'Adventures of Buckleharry Finn',
+              'Parry Hotter'
+            ]
+          )
+        end
+      end
+
+      context 'when the cardtype of Parry Hotter changed' do
+        before do
+          Card['Parry Hotter'].update_attributes! type_id: Card::BasicID
+        end
+        it { is_expected.to eq ['50 grades of shy'] }
+      end
+      context 'when the name of Parry Hotter changed to Parry Moppins' do
+        before do
+          Card::Auth.as_bot do
+            Card['Parry Hotter'].update_attributes!(
+              name: 'Parry Moppins',
+              update_referencers: true
+            )
+          end
+        end
+        it { is_expected.to eq ['50 grades of shy','Parry Moppins'] }
+      end
+
+      context 'when the name of Darles Chickens changed' do
+        before do
+          Card['Darles Chickens'].update_attributes!(
+            name: 'Darles Eggs',
+            update_referencers: true
+          )
+        end
+        subject { Card.fetch('Darles Eggs+books').item_names.sort }
+        it { is_expected.to eq ['50 grades of shy', 'Parry Hotter'] }
+      end
+      context 'when the cartype of Darles Chickens changed' do
+        it 'raises error' do
+          expect do
+            Card['Darles Chickens'].update_attributes! type_id: Card::BasicID
+          end.to raise_error
+        end
+      end
+      context 'when the name of Darles Chickens+books changed' do
+        subject { Card.fetch('Darles Chickens+authors').item_names.sort }
+        before do
+          Card['Darles Chickens+books'].update_attributes!(
+            name: 'Darles Chickens+authors'
+          )
+        end
+        it { is_expected.to eq [] }
+      end
+      context 'when the name of the cardtype books changed' do
+        before do
+          Card['book'].update_attributes! name: 'literature'
+        end
+        subject { Card.fetch('Darles Chickens+literature').item_names.sort }
+        it { is_expected.to eq ['50 grades of shy', 'Parry Hotter'] }
+      end
+      context 'when the name of the cardtype authors changed' do
+        before do
+          Card['author'].update_attributes! type_id: Card::BasicID
+        end
+        it { is_expected.to eq ['50 grades of shy', 'Parry Hotter'] }
+      end
+    end
+  end
+end