card 1.16.6 → 1.16.7

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

@@ -2,7 +2,7 @@ format do
   include Phrase::Format
 
   view :core do |args|
-    web_link _render_raw(args), :text=> render_title(args)
+    web_link _render_raw(args), text: render_title(args)
   end
 
   view :url_link do |args|

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

@@ -5,31 +5,31 @@ attr_accessor :email
 
 format :html do
 
-  view :setup, :tags=>:unknown_ok, :perms=>lambda { |r| Auth.needs_setup? } do |args|
+  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 
+    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.'
     end
     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' ),
-      :hidden => { 
-        :success => "REDIRECT: #{ Card.path_setting '/' }",
+      title: 'Welcome, Wagneer!',
+      optional_help: :show,
+      optional_menu: :never,
+      help_text: help_text,
+      buttons: button_tag( 'Set up', disable_with: 'Setting up', situation: 'primary' ),
+      hidden: {
+        success: "REDIRECT: #{ Card.path_setting '/' }",
         'card[type_id]' => Card.default_accounted_type_id,
         'setup'=>true
       }
     } )
 
-    account = card.fetch :trait=>:account, :new=>{}
+    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_name_formgroup( help: 'usually first and last name' ),
+          subformat(account)._render( :content_formgroup, structure: true ),
           _render_button_formgroup( args )
         ]
       end
@@ -38,30 +38,30 @@ format :html do
 end
 
 
-event :setup_as_bot, :before=>:check_permissions, :on=>:create, :when=>proc{ |c| Card::Env.params[:setup] } do
-  abort :failure unless Auth.needs_setup? 
+event :setup_as_bot, before: :check_permissions, on: :create, when: proc{ |c| Card::Env.params[:setup] } do
+  abort :failure unless Auth.needs_setup?
   Auth.as_bot
   # we need bot authority to set the initial administrator roles
-  # this is granted and inspected here as a separate event for 
+  # this is granted and inspected here as a separate event for
   # flexibility and security when configuring initial setups
-end  
+end
 
-event :setup_first_user, :before=>:process_subcards, :on=>:create, :when=>proc{ |c| Card::Env.params[:setup] } do
+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 }
-  
+  subcards['+*roles'] = { content: Card[:administrator].name }
+
   email, password = subcards.delete('+*account+*email'), subcards.delete('+*account+*password')
   subcards['+*account'] = { '+*email'=>email, '+*password'=>password }
 end
 
-event :signin_after_setup, :before=>:extend, :on=>:create, :when=>proc{ |c| Card::Env.params[:setup] } do
+event :signin_after_setup, before: :extend, on: :create, when: proc{ |c| Card::Env.params[:setup] } do
   Card.cache.delete Auth::NEED_SETUP_KEY
   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=>{}))
+    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!

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

@@ -88,14 +88,14 @@ describe Card::Chunk::Include, "Inclusion" do
     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"
+      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"
     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'
+      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'
 
       r=bob_address.reload.format.render_core
       assert_view_select r, 'div[class~=card-content]', "Sparta"
@@ -113,24 +113,24 @@ describe Card::Chunk::Include, "Inclusion" do
     end
 
     it "should handle options when nesting" do
-      Card.create! :type=>'Pointer', :name=>'Livable', :content=>'[[Earth]]'
-      Card.create! :name=>'Earth'
+      Card.create! type: 'Pointer', name: 'Livable', content: '[[Earth]]'
+      Card.create! name: '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}}'))
     end
 
     it "should prevent recursion" do
-      oak = Card.create! :name=>'Oak', :content=>'{{Quentin}}'
-      qnt = Card.create! :name=>'Quentin', :content=>'{{Admin}}'
+      oak = Card.create! name: 'Oak', content: '{{Quentin}}'
+      qnt = Card.create! name: 'Quentin', content: '{{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}}"
+      @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"]'
     end
@@ -138,15 +138,15 @@ describe Card::Chunk::Include, "Inclusion" do
     it "should handle structured cards" do
       age = newcard('age')
       template = Card['*template']
-      specialtype = Card.create :type_code=>'Cardtype', :name=>'SpecialType'
+      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
 
-      wooga = Card.create! :name=>'Wooga', :type=>'SpecialType'
-      wooga_age = Card.create!( :name=>"#{wooga.name}#{Card::Name.joint}age", :content=> "39" )
+      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}"
       expect(wooga_age.includers.map(&:name)).to eq(['Wooga'])
