card 1.101.5 → 1.101.6

data/tmpsets/set/{mod021-card-mod-bootstrap → mod022-card-mod-bootstrap}/all/bootstrap/helper.rb

@@ -20,27 +20,38 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     options = content_or_options if block_given?
     content = block_given? ? yield : content_or_options
     content = Array(content).map(&:to_s)
+    add_list_group_classes options
+    list_tag content, options
+  end
+
+  def add_list_group_classes options
     add_class options, "list-group"
     options[:items] ||= {}
     add_class options[:items], "list-group-item"
-    list_tag content, options
   end
 
-  def list_tag content_or_options=nil, options={}
-    options = content_or_options if block_given?
-    content = block_given? ? yield : content_or_options
-    content = Array(content)
+  def list_tag content_or_options=nil, options={}, &block
+    content, options = list_tag_content_and_options content_or_options, options, &block
     default_item_options = options.delete(:items) || {}
-    tag = options[:ordered] ? :ol : :ul
-    wrap_with tag, options do
-      content.map do |item|
-        i_content, i_opts = item
-        i_opts ||= default_item_options
-        wrap_with :li, i_content, i_opts
-      end
+    wrap_with (options[:ordered] ? :ol : :ul), options do
+      list_items content, default_item_options
     end
   end
 
+  def list_items content, default_item_options
+    content.map do |item|
+      i_content, i_opts = item
+      i_opts ||= default_item_options
+      wrap_with :li, i_content, i_opts
+    end
+  end
+
+  def list_tag_content_and_options content_or_options, options
+    options = content_or_options if block_given?
+    content = block_given? ? yield : content_or_options
+    [Array(content), options]
+  end
+
   def badge_tag content, options={}
     add_class options, "badge"
     wrap_with :span, content, options

data/tmpsets/set/{mod021-card-mod-bootstrap → mod022-card-mod-bootstrap}/all/bootstrap/icon.rb

@@ -30,7 +30,6 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
       expand: :expand_more,
       collapse_down: :expand_less,
       globe: :public,
-      check_circle_o: nil,
       commenting: :comment
     },
     font_awesome: {
@@ -39,10 +38,9 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
       globe: :globe,
       zoom_out: "search-minus",
       close: :remove,
-      check_circle_o: "check-circle-o",
-      check_circe: "check-circle",
+      check_circle: "check-circle",
       reorder: "align-justify",
-      commenting: :commenting
+      commenting: :comments
     },
     glyphicon: {
       option_horizontal: "option-horizontal",
@@ -58,7 +56,6 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
       close: :remove,
       new_window: "new-window",
       history: :time,
-      check_circle_o: "ok-circle",
       check_circle: "ok-sign",
       reorder: "align-justify"
     }
@@ -82,17 +79,18 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def icon_tag icon, opts={}
-    opts = { class: opts } unless opts.is_a? Hash
-    library = opts.delete(:library) || default_icon_library
-    universal_icon_tag icon, library, opts
+    with_icon_tag_opts(opts) do |tag_opts|
+      library = tag_opts.delete(:library) || default_icon_library
+      universal_icon_tag icon, library, tag_opts
+    end
   end
 
   def universal_icon_tag icon, icon_library=default_icon_library, opts={}
     return "" unless icon.present?
 
-    opts = { class: opts } unless opts.is_a? Hash
-    icon_method = "#{icon_library}_icon_tag"
-    send icon_method, icon, opts
+    with_icon_tag_opts(opts) do |tag_opts|
+      send "#{icon_library}_icon_tag", icon, tag_opts
+    end
   end
 
   def default_icon_library
@@ -113,6 +111,13 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     add_class opts, "material-icons"
     wrap_with :i, icon_class(:material, icon), opts
   end
+
+  private
+
+  def with_icon_tag_opts opts={}
+    opts = { class: opts } unless opts.is_a? Hash
+    yield opts
+  end
 end
 end;end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-bootstrap/set/all/bootstrap/icon.rb ~~

data/tmpsets/set/{mod021-card-mod-bootstrap → mod022-card-mod-bootstrap}/all/bootstrap/navbar.rb

@@ -5,8 +5,6 @@ class Card; module Set; class All; module Bootstrap;
 module Navbar;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-bootstrap/set/all/bootstrap/navbar.rb"; end
-
-
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   # Options
   # @param opts [Hash]
@@ -14,11 +12,17 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   # @option opts [String] class
   # @option opts [Boolean] no_collapse
   # @option opts [:left, :right] toggle_align
-  def navbar id, opts={}
+  def navbar id, opts={}, &block
     nav_opts = opts[:navbar_opts] || {}
     nav_opts[:class] ||= opts[:class]
     add_class nav_opts,
               "navbar navbar-dark bg-#{opts.delete(:navbar_type) || 'primary'}"
+    navbar_content id, opts, nav_opts, &block
+  end
+
+  private
+
+  def navbar_content id, opts, nav_opts
     content = yield
     if opts[:no_collapse]
       navbar_nocollapse content, nav_opts
