card 1.101.5 → 1.101.6

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/base.rb

@@ -49,6 +49,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def specify_type_in_link! opts
     return if opts[:known] || !voo.type
+
     opts[:path] = { card: { type: voo.type } }
   end
 
@@ -78,6 +79,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def structure_card
     return nil if voo.structure == true
+
     voo.structure ? Card[voo.structure] : card
   end
 
@@ -111,7 +113,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
     ""
   end
 
-  # note: content and open_content may look like they should be aliased to
+  # NOTE: content and open_content may look like they should be aliased to
   # core, but it's important that they render core explicitly so that core view
   # overrides work.  the titled and labeled views below, however, are not
   # intended for frequent override, so this shortcut is fine.

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/css.rb

@@ -5,7 +5,6 @@ class Card; module Set; class All
 module Css;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-format/set/all/css.rb"; end
-
 module CssFormat; module_parent.send :register_set_format, Card::Format::CssFormat, self; extend Card::Set::AbstractFormat
   def default_nest_view
     :raw

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/csv.rb

@@ -25,7 +25,7 @@ module CsvFormat; module_parent.send :register_set_format, Card::Format::CsvForm
   end
 
   view :csv_row do
-    array = _render_raw.scan(/\{\{[^\}]*\}\}/).map do |inc|
+    array = _render_raw.scan(/\{\{[^}]*\}\}/).map do |inc|
       process_content(inc).strip
     end
 
@@ -76,6 +76,7 @@ module CsvFormat; module_parent.send :register_set_format, Card::Format::CsvForm
   def title_row extra_titles=nil
     titles = column_titles extra_titles
     return "" unless titles.present?
+
     CSV.generate_line titles.map(&:upcase)
   end
 

data/tmpsets/set/mod007-card-mod-format/all/demo.rb

@@ -0,0 +1,45 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class All
+# Set: All cards (Demo)
+#
+module Demo;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-format/set/all/demo.rb"; end
+module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  view :demo do
+    frame do
+      [view_select, wrap_with(:div, view_demo, class: "demo-slot")]
+    end
+  end
+
+  view :view_list do
+    %i[bar box info_bar open closed titled labeled content content_panel].map do |v|
+      wrap_with :p, [content_tag(:h3, v), render(v, show: :menu)]
+    end.flatten.join ""
+  end
+
+  def demo_view
+    Env.params[:demo_view] || :core
+  end
+
+  def view_demo
+    wrap(true) do
+      render demo_view
+    end
+  end
+
+  def view_select
+    card_form :get, success: { view: :demo } do
+      select_tag :demo_view,
+                 options_for_select(all_views, demo_view),
+                 class: "_submit-on-select"
+    end
+  end
+
+  def all_views
+    Card::Set::Format::AbstractFormat::ViewDefinition
+      .views.slice(*self.class.ancestors).values.map(&:keys).flatten.uniq
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card-mod-format/set/all/demo.rb ~~

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/error.rb

@@ -15,21 +15,21 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
   end
 
   view :server_error, perms: :none do
-    tr(:server_error)
+    t(:format_server_error)
   end
 
   view :denial, perms: :none do
-    focal? ? tr(:denial) : ""
+    focal? ? t(:format_denial) : ""
   end
 
   view :not_found, perms: :none do
-    error_name = card.name.present? ? safe_name : tr(:not_found_no_name)
-    tr(:not_found_named, cardname: error_name)
+    error_name = card.name.present? ? safe_name : t(:format_not_found_no_name)
+    t(:format_not_found_named, cardname: error_name)
   end
 
   view :bad_address, perms: :none do
     root.error_status = 404
-    tr(:bad_address)
+    t(:format_bad_address)
   end
 
   view :errors do
@@ -57,31 +57,24 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
   end
 
   def unsupported_view_error_message view
-    tr(:unsupported_view, view: view, cardname: card.name)
+    t(:format_unsupported_view, view: view, cardname: card.name)
   end
 end
 
 module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFormat, self; extend Card::Set::AbstractFormat
   view :errors do
-    format_error error_list
+    {
+      error_status: error_status,
+      errors: card.errors.each_with_object({}) { |e, h| h[e.attribute] = e.message }
+    }
   end
 
   view :server_error, :errors
   view :denial, :errors
   view :not_found, :errors
