card 1.16.8 → 1.16.9

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

@@ -1,92 +1,94 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Signup do
-
   before do
     Card::Auth.current_id = Card::AnonymousID
   end
 
-
   context 'signup form form' do
     before do
       card = Card.new type_id: Card::SignupID
       @form = card.format.render_new
     end
 
-    it 'should prompt to signup' do
+    it 'prompts to signup' do
       Card::Auth.as :anonymous do
-        expect(@form.match( /Sign up/ )).to be_truthy
+        expect(@form.match(/Sign up/)).to be_truthy
       end
     end
   end
 
-
-
   context 'signup (without approval)' do
     before do
-      ActionMailer::Base.deliveries = [] #needed?
+      ActionMailer::Base.deliveries = [] # needed?
 
       Card::Auth.as_bot do
         Card.create! name: 'User+*type+*create', content: '[[Anyone]]'
       end
 
       Card::Auth.current_id = Card::AnonymousID
-      @signup = Card.create! name: 'Big Bad Wolf', type_id: Card::SignupID,
-        '+*account'=>{'+*email'=>'wolf@wagn.org', '+*password'=>'wolf'}
+      @signup = Card.create!(
+        name: 'Big Bad Wolf', type_id: Card::SignupID,
+        '+*account' => { '+*email' => 'wolf@wagn.org', '+*password' => 'wolf' }
+      )
 
       @account = @signup.account
       @token = @account.token
     end
 
-    it 'should create all the necessary cards' do
+    it 'creates all the necessary cards' do
       expect(@signup.type_id).to eq(Card::SignupID)
       expect(@account.email).to eq('wolf@wagn.org')
       expect(@account.status).to eq('pending')
       expect(@account.salt).not_to eq('')
-      expect(@account.password.length).to be > 10 #encrypted
+      expect(@account.password.length).to be > 10 # encrypted
       expect(@account.token).to be_present
     end
 
-    it 'should send email with an appropriate link' do
+    it 'sends email with an appropriate link' do
       @mail = ActionMailer::Base.deliveries.last
-      expect( @mail.parts[0].body.raw_source ).to match(Card.setting( :title ))
+      expect(@mail.parts[0].body.raw_source).to match(Card.setting(:title))
     end
 
-    it 'should create an authenticable token' do
+    it 'creates an authenticable token' do
       expect(@account.token).to eq(@token)
       expect(@account.authenticate_by_token(@token)).to eq(@signup.id)
       expect(@account.fetch(trait: :token)).not_to be_present
     end
 
-    it 'should notify someone' do
+    it 'notifies someone' do
       expect(ActionMailer::Base.deliveries.last.to).to eq(['signups@wagn.org'])
     end
 
-    it 'should be activated by an update' do
+    it 'is activated by an update' do
       Card::Env.params[:token] = @token
+      @signup = Card.fetch 'big bad wolf'
       @signup.update_attributes({})
-      #puts @signup.errors.full_messages * "\n"
+      # puts @signup.errors.full_messages * "\n"
       expect(@signup.errors).to be_empty
       expect(@signup.type_id).to eq(Card::UserID)
       expect(@account.status).to eq('active')
-      expect(Card[ @account.name ].active?).to be_truthy
+      expect(Card[@account.name].active?).to be_truthy
     end
 
-    it 'should reject expired token and create new token' do
-      @account.token_card.update_column :updated_at, 8.days.ago.strftime("%F %T")
+    it 'rejects expired token and creates new token' do
+      @account.token_card.update_column :updated_at,
+                                        8.days.ago.strftime('%F %T')
       @account.token_card.expire
       Card::Env.params[:token] = @token
 
       result = @signup.update_attributes!({})
-      expect(result).to eq(true)                 # successfully completes save
+      # successfully completes save
+      expect(result).to eq(true)
       @account.reload
-      expect(@account.token).not_to eq(@token)   # token gets updated
+      # token gets updated
+      expect(@account.token).not_to eq(@token)
       success = Card::Env.params[:success]
-      expect(success[:message]).to match(/expired/) # user notified of expired token
+      # user notified of expired token
+      expect(success[:message]).to match(/expired/)
     end
   end
 
-
   context 'signup (with approval)' do
     before do
       # NOTE: by default Anonymous does not have permission to create User cards.
@@ -167,24 +169,28 @@ describe Card::Set::Type::Signup do
 
     end
     it 'sends welcome email when account is activated' do
-      @signup.activate_account
-      @mail = ActionMailer::Base.deliveries.find{ |a| a.subject == 'welcome' }
+      @signup.run_phase :approve do
+        @signup.activate_account
+      end
+      @mail = ActionMailer::Base.deliveries.find { |a| a.subject == 'welcome' }
       Mail::TestMailer.deliveries.clear
 
       expect(@mail).to be_truthy
-      expect(@mail.body.raw_source ).to include('Welcome Big Bad Sheep')
+      expect(@mail.body.raw_source).to include('Welcome Big Bad Sheep')
     end
   end
 
   context 'invitation' do
     before do
