card 1.16.6 → 1.16.7

data/mod/01_core/set/all/rules.rb

@@ -24,19 +24,19 @@ ReadRuleSQL = %{
  end
 
 def is_standard_rule?
-  (r = right( :skip_modules=>true )) &&
+  (r = right( skip_modules: true )) &&
   r.type_id == Card::SettingID       &&
-  (l = left( :skip_modules=>true ))  &&
+  (l = left( skip_modules: true ))  &&
   l.type_id == Card::SetID
 end
 
 def is_user_rule?
   cardname.parts.length > 2                                  &&
-  (r = right( :skip_modules=>true ))                         &&
+  (r = right( skip_modules: true ))                         &&
    r.type_id == Card::SettingID                              &&
-  (set = self[0..-3, :skip_modules=>true])                   &&
+  (set = self[0..-3, skip_modules: true])                   &&
    set.type_id == Card::SetID                                &&
-  (user = self[-2, :skip_modules=>true] )                    &&
+  (user = self[-2, skip_modules: true] )                    &&
   (user.type_id == Card::UserID  || user.codename == 'all' )
 end
 
@@ -78,7 +78,7 @@ def related_sets with_self = false
   sets << ["#{name}+*self",  Card::SelfSet.label( name) ] if with_self
   sets << ["#{name}+*right", Card::RightSet.label(name) ] if known? && cardname.simple?
 
-#      Card.search(:type=>'Set',:left=>{:right=>name},:right=>'*type plus right',:return=>'name').each do |set_name|
+#      Card.search(type: 'Set',left: {right: name},right: '*type plus right',return: 'name').each do |set_name|
 #        sets<< set_name
 #      end
   sets
@@ -183,7 +183,7 @@ module ClassMethods
       end
     user_ids = user_ids_cache[key] || []
     if user_ids.include? AllID  # rule for all -> return all user ids
-      Card.where(:type_id=>UserID).pluck(:id)
+      Card.where(type_id: UserID).pluck(:id)
     else
       user_ids
     end
@@ -191,7 +191,7 @@ module ClassMethods
   end
 
   def user_rule_cards user_name, setting_code
-    Card.search :right=>{:codename=>setting_code}, :left=>{:left=>{:type_id=>SetID}, :right=>user_name}
+    Card.search right: {codename: setting_code}, left: {left: {type_id: SetID}, right: user_name}
   end
 
   def rule_cache

data/mod/01_core/set/all/templating.rb

@@ -15,7 +15,7 @@ def template
 
     # NEW CARDS
     if new_card?
-      default = rule_card :default, :skip_modules=>true
+      default = rule_card :default, skip_modules: true
 
       dup_card = dup
       dup_card.type_id = default ? default.type_id : Card.default_type_id
@@ -55,14 +55,14 @@ def virtual?
 end
 
 def structure_rule_card
-  card = rule_card :structure, :skip_modules=>true
+  card = rule_card :structure, skip_modules: true
   card && card.db_content.strip == '_self' ? nil : card
 end
 
 def structuree_names
   if wql = structuree_spec
     Auth.as_bot do
-      Card::Query.new(wql.merge :return=>:name).run
+      Card::Query.run(wql.merge return: :name)
     end
   else
     []
@@ -75,7 +75,7 @@ end
 # I'll leave the FIXME here until the need (and/or other solution) is well documented.  -efm
 
 def expire_structuree_references
-  update_structurees :references_expired => 1
+  update_structurees references_expired: 1
 end
 
 def update_structurees args
@@ -84,8 +84,9 @@ def update_structurees args
   # by a +*type plus right+*structure rule, the override would not be respected.
   if query = structuree_spec
     Auth.as_bot do
-      Card::Query.new( query.merge(:return => :id) ).run.each_slice(100) do |id_batch|
-        Card.where( :id => id_batch ).update_all args
+      query[:return] = :id
+      Card::Query.run(query).each_slice(100) do |id_batch|
+        Card.where( id: id_batch ).update_all args
       end
     end
   end
@@ -96,7 +97,7 @@ def assigns_type?
   # for example, X+*type+*structure governs all cards of type X,
   # but the content rule does not (in fact cannot) have the type X.
   if is_structure?
-    if set_pattern = Card.fetch( cardname.trunk_name.tag_name, :skip_modules=>true )
+    if set_pattern = Card.fetch( cardname.trunk_name.tag_name, skip_modules: true )
       pattern_code = set_pattern.codename and
       set_class    = Card::SetPattern.find( pattern_code ) and
       set_class.assigns_type
@@ -119,8 +120,8 @@ def structuree_spec
   end
 end
 
-event :update_structurees_type, :after=>:store, :changed=>:type_id do
+event :update_structurees_type, after: :store, changed: :type_id do
   if assigns_type? # certain *structure templates
-    update_structurees :type_id => type_id
+    update_structurees type_id: type_id
   end
 end

data/mod/01_core/set/all/tracked_attributes.rb

@@ -42,7 +42,7 @@ end
 
 protected
 
-event :set_content, :before=>:store, :on=>:save do
+event :set_content, before: :store, on: :save do
   self.db_content = content || '' #necessary?
   self.db_content = Card::Content.clean! self.db_content if clean_html?
   @selected_action_id = @selected_content = nil
@@ -53,7 +53,7 @@ end
 
 #fixme - the following don't really belong here, but they have to come after the reference stuff.  we need to organize a bit!
 
-event :update_ruled_cards, :after=>:store do
+event :update_ruled_cards, after: :store do
   if is_rule?
 #      warn "updating ruled cards for #{name}"
     self.class.clear_rule_cache
@@ -76,7 +76,7 @@ event :update_ruled_cards, :after=>:store do
            Auth.as_bot do
              cur_index = rule_class_ids.index Card[read_rule_class].id
              if rule_class_index = rule_class_ids.index( class_id )
-                set.item_cards(:limit=>0).each do |item_card|
+                set.item_cards(limit: 0).each do |item_card|
                   in_set[item_card.key] = true
                   next if cur_index < rule_class_index
                   if cur_index >= rule_class_index
@@ -96,7 +96,7 @@ event :update_ruled_cards, :after=>:store do
 
       #then find all cards with me as read_rule_id that were not just updated and regenerate their read_rules
       if !new_record?
-        Card.where( :read_rule_id=>self.id, :trash=>false ).reject do |w|
+        Card.where( read_rule_id: self.id, trash: false ).reject do |w|
           in_set[ w.key ]
         end.each &:update_read_rule
       end
@@ -105,14 +105,14 @@ event :update_ruled_cards, :after=>:store do
   end
 end
 
-event :process_read_rule_update_queue, :after=>:store do
+event :process_read_rule_update_queue, after: :store do
   Array.wrap(@read_rule_update_queue).each { |card| card.update_read_rule }
   @read_rule_update_queue = []
 end
 
-#  set_callback :store, :after, :process_read_rule_update_queue, :prepend=>true
+#  set_callback :store, :after, :process_read_rule_update_queue, prepend: true
 
-event :expire_related, :after=>:store do
+event :expire_related, after: :store do
   self.expire
 
   if self.is_structure?

data/mod/01_core/set/all/trash.rb

@@ -1,15 +1,15 @@
 def delete
-  update_attributes :trash => true unless new_card?
+  update_attributes trash: true unless new_card?
 end
 
 def delete!
-  update_attributes! :trash => true unless new_card?
+  update_attributes! trash: true unless new_card?
 end
 
 
-event :pull_from_trash, :before=>:store, :on=>:create do
+event :pull_from_trash, before: :store, on: :create do
   if trashed_card = Card.find_by_key_and_trash(key, true)
-    # a. (Rails way) tried Card.where(:key=>'wagn_bot').select(:id), but it wouldn't work.  This #select
+    # a. (Rails way) tried Card.where(key: 'wagn_bot').select(:id), but it wouldn't work.  This #select
     #    generally breaks on cards. I think our initialization process screws with something
     # b. (Wagn way) we could get card directly from fetch if we add :include_trashed (eg).
     #    likely low ROI, but would be nice to have interface to retrieve cards from trash...
@@ -21,7 +21,7 @@ event :pull_from_trash, :before=>:store, :on=>:create do
   true
 end
 
-event :validate_delete, :before=>:approve, :on=>:delete do
+event :validate_delete, before: :approve, on: :delete do
   if !codename.blank?
     errors.add :delete, "#{name} is is a system card. (#{codename})"
   end
@@ -36,7 +36,7 @@ event :validate_delete, :before=>:approve, :on=>:delete do
   end
 end
 
-event :validate_delete_children, :after=>:approve, :on=>:delete do
+event :validate_delete_children, after: :approve, on: :delete do
   children.each do |child|
     child.supercard = self
     subcards[child.name]=child

data/mod/01_core/set/all/type.rb

@@ -1,13 +1,13 @@
 
 module ClassMethods
   def default_type_id
-    @@default_type_id ||= Card[:all].fetch( :trait=>:default ).type_id
+    @@default_type_id ||= Card[:all].fetch( trait: :default ).type_id
   end
 end
 
 def type_card
   return if type_id.nil?
-  Card.fetch type_id.to_i, :skip_modules=>true
+  Card.fetch type_id.to_i, skip_modules: true
 end
 
 def type_code
@@ -54,13 +54,13 @@ def get_type_id args={}
 end
 
 
-event :validate_type_change, :before=>:approve, :on=>:update, :changed=>:type_id do
+event :validate_type_change, before: :approve, on: :update, changed: :type_id do
   if c = dup and c.action == :create and !c.valid?
     errors.add :type, "of #{ name } can't be changed; errors creating new #{ type_id }: #{ c.errors.full_messages * ', ' }"
   end
 end
 
-event :validate_type, :before=>:approve, :changed=>:type_id do
+event :validate_type, before: :approve, changed: :type_id do
   if !type_name
     errors.add :type, "No such type"
   end
@@ -70,15 +70,15 @@ event :validate_type, :before=>:approve, :changed=>:type_id do
   end
 end
 
-event :reset_type_specific_fields, :after=>:store do
+event :reset_type_specific_fields, after: :store do
   Auth.as_bot do
-    Card.search :left=>{ :left_id=>type_id }, :right=>{:codename=>'type_plus_right'} do |set_card|
+    Card.search left: { left_id: type_id }, right: {codename: 'type_plus_right'} do |set_card|
       set_card.reset_set_patterns
     end
   end
 end
 
-#    Card.search :left_plus=>[ type_name, :right_plus=>{:codename=>'type_plus_right'}] do |right_anchor|
+#    Card.search left_plus: [ type_name, right_plus: {codename: 'type_plus_right'}] do |right_anchor|
 #      Card["#{lef}"]
 #      set_card.reset_set_patterns
 #    end

data/mod/01_core/set/all/utils.rb

@@ -3,7 +3,7 @@ module ClassMethods
 
   def empty_trash
     Card.delete_trashed_files
-    Card.where(:trash=>true).delete_all
+    Card.where(trash: true).delete_all
     Card::Action.delete_cardless
     Card::Reference.repair_missing_referees
     Card::Reference.delete_missing_referers
@@ -18,7 +18,7 @@ module ClassMethods
     file_ids.each do |file_id|
       if trashed_card_ids.member?(file_id)
         raise Card::Error, "Narrowly averted deleting current file" if Card.exists?(file_id) #double check!
-        FileUtils.rm_rf "#{dir}/#{file_id}", :secure => true
+        FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
       end
     end
   end
@@ -64,7 +64,7 @@ module ClassMethods
 
   def merge name, attribs={}, opts={}
     puts "merging #{ name }"
-    card = fetch name, :new=>{}
+    card = fetch name, new: {}
 
     if opts[:pristine] && !card.pristine?
       false
@@ -134,7 +134,7 @@ format :html do
       accordions << accordion(title, content, "#{collapse_id}-#{index}")
       index += 1
     end
-    content_tag :div, accordions.html_safe, :class=>"panel-group", :id=>"accordion-#{collapse_id}", :role=>"tablist", 'aria-multiselectable'=>"true"
+    content_tag :div, accordions.html_safe, class: "panel-group", id: "accordion-#{collapse_id}", role: "tablist", 'aria-multiselectable'=>"true"
   end
 
   def accordion title, content, collapse_id=card.cardname.safe_key

data/mod/01_core/set/all/view_cache.rb

@@ -1,4 +1,4 @@
-event :clear_view_cache, :after=>:store do
+event :clear_view_cache, after: :store do
   Card::ViewCache.reset
 end
 

data/mod/01_core/set_pattern/02_all_plus.rb

@@ -1,11 +1,11 @@
-@@options = { :junction_only => true }
+@@options = { junction_only: true }
 
 def label name
   'All "+" cards'
 end
 
 def prototype_args anchor
-  { :name=>'+' }
+  { name: '+' }
 end
 
 def follow_label name

data/mod/01_core/set_pattern/03_type.rb

@@ -3,7 +3,7 @@ def label name
 end
 
 def prototype_args anchor
-  { :type=>anchor }
+  { type: anchor }
 end
 
 def pattern_applies? card

data/mod/01_core/set_pattern/04_star.rb

@@ -3,7 +3,7 @@ def label name
 end
 
 def prototype_args anchor
-  { :name=>'*dummy' }
+  { name: '*dummy' }
 end
 
 def pattern_applies? card

data/mod/01_core/set_pattern/05_rstar.rb

@@ -1,11 +1,11 @@
-@@options = { :junction_only => true }
+@@options = { junction_only: true }
 
 def label name
   'All "+*" cards'
 end
 
 def prototype_args anchor
-  { :name=>'*dummy+*dummy' }
+  { name: '*dummy+*dummy' }
 end
 
 def pattern_applies? card

data/mod/01_core/set_pattern/06_right.rb

@@ -1,6 +1,6 @@
-@@options = { 
-  :junction_only => true,
-  :assigns_type=>true
+@@options = {
+  junction_only: true,
+  assigns_type: true
 }
 
 def label name
@@ -8,7 +8,7 @@ def label name
 end
 
 def prototype_args anchor
-  { :name=>"*dummy+#{anchor}" }
+  { name: "*dummy+#{anchor}" }
 end
 
 def anchor_name card

data/mod/01_core/set_pattern/07_type_plus_right.rb

@@ -1,7 +1,7 @@
 @@options = {
-  :junction_only=>true,
-  :assigns_type=>true,
-  :anchor_parts_count=>2
+  junction_only: true,
+  assigns_type: true,
+  anchor_parts_count: 2
 }
 
 def label name
@@ -9,7 +9,7 @@ def label name
 end
 
 def prototype_args anchor
-  { :name=>"+#{anchor.tag}", :supercard=>Card.new( :name=>'*dummy', :type=>anchor.trunk_name ) }
+  { name: "+#{anchor.tag}", supercard: Card.new( name: '*dummy', type: anchor.trunk_name ) }
 end
 
 def anchor_name card

data/mod/01_core/set_pattern/08_self.rb

@@ -3,7 +3,7 @@ def label name
 end
 
 def prototype_args anchor
-  { :name=>anchor }
+  { name: anchor }
 end
 
 def anchor_name card

data/mod/01_core/spec/chunk/uri_spec.rb

@@ -10,128 +10,128 @@ describe Card::Chunk::URI, "URI chunk tests" do
   it "should test_simple_uri" do
     # Simplest case
     match_chunk(Card::Chunk::URI, 'http://www.example.com',
-      :scheme =>'http', :host =>'www.example.com', :path => '',
-      :link_text => 'http://www.example.com'
+      scheme: 'http', host: 'www.example.com', path: '',
+      link_text: 'http://www.example.com'
     )
   end
   it "should work with trailing slash" do
     match_chunk(Card::Chunk::URI, 'http://www.example.com/',
-      :scheme =>'http', :host =>'www.example.com', :path => '/',
-      :link_text => 'http://www.example.com/'
+      scheme: 'http', host: 'www.example.com', path: '/',
+      link_text: 'http://www.example.com/'
     )
   end
   it "should work with trailing slash inside html tags" do
     match_chunk(Card::Chunk::URI, '<p>http://www.example.com/</p>',
-      :scheme =>'http', :host =>'www.example.com', :path => '/',
-      :link_text => 'http://www.example.com/'
+      scheme: 'http', host: 'www.example.com', path: '/',
+      link_text: 'http://www.example.com/'
     )
   end
   it "should work with trailing period (no longer suppressed .. spec?)" do
     match_chunk(Card::Chunk::URI, 'http://www.example.com/. ',
-      :scheme =>'http', :host =>'www.example.com', :path => '/',
-      :link_text => 'http://www.example.com/'
+      scheme: 'http', host: 'www.example.com', path: '/',
+      link_text: 'http://www.example.com/'
     )
   end
   it "should work with trailing period inside html tags (dot change?)" do
     match_chunk(Card::Chunk::URI, '<p>http://www.example.com/.</p>',
-      :scheme =>'http', :host =>'www.example.com', :path => '/',
-      :link_text => 'http://www.example.com/'
+      scheme: 'http', host: 'www.example.com', path: '/',
+      link_text: 'http://www.example.com/'
     )
   end
   it "should work with trailing &nbsp;" do
     match_chunk(Card::Chunk::URI, 'http://www.example.com/&nbsp;',
-      :scheme =>'http', :host =>'www.example.com', :path => '/',
-      :link_text => 'http://www.example.com/'
+      scheme: 'http', host: 'www.example.com', path: '/',
+      link_text: 'http://www.example.com/'
     )
   end
   it "should work without http://" do
     match_chunk(Card::Chunk::URI, 'www.example.com',
-      :scheme =>'http', :host =>'www.example.com', :text => 'www.example.com', :link_text => 'http://www.example.com'
+      scheme: 'http', host: 'www.example.com', text: 'www.example.com', link_text: 'http://www.example.com'
     )
     match_chunk(Card::Chunk::URI, 'example.com',
-      :scheme =>'http',:host =>'example.com', :text => 'example.com', :link_text => 'http://example.com'
+      scheme: 'http',host: 'example.com', text: 'example.com', link_text: 'http://example.com'
     )
   end
   it "should match \"unusual\" base domain (was a bug in an early version)" do
     match_chunk(Card::Chunk::URI, 'http://example.com.au/',
-      :scheme =>'http', :host =>'example.com.au', :link_text => 'http://example.com.au/'
+      scheme: 'http', host: 'example.com.au', link_text: 'http://example.com.au/'
     )
   end
   it 'should work with "unusual" base domain without http://' do
     match_chunk(Card::Chunk::URI, 'example.com.au',
-      :scheme =>'http', :host =>'example.com.au', :text => 'example.com.au', :link_text => 'http://example.com.au'
+      scheme: 'http', host: 'example.com.au', text: 'example.com.au', link_text: 'http://example.com.au'
     )
   end
   it 'should work with another "unusual" base domain' do
     match_chunk(Card::Chunk::URI, 'http://www.example.co.uk/',
-      :scheme =>'http', :host =>'www.example.co.uk',
-      :link_text => 'http://www.example.co.uk/'
+      scheme: 'http', host: 'www.example.co.uk',
+      link_text: 'http://www.example.co.uk/'
     )
     match_chunk(Card::Chunk::URI, 'example.co.uk',
-      :scheme =>'http', :host =>'example.co.uk', :link_text => 'http://example.co.uk', :text => 'example.co.uk'
+      scheme: 'http', host: 'example.co.uk', link_text: 'http://example.co.uk', text: 'example.co.uk'
     )
   end
   it "should work with some path at the end" do
     match_chunk(Card::Chunk::URI, 'http://moinmoin.wikiwikiweb.de/HelpOnNavigation',
-      :scheme => 'http', :host => 'moinmoin.wikiwikiweb.de', :path => '/HelpOnNavigation',
-      :link_text => 'http://moinmoin.wikiwikiweb.de/HelpOnNavigation'
+      scheme: 'http', host: 'moinmoin.wikiwikiweb.de', path: '/HelpOnNavigation',
+      link_text: 'http://moinmoin.wikiwikiweb.de/HelpOnNavigation'
     )
   end
   it "should work with some path at the end, and withot http:// prefix (@link_text has prefix added)" do
     match_chunk(Card::Chunk::URI, 'moinmoin.wikiwikiweb.de/HelpOnNavigation',
-      :scheme => 'http', :host => 'moinmoin.wikiwikiweb.de', :path => '/HelpOnNavigation',
-      :text => 'moinmoin.wikiwikiweb.de/HelpOnNavigation',
-      :link_text => 'http://moinmoin.wikiwikiweb.de/HelpOnNavigation'
+      scheme: 'http', host: 'moinmoin.wikiwikiweb.de', path: '/HelpOnNavigation',
+      text: 'moinmoin.wikiwikiweb.de/HelpOnNavigation',
+      link_text: 'http://moinmoin.wikiwikiweb.de/HelpOnNavigation'
     )
   end
   it "should work with a port number" do
     match_chunk(Card::Chunk::URI, 'http://www.example.com:80',
-       :scheme =>'http', :host =>'www.example.com', :port => 80, :path => '',
-       :link_text => 'http://www.example.com:80')
+       scheme: 'http', host: 'www.example.com', port: 80, path: '',
+       link_text: 'http://www.example.com:80')
   end
   it "should work with a port number and a path" do
     match_chunk(Card::Chunk::URI, 'http://www.example.com.tw:80/HelpOnNavigation',
-        :scheme =>'http', :host =>'www.example.com.tw', :port => 80, :path => '/HelpOnNavigation',
-        :link_text => 'http://www.example.com.tw:80/HelpOnNavigation')
+        scheme: 'http', host: 'www.example.com.tw', port: 80, path: '/HelpOnNavigation',
+        link_text: 'http://www.example.com.tw:80/HelpOnNavigation')
   end
   it "should work with a query" do
     match_chunk(Card::Chunk::URI, 'http://www.example.com.tw:80/HelpOnNavigation?arg=val',
-        :scheme =>'http', :host =>'www.example.com.tw', :port => 80, :path => '/HelpOnNavigation',
-        :query => 'arg=val',
-        :link_text => 'http://www.example.com.tw:80/HelpOnNavigation?arg=val')
+        scheme: 'http', host: 'www.example.com.tw', port: 80, path: '/HelpOnNavigation',
+        query: 'arg=val',
+        link_text: 'http://www.example.com.tw:80/HelpOnNavigation?arg=val')
   end
   it "should work on Query with two arguments" do
     match_chunk(Card::Chunk::URI, 'http://www.example.com.tw:80/HelpOnNavigation?arg=val&arg2=val2',
-        :scheme =>'http', :host =>'www.example.com.tw', :port => 80, :path => '/HelpOnNavigation',
-        :query => 'arg=val&arg2=val2',
-        :link_text => 'http://www.example.com.tw:80/HelpOnNavigation?arg=val&arg2=val2')
+        scheme: 'http', host: 'www.example.com.tw', port: 80, path: '/HelpOnNavigation',
+        query: 'arg=val&arg2=val2',
+        link_text: 'http://www.example.com.tw:80/HelpOnNavigation?arg=val&arg2=val2')
   end
   it "should work with IRC" do
     match_chunk(Card::Chunk::URI, 'irc://irc.freenode.net#recentchangescamp',
-        :scheme =>'irc', :host =>'irc.freenode.net',
-        :fragment => 'recentchangescamp',
-        :link_text => 'irc://irc.freenode.net#recentchangescamp')
+        scheme: 'irc', host: 'irc.freenode.net',
+        fragment: 'recentchangescamp',
+        link_text: 'irc://irc.freenode.net#recentchangescamp')
   end
 
   it "should see HTTPS" do
     match_chunk(Card::Chunk::URI, 'https://www.example.com',
-        :scheme =>'https', :host =>'www.example.com', :port => 443, :path => '', :query => nil,
-        :link_text => 'https://www.example.com')
+        scheme: 'https', host: 'www.example.com', port: 443, path: '', query: nil,
+        link_text: 'https://www.example.com')
   end
   it "should see FTP" do
     match_chunk(Card::Chunk::URI, 'ftp://www.example.com',
-        :scheme =>'ftp', :host =>'www.example.com', :port => 21, :path => '', :query => nil,
-        :link_text => 'ftp://www.example.com')
+        scheme: 'ftp', host: 'www.example.com', port: 21, path: '', query: nil,
+        link_text: 'ftp://www.example.com')
   end
   it "should handle mailto:" do
     match_chunk(Card::Chunk::URI, 'mailto:jdoe123@example.com',
-        :scheme =>'mailto', :host =>nil, :port => nil, :path => nil, :query => nil,
-        :to => 'jdoe123@example.com', :link_text => 'mailto:jdoe123@example.com')
+        scheme: 'mailto', host: nil, port: nil, path: nil, query: nil,
+        to: 'jdoe123@example.com', link_text: 'mailto:jdoe123@example.com')
   end
     # something nonexistant (pending spec?  this is no longer recognized, the sheme has to be listed)
     #match_chunk(Card::Chunk::URI, 'foobar://www.example.com',
