card-mod-bootstrap 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c31511cfd0da92aab931377fa7fe620fe5e4dc52e3e4ed1690174a2a2bbb911f
-  data.tar.gz: 4a8e03c11693359eaacf38f6694ea59075aef2e4e9446628ac51352577d2070e
+  metadata.gz: e192bb7175f1854e0704e18a89779d43a2fea5997193d9aeeb93e776cff5932b
+  data.tar.gz: 1aee3beaadc0f57a084dc668241c14382ae4fffb967c2602fbc6b91865129b8a
 SHA512:
-  metadata.gz: f4200d94a9802111e90f12b72246aacad7e1f8390e740c231f6b765081dcbc3ed1a6c9bcc16f9e836e4463e0cd59b801a9a301a5ee898c6eb3fbebf39f0c7e7e
-  data.tar.gz: 544ff54e8ec2cd5413ab3e3ea2af794dbc12385c105dd7e7848c627b68f0041487479be4f02db8db5935149fb67c02d95795d569ba56e340c89c1fc61d3dce9a
+  metadata.gz: 52ef33f4a6643179eed3182d08894522f335e56083cb4599bdbee2c6a8d9b3481adff39b7a70d1e92d9be614240087fd1de0a9eb096ec3a0498bfdd558730c5f
+  data.tar.gz: a89f64983869e77742c45f0bea1d109981ab83a378459d1e9dd1494aff989a6e3d6f940ecc43f731df803e0120b0b1830c5154a9c27a42005926bb3f0a1a1542

data/assets/script/manifest.yml

@@ -6,6 +6,8 @@ remote:
       integrity: sha512-Y4+u+T/6DpDb2AkTrxs3eJiN9o/u+l8pLNt0lSRKnJe2wIDVCwd7N8afy+70Pmr5FtmoX5IXmwK6H7Jlb8Nx8A==
       referrerpolicy: no-referrer
       crossorigin: anonymous
+    - src: https://kit.fontawesome.com/1366963381.js
+      crossorigin: anonymous
 
 bootstrap:
   items:
@@ -15,4 +17,3 @@ bootstrap:
     - script_load_select2.js.coffee
     - ../../vendor/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min.js
     - script_colorpicker.js.coffee
-

data/assets/style/manifest.yml

@@ -9,7 +9,7 @@ bootstrap_decko:
 
 libraries:
   items:
-    - font_awesome.css
+    # - font_awesome.css
     # - material_icons.css
     - bootstrap-icons.css
     - bootstrap_colorpicker.scss

data/data/real.yml

@@ -27,8 +27,7 @@
 - :name:
     - :cerulean_skin
     - :image
-  :image: cerulean_skin_image/image-original.png
-  :codename: cerulean_skin_image
+  :image: cerulean_skin/image/image-original.png
   :storage_type: :coded
 - :name: cosmo skin
   :type: :bootswatch_skin
@@ -36,8 +35,7 @@
 - :name:
     - :cosmo_skin
     - :image
-  :image: cosmo_skin_image/image-original.png
-  :codename: cosmo_skin_image
+  :image: cosmo_skin/image/image-original.png
   :storage_type: :coded
 - :name: cyborg skin
   :type: :bootswatch_skin
@@ -45,8 +43,7 @@
 - :name:
     - :cyborg_skin
     - :image
-  :image: cyborg_skin_image/image-original.png
-  :codename: cyborg_skin_image
+  :image: cyborg_skin/image/image-original.png
   :storage_type: :coded
 - :name: darkly skin
   :type: :bootswatch_skin
@@ -54,8 +51,7 @@
 - :name:
     - :darkly_skin
     - :image
-  :image: darkly_skin_image/image-original.png
-  :codename: darkly_skin_image
+  :image: darkly_skin/image/image-original.png
   :storage_type: :coded
 - :name: flatly skin
   :type: :bootswatch_skin
@@ -63,8 +59,7 @@
 - :name:
     - :flatly_skin
     - :image
-  :image: flatly_skin_image/image-original.png
-  :codename: flatly_skin_image
+  :image: flatly_skin/image/image-original.png
   :storage_type: :coded
 - :name: journal skin
   :type: :bootswatch_skin
@@ -72,8 +67,7 @@
 - :name:
     - :journal_skin
     - :image