-      # NOTE: by default Anonymous does not have permission to create User cards.
+      # NOTE:
+      # by default Anonymous does not have permission to create User cards.
       Card::Auth.current_id = Card::WagnBotID
-      @signup = Card.create! name: 'Big Bad Wolf', type_id: Card::SignupID, '+*account'=>{ '+*email'=>'wolf@wagn.org'}
+      @signup = Card.create! name: 'Big Bad Wolf', type_id: Card::SignupID,
+                             '+*account' => { '+*email' => 'wolf@wagn.org' }
       @account = @signup.account
     end
 
-    it 'should create all the necessary cards, but no password' do
+    it 'creates all the necessary cards, but no password' do
       expect(@signup.type_id).to eq(Card::SignupID)
       expect(@account.email).to eq('wolf@wagn.org')
       expect(@account.status).to eq('pending')
@@ -192,7 +198,6 @@ describe Card::Set::Type::Signup do
       expect(@account.token).to be_present
       expect(@account.password).not_to be_present
     end
-
   end
 
   # describe '#signup_notifications' do
@@ -202,7 +207,8 @@ describe Card::Set::Type::Signup do
   #     end
   #     @user_name = 'Big Bad Wolf'
   #     @user_email = 'wolf@wagn.org'
-  #     @signup = Card.create! name: @user_name, type_id: Card::SignupID, '+*account'=>{
+  #     @signup = Card.create! name: @user_name, type_id: Card::SignupID,
+  #                            '+*account'=>{
   #       '+*email'=>@user_email, '+*password'=>'wolf'}
   #     ActionMailer::Base.deliveries = []
   #     @signup.signup_notifications

data/spec/lib/card/subcards_spec.rb

@@ -0,0 +1,126 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Subcards do
+  describe 'creating card with subcards' do
+    it 'works with subcard hash' do
+      Card::Auth.as_bot do
+        @card = Card.create!(
+          name: 'card with subs',
+          subcards: { '+sub1' => { content: 'this is sub1' } }
+        )
+      end
+      expect(Card['card with subs+sub1'].content).to eq 'this is sub1'
+    end
+
+    it 'works with content string' do
+      Card::Auth.as_bot do
+        @card = Card.create!(
+          name: 'card with subs', subcards: { '+sub1' => 'this is sub1' }
+        )
+      end
+      expect(Card['card with subs+sub1'].content).to eq 'this is sub1'
+    end
+
+    it 'works with +name key in args' do
+      Card::Auth.as_bot do
+        @card = Card.create!(
+          name: 'card with subs', '+sub1' => { content: 'this is sub1' }
+        )
+      end
+      expect(Card['card with subs+sub1'].content).to eq 'this is sub1'
+    end
+
+    it 'handles more than one level' do
+      Card::Auth.as_bot do
+        @card = Card.create!(
+          name: 'card with subs', '+sub1' => { '+sub2' => 'this is sub2' }
+        )
+      end
+      expect(Card['card with subs+sub1+sub2'].content).to eq 'this is sub2'
+    end
+
+    it 'handles compound names' do
+      Card::Auth.as_bot do
+        @card = Card.create! name: 'superman', '+sub1+sub2' => 'this is sub2'
+      end
+      expect(Card['superman+sub1']).to be_truthy
+      expect(Card['superman+sub1+sub2'].content).to eq 'this is sub2'
+    end
+
+    it 'keeps plural of left part' do
+      Card::Auth.as_bot do
+        @card = Card.create!(
+          name: 'supermen', content: 'something',
+          subcards: { '+pseudonym' => 'clark' }
+        )
+      end
+      expect(Card['supermen+pseudonym'].name).to eq 'supermen+pseudonym'
+    end
+
+    it "cleans the cache for autonaming case" do
+      Card::Auth.as_bot do
+        Card.create!(
+          name: 'Book+*type+*autoname', content: 'Book_1',
+          type_id: Card::PhraseID
+        )
+        card = Card.create!(
+          type: "Book",
+          subcards: { '+editable' => 'yes'}
+        )
+        expect(card.errors).to be_empty
+        expect(Card["#{card.name}+editable"]).to be_truthy
+
+        @card = Card.create!(
+          type: "Book",
+          subcards: { '+editable' => 'sure'}
+        )
+      end
+
+      expect(@card.errors).to be_empty
+      expect(Card["#{@card.name}+editable"]).to be_truthy
+    end
+  end
+
+  describe '#add_subfield' do
+    before do
+      @card = Card['A']
+    end
+    subject { Card.fetch("#{@card.name}+sub", new: {}, local_only: true).content }
+    it 'works with string' do
+      @card._add_subfield 'sub', content: 'this is a sub'
+      is_expected.to eq 'this is a sub'
+    end
+    it 'works with codename' do
+      @card._add_subfield :phrase, content: 'this is a sub'
+      subcard = Card.fetch('A+phrase', new: {}, local_only: true)
+      expect(subcard.content).to eq 'this is a sub'
+    end
+  end
+
+  describe '#subfield' do
+    before do
+      @card = Card['A']
+    end
+    subject { Card.fetch("#{@card.name}+sub", new: {}, local_only: true).content }
+    it 'works with string' do
+      @card._add_subfield 'sub', content: 'this is a sub'
+      expect(@card.subfield('sub').content).to eq 'this is a sub'
+    end
+
+    it 'works with codename' do
+      @card._add_subfield :phrase, content: 'this is a sub'
+      expect(@card.subfield(':phrase').content).to eq 'this is a sub'
+    end
+  end
+
+  describe '#add' do
+    before do
+      @card = Card['A']
+    end
+    it 'adds a subcard' do
+      @card._add_subcard 'sub', content: 'sub content'
+      @card.save!
+      expect(Card['sub'].content).to eq 'sub content'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.16.8
+  version: 1.16.9
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -262,6 +262,7 @@ files:
 - db/migrate/20141208132159_remove_present_from_reference_table.rb
 - db/migrate/20141216053032_better_index_names.rb
 - db/migrate/20150724210803_add_comment_to_actions.rb
