card 1.16.6 → 1.16.7

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

@@ -10,14 +10,14 @@ describe Card::Set::Type::Html do
   end
 
   it "should not render any content in closed view" do
-    expect(render_card(:closed_content, :type=>'Html', :content=>"<strong>Lions and Tigers</strong>")).to eq('')
+    expect(render_card(:closed_content, type: 'Html', content: "<strong>Lions and Tigers</strong>")).to eq('')
   end
 
   it "should render inclusions" do
-    expect(render_card( :core, :type=>'HTML', :content=>'{{a}}' )).to match(/slot/)
+    expect(render_card( :core, type: 'HTML', content: '{{a}}' )).to match(/slot/)
   end
 
   it 'should not render uris' do
-    expect(render_card( :core, :type=>'HTML', :content=>'http://google.com' )).not_to match(/\<a/)
+    expect(render_card( :core, type: 'HTML', content: 'http://google.com' )).not_to match(/\<a/)
   end
 end

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

@@ -9,8 +9,8 @@ describe Card::Set::Type::Image do
   end
 
   it "handles size argument in inclusion syntax" do
-    image_card = Card.create! :name => "TestImage", :type=>"Image", :content => '~12345/TestImage.jpg'
-    including_card = Card.new :name => 'Image1', :content => "{{TestImage | core; size:small }}"
+    image_card = Card.create! name: "TestImage", type: "Image", content: '~12345/TestImage.jpg'
+    including_card = Card.new name: 'Image1', content: "{{TestImage | core; size:small }}"
     rendered = including_card.format._render :core
     assert_view_select rendered, 'img[src=?]', "/files/~#{image_card.id}/#{image_card.last_content_action_id}-small.jpg"
   end
@@ -19,7 +19,7 @@ describe Card::Set::Type::Image do
   context "newly created image card" do
     before do
       Card::Auth.as_bot do
-        Card.create! :name => "image card", :type=>'image', :image=>File.new( File.join FIXTURES_PATH, 'mao2.jpg' )
+        Card.create! name: "image card", type: 'image', image: File.new( File.join FIXTURES_PATH, 'mao2.jpg' )
       end
     end
     subject { Card['image card'] }
@@ -63,7 +63,7 @@ describe Card::Set::Type::Image do
 
     describe 'view: act_expanded' do
       it 'gets image url' do
-        act_summary = subject.format.render(:act_expanded, :act=>subject.last_act)
+        act_summary = subject.format.render(:act_expanded, act: subject.last_act)
         current_url = subject.image.versions[:medium].url
         expect(act_summary).to match /#{Regexp.quote current_url}/
       end
@@ -72,7 +72,7 @@ describe Card::Set::Type::Image do
 
     context "updated file card" do
       before do
-        subject.update_attributes! :image=>File.new( File.join FIXTURES_PATH, 'rails.gif' )
+        subject.update_attributes! image: File.new( File.join FIXTURES_PATH, 'rails.gif' )
       end
       it "updates file" do
         expect(subject.image.size).to eq 8533
@@ -102,7 +102,7 @@ describe Card::Set::Type::Image do
 
     it "becomes a regular file when changed" do
       Card::Auth.as_bot do
-        subject.update_attributes! :image=>File.new( File.join FIXTURES_PATH, 'rails.gif' )
+        subject.update_attributes! image: File.new( File.join FIXTURES_PATH, 'rails.gif' )
       end
       expect(subject.mod_file?).to be_falsey
       expect(subject.image.url).to eq "/files/~#{subject.id}/#{subject.last_action_id}-original.gif"

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

@@ -2,6 +2,6 @@
 
 describe Card::Set::Type::LayoutType do
   it "should include Html card methods" do
-    expect(Card.new( :type=>'Layout' ).clean_html?).to be_falsey
+    expect(Card.new( type: 'Layout' ).clean_html?).to be_falsey
   end
 end

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

