card 1.101.5 → 1.101.6

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

@@ -5,7 +5,7 @@ class Card; module Set; class All
 module Links;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-format/set/all/links.rb"; end
-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.
 module Format; module_parent.send :register_set_format, Card::Format, self; extend Card::Set::AbstractFormat
@@ -70,10 +70,10 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   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
 
@@ -145,6 +145,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   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/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/menu.rb

@@ -123,7 +123,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   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/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/path.rb

@@ -41,6 +41,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def path opts={}
     return opts unless opts.is_a? Hash
+
     path = Card::Path.new(card, opts)&.render
     contextualize_path path
   end

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

@@ -8,6 +8,18 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-format/set/all/ri
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   delegate :class_up, :class_down, :with_class_up, :without_upped_class, :classy,
            to: :voo
+
+  view :type, unknown: true do
+    link_to_card card.type_card, nil, class: "cardtype"
+  end
+
+  view :type_info do
+    return unless card.type_code != :basic
+
+    wrap_with :span, class: "type-info float-right" do
+      link_to_card card.type_name, nil, class: "navbar-link"
+    end
+  end
 end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-format/set/all/rich_html.rb ~~

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

@@ -21,6 +21,7 @@ module RssFormat; module_parent.send :register_set_format, Card::Format::RssForm
   # 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",
@@ -32,7 +33,7 @@ module RssFormat; module_parent.send :register_set_format, Card::Format::RssForm
           render_feed_body
         end
       end
-    rescue => e
+    rescue StandardError => e
       @xml.error "\n\nERROR rendering RSS: #{e.inspect}\n\n #{e.backtrace}"
     end
   end
@@ -50,7 +51,7 @@ module RssFormat; module_parent.send :register_set_format, Card::Format::RssForm
   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/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/all/text.rb

@@ -5,7 +5,6 @@ class Card; module Set; class All
 module Text;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-format/set/all/text.rb"; end
-
 module TextFormat; module_parent.send :register_set_format, Card::Format::TextFormat, self; extend Card::Set::AbstractFormat
   view :core do
     HTMLEntities.new.decode strip_tags(super()).to_s

data/tmpsets/set/mod007-card-mod-format/type/cardtype.rb

@@ -0,0 +1,98 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class Type
+# Set: All "Cardtype" cards
+#
+module Cardtype;
+extend Card::Set
+def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-format/set/type/cardtype.rb"; end
+module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
+  view :type, unknown: true do
+    link_to_card card.type_card, nil, class: "cardtype"
+  end
+
+  def type_formgroup args={}
+    if card.cards_of_type_exist?
+      wrap_with :div, t(:format_cards_exist, scope: "core", cardname: safe_name)
+    else
+      super
+    end
+  end
+
+  view :add_link do
+    add_link
+  end
+
+  view :add_button do
+    add_link class: "btn btn-secondary"
+  end
+
+  def add_link opts={}
+    voo.title ||= t(:format_add_card, cardname: safe_name)
+    link_to render_title, add_link_opts(opts)
+  end
+
+  def add_link_opts opts
+    modal = opts.delete :modal
+    if modal.nil? || modal
+      modal_link_opts opts.merge(path: add_path(:new_in_modal))
+    else
+      opts.merge path: add_path(:new)
+    end
+  end
+
+  view :add_url do
+    card_url _render_add_path
+  end
+
+  def add_path view
+    path_args = { mark: card.name }
+    process_voo_params(path_args) if voo.params
+    if view == :new
+      path_args[:action] = :new
+    else
+      path_args[:action] = :type
+      path_args[:view] = view
+    end
+    path path_args
+  end
+
+  # don't cache because it depends on update permission for another card
+  view :configure_link, cache: :never, perms: ->(fmt) { fmt.can_configure? } do
+    configure_link
+  end
+
+  def can_configure?
+    Card.fetch(card, :type, :structure, new: {}).ok? :update
+  end
+
+  view :configure_button, cache: :never,
+                          denial: :blank,
+                          perms: ->(fmt) { fmt.can_configure? } do
+    configure_link "btn btn-secondary"
+  end
+
+  def configure_link css_class=nil
+    return "" unless Card.fetch(card, :type, :structure, new: {}).ok? :update
+
+    voo.title ||= t(:format_configure_card, cardname: safe_name.pluralize)
+    title = _render_title
+    link_to_card card, title,
+                 path: { view: :bridge,
+                         bridge: { tab: :rules_tab },
+                         set: Card::Name[safe_name, :type] },
+                 class: css_classes("configure-type-link ml-3", css_class)
+  end
+
+  private
+
+  def process_voo_params path_args
+    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)
+      path_args[key] = value
+    end
+  end
+end
+end;end;end;end;
+# ~~ generated from /Users/ethan/dev/decko/gem/card-mod-format/set/type/cardtype.rb ~~

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

@@ -14,7 +14,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/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/type/number.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Type
 module Number;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-format/set/type/number.rb"; end
-
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   def input_type
     :text_field
@@ -13,7 +12,10 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 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/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/type/toggle.rb

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

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/abstract/01_pointer/html_views.rb