-
   view :bad_address do
-    format_error super()
-  end
-
-  def format_error error
-    { error_status: error_status, errors: error }
-  end
-
-  def error_list
-    card.errors.each_with_object([]) do |(field, message), list|
-      list << { field: field, message: message }
-    end
+    card.errors.add :address, super()
+    render_error
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/export.rb

@@ -42,6 +42,7 @@ module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFo
 
   def track_exporting card
     return unless @exported_keys
+
     @exported_keys << card.key
   end
 
@@ -59,6 +60,7 @@ module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFo
   def items_for_export
     nest_chunks.map do |chunk|
       next if chunk.try :main?
+
       chunk.referee_card
     end.compact
   end

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/frame.rb

@@ -17,9 +17,9 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     standard_frame(&block)
   end
 
-  def standard_frame slot=true
+  def standard_frame slot=true, &block
     with_frame slot do
-      wrap_body { yield } if block_given?
+      wrap_body(&block) if block_given?
     end
   end
 
@@ -43,19 +43,15 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     end
   end
 
-  def frame_and_form action, form_opts={}
+  def frame_and_form action, form_opts={}, &block
     form_opts ||= {}
     frame do
-      card_form action, form_opts do
-        yield
-      end
+      card_form action, form_opts, &block
     end
   end
 
-  def panel
-    wrap_with :div, class: classy("d0-card-frame") do
-      yield
-    end
+  def panel &block
+    wrap_with :div, class: classy("d0-card-frame"), &block
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/head.rb

@@ -49,6 +49,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   view :universal_edit_button, unknown: true, denial: :blank, perms: :update do
     return if card.new?
+
     tag "link", rel: "alternate", type: "application/x-wiki",
                 title: "Edit this page!", href: path(view: :edit)
   end
@@ -58,6 +59,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   # (but note that machine clearing would need to reset card cache...)
   view :head_stylesheet, unknown: true, cache: :never, perms: :none do
     return unless (href = head_stylesheet_path)
+
     tag "link", href: href, media: "all", rel: "stylesheet", type: "text/css"
   end
 
@@ -89,7 +91,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     if value.is_a? Hash
       string = "{"
       value.each { |k, v| string += "#{k}:#{script_variable_to_js v}" }
-      string + "}"
+      "#{string}}"
     else
       "'#{value}'"
     end
@@ -105,11 +107,13 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def debug_or_machine_path setting, &block
     return unless (asset_card = param_or_rule_card setting)
+
     debug_path(setting, asset_card, &block) || asset_card.machine_output_url
   end
 
   def debug_path setting, asset_card
     return unless params[:debug] == setting.to_s
+
     yield asset_card
   end
 

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/html_content.rb

@@ -24,7 +24,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     prepare_content_slot
   end
 
-  view :content_with_edit_button do
+  view :content_with_edit_button, unknown: true do
     wrap do
       [_render_menu, _render_core, _render_edit_button(edit: :inline)]
     end
@@ -143,6 +143,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def short_content_items
     return unless card.respond_to? :count
+
     "#{count} #{'item'.pluralize count}"
   end
 

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/html_error.rb

@@ -59,7 +59,12 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   view :errors, perms: :none do
     return if card.errors.empty?
 
-    voo.title = card.name.blank? ? "Problems" : tr(:problems_name, cardname: card.name)
+    voo.title = if card.name.blank?
+                  "Problems"
+                else
+                  t(:format_problems_name,
+                    cardname: card.name)
+                end
     voo.hide! :menu
     class_up "alert", "card-error-msg"
     standard_errors voo.title
@@ -140,21 +145,21 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   def sign_in_or_up_links to_task
     return if Auth.signed_in?
 
-    links = [signin_link, signup_link].compact.join " #{tr :or} "
+    links = [signin_link, signup_link].compact.join " #{t(:format_or)} "
     wrap_with(:div) do
-      [tr(:please), links, to_task].join(" ") + "."
+      "#{[t(:format_please), links, to_task].join(' ')}."
     end
   end
 
   def signin_link