@@ -2,7 +2,7 @@
 
 describe Card::Set::Type::SearchType do
   it "wraps search items with correct view class" do
-    Card.create :type=>'Search', :name=>'Asearch', :content=>%{{"type":"User"}}
+    Card.create type: 'Search', name: 'Asearch', content: %{{"type":"User"}}
     c=render_content("{{Asearch|core;item:name}}")
     expect(c).to match('search-result-item item-name')
     expect(render_content("{{Asearch|core}}"          ).scan('search-result-item item-closed').size).to eq(14)
@@ -11,14 +11,14 @@ describe Card::Set::Type::SearchType do
   end
 
   it "handles returning 'count'" do
-    expect(render_card(:core, :type=>'Search', :content=>%{{ "type":"User", "return":"count"}})).to eq('14')
+    expect(render_card(:core, type: 'Search', content: %{{ "type":"User", "return":"count"}})).to eq('14')
   end
 
   it "passes item args correctly" do
     Card.create!(
-      :name=>'Pointer2Searches',
-      :type_id=>Card::PointerID,
-      :content=>"[[Layout+*type+by name]]\n[[PlainText+*type+by name]]"
+      name: 'Pointer2Searches',
+      type_id: Card::PointerID,
+      content: "[[Layout+*type+by name]]\n[[PlainText+*type+by name]]"
     )
     r = render_content "{{Pointer2Searches|core|closed|hide:menu}}"
     expect(r.scan('"view":"link"').size).to eq(0)
@@ -27,24 +27,24 @@ describe Card::Set::Type::SearchType do
 
   it 'handles type update from pointer' do
     pointer_card = Card.create!(
-        :name=>"PointerToSearches",
-        :type_id=>Card::PointerID,
+        name: "PointerToSearches",
+        type_id: Card::PointerID,
     )
 
-    pointer_card.update_attributes! :type_id=>Card::SearchTypeID,:content=>%{{"type":"User"}}
+    pointer_card.update_attributes! type_id: Card::SearchTypeID,content: %{{"type":"User"}}
     expect(pointer_card.content).to eq(%{{"type":"User"}})
   end
 
   context 'references' do
     before do
-      Card.create :type=>'Search', :name=>'search with references', :content=>'{"name":"Y"}'
+      Card.create type: 'Search', name: 'search with references', content: '{"name":"Y"}'
     end
     subject do
       Card['search with references']
     end
 
     it 'updates query if referee changed' do
-      Card['Y'].update_attributes! :name=>'YYY', :update_referencers => true
+      Card['Y'].update_attributes! name: 'YYY', update_referencers: true
       expect(subject.content).to eq '{"name":"YYY"}'
     end
 

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

@@ -9,7 +9,7 @@ describe Card::Set::Type::Signup do
 
   context 'signup form form' do
     before do
-      card = Card.new :type_id=>Card::SignupID
+      card = Card.new type_id: Card::SignupID
       @form = card.format.render_new
     end
 
@@ -27,11 +27,11 @@ describe Card::Set::Type::Signup do
       ActionMailer::Base.deliveries = [] #needed?
 
       Card::Auth.as_bot do
-        Card.create! :name=>'User+*type+*create', :content=>'[[Anyone]]'
+        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,
+      @signup = Card.create! name: 'Big Bad Wolf', type_id: Card::SignupID,
         '+*account'=>{'+*email'=>'wolf@wagn.org', '+*password'=>'wolf'}
 
       @account = @signup.account
@@ -55,7 +55,7 @@ describe Card::Set::Type::Signup do
     it 'should create 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
+      expect(@account.fetch(trait: :token)).not_to be_present
     end
 
     it 'should notify someone' do
@@ -92,7 +92,7 @@ describe Card::Set::Type::Signup do
       # NOTE: by default Anonymous does not have permission to create User cards.
       Mail::TestMailer.deliveries.clear
       Card::Auth.current_id = Card::AnonymousID
