card 1.17.4 → 1.18.0

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

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Following do
-end
+end

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

@@ -12,7 +12,7 @@ describe Card::Set::Self::FollowDefaults do
 
     it 'updates follow rules of users' do
       ca = Card.fetch 'A'
-      expect(ca.follower_names).to include "Joe User"
+      expect(ca.follower_names).to include 'Joe User'
     end
   end
 end

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

@@ -17,25 +17,25 @@ module CarrierWave
       super
 
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        event :store_#{column}_event, on: :save, after: :store do
+        event :store_#{column}_event, :finalize, on: :save 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, :finalize,
+              on: :delete, 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, :finalize,
+              on: :update 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, :store,
+              on: :update, 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, :store,
+              on: :update, when: proc { |c| !c.history?} do
           if @previous_model_for_#{column}
             @previous_model_for_#{column}.include_set_modules
           end

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

@@ -60,25 +60,22 @@ class FileUploader < CarrierWave::Uploader::Base
 
   # generate identifier that gets stored in the card's db_content field
   def db_content opts={}
-    if opts[:mod] && !model.load_from_mod
-      model.load_from_mod = opts[:mod]
-    end
+    return '' unless file.present?
+    model.load_from_mod = opts[:mod] if opts[:mod] && !model.load_from_mod
     '%s/%s' % [file_dir, url_filename(opts)]
   end
 
   def url_filename opts={}
-    if opts[:mod] && !model.load_from_mod
-      model.load_from_mod = opts[:mod]
-    end
+    model.load_from_mod = opts[:mod] if opts[:mod] && !model.load_from_mod
 
     basename = if (mod = mod_file?)
-      "#{mod}#{extension}"
-    else
-      "#{action_id}#{extension}"
+                 "#{mod}#{extension}"
+               else
+                 "#{action_id}#{extension}"
     end
   end
 
-  def url opts = {}
+  def url opts={}
     '%s/%s/%s' % [card_path(Card.config.files_web_path), file_dir,
                   full_filename(url_filename(opts))]
   end
@@ -115,9 +112,7 @@ class FileUploader < CarrierWave::Uploader::Base
   end
 
   def tmp_path
-    if !Dir.exists? model.tmp_upload_dir
-      Dir.mkdir model.tmp_upload_dir
-    end
+    Dir.mkdir model.tmp_upload_dir unless Dir.exist? model.tmp_upload_dir
     File.join model.tmp_upload_dir, filename
   end
 

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

@@ -3,28 +3,29 @@ require 'mini_magick'
 class ImageUploader < FileUploader
   include CarrierWave::MiniMagick
 
-  def path(version=nil)
+  def path version=nil
     (version && version != :original) ? versions[version].path : super()
   end
 
   version :icon, if: :create_versions?, from_version: :small do
-    process resize_and_pad: [16,16]
+    process resize_and_pad: [16, 16]
   end
   version :small, if: :create_versions?, from_version: :medium do
-    process resize_to_fit: [75,75]
+    process resize_to_fit: [75, 75]
   end
   version :medium, if: :create_versions? do
-    process resize_to_fit: [200,200]
+    process resize_to_fit: [200, 200]
   end
   version :large, if: :create_versions? do
-    process resize_to_fit: [500,500]
+    process resize_to_fit: [500, 500]
   end
 
   def identifier
     full_filename(super())
   end
+
   # add 'original' if no version is given
-  def full_filename(for_file)
+  def full_filename for_file
     name = super(for_file)
     if version_name
       name
@@ -33,6 +34,4 @@ class ImageUploader < FileUploader
       "#{parts.shift}-original.#{parts.join('.')}"
     end
   end
-
-
-end
+end

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

@@ -8,8 +8,8 @@ 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, :prepare_to_validate,
+      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)
@@ -27,9 +27,8 @@ event :upload_attachment, before: :validate_name, on: :save,
   abort :success
 end
 
-event :assign_attachment_on_create,
-      after: :prepare,
-      on: :create,
+event :assign_attachment_on_create, :initialize,
+      after: :assign_action, on: :create,
       when: proc { |c| c.save_preliminary_upload? } do
   if (action = Card::Action.fetch(@action_id_of_cached_upload))
     upload_cache_card.selected_action_id = action.id
@@ -38,15 +37,14 @@ event :assign_attachment_on_create,
   end
 end
 
-event :assign_attachment_on_update,
-      after: :prepare,
-      on: :update,
+event :assign_attachment_on_update, :initialize,
+      after: :assign_action, on: :update,
       when:  proc { |c| c.save_preliminary_upload? } do
   if (action = Card::Action.fetch(@action_id_of_cached_upload))
     uploaded_file =
-       with_selected_action_id(action.id) do
-         attachment.file
-       end
+      with_selected_action_id(action.id) do
+        attachment.file
+      end
     assign_attachment uploaded_file, action.comment
   end
 end
@@ -59,7 +57,7 @@ end
 
 # we need a card id for the path so we have to update db_content when we have
 # an id