-    link_to_card :signin, tr(:sign_in),
+    link_to_card :signin, t(:account_sign_in)&.downcase,
                  class: "signin-link", slotter: true, path: { view: :open }
   end
 
   def signup_link
     return unless signup_ok?
 
-    link_to_card :signup, tr(:sign_up),
+    link_to_card :signup, t(:account_sign_up)&.downcase,
                  class: "signup-link", slotter: true, path: { action: :new }
   end
 
@@ -171,19 +176,24 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   def loud_denial
     voo.hide :menu
     frame do
-      [wrap_with(:h1, tr(:sorry)),
+      [wrap_with(:h1, t(:format_sorry)),
        wrap_with(:div, loud_denial_message)]
     end
   end
 
   def loud_denial_message
-    to_task = @denied_task ? tr(:denied_task, denied_task: @denied_task) : tr(:to_do_that)
+    to_task = if @denied_task
+                t(:format_denied_task,
+                  denied_task: @denied_task)
+              else
+                t(:format_to_do_that)
+              end
 
     case
     when not_denied_task_read?
-      tr(:read_only)
+      t(:format_read_only)
     when Auth.signed_in?
-      tr(:need_permission_task, task: to_task)
+      t(:format_need_permission_task, task: to_task)
     else
       Env.save_interrupted_action request.env["REQUEST_URI"]
       sign_in_or_up_links to_do_unauthorized_task
@@ -195,7 +205,12 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def to_do_unauthorized_task
-    @denied_task ? tr(:denied_task, denied_task: @denied_task) : tr(:to_do_that)
+    if @denied_task
+      t(:format_denied_task,
+        denied_task: @denied_task)
+    else
+      t(:format_to_do_that)
+    end
   end
 end
 end;end;end;end;

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/html_wrapper.rb

@@ -44,7 +44,12 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def wrap_data slot=true
     with_slot_data slot do
-      { "card-id": card.id, "card-name": slot_cardname, "slot-id": SecureRandom.hex(10) }
+      {
+        "card-id": card.id,
+        "card-name": slot_cardname,
+        "card-link-name": card.name.url_key,
+        "slot-id": SecureRandom.hex(10)
+      }
     end
   end
 
@@ -78,8 +83,8 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     opts[:name_context] = initial_context_names.map(&:key) * ","
   end
 
-  def debug_slot
-    debug_slot? ? debug_slot_wrap { yield } : yield
+  def debug_slot &block
+    debug_slot? ? debug_slot_wrap(&block) : yield
   end
 
   def debug_slot?
@@ -99,13 +104,13 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     classy list
   end
 
-  def wrap_body
-    wrap_with(:div, class: body_css_classes) { yield }
+  def wrap_body &block
+    wrap_with(:div, class: body_css_classes, &block)
   end
 
-  def haml_wrap_body
+  def haml_wrap_body &block
     wrap_body do
-      capture_haml { yield }
+      capture_haml(&block)
     end
   end
 
@@ -152,7 +157,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   def html_escape_except_quotes string
     # to be used inside single quotes (makes for readable json attributes)
     string.to_s.gsub(/&/,  "&")
-          .gsub(/\'/, "'")
+          .gsub(/'/, "'")
           .gsub(/>/,  ">")
           .gsub(/</,  "&lt;")
   end

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/js.rb

@@ -5,7 +5,6 @@ class Card; module Set; class All
 module Js;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-format/set/all/js.rb"; end
-
 module JsFormat; module_parent.send :register_set_format, Card::Format::JsFormat, self; extend Card::Set::AbstractFormat
   def default_item_view
     :core

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/json.rb

@@ -55,7 +55,6 @@ module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFo
     { key: card.key,
       url_key: card.name.url_key,
       status: card.state }.tap do |h|
-
       h[:id] = card.id if h[:status] == :real
     end
   end
@@ -136,6 +135,7 @@ module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFo
 
   def essentials
     return {} if card.structure
+
     { content: card.db_content }
   end
 
@@ -147,7 +147,6 @@ module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFo
       name: card.name,
       type: card.type_name,
       url: path(format: :json) }.tap do |h|
-
       h[:codename] = card.codename if card.codename
     end
   end