-    #    :scheme =>'foobar', :host =>'www.example.com', :port => '', :path => '', :query => nil,
-    #    :link_text => 'foobar://www.example.com')
+    #    scheme: 'foobar', host: 'www.example.com', port: '', path: '', query: nil,
+    #    link_text: 'foobar://www.example.com')
 
   it "should run more basic cases" do
 
@@ -141,30 +141,30 @@ describe Card::Chunk::URI, "URI chunk tests" do
 
     # Soap opera (the most complex case imaginable... well, not really, there should be more evil)
     match_chunk(Card::Chunk::URI, 'http://www.example.com.tw:80/~jdoe123/Help%20Me%20?arg=val&arg2=val2',
-        :scheme =>'http', :host =>'www.example.com.tw', :port => 80,
-        :path => '/~jdoe123/Help%20Me%20', :query => 'arg=val&arg2=val2',
-        :link_text => 'http://www.example.com.tw:80/~jdoe123/Help%20Me%20?arg=val&arg2=val2')
+        scheme: 'http', host: 'www.example.com.tw', port: 80,
+        path: '/~jdoe123/Help%20Me%20', query: 'arg=val&arg2=val2',
+        link_text: 'http://www.example.com.tw:80/~jdoe123/Help%20Me%20?arg=val&arg2=val2')
 
     # from 0.9 bug reports
     match_chunk(Card::Chunk::URI, 'http://www2.pos.to/~tosh/ruby/rdtool/en/doc/rd-draft.html',
-        :scheme =>'http', :host => 'www2.pos.to',
-        :path => '/~tosh/ruby/rdtool/en/doc/rd-draft.html')
+        scheme: 'http', host: 'www2.pos.to',
+        path: '/~tosh/ruby/rdtool/en/doc/rd-draft.html')
 
     match_chunk(Card::Chunk::URI, 'http://support.microsoft.com/default.aspx?scid=kb;en-us;234562',
-        :scheme =>'http', :host => 'support.microsoft.com', :path => '/default.aspx',
-        :query => 'scid=kb;en-us;234562')
+        scheme: 'http', host: 'support.microsoft.com', path: '/default.aspx',
+        query: 'scid=kb;en-us;234562')
 
   end
 
   it "should test_email_uri" do
     match_chunk(Card::Chunk::URI, 'mail@example.com',
-      :to => 'mail@example.com', :host => nil, :text => 'mail@example.com', :link_text => 'mailto:mail@example.com'
+      to: 'mail@example.com', host: nil, text: 'mail@example.com', link_text: 'mailto:mail@example.com'
     )
   end
 
   it "should test_non_email" do
     # The @ is part of the normal text, but 'example.com' is marked up.
