card 1.101.1 → 1.101.6

data/tmpsets/set/{mod013-card-mod-history → mod012-card-mod-history}/all/history_bridge.rb

@@ -9,30 +9,17 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   view :creator_credit,
        wrap: { div: { class: "text-muted creator-credit" } }, cache: :never do
     return "" unless card.real?
+
     "Created by #{nest card.creator, view: :link} "\
     "#{time_ago_in_words(card.created_at)} ago"
   end
 
   view :updated_by, wrap: { div: { class: "text-muted" } } do
-    return "" unless card.id
-    updaters = Card.search(updater_of: { id: card.id })
-    return "" unless updaters.present?
-
-    updaters = updater_links updaters, others_target: Card.fetch(card, :editors)
-    "Updated by #{updaters}"
-  end
-
-  def updater_links updaters, item_view: :link, max_count: 3, others_target: card
+    updaters = Card.search(updater_of: { id: card.id }) if card.id
     return "" unless updaters.present?
 
-    total = updaters.size
-    fetch_count = total > max_count ? max_count - 1 : max_count
-
-    reduced = first_card(fetch_count).map { |c| nest c, view: item_view }
-    if total > max_count
-      reduced << link_to_card(others_target, "#{total - fetch_count} others")
-    end
-    reduced.to_sentence
+    links = updater_links updaters, others_target: card.fetch(:editors)
+    "Updated by #{links}"
   end
 
   def acts_bridge_layout acts, context=:bridge
@@ -69,6 +56,33 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
       act_listing(act, opts[:act_seq], :bridge)
     end
   end
+
+  private
+
+  def updater_links updaters, item_view: :link, max_count: 3, others_target: card
+    total = updaters.size
+    num_to_show = number_of_updaters_to_show total, max_count
+
+    links =
+      links_to_updaters(updaters, num_to_show, item_view) +
+      link_to_other_updaters(total, others_target, num_to_show)
+
+    links.to_sentence
+  end
+
+  def number_of_updaters_to_show total, max_count
+    total > max_count ? max_count - 1 : max_count
+  end
+
+  def links_to_updaters updaters, num_to_show, item_view
+    updaters[0..(num_to_show - 1)].map { |c| nest c, view: item_view }
+  end
+
+  def link_to_other_updaters total, target, num_to_show
+    return [] unless total > num_to_show
+
+    link_to_card target, "#{total - num_to_show} others"
+  end
 end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-history/set/all/history_bridge.rb ~~

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/abstract/attachment.rb

@@ -24,11 +24,13 @@ end
 
 event :save_original_filename, :prepare_to_store, on: :save, when: :file_ready_to_save? do
   return unless @current_action
+
   @current_action.update! comment: original_filename
 end
 
 event :validate_file_exist, :validate, on: :create do
   return if empty_ok?
+
   if will_be_stored_as == :web
     errors.add "url is missing" if content.blank?
   elsif !attachment.file.present?
@@ -47,12 +49,14 @@ def file_ready_to_save?
     attachment_is_changing?
 end
 
-def item_names _args={} # needed for flexmail attachments.  hacky.
+# needed for flexmail attachments.  hacky.
+def item_names _args={}
   [name]
 end
 
 def original_filename
   return content.split("/").last if web?
+
   attachment.original_filename
 end
 
@@ -82,7 +86,7 @@ end
 
 def assign_set_specific_attributes
   # reset content if we really have something to upload
-  self.content = nil if set_specific[attachment_name.to_s].present?
+  self.content = nil if set_specific[attachment_name].present?
   super
 end
 
@@ -97,25 +101,44 @@ end
 
 def revision action, before_action=false
   return unless (result = super)
+
   result[:empty_ok] = true
   result
 end
 
 def attachment_format ext
-  if ext.present? && attachment && (original_ext = attachment.extension.sub(/^\./, ""))
-    if ["file", original_ext].member? ext
-      original_ext
-    elsif (exts = Mime::Types[attachment.content_type])
-      if exts.find { |mt| mt.extensions.member? ext }
-        ext
-      else
-        exts[0].extensions[0]
-      end
-    end
+  rescuing_extension_issues do
+    return unless ext.present? && original_extension
+
+    confirm_original_extension(ext) || detect_extension(ext)
   end
-rescue => e
+end
+
+def rescuing_extension_issues
+  yield
+rescue StandardError => e
   Rails.logger.info "attachment_format issue: #{e.message}"
   nil
 end
+
+def detect_extension ext
+  return unless (mime_types = MIME::Types[attachment.content_type])
+
+  recognized_extension?(mime_types, ext) ? ext : mime_types[0].extensions[0]
+end
+
+def recognized_extension? mime_types, ext
+  mime_types.find { |mt| mt.extensions.member? ext }
+end
+
+def confirm_original_extension ext
+  return unless ["file", original_extension].member? ext
+
+  original_extension
+end
+
+def original_extension
+  @original_extension ||= attachment&.extension&.sub(/^\./, "")
+end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-carrierwave/set/abstract/attachment.rb ~~

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/abstract/attachment/cloud.rb

