card 1.16.14 → 1.16.15

data/mod/05_email/set/all/notify.rb

@@ -18,7 +18,10 @@ class FollowerStash
           add_affected_card left_card
           break
         elsif item.to_name.key == Card[:includes].key
-          includee_set = Card.search(included_by: left_card.name).map(&:key)
+          includee_set = Card.search(
+            { included_by: left_card.name },
+            "follow cards included by #{left_card.name}"
+          ).map(&:key)
           if !@visited.intersection(includee_set).empty?
             add_affected_card left_card
             break

data/mod/05_email/set/right/followers.rb

@@ -4,18 +4,18 @@ include Card::Set::Type::Pointer
 
 def raw_content
   if left
-    items = if (left.type_id == SetID) || (left.type_id == CardtypeID)
-              left.default_follow_set_card.all_user_ids_with_rule_for(:follow).map do |user_id|
-                if left.followed_by?(user_id) && (user = Card.find(user_id))
-                  user.name
-                else
-                  nil
-                end
-              end.compact
-            else
-              left.follower_names
-            end
-    items.map {|item| "[[#{item}]]"}.join "\n"
+    items =
+      if (left.type_id == SetID) || (left.type_id == CardtypeID)
+        set_card = left.default_follow_set_card
+        set_card.all_user_ids_with_rule_for(:follow).map do |user_id|
+          if left.followed_by?(user_id) && (user = Card.find(user_id))
+            user.name
+          end
+        end.compact
+      else
+        left.follower_names
+      end
+    items.map { |item| "[[#{item}]]" }.join "\n"
   else
     ''
   end
@@ -23,8 +23,10 @@ end
 
 def virtual?; !real? end
 
-format() do
+format do
   include Card::Set::Type::Pointer::Format
 end
 
-format(:html)  { include Card::Set::Type::Pointer::HtmlFormat }
+format :html do
+  include Card::Set::Type::Pointer::HtmlFormat
+end

data/mod/05_email/set/self/follow_defaults.rb

@@ -1,25 +1,28 @@
-event :update_follow_rules, after: :store, on: :save, when: proc { |c| c.update_all_users } do
+event :update_follow_rules,
+      after: :store, on: :save, when: proc { |c| c.update_all_users } do
   defaults = item_names.map do |item|
-    if ((set_card = Card.fetch item.to_name.left) && set_card.type_code == :set)
-      option_card = Card.fetch(item.to_name.right) || Card[item.to_name.right.to_sym]
+    if (set_card = Card.fetch item.to_name.left) && set_card.type_code == :set
+      option_card = Card.fetch(item.to_name.right) ||
+                    Card[item.to_name.right.to_sym]
       option = if option_card.follow_option?
                  option_card.name
                else
                  '*always'
                end
       [set_card, option]
-    elsif ((set_card = Card.fetch sug) && set_card.type_code == :set)
+    elsif (set_card = Card.fetch sug) && set_card.type_code == :set
       [set_card, '*always']
     end
   end.compact
   Auth.as_bot do
     Card.search(type: 'user').each do |user|
       defaults.each do |set_card, option|
-        if (follow_rule = Card.fetch(set_card.follow_rule_name(user.name), new: {}))
-         follow_rule.drop_item "*never"
-         follow_rule.drop_item "*always"
-         follow_rule.add_item option
-         follow_rule.save!
+        follow_rule = Card.fetch(set_card.follow_rule_name(user.name), new: {})
+        if follow_rule
+          follow_rule.drop_item '*never'
+          follow_rule.drop_item '*always'
+          follow_rule.add_item option
+          follow_rule.save!
         end
       end
     end
@@ -31,20 +34,20 @@ format :html do
   view :edit, perms: :update, tags: :unknown_ok do |args|
     frame_and_form :update, args do
       [
-        _optional_render( :content_formgroup, args ),
-        _optional_render( :confirm_update_all, args ),
-        _optional_render( :button_formgroup,   args )
+        _optional_render(:content_formgroup, args),
+        _optional_render(:confirm_update_all, args),
+        _optional_render(:button_formgroup,   args)
       ]
     end
   end
 
-
   view :confirm_update_all do |args|
     wrap args do
       alert 'info' do
         %{
           <h1>Are you sure you want to change the default follow rules?</h1>
-          <p>You may choose to update all existing users. This may take a while. </p>
+          <p>You may choose to update all existing users.
+             This may take a while. </p>
         }
       end
     end
@@ -57,10 +60,10 @@ format :html do
       card:    { update_all_users: false }
     )
     args[:buttons] = %{
-      #{ button_tag 'Submit and update all users', disable_with: 'Updating', class: 'follow-updater', situation: 'primary' }
-      #{ button_tag 'Submit', class: 'follow'         }
-      #{ button_tag 'Cancel', class: 'slotter', type: 'button', href: path(view: :edit, id: card.id)}
+      #{submit_button text: 'Submit and update all users',
+                      disable_with: 'Updating', class: 'follow-updater'}
+      #{button_tag 'Submit', class: 'follow'}
+      #{cancel_button href: path(view: :edit, id: card.id)}
     }