@@ -35,34 +39,10 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   def navbar_responsive id, content, opts, nav_opts
     opts[:toggle_align] ||= :right
     wrap_with :nav, nav_opts do
-      [
-        navbar_header(opts[:brand]),
-        navbar_toggle(id, opts[:toggle_align]),
-        wrap_with(:div, class: "collapse navbar-collapse",
-                  id: "navbar-collapse-#{id}") { content }
-      ]
+      haml :navbar_responsive, id: id, content: content, opts: opts
     end
   end
 
-  def navbar_header brand
-    return "" unless brand
-    if brand.is_a? String
-      "<span class='navbar-brand'>#{brand}</span>"
-    else
-      link = brand[:href] || "#"
-      "<a class='navbar-brand' href='#{link}#'>#{brand[:name]}</a>"
-    end
-  end
-
-  def navbar_toggle id, align
-    content ||= %(<span class="navbar-toggler-icon"></span>)
-    <<-HTML
-      <button class="navbar-toggler navbar-toggler-#{align}" type="button" data-toggle="collapse" data-target="#navbar-collapse-#{id}" aria-controls="navbar-collapse-#{id}" aria-expanded="false" aria-label="Toggle navigation">
-          #{content}
-      </button>
-    HTML
-  end
-
   def breadcrumb items
     wrap_with :ol, class: "breadcrumb" do
       items.map do |item|

data/tmpsets/set/{mod021-card-mod-bootstrap → mod022-card-mod-bootstrap}/all/bootstrap/table.rb

@@ -24,6 +24,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
     def header
       return unless @header
+
       tag :thead do
         tag :tr do
           @header.map do |item|
@@ -71,20 +72,21 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
       end
     end
 
-    def tag elem, content_or_opts={}, opts={}, &block
+    def tag elem, *args, &block
       if @div_table
-        if content_or_opts.is_a? Hash
-          @format.add_class content_or_opts, elem
-        else
-          @format.add_class opts, elem
-        end
+        add_div_table_class elem, *args
         elem = :div
       end
-      @format.wrap_with elem, content_or_opts, opts, &block
+      @format.wrap_with elem, *args, &block
     end
 
     private
 
+    def add_div_table_class elem, content_or_opts={}, opts={}
+      klass_opts = content_or_opts.is_a?(Hash) ? content_or_opts : opts
+      @format.add_class klass_opts, elem
+    end
+
     def initialize_header header, content
       case header
       when Array then header

data/tmpsets/set/{mod021-card-mod-bootstrap → mod022-card-mod-bootstrap}/all/bootstrap/wrapper.rb

@@ -7,7 +7,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-bootstrap/set/all/bootstrap/wrapper.rb"; end
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   def frame
-    class_up "d0-card-header" , "card-header"
+    class_up "d0-card-header", "card-header"
     class_up "d0-card-body", "card-body card-text"
     super
   end
@@ -21,8 +21,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
     super
   end
 
-  def panel_state
-  end
+  def panel_state; end
 end
 end;end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-bootstrap/set/all/bootstrap/wrapper.rb ~~

data/tmpsets/set/{mod021-card-mod-bootstrap → mod022-card-mod-bootstrap}/self/bootstrap_core.rb

@@ -10,12 +10,13 @@ include_set Abstract::BootstrapCodeFile
 def load_stylesheets
   add_bs_stylesheet "variables"
   add_bs_subdir "mixins"
-  %w[ print reboot type images code grid tables forms buttons transitions dropdown
-      button-group input-group custom-forms nav navbar card breadcrumb pagination badge
-      jumbotron alert progress media list-group close modal tooltip popover carousel
-    ].each do |name|
-      add_bs_stylesheet name
-    end
+  %w[
+    print reboot type images code grid tables forms buttons transitions dropdown
+    button-group input-group custom-forms nav navbar card breadcrumb pagination badge
+    jumbotron alert progress media list-group close modal tooltip popover carousel
+  ].each do |name|
+    add_bs_stylesheet name
+  end
   add_bs_subdir "utilities"
 end
 end;end;end;end;

data/tmpsets/set/{mod021-card-mod-bootstrap → mod022-card-mod-bootstrap}/type/customized_bootswatch_skin.rb

@@ -44,13 +44,17 @@ def theme_codename
 end
 
 event :validate_theme_template, :validate, on: :create do
-  if theme_name
-    if Card.fetch_type_id(theme_card_name) != Card::BootswatchSkinID
-      errors.add :abort, tr(:not_valid_theme, theme_name: theme_name)
-    elsif !Dir.exist? source_dir
-      puts method(:source_dir).source_location
-      errors.add :abort, tr(:cannot_source_theme, theme_name: theme_name)
-    end
+  return unless (tname = theme_name) && (etype = theme_error_type)
+
+  errors.add :abort, t("bootstrap_#{etype}", theme_name: tname)
+end
+
+def theme_error_type
+  if Card.fetch_type_id(theme_card_name) != Card::BootswatchSkinID
+    :not_valid_theme
+  elsif !Dir.exist? source_dir
+    # puts method(:source_dir).source_location
+    :cannot_source_theme
   end
 end
 