@@ -177,8 +177,8 @@ describe Card::Chunk::Include, "Inclusion" do
     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(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

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

@@ -8,48 +8,48 @@ describe Card::Chunk::Link do
     args.each_pair do |key,val|
       assert_args[0] << "[#{key}=\"#{val}\"]"
     end
-    assert_args << { :text=>text } if text
+    assert_args << { text: text } if text
     assert_view_select render_content(target, (format_args || {})), *assert_args
   end
 
   it "handles unknown cards" do
-    assert_link '[[Nixon]]', :class=>"wanted-card", :href=>"/Nixon", :text=>'Nixon'
+    assert_link '[[Nixon]]', class: "wanted-card", href: "/Nixon", text: 'Nixon'
   end
 
   it 'handles known cards' do
-    assert_link "[[A]]", :class=>"known-card", :href=>"/A", :text=>'A'
+    assert_link "[[A]]", class: "known-card", href: "/A", text: 'A'
   end
 
 
   it 'handles custom text' do
-    assert_link '[[Baines|Lyndon]]', :class=>"wanted-card", :href=>"/Baines", :text=>'Lyndon'
+    assert_link '[[Baines|Lyndon]]', class: "wanted-card", href: "/Baines", text: 'Lyndon'
   end
 
   it "handles relative names" do
-    @card = Card.new :name=>'Kennedy'
-    assert_link '[[+Monroe]]'    , :class=>"wanted-card", :href=>"/Kennedy+Monroe", :text=>'Kennedy+Monroe'
-    assert_link '[[_self+Exner]]', :class=>"wanted-card", :href=>"/Kennedy+Exner",  :text=>'Kennedy+Exner'
-    assert_link '[[Onassis+]]'   , :class=>"wanted-card", :href=>"/Onassis+Kennedy",:text=>'Onassis+Kennedy'
+    @card = Card.new name: 'Kennedy'
+    assert_link '[[+Monroe]]'    , class: "wanted-card", href: "/Kennedy+Monroe", text: 'Kennedy+Monroe'
+    assert_link '[[_self+Exner]]', class: "wanted-card", href: "/Kennedy+Exner",  text: 'Kennedy+Exner'
+    assert_link '[[Onassis+]]'   , class: "wanted-card", href: "/Onassis+Kennedy",text: 'Onassis+Kennedy'
   end
 
   it "handles relative names in context" do
-    @card = Card.new :name=>'Kennedy'
-    format_args = { :context_names => [ 'Kennedy'.to_name ] }
-    assert_link '[[+Monroe]]'    , :format_args=>format_args, :class=>"wanted-card", :href=>"/Kennedy+Monroe", :text=>'+Monroe'
-    assert_link '[[_self+Exner]]', :format_args=>format_args, :class=>"wanted-card", :href=>"/Kennedy+Exner", :text=>'+Exner'
-    assert_link '[[Onassis+]]'   , :format_args=>format_args, :class=>"wanted-card", :href=>"/Onassis+Kennedy", :text=>'Onassis'
+    @card = Card.new name: 'Kennedy'
+    format_args = { context_names: [ 'Kennedy'.to_name ] }
+    assert_link '[[+Monroe]]'    , format_args: format_args, class: "wanted-card", href: "/Kennedy+Monroe", text: '+Monroe'
+    assert_link '[[_self+Exner]]', format_args: format_args, class: "wanted-card", href: "/Kennedy+Exner", text: '+Exner'
+    assert_link '[[Onassis+]]'   , format_args: format_args, class: "wanted-card", href: "/Onassis+Kennedy", text: 'Onassis'
   end
 
   it "handles relative urls" do
-    assert_link '[[/recent]]', :class=>"internal-link", :href=>"/recent", :text=>'/recent'
+    assert_link '[[/recent]]', class: "internal-link", href: "/recent", text: '/recent'
   end
 
   it "handles absolute urls" do
-    assert_link '[[http://google.com]]', :class=>'external-link', :target=>'_blank', :href=>'http://google.com', :text=> 'http://google.com'
+    assert_link '[[http://google.com]]', class: 'external-link', target: '_blank', href: 'http://google.com', text: 'http://google.com'
   end
 
   it "should escape spaces in cardnames with %20 (not +)" do
-    assert_link '[[Marie "Mad Dog" Deatherage|Marie]]', :class=>"wanted-card", :href=>"/Marie_Mad_Dog_Deatherage?card%5Bname%5D=Marie+%22Mad+Dog%22+Deatherage", :text=>'Marie'
+    assert_link '[[Marie "Mad Dog" Deatherage|Marie]]', class: "wanted-card", href: "/Marie_Mad_Dog_Deatherage?card%5Bname%5D=Marie+%22Mad+Dog%22+Deatherage", text: 'Marie'
   end
 
 
@@ -59,11 +59,11 @@ describe Card::Chunk::Link do
   end
 
   it "handles inclusions in link text" do
-    assert_link '[[linkies|{{namies|name}}]]', :class=>"wanted-card", :href=>"/linkies", :text=>'namies'
+    assert_link '[[linkies|{{namies|name}}]]', class: "wanted-card", href: "/linkies", text: 'namies'
   end
 
   it "handles dot (.) in missing cardlink" do
-    assert_link "[[Wagn 1.10.12]]", :class=>"wanted-card", :href=>"/Wagn_1_10_12?card%5Bname%5D=Wagn+1.10.12", :text=>'Wagn 1.10.12'
+    assert_link "[[Wagn 1.10.12]]", class: "wanted-card", href: "/Wagn_1_10_12?card%5Bname%5D=Wagn+1.10.12", text: 'Wagn 1.10.12'
 
   end
 

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

@@ -8,7 +8,7 @@ describe Card::Chunk::QueryReference, "QueryReference" do
     end
 
     let :query_refs do
-       content = Card::Content.new @content, Card.new(:type=>'Search')
+       content = Card::Content.new @content, Card.new(type: 'Search')
        content.find_chunks(Card::Chunk::QueryReference)
     end
 

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

@@ -9,8 +9,8 @@ describe Card::Set::All::Account do
 
     it 'should be true for cards with *accountable rule on' do
       Card::Auth.as_bot do
-        Card.create :name=>'A+*self+*accountable', :content=>'1'
-        Card.create :name=>'*account+*right+*create', :content=>'[[Anyone Signed In]]'
+        Card.create name: 'A+*self+*accountable', content: '1'
+        Card.create name: '*account+*right+*create', content: '[[Anyone Signed In]]'
       end
       expect(Card['A'].accountable?).to eq(true)
     end
@@ -40,7 +40,7 @@ describe Card::Set::All::Account do
       end
 
       it 'should update when new roles are set' do
-        roles_card = @joe_user_card.fetch :trait=>:roles, :new=>{}
+        roles_card = @joe_user_card.fetch trait: :roles, new: {}
         r1 = Card['r1']
 
         Card::Auth.as_bot { roles_card.items = [ r1.id ] }
@@ -72,8 +72,8 @@ describe Card::Set::All::Account do
       Card::Auth.current_id = jadmin.id #simulate login to get correct from address
       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::Env[:params] = { email: {subject: 'Hey Joe!', message: 'Come on in.'} }
+      Card.create name: 'Joe New', type_id: Card::UserID, '+*account'=>{ '+*email'=> 'joe@new.com' }
 
       c = Card['Joe New']
       u = Card::Auth[ 'joe@new.com' ]
@@ -100,7 +100,7 @@ describe Card::Set::All::Account do
 
     it "should let Wagn Bot block accounts" do
       Card::Auth.as_bot do
-        @card.account.status_card.update_attributes! :content => 'blocked'
+        @card.account.status_card.update_attributes! content: 'blocked'
         expect(@card.account.blocked?).to be_truthy
       end
     end
@@ -108,7 +108,7 @@ describe Card::Set::All::Account do
 
     it "should not allow a user to block or unblock himself" do
       expect do
-        @card.account.status_card.update_attributes! :content => 'blocked'
+        @card.account.status_card.update_attributes! content: 'blocked'
       end.to raise_error
       expect(@card.account.blocked?).to be_falsey
     end

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

@@ -4,12 +4,12 @@ describe Card::EmailHtmlFormat do
   it "renders full urls" do
     Card::Env[:protocol] = 'http://'
     Card::Env[:host] = 'www.fake.com'
-    expect(render_content('[[B]]', :format=>'email_html')).to eq('<a class="known-card" href="http://www.fake.com/B">B</a>')
+    expect(render_content('[[B]]', format: 'email_html')).to eq('<a class="known-card" href="http://www.fake.com/B">B</a>')
   end
-  
+
   describe "raw view" do
     it "renders missing included cards as blank" do
-      expect(render_content('{{strombooby}}', :format=>'email_html')).to eq('')
+      expect(render_content('{{strombooby}}', format: 'email_html')).to eq('')
     end
   end
 end

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

@@ -2,10 +2,10 @@
 describe Card::Set::All::History do
   context "history view" do
     # before do
-    #   Card.create! :name=>"my histoer card"
+    #   Card.create! name: "my histoer card"
     # end
     it 'should have a frame' do
-      history = render_card :history, :name=>"A"
+      history = render_card :history, name: "A"
       assert_view_select history, 'div[class~="card-frame"]'
     end
 
@@ -16,8 +16,8 @@ describe Card::Set::All::History do
         first.format.render_action_summary
       end
       it 'should have a summary' do
-        assert_view_select subject, 'del[class="diffdel diff-red"]', :text=>'chicken'
-        assert_view_select subject, 'ins[class="diffins diff-green"]', :text=>'chick'
+        assert_view_select subject, 'del[class="diffdel diff-red"]', text: 'chicken'
+        assert_view_select subject, 'ins[class="diffins diff-green"]', text: 'chick'
       end
     end
   end
@@ -32,7 +32,7 @@ describe Card::Set::All::History do
     context 'for single card' do
       before do
         @card = Card::Auth.as_bot do
-          Card.create :name=>"single card", :content=>content
+          Card.create name: "single card", content: content
         end
       end
 
@@ -48,11 +48,11 @@ describe Card::Set::All::History do
 
       context 'when updated' do
         it 'adds no act if nothing changed' do
-          @card.update_attributes  :name=>"single card", :content=>content
+          @card.update_attributes  name: "single card", content: content
           expect(Card::Act.count).to eq(act_start_cnt+1)
         end
         it 'adds new act' do
-          @card.update_attributes :content=>"new content"
+          @card.update_attributes content: "new content"
           expect(Card::Act.count).to eq(act_start_cnt+2)
         end
       end
@@ -79,7 +79,7 @@ describe Card::Set::All::History do
         it "doesn't create an act" do
           Card::Auth.as(:anonymous) do
             act_count = Card::Act.count
-            Card.create :name=>"create fail"
+            Card.create name: "create fail"
             expect(Card::Act.count).to eq act_count
           end
         end
@@ -87,7 +87,7 @@ describe Card::Set::All::History do
         it "doesn't create an action" do
           Card::Auth.as(:anonymous) do
             action_count = Card::Action.count
-            Card.create :name=>"create fail"
+            Card.create name: "create fail"
             expect(Card::Action.count).to eq action_count
           end
         end
@@ -96,7 +96,7 @@ describe Card::Set::All::History do
           Card::Auth.as(:joe_user) do
             act_count    = Card::Act.count
             action_count = Card::Action.count
-            Card.create :name=>"crete fail", :subcards=>{'*all+*create'=>''}
+            Card.create name: "crete fail", subcards: {'*all+*create'=>''}
             expect(Card::Action.count).to eq action_count
             expect(Card::Act.count).to eq act_count
           end
@@ -109,7 +109,7 @@ describe Card::Set::All::History do
     context 'for subcard' do
       before do
         Card::Auth.as_bot do
-          @card = Card.create :name=>"left", :subcards=>{"+right" =>{ :content=>content}}
+          @card = Card.create name: "left", subcards: {"+right" =>{ content: content}}
           @left_action = act.actions[0]
           @right_action = act.actions[2]
           @plus_action = act.actions[1]
@@ -147,12 +147,12 @@ describe Card::Set::All::History do
 
       context 'when updated' do
         it 'adds act for left card' do
-          @card.update_attributes :subcards=>{"+right"=>{:content=>"New content", :db_content=>"New Content"}}
+          @card.update_attributes subcards: {"+right"=>{content: "New content", db_content: "New Content"}}
           expect(Card::Act.count).to eq(act_start_cnt+2)
           expect(act.card).to eq(@card)
         end
         it 'adds action for subcard' do
-          @card.update_attributes :subcards=>{"+right"=>{:content=>"New Content"}}
+          @card.update_attributes subcards: {"+right"=>{content: "New Content"}}
           act = @card.acts.last
           expect(act.actions.count).to eq(1)
           expect(act.actions.last.action_type).to eq(:update)
@@ -164,7 +164,7 @@ describe Card::Set::All::History do
     context 'for plus card' do
       before do
         Card::Auth.as_bot do
-          @card = Card.create :name=>'left+right', :content=>content
+          @card = Card.create name: 'left+right', content: content
           @left_action = act.actions[1]
           @plus_action = act.actions[0]
           @right_action = act.actions[2]

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

@@ -51,7 +51,7 @@ describe Card::Set::All::RichHtml::Editing do
   # describe 'edit_nests view' do
   #   before do
   #     Card::Auth.as_bot do
-  #       Card.create! :name=>'Iliad+author', :content=>'Homer'
+  #       Card.create! name: 'Iliad+author', content: 'Homer'
   #     end
   #     @mycard = Card["Iliad"].format
   #   end

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

@@ -8,7 +8,7 @@ describe Card::Set::All::RichHtml::Form do
 
     it "should get type options from type_field renderer method" do
       expect(@card.format.type_field).to match(/<option [^>]*selected/)
-      tf=@card.format.type_field(:no_current_type=>true)
+      tf=@card.format.type_field(no_current_type: true)
       expect(tf).not_to match(/<option [^>]*selected/)
       expect(tf.scan(/<option /).length).to eq(26)
       tf=@card.format.type_field
@@ -18,7 +18,7 @@ describe Card::Set::All::RichHtml::Form do
 
     it "should get type list" do
       Card::Auth.as :anonymous do
-        tf=@card.format.type_field(:no_current_type=>true)
+        tf=@card.format.type_field(no_current_type: true)
         expect(tf).not_to match(/<option [^>]*selected/)
         expect(tf.scan(/<option /).length).to eq(1)
         tf=@card.format.type_field