@@ -18,7 +18,7 @@ event :validate_storage_type_update, :validate, on: :update, when: :cloud? do
   #        `update storage_type: :local, file: [file handle]` is ok
   return unless storage_type_changed? && !attachment_is_changing?
 
-  errors.add :storage_type, tr(:moving_files_is_not_supported)
+  errors.add :storage_type, t(:carrierwave_moving_files_is_not_supported)
 end
 
 def bucket
@@ -27,6 +27,7 @@ end
 
 def new_card_bucket
   return unless new_card?
+
   # If the file is assigned before the bucket option we have to
   # check if there is a bucket options in set_specific.
   # That happens for exmaple when the file appears before the bucket in the
@@ -41,6 +42,7 @@ end
 
 def load_bucket_config
   return {} unless bucket
+
   bucket_config = Cardio.config.file_buckets&.dig(bucket.to_sym) || {}
   bucket_config.symbolize_keys!
   bucket_config[:credentials]&.symbolize_keys!
@@ -103,6 +105,7 @@ def each_credential_from_env
   regexp = credential_from_env_regexp
   ENV.each_key do |env_key|
     next unless (m = regexp.match env_key)
+
     yield m[:option].downcase.to_sym
   end
 end
@@ -119,6 +122,7 @@ end
 
 def bucket_from_content
   return unless content
+
   content.match(/^\((?<bucket>[^)]+)\)/) { |m| m[:bucket] }
 end
 

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/abstract/attachment/coded.rb

@@ -8,12 +8,17 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-carrierwave/set/a
 event :lose_coded_status_on_update, :initialize, on: :update, when: :coded? do
   # unless explicit
   return if @new_mod
+
   @new_storage_type ||= storage_type_from_config
 end
 
 event :validate_coded_storage_type, :validate, on: :save, when: :will_become_coded? do
-  errors.add :storage_type, tr(:mod_argument_needed_to_save) unless mod || @new_mod
-  errors.add :storage_type, tr(:codename_needed_for_storage) if codename.blank?
+  storage_type_error :mod_argument_needed_to_save unless mod || @new_mod
+  storage_type_error :codename_needed_for_storage if codename.blank?
+end
+
+def storage_type_error error_name
+  errors.add :storage_type, t("carrierwave_#{error_name}")
 end
 
 def will_become_coded?

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/abstract/attachment/local.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Abstract; module Attachment;
 module Local;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-carrierwave/set/abstract/attachment/local.rb"; end
-
 event :update_public_link_on_create, :integrate, on: :create, when: :local? do
   update_public_link
 end
@@ -16,6 +15,7 @@ end
 
 event :update_public_link, after: :update_read_rule, when: :local? do
   return if content.blank?
+
   if who_can(:read).include? Card::AnyoneID
     create_public_links
   else
@@ -28,6 +28,7 @@ private
 def create_public_links
   path = attachment.public_path
   return if File.exist? path
+
   FileUtils.mkdir_p File.dirname(path)
   File.symlink attachment.path, path unless File.symlink? path
   create_versions_public_links
@@ -36,6 +37,7 @@ end
 def create_versions_public_links
   attachment.versions.each_value do |version|
     next if File.symlink? version.public_path
+
     File.symlink version.path, version.public_path
   end
 end
@@ -43,6 +45,7 @@ end
 def remove_public_links
   symlink_dir = File.dirname attachment.public_path
   return unless Dir.exist? symlink_dir
+
   FileUtils.rm_rf symlink_dir
 end
 end;end;end;end;end;

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/abstract/attachment/paths.rb

@@ -32,6 +32,7 @@ def mod_dir new_mod=nil
   dir = Cardio::Mod.dirs.path(mod_name) || (mod_name.to_sym == :test && "test")
 
   raise Error, "can't find mod \"#{mod_name}\"" unless dir
+
   dir
 end
 

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/abstract/attachment/storage_type.rb

@@ -21,12 +21,9 @@ event :storage_type_change, :store, on: :update, when: :storage_type_changed? do
 end
 
 event :validate_storage_type, :validate, on: :save do
-  unless known_storage_type? will_be_stored_as
-    errors.add :storage_type, tr(
-      :unknown_storage_type,
-      new_storage_type: @new_storage_type
-    )
-  end
+  return if known_storage_type? will_be_stored_as
+
+  errors.add :storage_type, unknown_storage_type(@new_storage_type)
 end
 
 def will_be_stored_as
@@ -71,8 +68,8 @@ def mod
 end
 
 def mod_from_content
-  if content =~ %r{^:[^/]+/([^.]+)}
-    Regexp.last_match(1) # current mod_file format
+  if (m = content.match %r{^:[^/]+/([^.]+)})
+    m[1] # current mod_file format
   else
     mod_from_deprecated_content
   end