data/tmpsets/set/{mod021-card-mod-bootstrap → mod022-card-mod-bootstrap}/type_plus_right/customized_bootswatch_skin/colors.rb

@@ -34,11 +34,12 @@ end
 
 def value_from_variables_card name
   return unless (var_card = left.variables_card) && var_card.content.present?
+
   value_from_scss name, var_card.content
 end
 
 def definition_regex name
-  /^(?<before>\s*\$#{name}\:\s*)(?<value>.+?)(?<after> !default;)$/
+  /^(?<before>\s*\$#{name}:\s*)(?<value>.+?)(?<after> !default;)$/
 end
 
 def default_value_from_bootstrap name
@@ -116,7 +117,7 @@ def replace_values group, prefix=""
 end
 
 def variable_values_from_params group
-  Env.params.dig(group)&.slice(*VARIABLE_NAMES[group]) || {}
+  Env.params[group]&.slice(*VARIABLE_NAMES[group]) || {}
 end
 end;end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-bootstrap/set/type_plus_right/customized_bootswatch_skin/colors.rb ~~

data/tmpsets/set/{mod022-card-mod-comment → mod023-card-mod-comment}/all/comment.rb

@@ -12,6 +12,7 @@ end
 event :add_comment, :prepare_to_store, on: :save, when: :comment do
   Env.session[:comment_author] = comment_author if Env.session
   return unless comment.present?
+
   self.content =
     [content, format.comment_with_signature].compact.join "\n<hr\>\n"
   self.comment = nil
@@ -32,7 +33,7 @@ end
 
 module Format; module_parent.send :register_set_format, Card::Format, self; extend Card::Set::AbstractFormat
   def comment_with_signature
-    card.clean_comment + "\n" + comment_signature
+    "#{card.clean_comment}\n#{comment_signature}"
   end
 
   def comment_signature
@@ -60,6 +61,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def hidden_comment_fields
     return unless card.new_card?
+
     hidden_field_tag "card[name]", card.name
     # FIXME: wish we had more generalized solution for names.
     # without this, nonexistent cards will often take left's linkname.
@@ -78,6 +80,7 @@ module Format; module_parent.send :register_set_format, Card::Format, self; exte
 
   def comment_author_label
     return if Auth.signed_in?
+
     %(<label>My Name is:</label> #{text_field :comment_author})
   end
 

data/tmpsets/set/{mod023-card-mod-date → mod024-card-mod-date}/right/when_created.rb

@@ -7,6 +7,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-date/set/right/when_created.rb"; end
 def content
   return "" unless left&.real?
+
   I18n.localize left.created_at, format: :card_dayofwk_min_tz
 end
 

data/tmpsets/set/{mod023-card-mod-date → mod024-card-mod-date}/right/when_last_edited.rb

@@ -7,6 +7,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-date/set/right/when_last_edited.rb"; end
 def content
   return "" unless left&.real?
+
   I18n.localize left.updated_at, format: :card_dayofwk_min_tz
 end
 

data/tmpsets/set/{mod023-card-mod-date → mod024-card-mod-date}/self/datepicker.rb

@@ -7,7 +7,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-date/set/self/datepicker.rb"; end
 def raw_help_text
   <<-TEXT
-    Configure the date select tool using these available 
+    Configure the date select tool using these available
     [[https://tempusdominus.github.io/bootstrap-4/Options/|options]]
   TEXT
 end

data/tmpsets/set/{mod023-card-mod-date → mod024-card-mod-date}/self/now.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Self
 module Now;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-date/set/self/now.rb"; end
-
 def content
   I18n.localize(Time.now, format: :card_dayofwk_min_tz)
 end

data/tmpsets/set/{mod025-card-mod-follow → mod026-card-mod-follow}/all/follow/follow_link.rb

@@ -31,7 +31,8 @@ class FollowLink
       class: @format.css_classes("follow-link", link_opts[:class],
                                  "slotter btn btn-sm btn-primary")
     )
-    opts["data-update-foreign-slot"] = ".d0-card-body > .card-slot.RIGHT-Xfollower.content-view"
+    opts["data-update-foreign-slot"] =
+      ".d0-card-body > .card-slot.RIGHT-Xfollower.content-view"
     opts["data-hover-text"] = hover_text if hover_text
     link_to render_link_text, opts
   end
@@ -57,7 +58,7 @@ class FollowLink
   def path view=:follow_status
     @format.path mark: mark,
                  action: :update,
-                 success: { id: @card.name, view: view },
+                 success: { mark: @card.name, view: view },
                  card: { content: "[[#{rule_content}]]" }
   end