-     match_chunk(Card::Chunk::URI, 'Not an email: @example.com', :uri => 'http://example.com')
+     match_chunk(Card::Chunk::URI, 'Not an email: @example.com', uri: 'http://example.com')
   end
 
   it "should test_textile_image" do
@@ -177,7 +177,7 @@ describe Card::Chunk::URI, "URI chunk tests" do
              'This "hobix (hobix)":http://hobix.com/sample.jpg is a Textile link.')
     # just to be sure ...
     match_chunk(Card::Chunk::URI, 'This http://hobix.com/sample.jpg should match',
-          :link_text => 'http://hobix.com/sample.jpg')
+          link_text: 'http://hobix.com/sample.jpg')
   end
 
   it "should test_inline_html" do
@@ -187,7 +187,7 @@ describe Card::Chunk::URI, "URI chunk tests" do
 
   it "should test_non_uri" do
     # "so" is a valid country code; "libproxy.so" is a valid url
-    match_chunk(Card::Chunk::URI, 'libproxy.so', :host => 'libproxy.so', :text => 'libproxy.so', :link_text => 'http://libproxy.so')
+    match_chunk(Card::Chunk::URI, 'libproxy.so', host: 'libproxy.so', text: 'libproxy.so', link_text: 'http://libproxy.so')
 
     no_match Card::Chunk::URI, 'httpd.conf'
     # THIS ONE'S BUSTED.. Ethan fix??
