card-mod-bootstrap 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55d82665bf9f0dbe95249c6ca217b2680bc4d5b5c686603d6c2492326ef509d6
-  data.tar.gz: a1b37069189c92055118ff4f83d5bdd36b0cbd4ffe8cb5a7c04cb8608de2d56f
+  metadata.gz: 3cec84d4d107eb10c36b89dcdcf027d3c5dd2f6fd3a0f37409099cee8fe037b9
+  data.tar.gz: 641ae7a1c7480deac8d098899b3188d8e0b0e55579ebdc430d393f423b4e7754
 SHA512:
-  metadata.gz: cadf0a9e8215088ea069a2a03200f8485ca417c9c3cf4450286d812f32b543e13e135a045f39e41886734591d5724376e124054d53337c535e750915522e8fde
-  data.tar.gz: 3ee09c23802cc22827423258bfaf33f95aeef889e979b813f530585fc4d0c5fa1f055416fe8eb8addbb2fa3e8843cec9f818b2c5097083789fdf759b2791e885
+  metadata.gz: d1ddfdf005e2cc00e919f50f6e39c5395eaae0de0c713ecb44bb8dc9a66a7a5390d89fb12f99a21f0d681eef7aa8abf97a86e188d670ebbcb355058ba9c03f84
+  data.tar.gz: 748a9964081887d8b5a9123197db0e5278e03d55201302c7b3b5843f9fa2c8273fd0770ee7d8d749dd1061c7c2694745bef2b65656f30718394159a659ed2e1b

data/db/migrate_core_cards/20170719163733_update_bootswatch_themes_to_4_beta.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require_relative "lib/skin"
 
 class UpdateBootswatchThemesTo4Beta < Cardio::Migration::Core
@@ -51,5 +52,3 @@ class UpdateBootswatchThemesTo4Beta < Cardio::Migration::Core
     end
   end
 end
-
-

data/db/migrate_core_cards/20170726111053_add_bootstrap_mixins.rb

@@ -3,9 +3,9 @@
 class AddBootstrapMixins < Cardio::Migration::Core
   def up
     ensure_card "style: bootstrap mixins", type_id: Card::ScssID,
-                codename: "style_bootstrap_mixins"
+                                           codename: "style_bootstrap_mixins"
 
     ensure_card "style: bootstrap breakpoints", type_id: Card::ScssID,
-                    codename: "style_bootstrap_breakpoints"
+                                                codename: "style_bootstrap_breakpoints"
   end
 end

data/db/migrate_core_cards/20170726145012_select2.rb

@@ -3,8 +3,8 @@
 class Select2 < Cardio::Migration
   def up
     add_script "select2",
-                type_id: Card::JavaScriptID,
-                to: "*all+*script"
+               type_id: Card::JavaScriptID,
+               to: "*all+*script"
 
     # add_style "select2",
     #           type_id: Card::CssID,

data/db/migrate_core_cards/20180423160231_migrate_customized_bootstrap_skin.rb

@@ -51,6 +51,7 @@ class MigrateCustomizedBootstrapSkin < Cardio::Migration::Core
   def migrate_customizable_bootstrap_skin
     referers = Card.search refer_to: { codename: OLD_SKIN.to_s }
     return unless referers.present?
+
     replace_old_skin referers
     build_new_skin
     delete_code_card OLD_SKIN

data/db/migrate_core_cards/20180423170283_add_type_bootswatch_skin.rb

@@ -25,6 +25,7 @@ class AddTypeBootswatchSkin < Cardio::Migration::Core
       puts "updating #{skin_name}"
       card = Card.fetch(skin_name)
       next puts "card not found" unless card
+
       card.update! type_id: Card::BootswatchSkinID
     end
   end

data/db/migrate_core_cards/20180425174433_delete_deprecated_skin_cards.rb

@@ -6,6 +6,7 @@ class Skin
   def delete_deprecated_skin_cards
     skin_cards.each do |name_parts|
       next if !Card.fetch(name_parts) || !Card.fetch(name_parts).pristine?
+
       delete_card name_parts
     end
   end

data/db/migrate_core_cards/20181129140917_fix_skin_images.rb

@@ -1,4 +1,3 @@
-
 require_relative "lib/skin"
 
 class FixSkinImages < ActiveRecord::Migration[5.2]

data/db/migrate_core_cards/data/20181108181219_migrate_classic_skins_to_bootstrap.rb