@@ -68,8 +68,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def autocomplete_input
-    items = items_for_input
-    haml :autocomplete_input, item: items.first, options_card: options_card_name
+    haml :autocomplete_input, item: items_for_input.first, options_card: options_card_name
   end
 
   def checkbox_input

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/abstract/01_pointer/html_views/filter.rb

@@ -58,6 +58,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def filter_card_from_params
     return unless params[:filter_card]
+
     Card.fetch params[:filter_card], new: {}
   end
 

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/abstract/01_pointer/other_views.rb

@@ -71,6 +71,7 @@ module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFo
 
   def essentials
     return {} if depth > max_depth
+
     card.item_cards.map do |item|
       nest item, view: :essentials
     end

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/abstract/id_pointer.rb

@@ -8,7 +8,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-list/set/abstract/id_pointer.rb"; end
 
 def standardize_item cardish
-  if (id = Card.fetch_id cardish)
+  if (id = Card.id cardish)
     "~#{id}"
   else
     Rails.logger.info "no id for '#{cardish}' added to id pointer"

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/self/input_options.rb

@@ -14,6 +14,7 @@ add_to_basket :options, "select"
 add_to_basket :options, "multiselect"
 add_to_basket :options, "list"
 add_to_basket :options, "filtered list"
+add_to_basket :options, "autocomplete"
 
 def content
   options.to_pointer_content

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/type/nest_list.rb

@@ -8,7 +8,7 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-list/set/type/nes
 include_set Abstract::Items
 
 def raw_item_strings content
-  reference_chunks(content).map(&:referee_name)
+  reference_chunks(content).map(&:referee_raw_name)
 end
 
 def item_options

data/tmpsets/set/{mod010-card-mod-permissions → mod009-card-mod-permissions}/abstract/permission.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Abstract
 module Permission;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-permissions/set/abstract/permission.rb"; end
-
 def standardize_items
   super unless content == "_left"
 end
@@ -91,6 +90,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def inheritance_checkbox
     return unless inheritable?
+
     <<-HTML
       <div class="perm-inheritance perm-section">
         #{check_box_tag 'inherit', 'inherit', inheriting?}
@@ -113,6 +113,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def in_context_of_self_set?
     return false unless @set_context
+
     @set_context.to_name.tag_name.key == Card[:self].key
   end
 
@@ -123,7 +124,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
       link_to_card card_id, nil, target: args[:target]
     end * ", "
     "Inherit ( #{links} )"
-  rescue
+  rescue StandardError
     "Inherit"
   end
 end

data/tmpsets/set/{mod010-card-mod-permissions → mod009-card-mod-permissions}/all/permissions.rb

@@ -58,7 +58,7 @@ def direct_rule_card action
 end
 
 def permission_rule_id action
-  if junction? && rule(action).match?(/^\[?\[?_left\]?\]?$/)
+  if compound? && rule(action).match?(/^\[?\[?_left\]?\]?$/)
     left_permission_rule_id action
   else
     rule_card_id(action)
@@ -71,9 +71,7 @@ end
 
 def left_permission_rule_id action
   lcard = left_or_new(skip_virtual: true, skip_modules: true)
-  if action == :create && lcard.real? && lcard.action != :create
-    action = :update
-  end
+  action = :update if action == :create && lcard.real? && lcard.action != :create
   lcard.permission_rule_id action
 end
 
@@ -83,9 +81,11 @@ end
 
 def require_permission_rule! rule_id, action
   return if rule_id
+
   # RULE missing.  should not be possible.
   # generalize this to handling of all required rules
-  errors.add :permission_denied, tr(:error_no_action_rule, action: action, name: name)
+  errors.add :permission_denied,
+             t(:permission_error_no_action_rule, action: action, name: name)
   raise Card::Error::PermissionDenied, self
 end
 
@@ -117,6 +117,7 @@ def permit action, verb=nil
   end
 
   return true if permitted? action
+
   verb ||= action.to_s
   deny_because you_cant("#{verb} #{name.present? ? name : 'this'}")
 end
@@ -131,6 +132,7 @@ end
 def ok_to_create_side side
   # left is supercard; create permissions will get checked there.
   return true if side == :left && superleft
+
   part_card = send side, new: {}
   # if no card, there must be other errors
   return true unless part_card&.new_card? && !part_card.ok?(:create)
@@ -151,6 +153,7 @@ end
 def ok_to_update
   return false unless permit(:update)
   return true unless type_id_changed? && !permitted?(:create)
+
   deny_because you_cant("change to this type (need create permission)")
 end
 
@@ -177,17 +180,18 @@ end
 
 def update_field_read_rules
   return unless type_id_changed? || read_rule_id_changed?
+
   each_field_as_bot do |field|
     field.update_read_rule if field.rule(:read) == "_left"
   end
 end
 
-def each_field_as_bot
+def each_field_as_bot &block
   # find all cards with me as trunk and update their read_rule
   # (because of *type plus right)
   # skip if name is updated because will already be resaved
   Auth.as_bot do
-    fields.each { |field| yield field }
+    fields.each(&block)
   end
 end