card 1.101.1 → 1.101.6

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

data/tmpsets/set/{mod017-card-mod-script → mod016-card-mod-script}/abstract/script.rb

@@ -29,7 +29,7 @@ end
 
 def compress_js input
   Uglifier.compile input
-rescue => e
+rescue StandardError => e
   # CoffeeScript is compiled in a view
   # If there is a CoffeeScript syntax error we get the rescued view here
   # and the error that the rescued view is no valid Javascript

data/tmpsets/set/{mod017-card-mod-script → mod016-card-mod-script}/type/coffee_script.rb

@@ -24,7 +24,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def compile_coffee script
     ::CoffeeScript.compile script
-  rescue => e
+  rescue StandardError => e
     line_nr = e.to_s.match(/\[stdin\]:(\d*)/)&.capture(0)&.to_i
     line = script.lines[line_nr - 1] if line_nr
     raise Card::Error, "CoffeeScript::Error (#{card.name}): #{e.message}: #{line}"

data/tmpsets/set/{mod018-card-mod-ace_editor → mod017-card-mod-ace_editor}/all/ace_editor.rb

@@ -5,7 +5,6 @@ class Card; module Set; class All
 module AceEditor;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-ace_editor/set/all/ace_editor.rb"; end
-
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   def ace_editor_input
     text_area :content, rows: 5,

data/tmpsets/set/mod018-card-mod-alias/all/alias.rb

@@ -0,0 +1,30 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class All
+# Set: All cards (Alias)
+#
+# triggerable event to auto-add an alias upon renaming a card
+module Alias;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-alias/set/all/alias.rb"; end
+event :create_alias_upon_rename, :finalize,
+      on: :update, changed: :name, trigger: :required do
+  add_subcard name_before_act, type_code: :alias, content: name
+end
+
+# actual aliases override this in narrower sets.
+def alias?
+  false
+end
+
+module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  # adds checkbox to rename form
+  def edit_name_buttons
+    output [auto_alias_checkbox, super].compact
+  end
+
+  def auto_alias_checkbox
+    haml :auto_alias_checkbox if card.simple?
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card-mod-alias/set/all/alias.rb ~~

data/tmpsets/set/mod018-card-mod-alias/all_plus/alias.rb

@@ -0,0 +1,31 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class AllPlus
+# Set: All "+" cards (Alias)
+#
+module Alias;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-alias/set/all_plus/alias.rb"; end
+event :validate_not_alias, :validate, on: :save do
+  errors.add t(:alias_cards_no_children) if alias? && type_code != :alias
+end
+
+# a compound name is an alias if any part is an alias
+def alias?
+  name.parts.any? { |p| Card[p]&.alias? }
+end
+
+# reconstructs the name to which a compound name is aliased
+def target_name
+  Card::Name[
+    name.parts.map do |p|
+      part = Card[p]
+      part&.alias? ? part.target_name : p
+    end
+  ]
+end
+
+def target_card
+  Card.fetch target_name, new: {}
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card-mod-alias/set/all_plus/alias.rb ~~

data/tmpsets/set/mod018-card-mod-alias/type/alias.rb

@@ -0,0 +1,42 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Type
+# Set: All "Alias" cards
+#
+module Alias;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-alias/set/type/alias.rb"; end
+include_set Abstract::Pointer
+include_set Abstract::IdPointer
+
+event :validate_alias_source, :validate, on: :save do
+  errors.add :name, t(:alias_must_be_simple) if name.compound?
+  errors.add :type, t(:alias_cards_no_children) if child_ids.present?
+end
+
+event :validate_alias_target, :validate, on: :save do
+  return if count == 1 && target_name&.simple?
+
+  errors.add :content, t(:alias_target_must_be_simple)
+end
+
+def alias?
+  true
+end
+
+# @return [Card::Name] name to which card's name is aliased
+def target_name
+  first_name
+end
+
+# @return [Card] card to which card is aliased
+def target_card
+  first_card
+end
+
+module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  def input_type
+    :autocomplete
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card-mod-alias/set/type/alias.rb ~~

data/tmpsets/set/mod019-card-mod-api_key/right/account.rb

@@ -0,0 +1,18 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Right
+# Set: All "+Account" cards
+#
+module Account;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-api_key/set/right/account.rb"; end
+card_accessor :api_key
+
+delegate :authenticate_api_key, to: :api_key_card
+
+module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  view :api_key do
+    field_nest :api_key
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card-mod-api_key/set/right/account.rb ~~