card 1.16.6 → 1.16.7

data/mod/05_email/spec/set/right/followers_spec.rb

@@ -38,7 +38,7 @@ describe Card::Set::Right::Followers do
     it 'recognizes card name changes' do
       @card = Card['Look At Me']
       @card.update_referencers = true
-      @card.update_attributes! :name=>'Look away'
+      @card.update_attributes! name: 'Look away'
       is_expected.to eq ['Big Brother']
     end
 
@@ -66,14 +66,14 @@ describe Card::Set::Right::Followers do
 
     context 'when following a *type set' do
       it 'contains follower' do
-        @card = Card.create! :name=>'telescope', :type=>'Optic'
+        @card = Card.create! name: 'telescope', type: 'Optic'
         is_expected.to include('Big Brother')
       end
     end
 
     context 'when following a *right set' do
       it 'contains follower' do
-        @card = Card.create! :name=>'telescope+lens'
+        @card = Card.create! name: 'telescope+lens'
         is_expected.to include('Big Brother')
       end
     end
@@ -88,7 +88,7 @@ describe Card::Set::Right::Followers do
     context 'when following content I created' do
       it 'contains creator' do
         Card::Auth.current_id = Card['Big Brother'].id
-        @card = Card.create! :name=>"created by Follower"
+        @card = Card.create! name: "created by Follower"
         is_expected.to include('Big Brother')
       end
     end
@@ -99,9 +99,9 @@ describe Card::Set::Right::Followers do
           Card['Sara'].follow '*all', '*edited'
         end
 
-        @card = Card.create! :name=>"edited by Sara"
+        @card = Card.create! name: "edited by Sara"
         Card::Auth.current_id = Card['Sara'].id
-        @card.update_attributes! :content=> 'some content'
+        @card.update_attributes! content: 'some content'
         is_expected.to include('Sara')
       end
     end

data/mod/05_email/spec/set/self/follow_defaults_spec.rb

@@ -2,11 +2,11 @@
 
 describe Card::Set::Self::FollowDefaults do
   context 'when updated' do
-    before do 
+    before do
       Card::Auth.as_bot do
         @card = Card[:follow_defaults]
         @card.update_all_users = true
-        @card.update_attributes! :content=>'[[A+*self+*always]]'
+        @card.update_attributes! content: '[[A+*self+*always]]'
       end
     end
 

data/mod/05_standard/lib/carrier_wave/cardmount.rb

@@ -18,21 +18,21 @@ module CarrierWave
       super
 
       class_eval <<-RUBY, __FILE__, __LINE__+1
-        event :store_#{column}_event, :on=>:save, :after=>:store do
+        event :store_#{column}_event, on: :save, after: :store do
           store_#{column}!
         end
 
         # remove files only if card has no history
-        event :remove_#{column}_event, :on =>:delete, :after=>:stored, :when => proc { |c| !c.history? } do
+        event :remove_#{column}_event, on: :delete, after: :stored, when: proc { |c| !c.history? } do
           remove_#{column}!
         end
-        event :mark_remove_#{column}_false_event, :on => :update, :after=>:stored do
+        event :mark_remove_#{column}_false_event, on: :update, after: :stored do
           mark_remove_#{column}_false
         end
-        event :store_previous_model_for_#{column}_event, :on=>:update, :before =>:store, :when => proc { |c| !c.history? } do
+        event :store_previous_model_for_#{column}_event, on: :update, before: :store, when: proc { |c| !c.history? } do
           store_previous_model_for_#{column}
         end
-        event :remove_previously_stored_#{column}_event, :on=>:update, :after => :store, :when => proc { |c| !c.history?} do
+        event :remove_previously_stored_#{column}_event, on: :update, after: :store, when: proc { |c| !c.history?} do
           remove_previously_stored_#{column}
         end
 

data/mod/05_standard/lib/image_uploader.rb

@@ -7,17 +7,17 @@ class ImageUploader < FileUploader
     (version && version != :original) ? versions[version].path : super()
   end
 
-  version :icon, :if=>:create_versions?, :from_version=>:small do
-    process :resize_and_pad => [16,16]
+  version :icon, if: :create_versions?, from_version: :small do
+    process resize_and_pad: [16,16]
   end
-  version :small, :if=>:create_versions?, :from_version=>:medium do
-    process :resize_to_fit => [75,75]
+  version :small, if: :create_versions?, from_version: :medium do
+    process resize_to_fit: [75,75]
   end