@@ -202,23 +202,23 @@ describe Card::Chunk::URI, "URI chunk tests" do
   end
 
   it "should test_uri_in_text" do
-    match_chunk(Card::Chunk::URI, 'Go to: http://www.example.com/', :host => 'www.example.com', :path =>'/')
-    match_chunk(Card::Chunk::URI, 'http://www.example.com/ is a link.', :host => 'www.example.com')
+    match_chunk(Card::Chunk::URI, 'Go to: http://www.example.com/', host: 'www.example.com', path: '/')
+    match_chunk(Card::Chunk::URI, 'http://www.example.com/ is a link.', host: 'www.example.com')
     match_chunk(Card::Chunk::URI,
         'Email david@loudthinking.com',
-        :scheme =>'mailto', :to =>'david@loudthinking.com', :host => nil)
+        scheme: 'mailto', to: 'david@loudthinking.com', host: nil)
     # check that trailing punctuation is not included in the hostname
-    match_chunk(Card::Chunk::URI, 'Hey dude, http://fake.link.com.', :scheme => 'http', :host => 'fake.link.com')
+    match_chunk(Card::Chunk::URI, 'Hey dude, http://fake.link.com.', scheme: 'http', host: 'fake.link.com')
     # this is a textile link, no match please.
     no_match(Card::Chunk::URI, '"link":http://fake.link.com.')
    end
 
   it "should test_uri_in_parentheses" do