@@ -22,6 +22,7 @@ class MigrateClassicSkinsToBootstrap < ActiveRecord::Migration[5.2]
 
     layout_rule = Card[:all, :layout]
     return unless layout_rule.first_name.key == UNSUPPORTED_LAYOUT
+
     layout_rule.update! content: DEFAULT_LAYOUT
   end
 end

data/db/migrate_core_cards/lib/skin.rb

@@ -4,7 +4,7 @@ class Skin
 
   class << self
     def vendor_path
-      File.expand_path "../../../../vendor", __FILE__
+      File.expand_path "../../../vendor", __dir__
     end
 
     def bootstrap_scss_path filename

data/lib/bootstrap.rb

@@ -6,11 +6,13 @@ class Bootstrap
   extend ComponentLoader
   load_components
 
+  attr_reader :context
+
   def initialize context=nil
     @context = context
   end
 
   def render *args, &block
-    instance_exec *args, &block
+    instance_exec(*args, &block)
   end
 end

data/lib/bootstrap/component.rb

@@ -1,6 +1,8 @@
 class Bootstrap
   # render components of bootstrap library
   class Component
+    extend ComponentClass
+
     def initialize context, *args, &block
       @context = context
       @content = ["".html_safe]
@@ -12,53 +14,8 @@ class Bootstrap
       @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
+      @rendered = render_content
     end
 
     def prepend &block
@@ -79,17 +36,29 @@ class Bootstrap
       @wrap[-1] << (block_given? ? block : tag)
     end
 
+    def card
+      @context.context.card
+    end
+
     private
 
+    def tag_method_opts args, html_class, tag_opts, &tag_opts_block
+      opts = {}
+      _blah, opts, _blah = standardize_args args, &tag_opts_block if block_given?
+      add_classes opts, html_class, tag_opts.delete(:optional_classes)
+      opts
+    end
+
     def render_content
       # if @build_block.arity > 0
-      instance_exec *@args, &@build_block
+      instance_exec(*@args, &@build_block)
     end
 
     def generate_content content, processor, &block
-      content = instance_exec &block if block.present?
+      content = instance_exec(&block) if block.present?
       return content if !processor || !content.is_a?(Array)
-      content.each {|item| send processor, item}
+
+      content.each { |item| send processor, item }
       ""
     end
 

data/lib/bootstrap/component/carousel.rb

@@ -2,14 +2,14 @@ class Bootstrap
   class Component
     class Carousel < Component
       def render_content
-        carousel *@args, &@build_block
+        carousel(*@args, &@build_block)
       end
 
       def carousel id, active_index, &block
         @id = id
         @active_item_index = active_index
         @items = []
-        instance_exec &block
+        instance_exec(&block)
 
         @html.div class: "carousel slide", id: id, "data-ride" => "carousel" do
           indicators
@@ -26,16 +26,24 @@ class Bootstrap
       def items
         @html.div class: "carousel-inner", role: "listbox" do
           @items.each_with_index do |item, index|
-            html_opts = { class: "carousel-item" }
-            add_class html_opts, "active" if index == @active_item_index
-            @html.div html_opts do
-              item = item.call if item.respond_to?(:call)
-              @html << item if item.is_a?(String)
-            end
+            carousel_item item, carousel_item_opts(index)
           end
         end
       end
 
+      def carousel_item_opts index
+        { class: "carousel-item" }.tap do |opts|
+          add_class opts, "active" if index == @active_item_index
+        end
+      end
+
+      def carousel_item item, html_opts
+        @html.div html_opts do
+          item = item.call if item.respond_to?(:call)
+          @html << item if item.is_a?(String)
+        end
+      end
+
       def control_prev
         @html.a class: "carousel-control-prev", href: "##{@id}", role: "button",
                 "data-slide" => "prev" do

data/lib/bootstrap/component/component_class.rb