-
   end
-end
+end

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

@@ -63,6 +63,7 @@ module CarrierWave
         end
 
         def #{column}=(new_file)
+          return if new_file.blank?
           send(:"#{column}_will_change!")
           db_column = _mounter(:#{column}).serialization_column
           send(:"\#{db_column}_will_change!")

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

@@ -8,12 +8,16 @@ 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)
+  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)
+
+  card_id = new_card? ? upload_cache_card.id : id
+  @current_action.update_attributes! draft: true, card_id: card_id
   success << {
     target: (new_card? ? upload_cache_card : self),
     type: type_name,
@@ -23,7 +27,10 @@ event :upload_attachment, before: :validate_name, on: :save, when: proc { |c| c.
   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(@action_id_of_cached_upload))
     upload_cache_card.selected_action_id = action.id
     upload_cache_card.select_file_revision
@@ -31,7 +38,9 @@ event :assign_attachment_on_create, after: :prepare, on: :create, when: proc { |
   end
 end
 
-event :assign_attachment_on_update, after: :prepare, on: :update,
+event :assign_attachment_on_update,
+      after: :prepare,
+      on: :update,
       when:  proc { |c| c.save_preliminary_upload? } do
   if (action = Card::Action.fetch(@action_id_of_cached_upload))
     uploaded_file =
@@ -42,26 +51,36 @@ event :assign_attachment_on_update, after: :prepare, on: :update,
   end
 end
 
-
 def assign_attachment file, original_filename
   send "#{attachment_name}=", file
   write_identifier
   @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
+# 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
-  update_column(:db_content,attachment.db_content(mod: load_from_mod))
+  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
 
-  if @current_action
-    @current_action.update_attributes! comment: original_filename
-  end
+def file_ready_to_save?
+  attachment.file.present? &&
+    !preliminary_upload? &&
+    !save_preliminary_upload? &&
+    attachment_changed?
+end
+
+event :save_original_filename, after: :validate_name,
+                               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,
+      after: :extend,
+      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
@@ -69,21 +88,28 @@ event :delete_cached_upload_file_on_create, after: :extend, on: :create, when: p
   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(@action_id_of_cached_upload))
     delete_files_for_action action
     action.delete
   end
 end
 
+event :validate_file_exist, before: :validate, on: :create do
+  unless attachment.file.present? || empty_ok?
+    errors.add attachment_name, 'is missing'
+  end
+end
 
 event :write_identifier, after: :save_original_filename do
   self.content = attachment.db_content(mod: load_from_mod)
 end
 
-
-def item_names(args={})  # needed for flexmail attachments.  hacky.
-  [self.cardname]
+def item_names _args={} # needed for flexmail attachments.  hacky.
+  [cardname]
 end
 
 def original_filename
@@ -91,7 +117,7 @@ def original_filename
 end
 
 def unfilled?
-  !attachment.present? && !save_preliminary_upload? && super
+  !attachment.present? && !save_preliminary_upload? && !subcards.present?
 end
 
 def preliminary_upload?
@@ -112,7 +138,7 @@ end
 
 # used for uploads for new cards until the new card is created
 def upload_cache_card
-  @upload_cache_card ||= Card["new_#{attachment_name}".to_sym ]
+  @upload_cache_card ||= Card["new_#{attachment_name}".to_sym]
 end
 
 # action id of the cached upload
@@ -124,12 +150,18 @@ def action_id_of_cached_upload
   @action_id_of_cached_upload
 end
 
+def empty_ok= value
+  @empty_ok = value
+end
+
+def empty_ok?
+  @empty_ok
+end
+
 def load_from_mod= value
   @mod = value
   write_identifier
-  if value
-    @store_in_mod = true
-  end
+  @store_in_mod = true if value
 end
 
 def load_from_mod
@@ -155,22 +187,22 @@ end
 # place for files of regular file cards
 def upload_dir
   if id
-    "#{ Card.paths['files'].existent.first }/#{id}"
+    "#{Card.paths['files'].existent.first}/#{id}"
   else
     tmp_upload_dir
   end
 end
 
 # place for files if card doesn't have an id yet
-def tmp_upload_dir action_id=nil
-  "#{ Card.paths['files'].existent.first }/#{upload_cache_card.id}"
+def tmp_upload_dir _action_id=nil
+  "#{Card.paths['files'].existent.first}/#{upload_cache_card.id}"
 end
 
 # place for files of mod file cards
 def mod_dir
   mod = @mod || mod_file?
   Card.paths['mod'].to_a.each do |mod_path|
-    dir = File.join(mod_path, mod, 'file', codename )
+    dir = File.join(mod_path, mod, 'file', codename)
     if Dir.exist? dir
       return dir
     end
@@ -183,19 +215,20 @@ 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 /^:[^\/]+\/([^.]+)/ ; $1     # current mod_file format
-    when /^\~/               ; false  # current id file format
+    when %r{^:[^/]+/([^.]+)} then $1     # current mod_file format
+    when /^\~/               then false  # current id file format
     else
-      if lines = content.split("\n") and lines.size == 4 # old format, still used in card_changes.
+      if (lines = content.split("\n")) && (lines.size == 4)
+        # old format, still used in card_changes.
         lines.last
       end
     end
   end
 end
 
-
 def assign_set_specific_attributes
-  if @set_specific && @set_specific.present?
+  # reset content if we really have something to upload
+  if @set_specific.present? && @set_specific[attachment_name.to_s].present?
     self.content = nil
   end
   super
@@ -205,16 +238,13 @@ 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 older_than_five_days? File.ctime(path)
+      if Card.older_than_five_days? File.ctime(path)
         FileUtils.rm path
       end
     end
   end
 end
 
-def older_than_five_days? time
-  Time.now - time > 432000
-end
 
 def delete_files_for_action action
   with_selected_action_id(action.id) do
@@ -225,34 +255,33 @@ def delete_files_for_action action
   end
 end
 
+# create filesystem links to files from prior action
+def symlink_to prior_action_id
+  return unless prior_action_id != last_action_id
+  save_action_id = selected_action_id
+  links = {}
 
-def symlink_to(prior_action_id) # create filesystem links to files from prior action
-  if prior_action_id != last_action_id
-    save_action_id = selected_action_id
-    links = {}
-
-    self.selected_action_id = prior_action_id
-    attachment.versions.each do |name, version|
-      links[name] = version.store_path
-    end
-    original = attachment.store_path
-
-    self.selected_action_id = last_action_id
-    attachment.versions.each do |name, version|
-      ::File.symlink links[name], version.store_path
-    end
-    ::File.symlink original, attachment.store_path
+  self.selected_action_id = prior_action_id
+  attachment.versions.each do |name, version|
+    links[name] = version.store_path
+  end
+  original = attachment.store_path
 
-    self.selected_action_id = save_action_id
+  self.selected_action_id = last_action_id
+  attachment.versions.each do |name, version|
+    ::File.symlink links[name], version.store_path
   end
+  ::File.symlink original, attachment.store_path
+
+  self.selected_action_id = save_action_id
 end
 
-def attachment_format(ext)
-  if ext.present? && attachment && original_ext=attachment.extension
+def attachment_format ext
+  if ext.present? && attachment && (original_ext = attachment.extension)
     if['file', original_ext].member? ext
       original_ext
-    elsif exts = MIME::Types[attachment.content_type]
-      if exts.find {|mt| mt.extensions.member? ext }
+    elsif (exts = MIME::Types[attachment.content_type])
+      if exts.find { |mt| mt.extensions.member? ext }
         ext
       else
         exts[0].extensions[0]
@@ -263,5 +292,3 @@ rescue => e
   Rails.logger.info "attachment_format issue: #{e.message}"
   nil
 end
-
-

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

@@ -9,37 +9,53 @@ event :add_comment, after: :approve, on: :save, when: proc { |c| c.comment } do
       "[[#{Auth.current.name}]]"
     else
       Env.session[:comment_author] = comment_author if Env.session
-      "#{ comment_author } (Not signed in)"
+      "#{comment_author} (Not signed in)"
     end
 
   self.content = %{
     #{content}
     #{'<hr>' unless content.blank?}
     #{cleaned_comment}
-    <div class="w-comment-author">--#{signature}.....#{Time.now}</div>
+    <div class="w-comment-author">--#{signature}.....#{Time.zone.now}</div>
   }
 end
 
-view( :comment_box, denial: :blank, tags: :unknown_ok, perms: lambda { |r| r.card.ok? :comment } ) do |args|
+format do
+  view :comment_box,
+       denial: :blank, tags: :unknown_ok,
+       perms: lambda { |r| r.card.ok? :comment } do |_args|
+    <<-HTML
+      <div class="comment-box nodblclick">#{comment_form}</div>
+    HTML
+  end
 
-
-  %{<div class="comment-box nodblclick"> #{
+  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.  without this, nonexistent cards will often take left's linkname.  (needs test)
+        #{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 }
-        <div class="comment-buttons">
-          #{
-            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
-          }
-          #{ button_tag 'Comment', type: :submit, disable_with: "Commenting" }
-        </div>
+        #{text_area :comment, rows: 3}
+        #{comment_buttons}
       }
-    end}
-  </div>}
+    end
+  end
+
+  def comment_buttons
+    <<-HTML
+      <div class="comment-buttons">
+        #{
+          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
+        }
+        #{submit_button text: 'Comment', type: :submit,
+                        disable_with: 'Commenting'}
+      </div>
+    HTML
+  end
 end