card 1.17.4 → 1.18.0

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

@@ -16,10 +16,8 @@ format :html do
   end
 
   def invite_args args
-    args.merge!(
-      title: 'Invite',
-      buttons: button_tag('Send Invitation', situation: 'primary'),
-    )
+    args[:title] = 'Invite'
+    args[:buttons] = button_tag('Send Invitation', situation: 'primary')
     args[:hidden][:success] = '_self'
   end
 
@@ -49,8 +47,8 @@ format :html do
     headings = []
     by_anon = card.creator_id == AnonymousID
     headings << %(
-      <strong>#{ card.name }</strong> #{ 'was' if !by_anon } signed up on
-      #{ format_date card.created_at }
+      <strong>#{card.name}</strong> #{'was' unless by_anon} signed up on
+      #{format_date card.created_at}
     )
     if (account = card.account)
       headings += verification_info account
@@ -59,9 +57,9 @@ format :html do
     end
     <<-HTML
       <div class="invite-links">
-        #{ headings.map { |h| "<div>#{h}</div>" }.join "\n" }
+        #{headings.map { |h| "<div>#{h}</div>" }.join "\n"}
       </div>
-      #{ process_content render_raw }
+      #{process_content render_raw}
     HTML
   end
 
@@ -70,7 +68,7 @@ format :html do
     token_action = 'Send'
     if account.token.present?
       headings << 'A verification email has been sent ' \
-                  "#{ "to #{account.email}" if account.email_card.ok? :read }"
+                  "#{"to #{account.email}" if account.email_card.ok? :read}"
       token_action = 'Resend'
     end
     links = verification_links account, token_action
@@ -97,11 +95,11 @@ format :html do
   end
 end
 
-event :activate_by_token, before: :approve, on: :update,
-                          when: proc { |c| c.has_token? } do
+event :activate_by_token, :validate, on: :update,
+                                     when: proc { |c| c.has_token? } do
   abort :failure, 'no field manipulation mid-activation' if subcards.present?
   # necessary because this performs actions as Wagn Bot
-  abort :failure, "no account associated with #{name}" if !account
+  abort :failure, "no account associated with #{name}" unless account
 
   account.validate_token! @env_token
 
@@ -129,16 +127,16 @@ event :activate_account do
   account.send_welcome_email
 end
 
-event :approve_with_token,
-      on: :update, before: :approve,
+event :approve_with_token, :validate,
+      on: :update,
       when: proc { Env.params[:approve_with_token] } do
   abort :failure, 'illegal approval' unless account.confirm_ok?
   account.reset_token
   account.send_account_verification_email
 end
 
-event :approve_without_token,
-      on: :update, before: :approve,
+event :approve_without_token, :validate,
+      on: :update,
       when: proc { Env.params[:approve_without_token] } do
   abort :failure, 'illegal approval' unless account.confirm_ok?
   activate_account
@@ -158,12 +156,13 @@ def signed_in_as_me_without_password?
   Auth.signed_in? && Auth.current_id == id && account.password.blank?
 end
 
-event :redirect_to_edit_password,
-      on: :update, after: :store,
+event :redirect_to_edit_password, :finalize,
+      on: :update,
       when: proc { |c| c.signed_in_as_me_without_password? } do
   Env.params[:success] = account.edit_password_success_args
 end
 
-event :act_as_current_for_extend_phase, before: :extend, on: :create do
+event :act_as_current_for_integrate_stage, :integrate,
+      on: :create do
   Auth.current_id = id
 end

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

@@ -1,12 +1,12 @@
 
-view :core do |args|
+view :core do |_args|
   case card.raw_content.to_i
-  when 1; 'yes'
-  when 0; 'no'
-  else  ; '?'
+  when 1 then 'yes'
+  when 0 then 'no'
+  else; '?'
   end
 end
 
-view :editor do |args|
+view :editor do |_args|
   check_box :content
 end

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

@@ -5,7 +5,7 @@ attr_accessor :email
 
 format :html do
   view :setup, tags: :unknown_ok,
-               perms: lambda { |_r| Auth.needs_setup? } do |args|
+               perms: ->(_r) { Auth.needs_setup? } do |args|
     account = card.fetch trait: :account, new: {}
     Auth.as_bot do
       frame_and_form :create, args do
@@ -26,7 +26,7 @@ format :html do
       help_text: help_text,
       buttons: setup_button,
       hidden: {
-        success: "REDIRECT: #{ Card.path_setting '/' }",
+        success: "REDIRECT: #{Card.path_setting '/'}",
         'card[type_id]' => Card.default_accounted_type_id,
         'setup' => true
       }
@@ -58,14 +58,14 @@ event :setup_as_bot, before: :check_permissions, on: :create,
   # flexibility and security when configuring initial setups
 end
 