-  :image: journal_skin_image/image-original.png
-  :codename: journal_skin_image
+  :image: journal_skin/image/image-original.png
   :storage_type: :coded
 - :name: lumen skin
   :type: :bootswatch_skin
@@ -81,8 +75,7 @@
 - :name:
     - :lumen_skin
     - :image
-  :image: lumen_skin_image/image-original.png
-  :codename: lumen_skin_image
+  :image: lumen_skin/image/image-original.png
   :storage_type: :coded
 - :name: sandstone skin
   :type: :bootswatch_skin
@@ -90,8 +83,7 @@
 - :name:
     - :sandstone_skin
     - :image
-  :image: sandstone_skin_image/image-original.png
-  :codename: sandstone_skin_image
+  :image: sandstone_skin/image/image-original.png
   :storage_type: :coded
 - :name: simplex skin
   :type: :bootswatch_skin
@@ -99,8 +91,7 @@
 - :name:
     - :simplex_skin
     - :image
-  :image: simplex_skin_image/image-original.png
-  :codename: simplex_skin_image
+  :image: simplex_skin/image/image-original.png
   :storage_type: :coded
 - :name: slate skin
   :type: :bootswatch_skin
@@ -108,8 +99,7 @@
 - :name:
     - :slate_skin
     - :image
-  :image: slate_skin_image/image-original.png
-  :codename: slate_skin_image
+  :image: slate_skin/image/image-original.png
   :storage_type: :coded
 - :name: spacelab skin
   :type: :bootswatch_skin
@@ -117,8 +107,7 @@
 - :name:
     - :spacelab_skin
     - :image
-  :image: spacelab_skin_image/image-original.png
-  :codename: spacelab_skin_image
+  :image: spacelab_skin/image/image-original.png
   :storage_type: :coded
 - :name: superhero skin
   :type: :bootswatch_skin
@@ -126,8 +115,7 @@
 - :name:
     - :superhero_skin
     - :image
-  :image: superhero_skin_image/image-original.png
-  :codename: superhero_skin_image
+  :image: superhero_skin/image/image-original.png
   :storage_type: :coded
 - :name: united skin
   :type: :bootswatch_skin
@@ -135,8 +123,7 @@
 - :name:
     - :united_skin
     - :image
-  :image: united_skin_image/image-original.png
-  :codename: united_skin_image
+  :image: united_skin/image/image-original.png
   :storage_type: :coded
 - :name: yeti skin
   :type: :bootswatch_skin
@@ -144,8 +131,7 @@
 - :name:
     - :yeti_skin
     - :image
-  :image: yeti_skin_image/image-original.png
-  :codename: yeti_skin_image
+  :image: yeti_skin/image/image-original.png
   :storage_type: :coded
 - :name: litera skin
   :type: :bootswatch_skin
@@ -153,8 +139,7 @@
 - :name:
     - :litera_skin
     - :image
-  :image: litera_skin_image/image-original.png
-  :codename: litera_skin_image
+  :image: litera_skin/image/image-original.png
   :storage_type: :coded
 - :name: lux skin
   :type: :bootswatch_skin
@@ -162,8 +147,7 @@
 - :name:
     - :lux_skin
     - :image
-  :image: lux_skin_image/image-original.png
-  :codename: lux_skin_image
+  :image: lux_skin/image/image-original.png
   :storage_type: :coded
 - :name: materia skin
   :type: :bootswatch_skin
@@ -171,8 +155,7 @@
 - :name:
     - :materia_skin
     - :image
-  :image: materia_skin_image/image-original.png
-  :codename: materia_skin_image
+  :image: materia_skin/image/image-original.png
   :storage_type: :coded
 - :name: minty skin
   :type: :bootswatch_skin
@@ -180,8 +163,7 @@
 - :name:
     - :minty_skin
     - :image
-  :image: minty_skin_image/image-original.png
-  :codename: minty_skin_image
+  :image: minty_skin/image/image-original.png
   :storage_type: :coded
 - :name: pulse skin
   :type: :bootswatch_skin
@@ -189,8 +171,7 @@
 - :name:
     - :pulse_skin
     - :image
-  :image: pulse_skin_image/image-original.png
-  :codename: pulse_skin_image
+  :image: pulse_skin/image/image-original.png
   :storage_type: :coded
 - :name: solar skin
   :type: :bootswatch_skin
@@ -198,8 +179,7 @@
 - :name:
     - :solar_skin
     - :image