-      @signup = Card.create! :name=>'Big Bad Wolf', :type_id=>Card::SignupID,
+      @signup = Card.create! name: 'Big Bad Wolf', type_id: Card::SignupID,
         '+*account'=>{ '+*email'=>'wolf@wagn.org', '+*password'=>'wolf' }
       @account = @signup.account
     end
@@ -158,11 +158,11 @@ describe Card::Set::Type::Signup do
   context 'a welcome email card exists' do
     before do
       Card::Auth.as_bot do
-        Card.create! :name=>'welcome email', :subcards=>{'+*subject'=>'welcome',
-                     '+*html_message'=>'Welcome {{_self|name}}'}, :type_id=>Card::EmailTemplateID
+        Card.create! name: 'welcome email', subcards: {'+*subject'=>'welcome',
+                     '+*html_message'=>'Welcome {{_self|name}}'}, type_id: Card::EmailTemplateID
       end
       Mail::TestMailer.deliveries.clear
-      @signup = Card.create! :name=>'Big Bad Sheep', :type_id=>Card::SignupID,
+      @signup = Card.create! name: 'Big Bad Sheep', type_id: Card::SignupID,
         '+*account'=>{'+*email'=>'sheep@wagn.org', '+*password'=>'sheep'}
 
     end
@@ -180,7 +180,7 @@ describe Card::Set::Type::Signup do
     before do
       # 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
 
@@ -198,11 +198,11 @@ describe Card::Set::Type::Signup do
   # describe '#signup_notifications' do
   #   before do
   #     Card::Auth.as_bot do
-  #       Card.create! :name=>'*request+*to', :content=>'signups@wagn.org'
+  #       Card.create! name: '*request+*to', content: 'signups@wagn.org'
   #     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/mod/05_standard/spec/set/type/toggle_spec.rb

@@ -6,7 +6,7 @@ describe Card::Set::Type::Toggle do
   end
 
   it "should have yes/no as processed content" do
-    expect(render_card(:core, :type=>'Toggle', :content=>"0")).to eq('no')
-    expect(render_card(:closed_content, :type=>'Toggle', :content=>"1")).to eq('yes')
+    expect(render_card(:core, type: 'Toggle', content: "0")).to eq('no')
+    expect(render_card(:closed_content, type: 'Toggle', content: "1")).to eq('yes')
   end
 end

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

@@ -6,22 +6,22 @@ describe Card::Set::Type::Uri do
   end
 
   it "renders core view links" do
-    card = Card.create(:type=>'URI', :name=>'A URI card', :content=>'http://wagn.org/Home')
+    card = Card.create(type: 'URI', name: 'A URI card', content: 'http://wagn.org/Home')
     assert_view_select card.format.render('core'), 'a[class="external-link"][href="http://wagn.org/Home"]' do
-      assert_select 'span[class="card-title"]', {:text => 'A URI card' }
+      assert_select 'span[class="card-title"]', {text: 'A URI card' }
     end
   end
 
   it "renders core view links with title arg" do
-    card = Card.create(:type=>'URI', :name=>'A URI card', :content=>'http://wagn.org/Home')
-    assert_view_select card.format.render('core', :title=>'My Title'), 'a[class="external-link"][href="http://wagn.org/Home"]' do
-      assert_select 'span[class="card-title"]', {:text => 'My Title' }
+    card = Card.create(type: 'URI', name: 'A URI card', content: 'http://wagn.org/Home')
+    assert_view_select card.format.render('core', title: 'My Title'), 'a[class="external-link"][href="http://wagn.org/Home"]' do
+      assert_select 'span[class="card-title"]', {text: 'My Title' }
     end
   end
 
   it "renders title view in a plain formatter" do
     card = Card['A']
-    card.format(:text).render('title', :title=>'My Title').should == 'My Title'
+    card.format(:text).render('title', title: 'My Title').should == 'My Title'
     card.format(:text).render('title').should == 'A'
   end
 