-event :setup_first_user, before: :process_subcards, on: :create,
-                         when: proc { Card::Env.params[:setup] } do
+event :setup_first_user, :prepare_to_store, 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 { Card::Env.params[:setup] } do
+event :signin_after_setup, :integrate, on: :create,
+                                       when: proc { Card::Env.params[:setup] } do
   Auth.signin id
 end
 

data/mod/05_standard/spec/chunk/include_spec.rb

@@ -1,186 +1,203 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Chunk::Include, "Inclusion" do
-
-  context "syntax parsing" do
+describe Card::Chunk::Include, 'Inclusion' do
+  context 'syntax parsing' do
     before do
-      @class= Card::Chunk::Include
+      @class = Card::Chunk::Include
     end
 
-    it "ignores invisible comments" do
-      expect(render_content("{{## now you see nothing}}")).to eq('')
+    let :instance do
+      @class.new(@class.full_match(@chunk), nil)
+    end
+    let(:options) { instance.options }
+    let(:name) { instance.name }
+    it 'ignores invisible comments' do
+      expect(render_content('{{## now you see nothing}}')).to eq('')
     end
 
-    it "handles visible comments" do
-      expect(render_content("{{# now you see me}}")).to eq('<!-- # now you see me -->')
-      expect(render_content("{{# -->}}")).to eq('<!-- # --&gt; -->')
+    it 'handles visible comments' do
+      expect(render_content('{{# now you see me}}'))
+        .to eq('<!-- # now you see me -->')
+      expect(render_content('{{# -->}}')).to eq('<!-- # --&gt; -->')
     end
 
-    it "handles empty inclusions" do
-      instance = @class.new( @class.full_match( '{{ }}' ) , nil )
-      expect(instance.name).to eq('')
-      expect(instance.options[:inc_syntax]).to eq(' ')
-      instance1 = @class.new( @class.full_match( '{{|}}' ) , nil )
-      expect(instance1.name).to eq('')
-      expect(instance1.options[:inc_syntax]).to eq('|')
+    it 'handles empty nests' do
+      @chunk = '{{ }}'
+      expect(name).to eq('')
+      expect(options[:inc_syntax]).to eq(' ')
+    end
 
+    it 'handles empty nests with pipe' do
+      @chunk = '{{|}}'
+      expect(name).to eq('')
+      expect(options[:inc_syntax]).to eq('|')
     end
 
-    it "handles no pipes" do
-      instance = @class.new( @class.full_match( '{{toy}}') , nil )
-      expect(instance.name).to eq('toy')
-      expect(instance.options[:inc_name]).to eq('toy')
-      expect(instance.options.key?(:view)).to eq(false)
+    it 'handles no pipes' do
+      @chunk = '{{toy}}'
+      expect(name).to eq('toy')
+      expect(options[:inc_name]).to eq('toy')
+      expect(options.key?(:view)).to eq(false)
     end
 
-    it "strips the name" do
-      expect(@class.new( @class.full_match( '{{ toy }}') , nil ).name).to eq('toy')
+    it 'strips the name' do
+      @chunk = '{{ toy }}'
+      expect(name).to eq('toy')
     end
 
     it 'strips html tags' do
-      expect(@class.new( @class.full_match( '{{ <span>toy</span> }}') , nil ).name).to eq('toy')
-      instance = @class.new( @class.full_match( '{{ <span>toy|open</span> }}') , nil )
-      expect(instance.name).to eq('toy')
-      expect(instance.options[:view]).to eq('open')
+      @chunk = '{{ <span>toy</span> }}'
+      expect(name).to eq('toy')
+    end
+
+    it 'strips html tags with pipe' do
+      @chunk = '{{ <span>toy|open</span> }}'
+      expect(name).to eq('toy')
+      expect(options[:view]).to eq('open')
     end
 
-    it "handles single pipe" do
-      options = @class.new( @class.full_match('{{toy|view:link;hide:me}}'), nil ).options
+    it 'handles single pipe' do
+      @chunk = '{{toy|view:link;hide:me}}'
       expect(options[:inc_name]).to eq('toy')
       expect(options[:view]).to eq('link')
       expect(options[:hide]).to eq('me')
       expect(options.key?(:items)).to eq(false)
     end
 
-    it "handles multiple pipes" do
-      options = @class.new( @class.full_match('{{box|open|closed}}'), nil ).options
+    it 'handles multiple pipes' do
+      @chunk = '{{box|open|closed}}'
       expect(options[:inc_name]).to eq('box')
       expect(options[:view]).to eq('open')
       expect(options[:items][:view]).to eq('closed')
       expect(options[:items].key?(:items)).to eq(false)
     end
 