-    match_chunk(Card::Chunk::URI, 'URI (http://brackets.com.de) in brackets', :host => 'brackets.com.de')
-    match_chunk(Card::Chunk::URI, 'because (as shown at research.net) the results', :host => 'research.net')
+    match_chunk(Card::Chunk::URI, 'URI (http://brackets.com.de) in brackets', host: 'brackets.com.de')
+    match_chunk(Card::Chunk::URI, 'because (as shown at research.net) the results', host: 'research.net')
     match_chunk(Card::Chunk::URI,
       'A wiki (http://wiki.org/wiki.cgi?WhatIsWiki) card',
-      :scheme => 'http', :host => 'wiki.org', :path => '/wiki.cgi', :query => 'WhatIsWiki'
+      scheme: 'http', host: 'wiki.org', path: '/wiki.cgi', query: 'WhatIsWiki'
     )
   end
 
@@ -226,7 +226,7 @@ describe Card::Chunk::URI, "URI chunk tests" do
     match_chunk(
       Card::Chunk::URI,
       '* http://www.btinternet.com/~mail2minh/SonyEricssonP80xPlatform.sis',
-      :path => '/~mail2minh/SonyEricssonP80xPlatform.sis'
+      path: '/~mail2minh/SonyEricssonP80xPlatform.sis'
     )
   end
 