@@ -30,12 +30,12 @@ describe Card::Set::Type::Uri do
     card.format(:text).render('url_link').should == '/A'
     assert_view_select card.format.render('url_link'),
       'a[class="internal-link"][href="/A"]',
-      {:text => '/A' }
+      {text: '/A' }
   end
 
   it "renders a url_link view" do
-    card = Card.create(:type=>'URI', :name=>'A URI card', :content=>'http://wagn.org/Home')
-    assert_view_select card.format.render('url_link'), 'a[class="external-link"]', {:text => 'http://wagn.org/Home'}
+    card = Card.create(type: 'URI', name: 'A URI card', content: 'http://wagn.org/Home')
+    assert_view_select card.format.render('url_link'), 'a[class="external-link"]', {text: 'http://wagn.org/Home'}
     card.format(:text).render('url_link').should == 'http://wagn.org/Home'
   end
 end

data/mod/06_bootstrap/set/all/bootstrap/helper.rb

@@ -1,13 +1,13 @@
 format :html do
   def glyphicon icon_type, extra_class=''
-    content_tag(:span, '', :class=>"glyphicon glyphicon-#{icon_type} #{extra_class}", 'aria-hidden'=>true)
+    content_tag(:span, '', class: "glyphicon glyphicon-#{icon_type} #{extra_class}", 'aria-hidden'=>true)
   end
 
   def button_link link_text, target, html_args={}
     html_args[:class] ||= ''
     btn_type = html_args[:btn_type] || 'primary'
     html_args[:class] +=  " btn btn-#{btn_type}"
-    smart_link link_text, target, html_args.merge(:type=>'button')
+    smart_link link_text, target, html_args.merge(type: 'button')
   end
 
   def dropdown_button name, opts={}
@@ -52,7 +52,7 @@ format :html do
   end
 
   def breadcrumb items
-    content_tag :ol, :class=>'breadcrumb' do
+    content_tag :ol, class: 'breadcrumb' do
       items.map do |item|
         content_tag :li, item
       end
@@ -60,7 +60,7 @@ format :html do
   end
 
   # Options
-  # :header => { :content=>String, :brand=>( String | {:name=>, :href=>} ) }
+  # header: { content: String, brand: ( String | {name: , href: } ) }
   def navbar id, opts={}
     nav_opts = opts[:navbar_opts] || {}
     nav_opts[:class] ||= (opts[:class] || '')
@@ -73,9 +73,9 @@ format :html do
     end
     wrap_with :nav, nav_opts do
       [
-        navbar_header(id, header_opts.delete(:content), header_opts.reverse_merge(:toggle=>opts[:toggle])),
-        (content_tag(:div, opts[:collapsed_content].html_safe, :class=>'container-fluid') if opts[:collapsed_content]),
-        content_tag(:div, output(yield).html_safe, :class=>"collapse navbar-collapse", :id=>"navbar-collapse-#{id}"),
+        navbar_header(id, header_opts.delete(:content), header_opts.reverse_merge(toggle: opts[:toggle])),
+        (content_tag(:div, opts[:collapsed_content].html_safe, class: 'container-fluid') if opts[:collapsed_content]),
+        content_tag(:div, output(yield).html_safe, class: "collapse navbar-collapse", id: "navbar-collapse-#{id}"),
       ]
     end
   end
@@ -89,7 +89,7 @@ format :html do
                 "<a class='navbar-brand' href='#{link}#'>#{opts[:brand][:name]}</a>"
               end
             end