-    it "handles multiple pipes with blank lists" do
-      options = @class.new( @class.full_match('{{box||closed}}'), nil ).options
+    it 'handles multiple pipes with blank lists' do
+      @chunk = '{{box||closed}}'
       expect(options[:inc_name]).to eq('box')
       expect(options[:view]).to eq(nil)
       expect(options[:items][:view]).to eq('closed')
     end
 
-    it "treats :item as view of next level" do
-      options = @class.new( @class.full_match('{{toy|link;item:name}}'), nil ).options
+    it 'treats :item as view of next level' do
+      @chunk = '{{toy|link;item:name}}'
       expect(options[:inc_name]).to eq('toy')
       expect(options[:view]).to eq('link')
       expect(options[:items][:view]).to eq('name')
     end
-
   end
 
-  context "rendering" do
-
-    it "handles absolute names" do
-      alpha = newcard 'Alpha', "Pooey"
-      beta = newcard 'Beta', "{{Alpha}}"
+  context 'rendering' do
+    it 'handles absolute names' do
+      create! 'Alpha', 'Pooey'
+      beta = create! 'Beta', '{{Alpha}}'
       result = beta.format.render_core
-      assert_view_select result, 'div[class~="card-content"]', "Pooey"
+      assert_view_select result, 'div[class~="card-content"]', 'Pooey'
     end
 
-    it "handles simple relative names" do
-      alpha = newcard 'Alpha', "{{#{Card::Name.joint}Beta}}"
-      beta = newcard 'Beta'
-      alpha_beta = Card.create name: "#{alpha.name}#{Card::Name.joint}Beta", content: "Woot"
-      assert_view_select alpha.format.render_core, 'div[class~=card-content]', "Woot"
+    it 'handles simple relative names' do
+      alpha = create! 'Alpha', "{{#{Card::Name.joint}Beta}}"
+      create! 'Beta'
+      create! "#{alpha.name}#{Card::Name.joint}Beta", 'Woot'
+      assert_view_select alpha.format.render_core, 'div[class~=card-content]',
+                         'Woot'
     end
 
-    it "should handle complex relative names" do
-      bob_city = Card.create! name: 'bob+city', content: "Sparta"
-      Card::Auth.as_bot { address_tmpl = Card.create! name: 'address+*right+*structure', content: "{{_left+city}}" }
-      bob_address = Card.create! name: 'bob+address'
+    it 'handles complex relative names' do
+      bob_city = create! 'bob+city', 'Sparta'
+      Card::Auth.as_bot do
+        create! 'address+*right+*structure', '{{_left+city}}'
+      end
+      bob_address = create! 'bob+address'
 
-      r=bob_address.reload.format.render_core
-      assert_view_select r, 'div[class~=card-content]', "Sparta"
-      expect(Card.fetch("bob+address").includees.map(&:name)).to eq([bob_city.name])
+      r = bob_address.reload.format.render_core
+      assert_view_select r, 'div[class~=card-content]', 'Sparta'
+      expect(Card.fetch('bob+address').includees.map(&:name))
+        .to eq([bob_city.name])
     end
 
-    it "should handle nesting" do
-      alpha = newcard 'Alpha', "{{Beta}}"
-      beta = newcard 'Beta', "{{Delta}}"
-      delta = newcard 'Delta', "Booya"
-      r= alpha .format.render_core
-      #warn "r=#{r}"
+    it 'handles nesting' do
+      alpha = create! 'Alpha', '{{Beta}}'
+      create! 'Beta', '{{Delta}}'
+      create! 'Delta', 'Booya'
+      r = alpha.format.render_core
       assert_view_select r, 'div[class~=card-content]'
       expect(r).to match(/Booya/)
     end
 
-    it "should handle options when nesting" do
+    it 'handles options when nesting' do
       Card.create! type: 'Pointer', name: 'Livable', content: '[[Earth]]'
-      Card.create! name: 'Earth'
+      create! 'Earth'
 
-      expect(render_content('{{Livable|core;item:link}}')).to eq(render_content('{{Livable|core|link}}'))
-      expect(render_content('{{Livable|core;item:name}}')).to eq(render_content('{{Livable|core|name}}'))
+      expect(render_content('{{Livable|core;item:link}}'))
+        .to eq(render_content('{{Livable|core|link}}'))
+      expect(render_content('{{Livable|core;item:name}}'))
+        .to eq(render_content('{{Livable|core|name}}'))
     end
 
-    it "should prevent recursion" do
-      oak = Card.create! name: 'Oak', content: '{{Quentin}}'
-      qnt = Card.create! name: 'Quentin', content: '{{Admin}}'
+    it 'prevents recursion' do
+      create! 'Oak', '{{Quentin}}'
+      create! 'Quentin', '{{Admin}}'
       adm = Card['Quentin']