+- db/migrate_core_cards/20120611203506_rails_inflection_updates.rb
 - db/migrate_core_cards/20130411191151_renaming_for_menu.rb
 - db/migrate_core_cards/20130411211600_delete_old_related_tab_cards.rb
 - db/migrate_core_cards/20130419215612_import_help_text.rb
@@ -298,9 +299,9 @@ files:
 - db/migrate_core_cards/20150601133433_add_recent_setting_session_card.rb
 - db/migrate_core_cards/20150605115802_add_performance_log_card.rb
 - db/migrate_core_cards/20150610171702_add_debugger_session_card.rb
-- db/migrate_core_cards/20150611203506_rails_inflection_updates.rb
 - db/migrate_core_cards/20150627205133_fix_script_bootstrap_card_type.rb
 - db/migrate_core_cards/20150702130543_remove_edit_toolbar_pinned.rb
+- db/migrate_core_cards/20150708224756_add_list_cards.rb
 - db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb
 - db/migrate_core_cards/20150807205221_create_references_for_search_cards.rb
 - db/migrate_core_cards/20150824135418_update_file_history.rb
@@ -380,6 +381,7 @@ files:
 - db/version_core_cards.txt
 - lib/card.rb
 - lib/card/active_record_ext.rb
+- lib/card/active_record_helper.rb
 - lib/card/auth.rb
 - lib/card/cache.rb
 - lib/card/chunk.rb
@@ -408,6 +410,7 @@ files:
 - lib/card/set_pattern.rb
 - lib/card/simplecov_helper.rb
 - lib/card/spec_helper.rb
+- lib/card/subcards.rb
 - lib/card/success.rb
 - lib/card/version.rb
 - lib/card/view_cache.rb
@@ -455,6 +458,7 @@ files:
 - mod/01_core/set/all/references.rb
 - mod/01_core/set/all/rules.rb
 - mod/01_core/set/all/states.rb
+- mod/01_core/set/all/subcards.rb
 - mod/01_core/set/all/templating.rb
 - mod/01_core/set/all/tracked_attributes.rb
 - mod/01_core/set/all/trash.rb
@@ -681,6 +685,7 @@ files:
 - mod/05_standard/set/all/error.rb
 - mod/05_standard/set/all/event_viz.rb
 - mod/05_standard/set/all/links.rb
+- mod/05_standard/set/all/list_changes.rb
 - mod/05_standard/set/all/rich_html/content.rb
 - mod/05_standard/set/all/rich_html/editing.rb
 - mod/05_standard/set/all/rich_html/form.rb
@@ -718,6 +723,8 @@ files:
 - mod/05_standard/set/type/file.rb
 - mod/05_standard/set/type/image.rb
 - mod/05_standard/set/type/layout_type.rb
+- mod/05_standard/set/type/list.rb
+- mod/05_standard/set/type/listed_by.rb
 - mod/05_standard/set/type/number.rb
 - mod/05_standard/set/type/phrase.rb
 - mod/05_standard/set/type/search_type.rb
@@ -778,6 +785,8 @@ files:
 - mod/05_standard/spec/set/type/html_spec.rb
 - mod/05_standard/spec/set/type/image_spec.rb
 - mod/05_standard/spec/set/type/layout_type_spec.rb
+- mod/05_standard/spec/set/type/list_spec.rb
+- mod/05_standard/spec/set/type/listed_by_spec.rb
 - mod/05_standard/spec/set/type/number_spec.rb
 - mod/05_standard/spec/set/type/phrase_spec.rb
 - mod/05_standard/spec/set/type/search_type_spec.rb
@@ -965,6 +974,7 @@ files:
 - spec/lib/card/reference_spec.rb
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
+- spec/lib/card/subcards_spec.rb
 - spec/lib/card/success_spec.rb
 - spec/mailers/mailer_spec.rb
 - spec/models/card/cardtype_spec.rb
@@ -1193,6 +1203,7 @@ test_files:
 - spec/lib/card/reference_spec.rb
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
+- spec/lib/card/subcards_spec.rb
 - spec/lib/card/success_spec.rb
 - spec/mailers/mailer_spec.rb
 - spec/models/card/cardtype_spec.rb