@@ -0,0 +1,36 @@
+class Bootstrap
+  class Component
+    # class methods for Bootstrap::Component
+    module ComponentClass
+      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
+        define_method method_name do |*args, &content_block|
+          @html.tag! tag, tag_method_opts(args, html_class, tag_opts, &tag_opts_block) do
+            instance_exec(&content_block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bootstrap/component/form.rb

@@ -2,7 +2,7 @@ class Bootstrap
   class Component
     class Form < Component
       def render_content *args
-        form *args, &@build_block
+        form(*args, &@build_block)
       end
 
       #
@@ -23,13 +23,13 @@ class Bootstrap
         add_class opts, "form-horizontal" if opts.delete(:horizontal)
         add_class opts, "form-inline" if opts.delete(:inline)
         @html.form opts do
-          instance_exec &block
+          instance_exec(&block)
         end
       end
 
       def group text=nil, &block
         @html.div text, class: "form-group" do
-          instance_exec &block
+          instance_exec(&block)
         end
       end
 
@@ -53,7 +53,7 @@ class Bootstrap
         #   opts
         # end
 
-        define_method tag do |text: nil, id:, label: |
+        define_method tag do |id:, label:, text: nil|
           @html.input id: id, class: "form-control", type: tag do
             @html.label label, for: id if label
             @html << text

data/lib/bootstrap/component/horizontal_form.rb

@@ -27,7 +27,7 @@ class Bootstrap
         @html.label label, for: id, class: "col-sm-#{left_col_width} control-label"
       end
 
-      def input type, label:, id:, &block
+      def input type, label:, id:
         label_col label, id: id
         @html.div class: "col-sm-#{right_col_width}" do
           @html.input type: type, id: id, class: "form-control"
@@ -49,7 +49,7 @@ class Bootstrap
         { class: "col-sm-offset-#{left_col_width} col-sm-#{right_col_width}" }
       end
 
-      def checkbox text, extra_args
+      def checkbox _text, _extra_args
         @html.div class: "col-sm-offset-#{left_col_width} col-sm-#{right_col_width}" do
           @html.div class: "checkbox" do
             label_cllabel do

data/lib/bootstrap/component/layout.rb

@@ -17,7 +17,6 @@ class Bootstrap
     #     row 6, 6, ["unicorn", "rainbow"], class: "horn"
     #   end
     class Layout < OldComponent
-
       def render
         @rendered = begin
           render_content
@@ -26,10 +25,11 @@ class Bootstrap
       end
 
       def render_content
-        content = instance_exec *@args, &@build_block
+        content = instance_exec(*@args, &@build_block)
         add_content content
         opts = @args.first
-        return unless opts && opts.delete(:container)
+        return unless opts&.delete(:container)
+
         content = @content.pop
         @content = ["".html_safe]
         container content, opts
@@ -67,7 +67,7 @@ class Bootstrap
         opts
       end
 
-     alias_method :col, :column
+      alias_method :col, :column
 
       private
 
@@ -89,12 +89,14 @@ class Bootstrap
 
       def col_widths_from_args args
         raise Error, "bad argument" unless args.all? { |a| a.is_a? Integer }
+
         { md: Array.wrap(args) }
       end
 
       def col_widths_from_opts opts
         %i[lg xs sm md].each_with_object({}) do |k, cols_w|
           next unless (widths = opts.delete(k))
+
           cols_w[k] = Array.wrap widths
         end
       end

data/lib/bootstrap/component_loader.rb

@@ -15,7 +15,7 @@ class Bootstrap
     end
 
     def components
-      path = File.expand_path "../component/*.rb", __FILE__
+      path = File.expand_path "component/*.rb", __dir__
       Dir.glob(path).map do |file|
         File.basename file, ".rb"
       end

data/lib/bootstrapper.rb

@@ -7,7 +7,7 @@ module Bootstrapper
   end
 
   def bs *args, &block
-    bootstrap.render *args, &block
+    bootstrap.render(*args, &block)
   end
 
   components.each do |component|

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/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/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_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.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-10 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.4
+        version: 1.101.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.4
+        version: 1.101.5
 - !ruby/object:Gem::Dependency
   name: card-mod-edit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
 - !ruby/object:Gem::Dependency
   name: card-mod-bar_and_box
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
 - !ruby/object:Gem::Dependency
   name: card-mod-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
 - !ruby/object:Gem::Dependency
   name: card-mod-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
 description: ''
 email:
 - info@decko.org
@@ -230,6 +230,7 @@ files:
 - lib/bootstrap/basic_tags.rb
 - lib/bootstrap/component.rb
 - lib/bootstrap/component/carousel.rb
+- lib/bootstrap/component/component_class.rb
 - lib/bootstrap/component/form.rb
 - lib/bootstrap/component/horizontal_form.rb
 - lib/bootstrap/component/layout.rb