-event :correct_identifier, after: :store, on: :create do
+event :correct_identifier, :finalize, on: :create do
   update_column(:db_content, attachment.db_content(mod: load_from_mod))
   expire
 end
@@ -71,16 +69,14 @@ def file_ready_to_save?
     attachment_changed?
 end
 
-event :save_original_filename, after: :validate_name,
-                               when: proc { |c| c.file_ready_to_save? } do
+event :save_original_filename, :prepare_to_store,
+      when: proc { |c| c.file_ready_to_save? } do
   return unless @current_action
   @current_action.update_attributes! comment: original_filename
 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, :integrate,
+      on: :create, when: proc { |c| c.save_preliminary_upload? } do
   if (action = Card::Action.fetch(@action_id_of_cached_upload))
     upload_cache_card.delete_files_for_action action
     action.delete
@@ -88,17 +84,15 @@ event :delete_cached_upload_file_on_create,
   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, :integrate,
+      on: :update, when: proc { |c| c.save_preliminary_upload? } do
   if (action = Card::Action.fetch(@action_id_of_cached_upload))
     delete_files_for_action action
     action.delete
   end
 end
 
-event :validate_file_exist, before: :validate, on: :create do
+event :validate_file_exist, :validate, on: :create do
   unless attachment.file.present? || empty_ok?
     errors.add attachment_name, 'is missing'
   end
@@ -142,17 +136,11 @@ def upload_cache_card
 end
 
 # action id of the cached upload
-def action_id_of_cached_upload= value
-  @action_id_of_cached_upload = value
-end
+attr_writer :action_id_of_cached_upload
 
-def action_id_of_cached_upload
-  @action_id_of_cached_upload
-end
+attr_reader :action_id_of_cached_upload
 
-def empty_ok= value
-  @empty_ok = value
-end
+attr_writer :empty_ok
 
 def empty_ok?
   @empty_ok
@@ -203,9 +191,7 @@ def mod_dir
   mod = @mod || mod_file?
   Card.paths['mod'].to_a.each do |mod_path|
     dir = File.join(mod_path, mod, 'file', codename)
-    if Dir.exist? dir
-      return dir
-    end
+    return dir if Dir.exist? dir
   end
 end
 
@@ -215,7 +201,7 @@ def mod_file?
   # when db_content was changed assume that it's no longer a mod file
   elsif !db_content_changed? && content.present?
     case content
-    when %r{^:[^/]+/([^.]+)} then $1     # current mod_file format
+    when %r{^:[^/]+/([^.]+)} then Regexp.last_match(1) # current mod_file format
     when /^\~/               then false  # current id file format
     else
       if (lines = content.split("\n")) && (lines.size == 4)
@@ -236,16 +222,13 @@ end
 
 def clear_upload_cache_dir_for_new_cards
   Dir.entries(tmp_upload_dir).each do |filename|
-    if filename =~/^\d+/
-      path = File.join(tmp_upload_dir, filename )
-      if Card.older_than_five_days? File.ctime(path)
-        FileUtils.rm path
-      end
+    if filename =~ /^\d+/
+      path = File.join(tmp_upload_dir, filename)
+      FileUtils.rm path if Card.older_than_five_days? File.ctime(path)
     end
   end
 end
 
-
 def delete_files_for_action action
   with_selected_action_id(action.id) do
     FileUtils.rm attachment.file.path
@@ -278,7 +261,7 @@ end
 
 def attachment_format ext
   if ext.present? && attachment && (original_ext = attachment.extension)
-    if['file', original_ext].member? ext
+    if ['file', original_ext].member? ext
       original_ext
     elsif (exts = MIME::Types[attachment.content_type])
       if exts.find { |mt| mt.extensions.member? ext }

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

@@ -51,7 +51,7 @@ def fetch_roles
   Auth.as_bot do
     role_trait = fetch trait: :roles
     next [Card::AnyoneSignedInID] unless role_trait
-    [Card::AnyoneSignedInID] + (role_trait.item_ids)
+    [Card::AnyoneSignedInID] + role_trait.item_ids
   end
 end
 
@@ -59,7 +59,7 @@ event :generate_token do
   Digest::SHA1.hexdigest "--#{Time.zone.now.to_f}--#{rand 10}--"
 end
 
-event :set_stamper, before: :approve do
+event :set_stamper, :prepare_to_validate do
   self.updater_id = Auth.current_id
   self.creator_id = updater_id if new_card?
 end

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

@@ -1,4 +1,5 @@
-event :add_comment, after: :approve, on: :save, when: proc { |c| c.comment } do
+event :add_comment, :prepare_to_store,
+      on: :save, when: proc { |c| c.comment } do
   cleaned_comment =
     comment.split(/\n/).map do |line|
       "<p>#{line.strip.empty? ? '&nbsp;' : line}</p>"
@@ -12,18 +13,18 @@ event :add_comment, after: :approve, on: :save, when: proc { |c| c.comment } do
       "#{comment_author} (Not signed in)"
     end
 