@@ -80,8 +77,9 @@ end
 
 # old format is still used in card_changes
 def mod_from_deprecated_content
-  return if content =~ /^\~/
+  return if content.match?(/^~/)
   return unless (lines = content.split("\n")) && lines.size == 4
+
   lines.last
 end
 
@@ -100,15 +98,15 @@ def valid_storage_type_list
 end
 
 def invalid_storage_type! type
-  raise Card::Error, tr(:error_invalid_storage_type, type: type)
+  raise Card::Error, t(:carrierwave_error_invalid_storage_type, type: type)
 end
 
 def storage_type_from_content
   case content
-  when /^\(/           then :cloud
-  when %r{/^https?\:/} then :web
-  when /^~/            then :local
-  when /^\:/           then :coded
+  when /^\(/          then :cloud
+  when %r{/^https?:/} then :web
+  when /^~/           then :local
+  when /^:/           then :coded
   else
     if deprecated_mod_file?
       :coded
@@ -130,7 +128,7 @@ end
 
 def storage_type= value
   known_storage_type? value
-  if @action == :update #&& storage_type != value
+  if @action == :update # && storage_type != value
     # we cant update the storage type directly here
     # if we do then the uploader doesn't find the file we want to update
     @new_storage_type = value
@@ -140,19 +138,22 @@ def storage_type= value
 end
 
 def with_storage_options opts={}
-  old_values = {}
+  old_values = stash_and_set_storage_options opts
   validate_temporary_storage_type_change opts[:storage_type]
-  %i[storage_type mod bucket].each do |opt_name|
-    next unless opts[opt_name]
-    old_values[opt_name] = instance_variable_get "@#{opt_name}"
-    instance_variable_set "@#{opt_name}", opts[opt_name]
-    @temp_storage_type = true
-  end
+  @temp_storage_type = true
   yield
 ensure
   @temp_storage_type = false
-  old_values.each do |key, val|
-    instance_variable_set "@#{key}", val
+  old_values.each { |key, val| instance_variable_set "@#{key}", val }
+end
+
+def stash_and_set_storage_options opts
+  %i[storage_type mod bucket].each_with_object({}) do |opt_name, old_values|
+    next unless opts[opt_name]
+
+    old_values[opt_name] = instance_variable_get "@#{opt_name}"
+    instance_variable_set "@#{opt_name}", opts[opt_name]
+    old_values
   end
 end
 
@@ -160,14 +161,10 @@ def temporary_storage_type_change?
   @temp_storage_type
 end
 
-def validate_temporary_storage_type_change new_storage_type=nil
-  new_storage_type ||= @new_storage_type
-  return unless new_storage_type
-  unless known_storage_type? new_storage_type
-    raise Error, tr(:unknown_storage_type, new_storage_type: new_storage_type)
-  end
-
-  if new_storage_type == :coded && codename.blank?
+def validate_temporary_storage_type_change type=nil
+  return unless type ||= @new_storage_type
+  raise Error, unknown_storage_type(type) unless known_storage_type? type
+  if type == :coded && codename.blank?
     raise Error, "codename needed for storage type :coded"
   end
 end
@@ -175,5 +172,9 @@ end
 def known_storage_type? type=storage_type
   type.in? CarrierWave::FileCardUploader::STORAGE_TYPES
 end
+
+def unknown_storage_type type
+  t :carrierwave_unknown_storage_type, new_storage_type: type
+end
 end;end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-carrierwave/set/abstract/attachment/storage_type.rb ~~

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/abstract/attachment/upload_cache.rb

@@ -34,6 +34,7 @@ end
 event :assign_attachment_on_create, :initialize,
       after: :assign_action, on: :create, when: :save_preliminary_upload? do
   return unless  (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   upload_cache_card.selected_action_id = action.id
   upload_cache_card.select_file_revision
   assign_attachment upload_cache_card.attachment.file, action.comment
@@ -42,6 +43,7 @@ end
 event :assign_attachment_on_update, :initialize,
       after: :assign_action, on: :update, when: :save_preliminary_upload? do
   return unless (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   uploaded_file = with_selected_action_id(action.id) { attachment.file }
   assign_attachment uploaded_file, action.comment
 end
@@ -55,6 +57,7 @@ end
 event :delete_cached_upload_file_on_create, :integrate,
       on: :create, when: :save_preliminary_upload? do
   return unless (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   upload_cache_card.delete_files_for_action action
   action.delete
 end
@@ -68,6 +71,7 @@ end
 event :delete_cached_upload_file_on_update, :integrate,
       on: :update, when: :save_preliminary_upload? do
   return unless  (action = Card::Action.fetch(@action_id_of_cached_upload))
+
   delete_files_for_action action
   action.delete
 end

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/self/favicon.rb

@@ -13,6 +13,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   view :link_tag, perms: :none do
     return unless (source = render :source, size: :small)
+
     tag :link, rel: "shortcut icon", href: source
   end