-    wrap_with :div, :class=>'navbar-header' do
+    wrap_with :div, class: 'navbar-header' do
       [
         (navbar_toggle(id, opts[:toggle]) unless opts[:toggle] == :hide),
         brand,
@@ -116,10 +116,10 @@ format :html do
     items = yield
     args[:situation] ||= 'primary'
 
-    wrap_with :div, :class=>'btn-group' do
+    wrap_with :div, class: 'btn-group' do
       [
         button,
-        button_tag(:situation=>args[:situation], :class=>'dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-haspopup'=>'true', 'aria-expanded'=>'false') do
+        button_tag(situation: args[:situation], class: 'dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-haspopup'=>'true', 'aria-expanded'=>'false') do
           %{
             <span class="caret"></span>
             <span class="sr-only">Toggle Dropdown</span>

data/mod/06_bootstrap/set/all/bootstrap/wrapper.rb

@@ -2,10 +2,10 @@ format :html do
 
   def frame args={}, &block
     args.reverse_merge!(
-      :panel_class  => 'panel panel-default',
-      :header_class => 'panel-heading',
-      :title_class  => 'panel-title',
-      :body_class   => 'panel-body'
+      panel_class:  'panel panel-default',
+      header_class: 'panel-heading',
+      title_class:  'panel-title',
+      body_class:   'panel-body'
     )
     super args
   end

data/mod/06_bootstrap/set/all/rich_bootstrap.rb

@@ -1,7 +1,7 @@
 format :html do
 
   view :closed do |args|
-    args.merge! :body_class=>'closed-content'
+    args.merge! body_class: 'closed-content'
     super args
   end
 

data/spec/lib/card/action_spec.rb

@@ -4,8 +4,8 @@ describe Card::Action do
   describe '#delete_old_actions' do
     it 'puts all changes on one action' do
       a = Card['A']
-      a.update_attributes!(:name=>"New A")
-      a.update_attributes!(:content=>"New content")
+      a.update_attributes!(name: "New A")
+      a.update_attributes!(content: "New content")
       a.delete_old_actions
       expect(a.actions.count).to eq(1)
       expect(a.actions(true).last.new_values[:name]).to eq("New A")

data/spec/lib/card/cache_spec.rb

@@ -4,7 +4,7 @@ describe Card::Cache do
   describe "with nil store" do
     before do
       expect(Card::Cache).to receive(:generate_cache_id).exactly(2).times.and_return("cache_id")
-      @cache = Card::Cache.new :prefix=>"prefix"
+      @cache = Card::Cache.new prefix: "prefix"
     end
 
     describe "#basic operations" do
@@ -22,7 +22,7 @@ describe Card::Cache do
     before :each do
       @store = ActiveSupport::Cache::MemoryStore.new
       expect(Card::Cache).to receive(:generate_cache_id).and_return("cache_id")
-      @cache = Card::Cache.new :store=>@store, :prefix=>"prefix"
+      @cache = Card::Cache.new store: @store, prefix: "prefix"
     end
 
     it "#read" do
@@ -58,7 +58,7 @@ describe Card::Cache do
   it "#reset" do
     expect(Card::Cache).to receive(:generate_cache_id).and_return("cache_id1")
     @store = ActiveSupport::Cache::MemoryStore.new
-    @cache = Card::Cache.new :store=>@store, :prefix=>"prefix"
+    @cache = Card::Cache.new store: @store, prefix: "prefix"
     expect(@cache.prefix).to eq("prefix/cache_id1/")
     @cache.write("foo","bar")
     expect(@cache.read("foo")).to eq("bar")
@@ -70,7 +70,7 @@ describe Card::Cache do
     expect(@cache.store.read("prefix/cache_id")).to eq("cache_id2")
     expect(@cache.read("foo")).to be_nil
 
-    cache2 = Card::Cache.new :store=>@store, :prefix=>"prefix"
+    cache2 = Card::Cache.new store: @store, prefix: "prefix"
     expect(cache2.prefix).to eq("prefix/cache_id2/")
   end
 
@@ -92,13 +92,13 @@ describe Card::Cache do
       #FileUtils.rm_r(files_to_remove)
 
       expect(Card::Cache).to receive(:generate_cache_id).exactly(2).times.and_return("cache_id1")
-      @cache = Card::Cache.new :store=>@store, :prefix=>"prefix"
+      @cache = Card::Cache.new store: @store, prefix: "prefix"
     end
 
     describe "#basic operations with special symbols" do
       it "should work" do
         @cache.write('%\\/*:?"<>|', "foo")
-        cache2 = Card::Cache.new :store=>@store, :prefix=>"prefix"
+        cache2 = Card::Cache.new store: @store, prefix: "prefix"
         expect(cache2.read('%\\/*:?"<>|')).to eq("foo")
         @cache.reset
       end
@@ -108,7 +108,7 @@ describe Card::Cache do
       it "should work" do
         @cache.write('(汉语漢語 Hànyǔ; 华语華語 Huáyǔ; 中文 Zhōngwén', "foo")
         @cache.write('русский', "foo")
-        cache3 = Card::Cache.new :store=>@store, :prefix=>"prefix"
+        cache3 = Card::Cache.new store: @store, prefix: "prefix"
         expect(cache3.read('(汉语漢語 Hànyǔ; 华语華語 Huáyǔ; 中文 Zhōngwén')).to eq("foo")
         expect(cache3.read('русский')).to eq("foo")
         @cache.reset

data/spec/lib/card/content_spec.rb

@@ -2,51 +2,47 @@
 require 'card/content'
 
 EXAMPLES = {
-  :nests => {
-    :content  =>
-      [
+  nests: {
+    content:        [
         "Some Literals: \\[{I'm not| a link]}, and ",
         "\\{{This Card|Is not Included}}",
         ", but ",
         "{{this is}}",
         ", and some tail"
       ].join(''),
-    :rendered =>
-      [
+    rendered:       [
         "Some Literals: \\[{I'm not| a link]}, and ",
         "<span>{</span>{This Card|Is not Included}}",
         ", but ",
-        {:options => {:inc_name=>"this is",:inc_syntax=>"this is"}},
+        {options: {inc_name: "this is",inc_syntax: "this is"}},
         ", and some tail"
       ],
-    :classes => [String, :EscapedLiteral, String, :Include, String ]
+    classes: [String, :EscapedLiteral, String, :Include, String ]
   },
 
-  :links_and_nests => {
-    :content => %(Some Links and includes: [[the card|the text]], and {{This Card|Is Included}}{{this too}}
+  links_and_nests: {
+    content: %(Some Links and includes: [[the card|the text]], and {{This Card|Is Included}}{{this too}}
         and [[http://external.wagn.org/path|link text]]{{Included|open}}),
-    :rendered =>
-      [
+    rendered:       [
         "Some Links and includes: ",
         "<a class=\"wanted-card\" href=\"/the_card?card%5Bname%5D=the+card\">the text</a>",
         ", and ",
-        { :options => { :view => "Is Included", :inc_name=>"This Card", :inc_syntax => "This Card|Is Included"}},
-        { :options => { :inc_name=>"this too", :inc_syntax=>"this too"}},
+        { options: { view: "Is Included", inc_name: "This Card", inc_syntax: "This Card|Is Included"}},
+        { options: { inc_name: "this too", inc_syntax: "this too"}},
         "\n        and ",
         "<a target=\"_blank\" class=\"external-link\" href=\"http://external.wagn.org/path\">link text</a>",
-        { :options => { :view=>"open", :inc_name=>"Included", :inc_syntax=>"Included|open" }}
+        { options: { view: "open", inc_name: "Included", inc_syntax: "Included|open" }}
       ],
-    :classes => [String, :Link, String, :Include, :Include, String, :Link, :Include ]
+    classes: [String, :Link, String, :Include, :Include, String, :Link, :Include ]
   },
 
-  :uris_and_links => {
-    :content => %(Some URIs and Links: http://a.url.com/
+  uris_and_links: {
+    content: %(Some URIs and Links: http://a.url.com/
         More urls: wagn.com/a/path/to.html
         http://localhost:2020/path?cgi=foo&bar=baz  [[http://brain.org/Home|extra]]
         [ http://gerry.wagn.com/a/path ]
         { https://brain.org/more?args }),
-    :rendered =>
-      [
+    rendered:       [
         "Some URIs and Links: ", '<a target="_blank" class="external-link" href="http://a.url.com/">http://a.url.com/</a>',
         "\n        More urls: ",
         "<a target=\"_blank\" class=\"external-link\" href=\"http://wagn.com/a/path/to.html\">wagn.com/a/path/to.html</a>",
@@ -60,8 +56,7 @@ EXAMPLES = {
         "<a target=\"_blank\" class=\"external-link\" href=\"https://brain.org/more?args\">https://brain.org/more?args</a>",
         " }"
       ],
-    :text_rendered =>
-      [
+    text_rendered:       [
          "Some URIs and Links: ", 'http://a.url.com/',
          "\n        More urls: ",
          "wagn.com/a/path/to.html[http://wagn.com/a/path/to.html]",
@@ -75,17 +70,16 @@ EXAMPLES = {
          "https://brain.org/more?args",
          " }"
        ],
-    :classes => [String, :URI, String, :HostURI, String, :URI, String, :Link, String, :URI, String, :URI, String ]
+    classes: [String, :URI, String, :HostURI, String, :URI, String, :Link, String, :URI, String, :URI, String ]
   },
 
-  :uris_and_links_2 => {
-    :content => %(Some URIs and Links: http://a.url.com
+  uris_and_links_2: {
+    content: %(Some URIs and Links: http://a.url.com
         More urls: wagn.com/a/path/to.html
         [ http://gerry.wagn.com/a/path ]
         { https://brain.org/more?args }
         http://localhost:2020/path?cgi=foo&bar=baz  [[http://brain.org/Home|extra]]),
-    :rendered =>
-      [
+    rendered:       [
         "Some URIs and Links: ","<a target=\"_blank\" class=\"external-link\" href=\"http://a.url.com\">http://a.url.com</a>",
         "\n        More urls: ",
         "<a target=\"_blank\" class=\"external-link\" href=\"http://wagn.com/a/path/to.html\">wagn.com/a/path/to.html</a>",
@@ -98,21 +92,21 @@ EXAMPLES = {
         "  ",
         "<a target=\"_blank\" class=\"external-link\" href=\"http://brain.org/Home\">extra</a>"
       ],
-    :classes =>  [String, :URI, String, :HostURI, String, :URI, String, :URI, String, :URI, String, :Link ]
+    classes:  [String, :URI, String, :HostURI, String, :URI, String, :URI, String, :URI, String, :Link ]
   },
 
-  :no_chunks => {
-    :content => "No chunks",
-    :rendered => "No chunks"
+  no_chunks: {
+    content: "No chunks",
+    rendered: "No chunks"
   },
 
-  :single_nest => {
-    :content => "{{one inclusion|size;large}}",
-    :classes => [:Include]
+  single_nest: {
+    content: "{{one inclusion|size;large}}",
+    classes: [:Include]
   },
 
-  :css => {
-    :content => %~
+  css: {
+    content: %~
      /* body text */
      body {
        color: #444444;
@@ -171,7 +165,7 @@ describe Card::Content do
       @card = card
 
       # non-nil valued opts only ...
-      @render_block =  Proc.new do |opts| {:options => opts.inject({}) {|i,v| !v[1].nil? && i[v[0]]=v[1]; i } } end
+      @render_block =  Proc.new do |opts| {options: opts.inject({}) {|i,v| !v[1].nil? && i[v[0]]=v[1]; i } } end
     end
 
     let(:example)       { EXAMPLES[@example] }
@@ -254,7 +248,7 @@ describe Card::Content do
       it "renders links correctly for text formatters" do
         @example = :uris_and_links
         card2 = Card[@card.id]
-        format = card2.format :format => :text
+        format = card2.format format: :text
         cobj = Card::Content.new content, format
         cobj.process_content_object &@render_block
         expect(cobj.as_json.to_json).to eq(text_rendered.to_json)