-  self.content = %{
+  self.content = %(
     #{content}
     #{'<hr>' unless content.blank?}
     #{cleaned_comment}
     <div class="w-comment-author">--#{signature}.....#{Time.zone.now}</div>
-  }
+  )
 end
 
 format do
   view :comment_box,
        denial: :blank, tags: :unknown_ok,
-       perms: lambda { |r| r.card.ok? :comment } do |_args|
+       perms: ->(r) { r.card.ok? :comment } do |_args|
     <<-HTML
       <div class="comment-box nodblclick">#{comment_form}</div>
     HTML
@@ -31,28 +32,25 @@ format do
 
   def comment_form
     card_form :update do
-      %{
-        #{hidden_field_tag('card[name]', card.name) if card.new_card?
-          # FIXME: wish we had more generalized solution for names.
+      %(
+        #{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}
         #{comment_buttons}
-      }
+      )
     end
   end
 
   def comment_buttons
     <<-HTML
       <div class="comment-buttons">
-        #{
-          unless Auth.signed_in?
+        #{unless Auth.signed_in?
             card.comment_author = session[:comment_author] ||
                                   params[:comment_author] || 'Anonymous' # ENGLISH
-            %{<label>My Name is:</label> #{text_field :comment_author}}
-          end
-        }
+            %(<label>My Name is:</label> #{text_field :comment_author})
+          end}
         #{submit_button text: 'Comment', type: :submit,
                         disable_with: 'Commenting'}
       </div>

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

@@ -19,15 +19,15 @@ format do
 
   view :not_found, perms: :none, error_code: 404 do |_args|
     error_name = card.name.present? ? card.name : 'the card requested'
-    %{ Could not find #{error_name}. }
+    %( Could not find #{error_name}. )
   end
 
   view :server_error, perms: :none, error_code: 500 do
-    %{
+    %(
       Wagn Hitch!  Server Error. Yuck, sorry about that.
       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
@@ -35,15 +35,15 @@ format do
   end
 
   view :bad_address, perms: :none, error_code: 404 do
-    %{ 404: Bad Address }
+    %( 404: Bad Address )
   end
 
   view :too_deep, perms: :none, closed: true do
-    %{ Man, you're too deep.  (Too many levels of inclusions at a time) }
+    %{ Man, you're too deep.  (Too many levels of nests at a time) }
   end
 
   view :too_slow, perms: :none, closed: true do
-    %{ Timed out! #{showname} took too long to load. }
+    %( Timed out! #{showname} took too long to load. )
   end
 end
 
@@ -86,12 +86,12 @@ format :html do
   end
 
   view :unsupported_view, perms: :none, tags: :unknown_ok do |args|
-    %{
+    %(
       <strong>
         view <em>#{args[:unsupported_view]}</em>
         not supported for <em>#{error_cardname}</em>
       </strong>
-    }
+    )
   end
 
   view :message, perms: :none, tags: :unknown_ok do |args|
@@ -115,7 +115,7 @@ format :html do
   end
 
   view :closed_missing, perms: :none do
-    %{<span class="faint"> #{showname} </span>}
+    %(<span class="faint"> #{showname} </span>)
   end
 
   view :conflict, error_code: 409 do |args|
@@ -125,13 +125,13 @@ format :html do
     end
     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>#{actor_link} has also been making changes.</div>
           <div>Please examine below, resolve above, and re-submit.</div>
           #{expanded_act}
-        }
+        )
       end
     end
   end
@@ -157,14 +157,14 @@ format :html do
 
   view :not_found do |args| # ug.  bad name.
     sign_in_or_up_links =
-      if !Auth.signed_in?
+      unless Auth.signed_in?
         signin_link = card_link :signin, text: 'Sign in'
         signup_link = link_to 'Sign up', card_path('new/:signup')
-        %{<div>#{signin_link} or #{signup_link} to create it.</div>}
+        %(<div>#{signin_link} or #{signup_link} to create it.</div>)
       end
     frame args.merge(title: 'Not Found', optional_menu: :never) do
       card_label = card.name.present? ? "<em>#{card.name}</em>" : 'that'
-      %{<h2>Could not find #{card_label}.</h2> #{sign_in_or_up_links}}
+      %(<h2>Could not find #{card_label}.</h2> #{sign_in_or_up_links})
     end
   end
 
@@ -172,11 +172,11 @@ format :html do
     task = args[:denied_task]
     to_task = task ? "to #{task} this." : 'to do that.'
     if !focal?
-      %{
+      %(
         <span class="denied">
           <!-- Sorry, you don't have permission #{to_task} -->
         </span>
-      }
+      )
     else
       frame args do # ENGLISH below
         message =
@@ -195,10 +195,10 @@ format :html do
             "Please #{signin_link} #{or_signup_link} #{to_task}"
           end
 
-        %{
+        %(
           <h1>Sorry!</h1>
           <div>#{message}</div>
-        }
+        )
       end
     end
   end