card 1.101.5 → 1.101.6

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
 

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/type/file.rb

@@ -16,8 +16,9 @@ module SelectedAction
 
   def last_content_action_id
     return super if temporary_storage_type_change?
+
     # find action id from content (saves lookups)
-    db_content.to_s.split(%r{[/\.]})[-2]
+    db_content.to_s.split(%r{[/.]})[-2]
   end
 end
 include SelectedAction
@@ -26,6 +27,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
   view :source do
     file = card.attachment
     return "" unless file.valid?
+
     contextualize_path file.url
   end
 
@@ -40,17 +42,26 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
   end
 
   def handle_source
-    source = _render_source
-    return "" if source.blank?
-    block_given? ? yield(source) : source
-  rescue => e
-    Rails.logger.info "Error with file source: #{e.message}"
-    tr :file_error
+    rescuing_file_source_error do
+      source = _render_source
+      return "" if source.blank?
+
+      block_given? ? yield(source) : source
+    end
   end
 
   def selected_version
     card.attachment
   end
+
+  private
+
+  def rescuing_file_source_error
+    yield
+  rescue StandardError => e
+    Rails.logger.info "Error with file source: #{e.message}"
+    t :carrierwave_file_error
+  end
 end
 
 module FileFormat; module_parent.send :register_set_format, Card::Format::FileFormat, self; extend Card::Set::AbstractFormat
@@ -60,6 +71,7 @@ module FileFormat; module_parent.send :register_set_format, Card::Format::FileFo
     attachment_format = card.attachment_format(params[:format])
     return _render_not_found unless attachment_format
     return card.format(:html).render_core if card.remote_storage?
+
     set_response_headers
     args_for_send_file
   end
@@ -67,13 +79,14 @@ module FileFormat; module_parent.send :register_set_format, Card::Format::FileFo
   def args_for_send_file
     file = selected_version
     [file.path, { type: file.content_type,
-                  filename:  "#{card.name.safe_key}#{file.extension}",
+                  filename: "#{card.name.safe_key}#{file.extension}",
                   x_sendfile: true,
                   disposition: (params[:format] == "file" ? "attachment" : "inline") }]
   end
 
   def set_response_headers
     return unless params[:explicit_file] && (response = controller&.response)
+
     response.headers["Expires"] = 1.year.from_now.httpdate
     # currently using default "private", because proxy servers could block
     # needed permission checks
@@ -81,10 +94,14 @@ module FileFormat; module_parent.send :register_set_format, Card::Format::FileFo
   end
 end
 
+module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFormat, self; extend Card::Set::AbstractFormat
+  view(:content) { render_core }
+end
+
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   view :core do
     handle_source do |source|
-      "<a href=\"#{source}\">#{tr :download, title: title_in_context(voo.title)}</a>"
+      haml :core, source: source
     end
   end
 
@@ -118,7 +135,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def preview_editor_delete_text
-    tr :delete
+    t :carrierwave_delete
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/type/image.rb

@@ -30,8 +30,10 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   view :source do
     return card.content if card.web?
+
     image = selected_version
     return "" unless image.valid?
+
     contextualize_path image.url
   end
 
@@ -44,10 +46,6 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
     end
   end
 
-  def handle_source
-    super
-  end
-
   def closed_size
     :icon
   end
@@ -77,11 +75,16 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
   end
 end
 
+module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFormat, self; extend Card::Set::AbstractFormat
+  include File::JsonFormat
+end
+
 module EmailHtmlFormat; module_parent.send :register_set_format, Card::Format::EmailHtmlFormat, self; extend Card::Set::AbstractFormat
   view :inline, cache: :never do
     handle_source do |source|
       return source unless (mail = inherit :active_mail) &&
                            ::File.exist?(path = selected_version.path)
+
       url = attach_image mail, path
       image_tag url
     end

data/tmpsets/set/{mod014-card-mod-carrierwave → mod013-card-mod-carrierwave}/type/image/html_views.rb

@@ -11,6 +11,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   # core HTML image view.
   view :core do
     return card.attachment.read if card.svg?
+
     with_valid_source do |source|
       image_tag source, alt: card.name
     end
@@ -41,6 +42,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def preview
     return if card.new_card? && !card.preliminary_upload?
+
     wrap_with :div, class: "attachment-preview",
                     id: "#{card.attachment.filename}-preview" do
       _render_core size: :medium
@@ -62,12 +64,20 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def old_image action, hide_diff
     return if hide_diff || !action
-    return unless (last_change = card.last_change_on(:db_content, before: action))
-    card.with_selected_action_id last_change.card_action_id do
-      Card::Content::Diff.render_deleted_chunk _render_core
+
+    old_image_change action do |old_action_id|
+      card.with_selected_action_id old_action_id do
+        Card::Content::Diff.render_deleted_chunk _render_core
+      end
     end
   end
 
+  def old_image_change action
+    return unless (change = card.last_change_on(:db_content, before: action))
+
+    yield change.card_action_id
+  end
+
   def new_image action
     card.with_selected_action_id action.id do
       Card::Content::Diff.render_added_chunk _render_core

data/tmpsets/set/{mod016-card-mod-machines → mod015-card-mod-machines}/abstract/machine.rb

@@ -57,6 +57,7 @@ module MachineClassMethods
   def store_machine_output args={}, &block
     output_config.merge!(args)
     return unless block_given?
+
     define_method :after_engine, &block
   end
 end
@@ -64,8 +65,7 @@ end
 card_accessor :machine_output, type: FileID
 card_accessor :machine_input, type: PointerID
 
-def before_engine
-end
+def before_engine; end
 
 def engine_input
   ei = EngineInput.new self

data/tmpsets/set/{mod016-card-mod-machines → mod015-card-mod-machines}/abstract/machine/output_update.rb

@@ -17,11 +17,13 @@ end
 
 def regenerate_machine_output
   return unless ok?(:read)
+
   lock { run_machine }
 end
 
 def update_machine_output
   return unless ok?(:read)
+
   lock do
     update_input_card
     expire_if_source_file_changed output_updated_at
@@ -32,6 +34,7 @@ end
 def ensure_machine_output
   output = fetch :machine_output
   return if output&.selected_content_action_id
+
   update_machine_output
 end
 
@@ -53,8 +56,10 @@ end
 
 def expire_if_source_file_changed output_updated_at
   return unless output_updated_at
+
   changed = input_cards_with_changed_source(output_updated_at)
   return if changed.empty?
+
   changed.each(&:expire_machine_cache)
   true
 end
@@ -62,11 +67,13 @@ end
 # regenerates the machine output if a source file of a input card has been changed
 def update_if_source_file_changed
   return unless expire_if_source_file_changed output_updated_at
+
   regenerate_machine_output
 end
 
 def output_updated_at
   return unless (output_card = machine_output_card)
+
   if output_card.coded?
     File.mtime output_card.file.path
   else

data/tmpsets/set/{mod016-card-mod-machines → mod015-card-mod-machines}/abstract/machine_input.rb

@@ -74,6 +74,7 @@ def expire_machine_cache
               return: :name).each do |machine_name|
     cache_card = Card.fetch(name, machine_name, :machine_cache)
     next unless cache_card&.content?
+
     Auth.as_bot { cache_card.update! trash: true }
   end
 end