-  version :medium, :if=>:create_versions? do
-    process :resize_to_fit => [200,200]
+  version :medium, if: :create_versions? do
+    process resize_to_fit: [200,200]
   end
-  version :large, :if=>:create_versions? do
-    process :resize_to_fit => [500,500]
+  version :large, if: :create_versions? do
+    process resize_to_fit: [500,500]
   end
 
   def identifier

data/mod/05_standard/set/abstract/attachment.rb

@@ -4,26 +4,26 @@ def self.included host_class
   host_class.extend CarrierWave::CardMount
 end
 
-event :select_file_revision, :after=>:select_action do
+event :select_file_revision, after: :select_action do
   attachment.retrieve_from_store!(attachment.identifier)
 end
 
-event :upload_attachment, :before=>:validate_name, :on=>:save, :when=>proc { |c| c.preliminary_upload? } do
+event :upload_attachment, before: :validate_name, on: :save, when: proc { |c| c.preliminary_upload? } do
   save_original_filename  # save original filename as comment in action
   write_identifier        # set db_content (needs original filename to determine extension)
   store_attachment!
   finalize_action         # create Card::Change entry for db_content
-  @current_action.update_attributes! :draft => true, :card_id => (new_card? ? upload_cache_card.id : id)
+  @current_action.update_attributes! draft: true, card_id: (new_card? ? upload_cache_card.id : id)
   success << {
-    :target => (new_card? ? upload_cache_card : self),
-    :type=> type_name,
-    :view => 'preview_editor',
-    :rev_id => current_action.id
+    target: (new_card? ? upload_cache_card : self),
+    type: type_name,
+    view: 'preview_editor',
+    rev_id: current_action.id
   }
   abort :success
 end
 