@@ -238,31 +238,31 @@ describe Card::Chunk::URI, "URI chunk tests" do
     match_chunk(
         Card::Chunk::URI,
         "This text contains a URL http://someplace.org:8080/~person/stuff.cgi?arg=val, doesn't it?",
-        :scheme => 'http', :host => 'someplace.org', :port => 8080, :path => '/~person/stuff.cgi',
-        :query => 'arg=val')
+        scheme: 'http', host: 'someplace.org', port: 8080, path: '/~person/stuff.cgi',
+        query: 'arg=val')
   end
 
  describe Card::Chunk::URI, "URI chunk tests" do
   it "should test_local_urls" do
     # normal
     match_chunk(Card::Chunk::URI, 'http://perforce:8001/toto.html',
-          :scheme => 'http', :host => 'perforce',
-          :port => 8001, :link_text => 'http://perforce:8001/toto.html')
+          scheme: 'http', host: 'perforce',
+          port: 8001, link_text: 'http://perforce:8001/toto.html')
 
     # in parentheses
     match_chunk(Card::Chunk::URI, 'URI (http://localhost:2500) in brackets',
-          :host => 'localhost', :port => 2500)
+          host: 'localhost', port: 2500)
     match_chunk(Card::Chunk::URI, 'because (as shown at http://perforce:8001) the results',
-          :host => 'perforce', :port => 8001)
+          host: 'perforce', port: 8001)
     match_chunk(Card::Chunk::URI,
       'A wiki (http://localhost:2500/wiki.cgi?WhatIsWiki) card',
-          :scheme => 'http', :host => 'localhost', :path => '/wiki.cgi',
-          :port => 2500, :query => 'WhatIsWiki')
+          scheme: 'http', host: 'localhost', path: '/wiki.cgi',
+          port: 2500, query: 'WhatIsWiki')
   end
  end
 
   private
-  DUMMY_CARD = Card.new(:name=>'dummy')
+  DUMMY_CARD = Card.new(name: 'dummy')
 
   # Asserts a number of tests for the given type and text.
   def no_match(type, test_text)