card-mod-format 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76f350256fd1765dd6c99a1bed1712228e5d32208c532e9aa0215266bf4e3ba
-  data.tar.gz: 7177aa1e6218a7a33102aeb16a59b3e8a3f36938db16bf2d6263c074f8458d25
+  metadata.gz: 7a14a87f7d666f6e68411e159ea14f4b217fa6e8e3002dd69186dec8a0b9daeb
+  data.tar.gz: bdfe37143e119215126613981e2892002bdd254b0a8f6ea58f639cec5727b87b
 SHA512:
-  metadata.gz: 3a0d6f247d5efb0f51d6aefee39e2dbeacfff2bc4eb1931ef39590cf3a2e54f8b771b2978d2a9a26df5fa32c0610f827de1e83010fda789914857e3de8354885
-  data.tar.gz: 145ab53b7632f62ca5e84bbb2d21b740f51dc2888348b2a92ea1ed262c031004923e29b823228d7c5d39890b4480c08d9a707e97a7633b8a66c1c05b6e917995
+  metadata.gz: 874d45d7ab14d8bba368fbf31c461eeeacf59dff1e2b6cfc1904a055a77727a8d39304fb037690e1b5573db446690b2cb7212f5839185a712544d06dd84e8230
+  data.tar.gz: 664bd91c44a1f20f2dbdee671fdb405c02454524508d8a77e024ee1712295dc846d2f6725a23a6674ca18e5b575b2adc808ec7337c8e98a9778b1bd220c0ae5d

data/lib/card/path.rb

@@ -59,7 +59,7 @@ class Card
       name = handle_unknown do
         opts[:mark] ? Card::Name[opts.delete(:mark)] : @card.name
       end
-      (name&.url_key).to_s
+      name&.url_key.to_s
     end
 
     def markless?
@@ -99,7 +99,7 @@ class Card
 
     # no name info will be lost by using url_key
     def name_standardish? name
-      name.s == Card::Name.url_key_to_standard(name.url_key)
+      name.url_key == name.tr(" ", "_")
     end
   end
 end

data/lib/card/path/cast_params.rb

@@ -9,6 +9,7 @@ class Card
 
       def cast_path_hash hash, cast_hash=nil
         return hash unless hash.is_a? Hash
+
         cast_each_path_hash hash, (cast_hash || self.class.cast_params)
         hash
       end
@@ -16,6 +17,7 @@ class Card
       def cast_each_path_hash hash, cast_hash
         hash.each do |key, value|
           next unless (cast_to = cast_hash[key])
+
           hash[key] = cast_path_value value, cast_to
         end
       end

data/set/all/active_card.rb

@@ -1,4 +1,3 @@
-
 # FIXME: -this needs a better home!
 def format opts={}
   opts = { format: opts.to_sym } if [Symbol, String].member? opts.class

data/set/all/base.rb

@@ -42,6 +42,7 @@ format do
 
   def specify_type_in_link! opts
     return if opts[:known] || !voo.type
+
     opts[:path] = { card: { type: voo.type } }
   end
 
@@ -71,6 +72,7 @@ format do
 
   def structure_card
     return nil if voo.structure == true
+
     voo.structure ? Card[voo.structure] : card
   end
 
@@ -104,7 +106,7 @@ format do
     ""
   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/set/all/content.rb

@@ -0,0 +1,68 @@
+format do
+  ONE_LINE_CHARACTER_LIMIT = 60
+
+  # override to customize by set
+  def chunk_list
+    :default
+  end
+
+  view :one_line_content do
+    with_nest_mode :compact do
+      one_line_content
+    end
+  end
+
+  # DEPRECATED
+  view :closed_content, :one_line_content
+
+  view :raw_one_line_content do
+    raw_one_line_content
+  end
+
+  view :label do
+    card.label.to_s
+  end
+
+  view :smart_label, cache: :never, unknown: true do
+    label_with_description render_label, label_description
+  end
+
+  def label_with_description label, description
+    return label unless description
+
+    "#{label} #{popover_link description}"
+  end
+
+  # TODO: move this into a nest once popovers are stub safe
+  def label_description
+    return unless (desc = card.field :description)
+
+    desc.format.render_core
+  end
+
+  def raw_one_line_content
+    cut_with_ellipsis render_raw
+  end
+
+  def one_line_content
+    Content.smart_truncate render_core
+  end
+
+  def cut_with_ellipsis text, limit=one_line_character_limit
+    if text.size <= limit
+      text
+    else
+      "#{text[0..(limit - 3)]}..."
+    end
+  end
+
+  def one_line_character_limit
+    voo.size || ONE_LINE_CHARACTER_LIMIT
+  end
+end
+
+format :html do
+  view :hidden_content_field, unknown: true, cache: :never do
+    hidden_field :content, class: "d0-card-content"
+  end
+end

data/set/all/css.rb

@@ -1,4 +1,3 @@
-
 format :css do
   def default_nest_view
     :raw