-      adm.update_attributes content: "{{Oak}}"
+      adm.update_attributes content: '{{Oak}}'
       result = adm.format.render_core
       expect(result).to match('too deep')
     end
 
-    it "should handle missing cards" do
-      @a = Card.create name: 'boo', content: "hey {{+there}}"
-      r=@a.format.render_core
-      assert_view_select r, 'div[data-card-name="boo+there"][class~="missing-view"]'
+    it 'handles missing cards' do
+      @a = create! 'boo', 'hey {{+there}}'
+      r = @a.format.render_core
+      assert_view_select(
+        r, 'div[data-card-name="boo+there"][class~="missing-view"]'
+      )
     end
 
-    it "should handle structured cards" do
-      age = newcard('age')
-      template = Card['*template']
+    it 'handles structured cards' do
+      create!('age')
+      Card['*template']
       specialtype = Card.create type_code: 'Cardtype', name: 'SpecialType'
-
-      specialtype_template = specialtype.fetch(trait: :type,new: {}).fetch(trait: :structure,new: {})
+      specialtype_template = specialtype.fetch(trait: :type, new: {})
+                                        .fetch(trait: :structure, new: {})
       specialtype_template.content = "{{#{Card::Name.joint}age}}"
       Card::Auth.as_bot { specialtype_template.save! }
-      assert_equal "{{#{Card::Name.joint}age}}", specialtype_template.format.render_raw
+      assert_equal "{{#{Card::Name.joint}age}}",
+                   specialtype_template.format.render_raw
 
       wooga = Card.create! name: 'Wooga', type: 'SpecialType'
-      wooga_age = Card.create!( name: "#{wooga.name}#{Card::Name.joint}age", content: "39" )
-      expect(wooga_age.format.render_core).to eq("39")
-      #warn "cards #{wooga.inspect}, #{wooga_age.inspect}"
+      wooga_age = create! "#{wooga.name}#{Card::Name.joint}age", '39'
+      expect(wooga_age.format.render_core).to eq('39')
       expect(wooga_age.includers.map(&:name)).to eq(['Wooga'])
     end
 
-    it "should handle shading" do
-      alpha = newcard 'Alpha', "Pooey"
-      beta = newcard 'Beta', "{{Alpha|shade:off}}"
-      r=newcard('Bee', "{{Alpha|shade:off}}").format.render_core
+    it 'handles shading' do
+      create! 'Alpha', 'Pooey'
+      create! 'Beta', '{{Alpha|shade:off}}'
+      r = create!('Bee', '{{Alpha|shade:off}}').format.render_core
       assert_view_select r, 'div[style~="shade:off;"]' do
-        assert_select 'div[class~=card-content]', "Pooey"
+        assert_select 'div[class~=card-content]', 'Pooey'
       end
-      r=newcard('Cee', "{{Alpha| shade: off }}").format.render_core
+      r = create!('Cee', '{{Alpha| shade: off }}').format.render_core
       assert_view_select r, 'div[style~="shade:off;"]' do
-        assert_select 'div[class~=card-content]', "Pooey"
+        assert_select 'div[class~=card-content]', 'Pooey'
       end
-      r=newcard('Dee', "{{Alpha| shade:off }}").format.render_core
+      r = create!('Dee', '{{Alpha| shade:off }}').format.render_core
       assert_view_select r, 'div[style~="shade:off;"]' do
-        assert_select 'div[class~="card-content"]', "Pooey"
+        assert_select 'div[class~="card-content"]', 'Pooey'
       end
-      r=newcard('Eee', "{{Alpha| shade:on }}").format.render_core
+      r = create!('Eee', '{{Alpha| shade:on }}').format.render_core
       assert_view_select r, 'div[style~="shade:on;"]' do
-        assert_select 'div[class~="card-content"]', "Pooey"
+        assert_select 'div[class~="card-content"]', 'Pooey'
       end
     end
 
-    #FIXME - should move code and test to core_ext or some such
+    # FIXME: should move code and test to core_ext or some such
     it 'Hash.new_from_semicolon_attr_list should work' do
-      expect(Hash.new_from_semicolon_attr_list("")).to eq({})
+      expect(Hash.new_from_semicolon_attr_list('')).to eq({})
       expect(Hash.new_from_semicolon_attr_list(nil)).to eq({})
-      expect(Hash.new_from_semicolon_attr_list("a:b;c:4"  )).to eq({a: 'b', c: '4'})
-      expect(Hash.new_from_semicolon_attr_list("d:b;e:4; ")).to eq({d: 'b', e: '4'})
+      expect(Hash.new_from_semicolon_attr_list('a:b;c:4'))
+        .to eq(a: 'b', c: '4')
+      expect(Hash.new_from_semicolon_attr_list('d:b;e:4; '))
+        .to eq(d: 'b', e: '4')
     end
-
   end
-
 end