card 1.101.5 → 1.101.6

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/form_elements.rb

@@ -59,6 +59,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   # redirect to *previous if no :href is given
   def cancel_button args={}
     return unless voo.show? :cancel_button
+
     text = args.delete(:text) || "Cancel"
     add_class args, "btn btn-#{args.delete(:situation) || 'secondary'}"
     add_class args, cancel_strategy(args[:redirect], args[:href])

data/tmpsets/set/{mod012-card-mod-edit → mod011-card-mod-edit}/all/new.rb

@@ -82,7 +82,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def new_form_opts
-    { "main-success" => "REDIRECT" }
+    { "data-main-success": JSON(redirect: true) }
   end
 
   def new_view_title
@@ -97,7 +97,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def new_success
-    card.rule(:thanks) || "_self"
+    { mark: (card.rule(:thanks) || "_self") }
   end
 
   def new_in_modal_success; end

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

@@ -8,6 +8,7 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-history/set/all/h
 event :update_ancestor_timestamps, :integrate do
   ids = history_ancestor_ids
   return unless ids.present?
+
   Card.where(id: ids).update_all(updater_id: Auth.current_id, updated_at: Time.now)
   ids.map { |anc_id| Card.expire anc_id.cardname }
 end
@@ -31,7 +32,7 @@ def history_ancestor_ids recursion_level=0
   return [] if recursion_level > 5
 
   ids = history_parent_ids +
-    history_parent_ids.map { |id| Card[id].history_ancestor_ids(recursion_level + 1) }
+        history_parent_ids.map { |id| Card[id].history_ancestor_ids(recursion_level + 1) }
   ids.flatten
 end
 

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

@@ -5,8 +5,6 @@ class Card; module Set; class All; module History;
 module ActListing;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-history/set/all/history/act_listing.rb"; end
-ACTS_PER_PAGE = Card.config.acts_per_page
-
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   def act_from_context
     if (act_id = params["act_id"])
@@ -86,7 +84,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def acts_per_page
-    @acts_per_page || ACTS_PER_PAGE
+    @acts_per_page ||= Card.config.acts_per_page || 10
   end
 
   def acts_page_from_params
@@ -94,11 +92,16 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def act_paging acts, context
+    return unless controller.request # paginate requires a request
+
     wrap_with :div, class: "slotter btn-sm" do
-      acts = current_page_acts acts
-      opts = { remote: true, theme: "twitter-bootstrap-4" }
+      paginate current_page_acts(acts), act_paging_opts(context)
+    end
+  end
+
+  def act_paging_opts context
+    { remote: true, theme: "twitter-bootstrap-4" }.tap do |opts|
       opts[:total_pages] = 10 if limited_paging? context
-      paginate acts, opts
     end
   end
 

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

@@ -14,12 +14,16 @@ end
 def action_from_id action_id
   return unless action_id.is_a?(Integer) || action_id =~ /^\d+$/
 
-  # if not an integer revision id is probably a mod (e.g. if you request
+  # if not an integer, action_id is probably a mod (e.g. if you request
   # files/:logo/standard.png)
-  action = Action.fetch action_id
-  return unless action.card_id == id
 
-  action
+  action_if_on_self Action.fetch(action_id)
+end
+
+def action_if_on_self action
+  return unless action.is_a? Action
+
+  action if action.card_id == id
 end
 
 def old_actions

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

@@ -25,7 +25,7 @@ def actionable?
 end
 
 event :detect_conflict, :validate, on: :update, when: :edit_conflict? do
-  errors.add :conflict, tr(:error_not_latest_revision)
+  errors.add :conflict, Cardio.t(:history_error_not_latest_revision)
 end
 
 def edit_conflict?
@@ -41,7 +41,7 @@ event :finalize_action, :finalize, when: :finalize_action? do
   if changed_fields.present?
     @current_action.update! card_id: id
 
-    # Note: #last_change_on uses the id to sort by date
+    # NOTE: #last_change_on uses the id to sort by date
     # so the changes for the create changes have to be created before the first change
     store_card_changes_for_create_action if first_change?
     store_card_changes unless first_create?
@@ -71,7 +71,7 @@ def store_each_history_field action_id, fields=nil
   if false # Card::Change.supports_import?
     # attach.feature fails with this
     values = fields.map.with_index { |field, index| [index, yield(field), action_id] }
-    Card::Change.import [:field, :value, :card_action_id], values #, validate: false
+    Card::Change.import %i[field value card_action_id], values # , validate: false
   else
     fields.each do |field|
       Card::Change.create field: field,

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

@@ -31,7 +31,7 @@ def select_action action_id
 end
 
 def selected_action_id
-  @selected_action_id || (@current_action&.id) || last_action_id
+  @selected_action_id || @current_action&.id || last_action_id
 end
 
 def selected_action_id= action_id
@@ -48,8 +48,8 @@ def selected_content
 end
 
 def content_at_time_of_selected_action
-  lc = last_change_on(:db_content, not_after: @selected_action_id, including_drafts: true)
-  lc&.value
+  last_change_on(:db_content, not_after: selected_action_id,
+                              including_drafts: true)&.value
 end
 
 def with_selected_action_id action_id

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

@@ -39,6 +39,37 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   view :action_expanded do
     action_content action_from_context, :expanded
   end
+
+  view :change do
+    voo.show :title_link
+    voo.hide :menu
+    wrap do
+      [_render_title,
+       _render_menu,
+       _render_last_action]
+    end
+  end
+
+  view :last_action do
+    %(
+      <span class="last-update">
+        #{render_last_action_verb} #{render_acted_at} ago by
+        #{nest card.last_actor, view: :link}
+      </span>
+    )
+  end
+
+  view :last_action_verb, cache: :never do
+    return unless (act = card.last_act)
+    return unless (action = act.action_on card.id)
+
+    case action.action_type
+    when :create then "added"
+    when :delete then "deleted"
+    else
+      link_to_view :history, "edited", class: "last-edited", rel: "nofollow"
+    end
+  end
 end
 end;end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-history/set/all/history/views.rb ~~

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;