-  :image: solar_skin_image/image-original.png
-  :codename: solar_skin_image
+  :image: solar_skin/image/image-original.png
   :storage_type: :coded
 - :name: sketchy skin
   :type: :bootswatch_skin
@@ -207,8 +187,7 @@
 - :name:
     - :sketchy_skin
     - :image
-  :image: sketchy_skin_image/image-original.png
-  :codename: sketchy_skin_image
+  :image: sketchy_skin/image/image-original.png
   :storage_type: :coded
 
 - :name:

data/data/transform/20171110164934_customizable_skin.rb

@@ -51,8 +51,8 @@ class CustomizableSkin < Cardio::Migration::Transform
       {
         "+custom theme" => {
           type: :scss,
-          content: "{{bootstrap: functions}}\n"\
-                   "#{theme_field_nests}\n"\
+          content: "{{bootstrap: functions}}\n" \
+                   "#{theme_field_nests}\n" \
                    "{{bootstrap: core}}\n{{+style|title: style}}",
           subcards: custom_theme_subcard_args.merge(
             "+style" => {

data/data/transform/20201129140917_remove_script_cards.rb

@@ -1,4 +1,3 @@
-
 class RemoveScriptCards < Cardio::Migration::Transform
   def up
     delete_code_card :script_select2

data/data/transform/20220514141025_remove_customized_bootswatch_skins.rb

@@ -1,4 +1,3 @@
-
 class RemoveCustomizedBootswatchSkins < Cardio::Migration::Transform
   def up
     Card.ensure! codename: "parent", name: "parent"
@@ -25,6 +24,7 @@ class RemoveCustomizedBootswatchSkins < Cardio::Migration::Transform
   def fix_stylesheets_field skin
     fld = skin.field :stylesheets
     return unless fld.real? && fld.try(:item_names).present?
+
     fld.content = fld.item_names.select do |i|
       fld.try(:ok_item_types)&.include? i.card&.type_code
     end

data/lib/card/bootstrap/basic_tags.rb

@@ -1,5 +1,6 @@
 class Card
   class Bootstrap
+    # simple html tag handling (div, span, etc)
     module BasicTags
       def html content
         add_content String(content).html_safe

data/lib/card/bootstrap/component/carousel.rb

@@ -1,6 +1,7 @@
 class Card
   class Bootstrap
     class Component
+      # support class for bootstrap carousels
       class Carousel < Component
         def render_content
           carousel(*@args, &@build_block)

data/lib/card/bootstrap/component/form.rb

@@ -1,6 +1,7 @@
 class Card
   class Bootstrap
     class Component
+      # support class for bootstrap forms
       class Form < Component
         def render_content *args
           form(*args, &@build_block)

data/lib/card/bootstrap/component/horizontal_form.rb

@@ -1,13 +1,14 @@
 class Card
   class Bootstrap
     class Component
+      # support class for horizontal bootstrap forms
       class HorizontalForm < Form
         def left_col_width
-          @child_args.last && @child_args.last[0] || 2
+          (@child_args.last && @child_args.last[0]) || 2
         end
 
         def right_col_width
-          @child_args.last && @child_args.last[1] || 10
+          (@child_args.last && @child_args.last[1]) || 10
         end
 
         def_tag_method :form, "form-horizontal"

data/lib/card/bootstrap/component/panel.rb

@@ -1,6 +1,7 @@
 class Card
   class Bootstrap
     class Component
+      # support class for bootstrap panels
       class Panel < OldComponent
         def_div_method :panel, "card"
         def_div_method :heading, "card-header"

data/lib/card/bootstrap/component_klass.rb

@@ -2,8 +2,8 @@ class Card
   class Bootstrap
     # class methods for Bootstrap::Component
     module ComponentKlass
-      def render format, *args, &block
-        new(format, *args, &block).render
+      def render(format, ...)
+        new(format, ...).render
       end
 
       # Like def_tag_method but always generates a div tag

data/lib/card/bootstrap/component_loader.rb

@@ -1,5 +1,6 @@
 class Card
   class Bootstrap
+    # support class for loading bootstrap components
     module ComponentLoader
       def load_components
         components.each do |component|

data/lib/card/bootstrap/delegate.rb

@@ -1,5 +1,6 @@
 class Card
   class Bootstrap
+    # delegating methods to context
     module Delegate
       def method_missing method_name, *args, &block
         # return super unless @context.respond_to? method_name

data/lib/card/bootstrap/old_component.rb

@@ -5,18 +5,13 @@ class Card
       include Content
 
       def initialize context, *args, &block
-        @context = context
-        @content = ["".html_safe]
-        @args = args
-        @child_args = []
-        @append = []
-        @wrap = []
-        @build_block = block
+        super
+        @html = nil
       end
 
       class << self
-        def render format, *args, &block
-          new(format, *args, &block).render
+        def render(format, ...)
+          new(format, ...).render
         end
 
         # Like add_tag_method but always generates a div tag

data/lib/card/bootstrap/tag_method.rb

@@ -24,10 +24,10 @@ class Card
         ""
       end
 
-      def method_missing method, *args, &block
+      def method_missing(method, ...)
         return super unless respond_to_missing? method
 
-        @component.send method, *args, &block
+        @component.send(method, ...)
       end
 
       def respond_to_missing? method, _include_private=false

data/lib/card/bootstrap.rb

@@ -1,4 +1,5 @@
 class Card
+  # base class for bootstrap component support
   class Bootstrap
     include Delegate
     extend ComponentLoader
@@ -10,8 +11,8 @@ class Card
       @context = context
     end
 
-    def render *args, &block
-      instance_exec(*args, &block)
+    def render(...)
+      instance_exec(...)
     end
   end
 end

data/lib/card/bootstrapper.rb

@@ -1,4 +1,5 @@
 class Card
+  # shared methods for bootstrapping in card formats and act renderers
   module Bootstrapper
     extend Bootstrap::ComponentLoader
 
@@ -6,8 +7,8 @@ class Card
       @bootstrap ||= Bootstrap.new(self)
     end
 
-    def bs *args, &block
-      bootstrap.render(*args, &block)
+    def bs(...)
+      bootstrap.render(...)
     end
 
     components.each do |component|

data/set/abstract/bootstrap_code_file.rb

@@ -5,6 +5,7 @@ def self.included host_class
   host_class.include OverrideCodeFile
 end
 
+# method overrides wrt bootstrap codefile
 module OverrideCodeFile
   def content
     stylesheets.join "\n"

data/set/all/bootstrap/dropdown.rb

@@ -47,6 +47,7 @@ format :html do
 
   def dropdown_item item
     return unless item.present?
+
     item = dropdown_item_from_array item if item.is_a? Array
     "<li>#{item}</li>"
   end

data/set/all/bootstrap/form.rb

@@ -1,13 +1,25 @@
+FIELD_HELPERS = %w[hidden_field color_field date_field datetime_field
+                   datetime_local_field email_field month_field number_field
+                   password_field phone_field range_field search_field
+                   telephone_field text_area text_field time_field
+                   url_field week_field file_field].freeze
+
 format :html do
+  FIELD_HELPERS.each do |method_name|
+    define_method(method_name) do |name, options={}|
+      form.send(method_name, name, bootstrap_options(options))
+    end
+  end
+
   def button_tag content_or_options=nil, options={}, &block
     bootstrapify_button(block_given? ? content_or_options : options)
-    super(content_or_options, options, &block)
+    super
   end
 
   def type_field args={}
     args[:class] ||= ""
     args[:class] += " form-control"
-    super(args)
+    super
   end
 
   def bootstrap_options options
@@ -16,18 +28,6 @@ format :html do
     options
   end
 
-  FIELD_HELPERS = %w[hidden_field color_field date_field datetime_field
-                     datetime_local_field email_field month_field number_field
-                     password_field phone_field range_field search_field
-                     telephone_field text_area text_field time_field
-                     url_field week_field file_field].freeze
-
-  FIELD_HELPERS.each do |method_name|
-    define_method(method_name) do |name, options={}|
-      form.send(method_name, name, bootstrap_options(options))
-    end
-  end
-
   private
 
   def bootstrapify_button options

data/set/all/bootstrap/icon.rb

@@ -36,7 +36,6 @@ basket[:icons] = {
     show_password: :visibility,
     hide_password: :visibility_off
   },
-  #
   font_awesome: {
     plus: :plus,
     pencil: :pencil,
@@ -68,7 +67,6 @@ basket[:icons] = {
     show_password: "eye",
     hide_password: "eye-slash"
   },
-  #
   bootstrap: {
     plus: "plus-lg",
     pencil: "pencil-fill",