card-mod-bootstrap 0.11.2 → 0.12.0

data/set/abstract/bootstrap_code_file.rb

@@ -1,4 +1,3 @@
-
 def self.included host_class
   host_class.include_set Abstract::CodeFile
   host_class.include OverrideCodeFile

data/set/abstract/bootswatch_theme.rb

@@ -142,6 +142,7 @@ end
 def scss_from_theme_file file
   return "" unless (path = ::File.join(source_dir, "_#{file}.scss")) &&
                    ::File.exist?(path)
+
   ::File.read path
 end
 

data/set/abstract/bs_badge/tab_badge.haml

@@ -1,5 +1,5 @@
 %div.tab-badge.count-number.clearfix{ class: klass }
   %span.badge.badge-secondary{ class: "badge-#{color}" }
-    = count
+    = number_with_delimiter count
   %span.badge-label
     = label

data/set/all/bootstrap/dropdown.rb

@@ -57,19 +57,27 @@ format :html do
     return unless item
 
     if item.is_a? Array
-      [dropdown_header(item.first), dropdown_array_list(item.second)]
+      formatted_dropdown_list_item item
     else
-      "<li class='dropdown-item#{' active' if active_test == active}'>#{item}</li>"
+      simple_dropdown_list_item item, (active_test == active)
     end
   end
 
+  def formatted_dropdown_list_item item
+    [dropdown_header(item.first), dropdown_array_list(item.second)]
+  end
+
+  def simple_dropdown_list_item item, active
+    "<li class='dropdown-item#{' active' if active}'>#{item}</li>"
+  end
+
   def split_button_toggle
-    wrap_with(:a,
+    wrap_with :a,
               href: "#",
               class: "nav-link pl-0 dropdown-toggle dropdown-toggle-split",
               "data-toggle" => "dropdown",
               "aria-haspopup" => "true",
-              "aria-expanded" => "false") do
+              "aria-expanded" => "false" do
       '<span class="sr-only">Toggle Dropdown</span>'
     end
   end

data/set/all/bootstrap/helper.rb

@@ -23,21 +23,28 @@ format :html do
     add_class options[:items], "list-group-item"
   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/set/all/bootstrap/icon.rb

@@ -96,7 +96,9 @@ format :html do
   end
 
   def font_awesome_icon_tag icon, opts={}
-    prepend_class opts, "fa fa-#{icon_class(:font_awesome, icon)}"
+
+    prepend_class opts,
+                  "fa#{'b' if opts.delete :brand} fa-#{icon_class(:font_awesome, icon)}"
     wrap_with :i, "", opts
   end
 

data/set/all/bootstrap/table.rb

@@ -17,6 +17,7 @@ format :html do
 
     def header
       return unless @header
+
       tag :thead do
         tag :tr do
           @header.map do |item|

data/set/all/bootstrap/wrapper.rb

@@ -1,6 +1,6 @@
 format :html do
   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
@@ -14,7 +14,5 @@ format :html do
     super
   end
 
-  def panel_state
-  end
+  def panel_state; end
 end
-

data/set/self/bootstrap_core.rb

@@ -3,13 +3,12 @@ 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
-
-

data/set/type/customized_bootswatch_skin.rb

@@ -37,13 +37,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/set/type_plus_right/customized_bootswatch_skin/colors.rb

@@ -27,11 +27,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
@@ -109,5 +110,5 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-bootstrap
 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,70 +18,70 @@ 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-edit
   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
 - !ruby/object:Gem::Dependency
   name: card-mod-bar_and_box
   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
 - !ruby/object:Gem::Dependency
   name: card-mod-style
   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
 - !ruby/object:Gem::Dependency
   name: card-mod-script
   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
@@ -226,20 +226,21 @@ files:
 - file/yeti_skin_image/image-medium.png
 - file/yeti_skin_image/image-original.png
 - file/yeti_skin_image/image-small.png
-- lib/bootstrap.rb
-- lib/bootstrap/basic_tags.rb
-- lib/bootstrap/component.rb
-- lib/bootstrap/component/carousel.rb
-- lib/bootstrap/component/form.rb
-- lib/bootstrap/component/horizontal_form.rb
-- lib/bootstrap/component/layout.rb
-- lib/bootstrap/component/panel.rb
-- lib/bootstrap/component_loader.rb
-- lib/bootstrap/content.rb
-- lib/bootstrap/delegate.rb
-- lib/bootstrap/old_component.rb
-- lib/bootstrap/tag_method.rb
-- lib/bootstrapper.rb
+- lib/card/bootstrap.rb
+- lib/card/bootstrap/basic_tags.rb
+- lib/card/bootstrap/component.rb
+- lib/card/bootstrap/component/carousel.rb
+- lib/card/bootstrap/component/form.rb
+- lib/card/bootstrap/component/horizontal_form.rb
+- lib/card/bootstrap/component/layout.rb
+- lib/card/bootstrap/component/panel.rb
+- lib/card/bootstrap/component_klass.rb
+- lib/card/bootstrap/component_loader.rb
+- lib/card/bootstrap/content.rb
+- lib/card/bootstrap/delegate.rb
+- lib/card/bootstrap/old_component.rb
+- lib/card/bootstrap/tag_method.rb
+- lib/card/bootstrapper.rb
 - lib/card/lazy_tab.rb
 - lib/card/tab.rb
 - lib/javascript/bootstrap_modal_decko.js