-event :assign_attachment_on_create, :after=>:prepare, :on=>:create, :when => proc { |c| c.save_preliminary_upload? } do
+event :assign_attachment_on_create, after: :prepare, on: :create, when: proc { |c| c.save_preliminary_upload? } do
   if (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
     upload_cache_card.selected_action_id = action.id
     upload_cache_card.select_file_revision
@@ -31,7 +31,7 @@ event :assign_attachment_on_create, :after=>:prepare, :on=>:create, :when => pro
   end
 end
 
-event :assign_attachment_on_update, :after=>:prepare, :on=>:update, :when => proc { |c| c.save_preliminary_upload? } do
+event :assign_attachment_on_update, after: :prepare, on: :update, when: proc { |c| c.save_preliminary_upload? } do
   if (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
     uploaded_file =
        with_selected_action_id(action.id) do
@@ -45,22 +45,22 @@ end
 def assign_attachment file, original_filename
   send "#{attachment_name}=", file
   write_identifier
-  @current_action.update_attributes! :comment=>original_filename
+  @current_action.update_attributes! comment: original_filename
 end
 
 # we need a card id for the path so we have to update db_content when we got an id
-event :correct_identifier, :after=>:store, :on=>:create do
-  update_column(:db_content,attachment.db_content(:mod=>load_from_mod))
+event :correct_identifier, after: :store, on: :create do
+  update_column(:db_content,attachment.db_content(mod: load_from_mod))
   expire
 end
 
-event :save_original_filename, :after=>:validate_name, :when => proc {|c| !c.preliminary_upload? && !c.save_preliminary_upload? && c.attachment_changed?} do
+event :save_original_filename, after: :validate_name, when: proc {|c| !c.preliminary_upload? && !c.save_preliminary_upload? && c.attachment_changed?} do
   if @current_action
-    @current_action.update_attributes! :comment=>original_filename
+    @current_action.update_attributes! comment: original_filename
   end
 end
 
-event :delete_cached_upload_file_on_create, :after=>:extend, :on=>:create, :when => proc { |c| c.save_preliminary_upload? } do
+event :delete_cached_upload_file_on_create, after: :extend, on: :create, when: proc { |c| c.save_preliminary_upload? } do
   if (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
     upload_cache_card.delete_files_for_action action
     action.delete
@@ -68,7 +68,7 @@ event :delete_cached_upload_file_on_create, :after=>:extend, :on=>:create, :when
   clear_upload_cache_dir_for_new_cards
 end
 
-event :delete_cached_upload_file_on_update, :after=>:extend, :on=>:update, :when => proc { |c| c.save_preliminary_upload? } do
+event :delete_cached_upload_file_on_update, after: :extend, on: :update, when: proc { |c| c.save_preliminary_upload? } do
   if (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
     delete_files_for_action action
     action.delete
@@ -76,8 +76,8 @@ event :delete_cached_upload_file_on_update, :after=>:extend, :on=>:update, :when
 end
 
 
-event :write_identifier, :after=>:save_original_filename do
-  self.content = attachment.db_content(:mod=>load_from_mod)
+event :write_identifier, after: :save_original_filename do
+  self.content = attachment.db_content(mod: load_from_mod)
 end
 
 

data/mod/05_standard/set/all/account.rb

@@ -5,7 +5,7 @@ module ClassMethods
 end
 
 def account
-  fetch :trait=>:account
+  fetch trait: :account
 end
 
 def accountable?
@@ -44,12 +44,12 @@ def read_rules
 end
 
 def all_roles
-  @all_roles ||= 
+  @all_roles ||=
     if id == Card::AnonymousID
       []
     else
       Auth.as_bot do
-        role_trait = fetch :trait=>:roles
+        role_trait = fetch trait: :roles
         [ Card::AnyoneSignedInID ] + ( role_trait ? role_trait.item_ids : [] )
       end
     end
@@ -57,10 +57,10 @@ end
 
 
 event :generate_token do
-  Digest::SHA1.hexdigest "--#{Time.now.to_f}--#{rand 10}--" 
+  Digest::SHA1.hexdigest "--#{Time.now.to_f}--#{rand 10}--"
 end
 
-event :set_stamper, :before=>:approve do
+event :set_stamper, before: :approve do
   self.updater_id = Auth.current_id
   self.creator_id = self.updater_id if new_card?
 end

data/mod/05_standard/set/all/comment.rb

@@ -1,4 +1,4 @@
-event :add_comment, :after=>:approve, :on=>:save, :when=> proc {|c| c.comment } do
+event :add_comment, after: :approve, on: :save, when: proc {|c| c.comment } do
   self.content = %{
     #{ content }
     #{ '<hr>' unless content.blank? }
@@ -14,16 +14,16 @@ event :add_comment, :after=>:approve, :on=>:save, :when=> proc {|c| c.comment }
   }
 end
 
-view( :comment_box, :denial=>:blank, :tags=>:unknown_ok, :perms=>lambda { |r| r.card.ok? :comment } ) do |args|
-  
-  
+view( :comment_box, denial: :blank, tags: :unknown_ok, perms: lambda { |r| r.card.ok? :comment } ) do |args|
+
+
   %{<div class="comment-box nodblclick"> #{
     card_form :update do
       %{
-        #{ hidden_field_tag( 'card[name]', card.name ) if card.new_card? 
+        #{ hidden_field_tag( 'card[name]', card.name ) if card.new_card?
         # FIXME wish we had more generalized solution for names.  without this, nonexistent cards will often take left's linkname.  (needs test)
         }
-        #{ text_area :comment, :rows=>3 }
+        #{ text_area :comment, rows: 3 }
         <div class="comment-buttons">
           #{
             unless Auth.signed_in?
@@ -31,7 +31,7 @@ view( :comment_box, :denial=>:blank, :tags=>:unknown_ok, :perms=>lambda { |r| r.
               %{<label>My Name is:</label> #{ text_field :comment_author }}
             end
           }
-          #{ button_tag 'Comment', :type=>:submit, :disable_with=>"Commenting" }
+          #{ button_tag 'Comment', type: :submit, disable_with: "Commenting" }
         </div>
       }
     end}

data/mod/05_standard/set/all/error.rb

@@ -1,36 +1,36 @@
 
 
 format do
-  view :closed_missing, :perms=>:none, :closed=>true do |args|
+  view :closed_missing, perms: :none, closed: true do |args|
     ''
   end
 
-  view :missing, :perms=>:none do |args|
+  view :missing, perms: :none do |args|
     ''
   end
 
-  view :not_found, :perms=>:none, :error_code=>404 do |args|
+  view :not_found, perms: :none, error_code: 404 do |args|
     %{ Could not find #{card.name.present? ? %{"#{card.name}"} : 'the card requested'}. }
   end
 
-  view :server_error, :perms=>:none, :error_code=>500 do |args|
+  view :server_error, perms: :none, error_code: 500 do |args|
     %{ Wagn Hitch!  Server Error. Yuck, sorry about that.\n}+
     %{ To tell us more and follow the fix, add a support ticket at http://wagn.org/new/Support_Ticket }
   end
 
-  view :denial, :perms=>:none, :error_code=>403 do |args|
+  view :denial, perms: :none, error_code: 403 do |args|
     focal? ? 'Permission Denied' : ''
   end
 
-  view :bad_address, :perms=>:none, :error_code=>404 do |args|
+  view :bad_address, perms: :none, error_code: 404 do |args|
     %{ 404: Bad Address }
   end
 
-  view :too_deep, :perms=>:none, :closed=>true do |args|
+  view :too_deep, perms: :none, closed: true do |args|
     %{ Man, you're too deep.  (Too many levels of inclusions at a time) }
   end
 
-  view :too_slow, :perms=>:none, :closed=>true do |args|
+  view :too_slow, perms: :none, closed: true do |args|
     %{ Timed out! #{ showname } took too long to load. }
   end
 end
@@ -47,14 +47,14 @@ format :html do
 
   def commentable? view, args
     self.class.tagged view, :comment                                   and
-    show_view? :comment_box, args.merge( :default_visibility=>:hide )  and #developer or wagneer has overridden default
+    show_view? :comment_box, args.merge( default_visibility: :hide )  and #developer or wagneer has overridden default
     ok? :comment
   end
 
   def rendering_error exception, view
     details = if Auth.always_ok?
-                card_link(error_cardname, :class=>'render-error-link') +
-                    alert('warning', :dismissible=>true, :alert_class=>"render-error-message errors-view admin-error-message") do
+                card_link(error_cardname, class: 'render-error-link') +
+                    alert('warning', dismissible: true, alert_class: "render-error-message errors-view admin-error-message") do
                       %{
                         <h3>Error message (visible to admin only)</h3>
                         <p><strong>#{ exception.message }</strong></p>
@@ -65,7 +65,7 @@ format :html do
                 error_cardname
               end
 
-    content_tag :span, :class=>'render-error alert alert-danger' do
+    content_tag :span, class: 'render-error alert alert-danger' do
       [
         'error rendering',
         details,
@@ -78,7 +78,7 @@ format :html do
     "<strong>view <em>#{view}</em> not supported for <em>#{error_cardname}</em></strong>"
   end
 
-  view :message, :perms=>:none, :tags=>:unknown_ok do |args|
+  view :message, perms: :none, tags: :unknown_ok do |args|
     frame args do
       params[:message]
     end
@@ -88,28 +88,28 @@ format :html do
   view :missing do |args|
     return '' unless card.ok? :create  # should this be moved into ok_view?
 
-    opts = { :remote=>true, :class=>"slotter missing-#{ args[:denied_view] || args[:home_view]}" }
-    opts[:path_opts] = { :type=> args[:type] } if args[:type]
+    opts = { remote: true, class: "slotter missing-#{ args[:denied_view] || args[:home_view]}" }
+    opts[:path_opts] = { type: args[:type] } if args[:type]
 
     wrap args do
       view_link "Add #{ fancy_title args[:title] }", :new, opts
     end
   end
 
-  view :closed_missing, :perms=>:none do |args|
+  view :closed_missing, perms: :none do |args|
     %{<span class="faint"> #{ showname } </span>}
   end
 
 
 
-  view :conflict, :error_code=>409 do |args|
-    wrap args.merge( :slot_class=>'error-view' ) do  #ENGLISH below
+  view :conflict, error_code: 409 do |args|
+    wrap args.merge( slot_class: 'error-view' ) do  #ENGLISH below
       alert 'warning' do
         %{<strong>Conflict!</strong><span class="new-current-revision-id">#{card.last_action_id}</span>
           <div>#{ card_link card.last_action.act.actor.cardname } has also been making changes.</div>
           <div>Please examine below, resolve above, and re-submit.</div>
           #{ wrap do |args|
-              _render_act_expanded :act=>card.last_action.act, :current_rev_nr => 0
+              _render_act_expanded act: card.last_action.act, current_rev_nr: 0
             end
            }
         }
@@ -117,14 +117,14 @@ format :html do
     end
   end
 
-  view :errors, :perms=>:none do |args|
+  view :errors, perms: :none do |args|
 
     if card.errors.any?
       title = %{ Problems #{%{ with #{card.name} } unless card.name.blank?} }
-      frame args.merge(:panel_class=>"panel panel-warning", :title=>title, :hide=>'menu' ) do
+      frame args.merge(panel_class: "panel panel-warning", title: title, hide: 'menu' ) do
         card.errors.map do |attrib, msg|
           msg = "<strong>#{attrib.to_s.upcase}:</strong> #{msg}" unless attrib == :abort
-          alert 'warning', :dismissible=>true, :alert_class=>'card-error-msg' do
+          alert 'warning', dismissible: true, alert_class: 'card-error-msg' do
             msg
           end
         end
@@ -135,11 +135,11 @@ format :html do
   view :not_found do |args| #ug.  bad name.
     sign_in_or_up_links = if !Auth.signed_in?
       %{<div>
-        #{ card_link :signin, :text=>'Sign in' } or
+        #{ card_link :signin, text: 'Sign in' } or
         #{ link_to 'Sign up', card_path('new/:signup') } to create it.
        </div>}
     end
-    frame args.merge(:title=>'Not Found', :optional_menu=>:never) do
+    frame args.merge(title: 'Not Found', optional_menu: :never) do
       %{
         <h2>Could not find #{card.name.present? ? "<em>#{card.name}</em>" : 'that'}.</h2>
         #{sign_in_or_up_links}
@@ -163,7 +163,7 @@ format :html do
         when Auth.signed_in?
           "You need permission #{to_task}"
         else
-          or_signup = if Card.new(:type_id=>Card::SignupID).ok? :create
+          or_signup = if Card.new(type_id: Card::SignupID).ok? :create
             "or #{ link_to 'sign up', card_url('new/:signup') }"
           end
           Env.save_interrupted_action(request.env['REQUEST_URI'])

data/mod/05_standard/set/all/event_viz.rb

@@ -48,7 +48,7 @@ def puts_events events, prefix='', depth=0
 end
 
 def events_tree filt
-  hash = {:name => filt }
+  hash = {name: filt }
   if respond_to? "_#{filt}_callbacks"
     send( "_#{filt}_callbacks" ).each do |callback|
       next unless callback.applies? self

data/mod/05_standard/set/all/links.rb

@@ -18,14 +18,14 @@ format do
   #
   def smart_link link_text, target, html_args={}
     if (view = target.delete(:view))
-      view_link link_text, view, html_args.merge(:path_opts=>target)
+      view_link link_text, view, html_args.merge(path_opts: target)
     elsif (page = target.delete(:card))
-      card_link page, html_args.merge(:path_opts=>target, :text=>link_text)
+      card_link page, html_args.merge(path_opts: target, text: link_text)
     elsif target[:related]
       if target[:related].kind_of? String
-        target[:related] = {:name=>"+#{target[:related]}"}
+        target[:related] = {name: "+#{target[:related]}"}
       end
-      view_link link_text, :related, html_args.merge(:path_opts=>target)
+      view_link link_text, :related, html_args.merge(path_opts: target)
     elsif target[:web]
     else
       link_to link_text, target, html_args
@@ -53,7 +53,7 @@ format do
   # link to a specific card
   def card_link name_or_card, opts={}
     name = case name_or_card
-           when Symbol then Card.fetch( name_or_card, :skip_modules=>true ).cardname
+           when Symbol then Card.fetch( name_or_card, skip_modules: true ).cardname
            when Card   then name_or_card.cardname
            else             name_or_card
            end
@@ -79,12 +79,12 @@ format do
 
   def related_link name_or_card, opts={}
     name = case name_or_card
-           when Symbol then Card.fetch( name_or_card, :skip_modules=>true ).cardname
+           when Symbol then Card.fetch( name_or_card, skip_modules: true ).cardname
            when Card   then name_or_card.cardname
            else             name_or_card
            end
-   opts[:path_opts] ||= {:view=>:related}
-   opts[:path_opts][:related] = {:name=>"+#{name}"}
+   opts[:path_opts] ||= {view: :related}
+   opts[:path_opts][:related] = {name: "+#{name}"}
    opts[:path_opts][:related].merge! opts[:related_opts] if opts[:related_opts]
    view_link( opts[:text] || name, :related, opts)
   end
@@ -142,7 +142,7 @@ format :html do
       end
     end
 
-    content_tag :a, raw(text), opts.merge(:href=>href)
+    content_tag :a, raw(text), opts.merge(href: href)
   end
 
 end