data/set/all/csv.rb

@@ -18,7 +18,7 @@ format :csv  do
   end
 
   view :csv_row do
-    array = _render_raw.scan(/\{\{[^\}]*\}\}/).map do |inc|
+    array = _render_raw.scan(/\{\{[^}]*\}\}/).map do |inc|
       process_content(inc).strip
     end
 
@@ -69,6 +69,7 @@ format :csv  do
   def title_row extra_titles=nil
     titles = column_titles extra_titles
     return "" unless titles.present?
+
     CSV.generate_line titles.map(&:upcase)
   end
 

data/set/all/error.rb

@@ -8,21 +8,21 @@ format do
   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
@@ -50,7 +50,7 @@ format do
   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
 

data/set/all/export.rb

@@ -35,6 +35,7 @@ format :json do
 
   def track_exporting card
     return unless @exported_keys
+
     @exported_keys << card.key
   end
 
@@ -52,6 +53,7 @@ format :json do
   def items_for_export
     nest_chunks.map do |chunk|
       next if chunk.try :main?
+
       chunk.referee_card
     end.compact
   end

data/set/all/frame.rb

@@ -10,9 +10,9 @@ format :html do
     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
 
@@ -36,18 +36,14 @@ format :html do
     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

data/set/all/head.rb

@@ -42,6 +42,7 @@ format :html do
 
   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
@@ -51,6 +52,7 @@ format :html do
   # (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
 
@@ -82,7 +84,7 @@ format :html do
     if value.is_a? Hash
       string = "{"
       value.each { |k, v| string += "#{k}:#{script_variable_to_js v}" }
-      string + "}"
+      "#{string}}"
     else
       "'#{value}'"
     end
@@ -98,11 +100,13 @@ format :html do
 
   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/set/all/html_content.rb

@@ -17,7 +17,7 @@ format :html do
     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
@@ -136,6 +136,7 @@ format :html do
 
   def short_content_items
     return unless card.respond_to? :count
+
     "#{count} #{'item'.pluralize count}"
   end
 

data/set/all/html_error.rb

@@ -52,7 +52,12 @@ format :html do
   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
@@ -133,21 +138,21 @@ format :html do
   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, mod: "card-mod-account"),
+    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
 
@@ -164,19 +169,24 @@ format :html do
   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
@@ -188,6 +198,11 @@ format :html do
   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

data/set/all/html_wrapper.rb

@@ -37,7 +37,12 @@ format :html do
 
   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
 
@@ -71,8 +76,8 @@ format :html do
     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?
@@ -92,13 +97,13 @@ format :html do
     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
 
@@ -145,7 +150,7 @@ format :html do
   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/set/all/js.rb

@@ -1,4 +1,3 @@
-
 format :js do
   def default_item_view
     :core

data/set/all/json.rb

@@ -48,7 +48,6 @@ format :json do
     { 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
@@ -129,6 +128,7 @@ format :json do
 
   def essentials
     return {} if card.structure
+
     { content: card.db_content }
   end
 
@@ -140,7 +140,6 @@ format :json do
       name: card.name,
       type: card.type_name,
       url: path(format: :json) }.tap do |h|
-
       h[:codename] = card.codename if card.codename
     end
   end

data/set/all/links.rb

@@ -1,4 +1,4 @@
-RESOURCE_TYPE_REGEXP = /^([a-zA-Z][\-+\.a-zA-Z\d]*):/
+RESOURCE_TYPE_REGEXP = /^([a-zA-Z][\-+.a-zA-Z\d]*):/
 
 # The #link_to methods support smart formatting of links in multiple formats.
 format do
@@ -63,16 +63,17 @@ format do
 
   def resource_type resource
     case resource
-    when /^https?\:/          then "external-link"
+    when /^https?:/           then "external-link"
     when %r{^/}               then "internal-link"
-    when /^mailto\:/          then "email-link"
-    when RESOURCE_TYPE_REGEXP then Regexp.last_match(1) + "-link"
+    when /^mailto:/           then "email-link"
+    when RESOURCE_TYPE_REGEXP then "#{Regexp.last_match(1)}-link"
     end
   end
 
   def clean_resource resource, resource_type
     if resource_type == "internal-link"
-      contextualize_path resource[1..-1]
+      # remove initial slash; #contextualize_path handles relative root
+      contextualize_path resource.sub(%r{^/}, "")
     else
       resource
     end
@@ -138,6 +139,7 @@ format :html do
   def interpret_data_opts_to_link_to opts
     %i[remote method].each do |key|
       next unless (val = opts.delete key)
+
       opts["data-#{key}"] = val
     end
   end

data/set/all/menu.rb

@@ -102,7 +102,7 @@ format :html do
 
   def edit_link view=:edit, opts={}
     link_to_view view, opts.delete(:link_text) || menu_icon,
-                 edit_link_opts(opts.reverse_merge(modal: :lg))
+                 edit_link_opts(modal: (opts[:modal] || :lg))
   end
 
   # @param modal [Symbol] modal size