@@ -2993,7 +2994,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: Bootstrap

data/lib/bootstrap.rb

@@ -1,16 +0,0 @@
-require "bootstrap/component_loader"
-require "bootstrap/component"
-
-class Bootstrap
-  include Delegate
-  extend ComponentLoader
-  load_components
-
-  def initialize context=nil
-    @context = context
-  end
-
-  def render *args, &block
-    instance_exec *args, &block
-  end
-end

data/lib/bootstrap/basic_tags.rb

@@ -1,26 +0,0 @@
-# require 'component'
-
-class Bootstrap
-  module BasicTags
-    def html content
-      add_content String(content).html_safe
-      ""
-    end
-
-    Component.def_div_method :div, nil do |opts, extra_args|
-      prepend_class opts, extra_args.first if extra_args.present?
-      opts
-    end
-
-    Component.def_div_method :span, nil do |opts, extra_args|
-      prepend_class opts, extra_args.first if extra_args.present?
-      opts
-    end
-
-    Component.def_tag_method :tag, nil, tag: :yield do |opts, extra_args|
-      prepend_class opts, extra_args[1] if extra_args[1].present?
-      opts[:tag] = extra_args[0]
-      opts
-    end
-  end
-end

data/lib/bootstrap/component.rb

@@ -1,139 +0,0 @@
-class Bootstrap
-  # render components of bootstrap library
-  class Component
-    def initialize context, *args, &block
-      @context = context
-      @content = ["".html_safe]
-      @args = args
-      @child_args = []
-      @append = []
-      @wrap = []
-      @build_block = block
-      @html = Builder::XmlMarkup.new
-    end
-
-    class << self
-      def render format, *args, &block
-        new(format, *args, &block).render
-      end
-
-      # Like def_tag_method but always generates a div tag
-      # The tag option is not available
-      def def_div_method name, html_class, opts={}, &tag_block
-        def_tag_method name, html_class, opts.merge(tag: :div), &tag_block
-      end
-
-      # Defines a method that generates a html tag
-      # @param method_name [Symbol, String] the name of the method. If no :tag option in tag_opts is defined then the name is also the name of the tag that the method generates
-      # @param html_class [String] a html class that is added to tag. Use nil if you don't want a html_class
-      # @param tag_opts [Hash] additional argument that will be added to the tag
-      # @option tag_opts [Symbol, String] tag the name of the tag
-      # @example
-      #   def_tag_method :link, "known-link", tag: :a, id: "uniq-link"
-      #   link  # => <a class="known-link" id="uniq-link"></a>
-      def def_tag_method method_name, html_class, tag_opts={}, &tag_opts_block
-        tag = tag_opts.delete(:tag) || method_name
-        return def_simple_tag_method method_name, tag, html_class, tag_opts unless block_given?
-
-        define_method method_name do |*args, &content_block|
-          content, opts, new_child_args = standardize_args args, &tag_opts_block
-          add_classes opts, html_class, tag_opts.delete(:optional_classes)
-
-          @html.tag! tag, opts do
-            instance_exec(&content_block)
-          end
-        end
-      end
-
-      def def_simple_tag_method method_name, tag, html_class, tag_opts={}
-        define_method method_name do |*args, &content_block|
-          @html.tag! tag, class: html_class do
-            instance_exec &content_block
-          end
-        end
-      end
-    end
-
-    def render
-      @rendered = begin
-        render_content
-        # @content[-1]
-      end
-    end
-
-    def prepend &block
-      tmp = @content.pop
-      instance_exec(&block)
-      @content << tmp
-    end
-
-    def insert &block
-      instance_exec(&block)
-    end
-
-    def append &block
-      @append[-1] << block
-    end
-
-    def wrap tag=nil, &block
-      @wrap[-1] << (block_given? ? block : tag)
-    end
-
-    private
-
-    def render_content
-      # if @build_block.arity > 0
-      instance_exec *@args, &@build_block
-    end
-
-    def generate_content content, processor, &block
-      content = instance_exec &block if block.present?
-      return content if !processor || !content.is_a?(Array)
-      content.each {|item| send processor, item}
-      ""
-    end
-
-    def with_child_args args
-      @child_args << args if args.present?
-      yield.tap { @child_args.pop if args.present? }
-    end
-
-    def add_content content
-      @content[-1] << "\n#{content}".html_safe if content.present?
-    end
-
-    def standardize_args args, &block
-      opts = standardize_opts args
-      items = items_from_args args
-      opts, args = standardize_block_args opts, args, &block if block.present?
-
-      [items, opts, args]
-    end
-
-    def standardize_opts args
-      args.last.is_a?(Hash) ? args.pop : {}
-    end
-
-    def items_from_args args
-      ((args.one? && args.last.is_a?(String)) || args.last.is_a?(Array)) && args.pop
-    end
-
-    def standardize_block_args opts, args, &block
-      instance_exec(opts, args, &block).tap do |s_opts, _s_args|
-        unless s_opts.is_a? Hash
-          raise Card::Error, "first return value of a tag block has to be a hash"
-        end
-      end
-    end
-
-    def add_classes opts, html_class, optional_classes
-      prepend_class opts, html_class if html_class
-      Array.wrap(optional_classes).each do |k, v|
-        prepend_class opts, v if opts.delete k
-      end
-    end
-
-    include BasicTags
-    include Delegate
-  end
-end