card-mod-bootstrap 0.11.0 → 0.11.5

data/set/all/bootstrap/navbar.rb

@@ -1,5 +1,3 @@
-
-
 format :html do
   # Options
   # @param opts [Hash]
@@ -7,11 +5,17 @@ format :html do
   # @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
@@ -28,34 +32,10 @@ format :html do
   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/set/all/bootstrap/navbar/navbar_responsive.haml

@@ -0,0 +1,17 @@
+- brand = opts[:brand]
+- if brand.is_a? String
+  %span.navbar-brand
+    = brand
+- elsif brand
+  %a.navbar-brand{ href: brand[:href] || "#" }
+    = brand[:name]
+%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" }
+  %span.navbar-toggler-icon
+%div.collapse.navbar-collapse{ id: "navbar-collapse-#{id}" }
+  = content

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|
@@ -64,20 +65,21 @@ format :html do
       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/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.0
+  version: 0.11.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 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.0
+        version: 1.101.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.0
+        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.0
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        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.0
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        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.0
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        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.0
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.5
 description: ''
 email:
 - info@decko.org
@@ -230,13 +230,16 @@ 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
 - 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/lazy_tab.rb
 - lib/card/tab.rb
@@ -282,11 +285,13 @@ files:
 - set/abstract/bs_badge/labeled_badge.haml
 - set/abstract/bs_badge/tab_badge.haml
 - set/all/bootstrap/accordion.rb
+- set/all/bootstrap/downdown_button.haml
 - set/all/bootstrap/dropdown.rb
 - set/all/bootstrap/form.rb
 - set/all/bootstrap/helper.rb
 - set/all/bootstrap/icon.rb
 - set/all/bootstrap/navbar.rb
+- set/all/bootstrap/navbar/navbar_responsive.haml
 - set/all/bootstrap/table.rb
 - set/all/bootstrap/tabs.rb
 - set/all/bootstrap/tabs/tab_panel.haml
@@ -2964,10 +2969,15 @@ files:
 - vendor/select2/tests/vendor/qunit-1.23.1.css
 - vendor/select2/tests/vendor/qunit-1.23.1.js
 - vendor/select2/vendor/jquery-2.1.0.js
-homepage: http://decko.org
+homepage: https://decko.org
 licenses:
 - GPL-3.0
 metadata:
+  source_code_uri: https://github.com/decko-commons/decko
+  homepage_uri: https://decko.org
+  bug_tracker_uri: https://github.com/decko-commons/decko/issues
+  wiki_uri: https://decko.org
+  documentation_url: http://docs.decko.org/
   card-mod: bootstrap
 post_install_message:
 rdoc_options: []
@@ -2984,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.1.4
 signing_key:
 specification_version: 4
 summary: Bootstrap