@@ -116,7 +116,7 @@ format :html do
   end
 
   def menu_link_classes
-    "nodblclick" + (show_view?(:hover_link) ? " _show-on-hover" : "")
+    "nodblclick#{show_view?(:hover_link) ? ' _show-on-hover' : ''}"
   end
 
   def menu_icon

data/set/all/path.rb

@@ -34,6 +34,7 @@ format do
 
   def path opts={}
     return opts unless opts.is_a? Hash
+
     path = Card::Path.new(card, opts)&.render
     contextualize_path path
   end

data/set/all/rss.rb

@@ -1,3 +1,5 @@
+require "builder"
+
 format :rss do
   attr_accessor :xml
 
@@ -14,6 +16,7 @@ format :rss do
   # FIXME: integrate this with common XML features when it is added
   view :feed, cache: :never do
     return "RSS feeds disabled" unless Cardio.config.rss_enabled
+
     begin
       @xml.instruct! :xml, version: "1.0", standalone: "yes"
       @xml.rss version: "2.0",
@@ -25,7 +28,7 @@ format :rss do
           render_feed_body
         end
       end
-    rescue => e
+    rescue StandardError => e
       @xml.error "\n\nERROR rendering RSS: #{e.inspect}\n\n #{e.backtrace}"
     end
   end
@@ -43,7 +46,7 @@ format :rss do
   end
 
   view :feed_title do
-    Card::Rule.global_setting(:title) + " : " + card.name.gsub(/^\*/, "")
+    "#{Card::Rule.global_setting(:title)} : #{card.name.gsub(/^\*/, '')}"
   end
 
   view :feed_item do

data/set/all/text.rb

@@ -1,3 +1,4 @@
+require "htmlentities"
 
 format :text do
   view :core do

data/set/type/cardtype.rb

@@ -5,7 +5,7 @@ format :html do
 
   def type_formgroup args={}
     if card.cards_of_type_exist?
-      wrap_with :div, tr(:cards_exist, scope: "core", cardname: safe_name)
+      wrap_with :div, t(:format_cards_exist, scope: "core", cardname: safe_name)
     else
       super
     end
@@ -20,7 +20,7 @@ format :html do
   end
 
   def add_link opts={}
-    voo.title ||= tr(:add_card, cardname: safe_name)
+    voo.title ||= t(:format_add_card, cardname: safe_name)
     link_to render_title, add_link_opts(opts)
   end
 
@@ -67,7 +67,7 @@ format :html do
   def configure_link css_class=nil
     return "" unless Card.fetch(card, :type, :structure, new: {}).ok? :update
 
-    voo.title ||= tr(:configure_card, cardname: safe_name.pluralize)
+    voo.title ||= t(:format_configure_card, cardname: safe_name.pluralize)
     title = _render_title
     link_to_card card, title,
                  path: { view: :bridge,
@@ -79,7 +79,7 @@ format :html do
   private
 
   def process_voo_params path_args
-    context = ((@parent&.card) || card).name
+    context = (@parent&.card || card).name
     Rack::Utils.parse_nested_query(voo.params).each do |key, value|
       value = value.to_name.absolute(context) if value
       key = key.to_name.absolute(context)

data/set/type/json.rb

@@ -1,4 +1,4 @@
-# include_set Abstract::Pointer
+require "coderay"
 
 event :validate_json, :validate, on: :save, changed: :content do
   check_json_syntax if content.present?
@@ -7,7 +7,7 @@ end
 def check_json_syntax
   parse_content
 rescue JSON::ParserError => e
-  errors.add tr(:invalid_json), e.message.sub(/^\d+: /, "").to_s
+  errors.add t(:format_invalid_json), e.message.sub(/^\d+: /, "").to_s
 end
 
 def parse_content

data/set/type/number.rb

@@ -1,4 +1,3 @@
-
 format :html do
   def input_type
     :text_field
@@ -6,7 +5,10 @@ format :html do
 end
 
 event :validate_number, :validate, on: :save do
-  errors.add :content, tr(:not_numeric, content: content) unless valid_number?(content)
+  unless valid_number?(content)
+    errors.add :content,
+               t(:format_not_numeric, content: content)
+  end
 end
 
 def valid_number? string

data/set/type/toggle.rb

@@ -4,8 +4,8 @@ end
 
 view :core do
   case card.content.to_i
-  when 1 then tr :toggle_yes
-  when 0 then tr :toggle_no
+  when 1 then t(:format_toggle_yes)
+  when 0 then t(:format_toggle_no)
   else
     "?"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-format
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 description: ''
 email:
 - info@decko.org
@@ -61,6 +61,7 @@ files:
 - lib/card/path/cast_params.rb
 - set/all/active_card.rb
 - set/all/base.rb
+- set/all/content.rb
 - set/all/css.rb
 - set/all/csv.rb
 - set/all/demo.rb
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: format