card-mod-bootstrap 0.11.6 → 0.13.1

data/lib/card/bootstrap/old_component.rb

@@ -0,0 +1,108 @@
+class Card
+  class Bootstrap
+    # not-yet-obviated component handling
+    class OldComponent < Component
+      include Content
+
+      def initialize context, *args, &block
+        @context = context
+        @content = ["".html_safe]
+        @args = args
+        @child_args = []
+        @append = []
+        @wrap = []
+        @build_block = block
+      end
+
+      class << self
+        def render format, *args, &block
+          new(format, *args, &block).render
+        end
+
+        # Like add_tag_method but always generates a div tag
+        # The tag option is not available
+        def add_div_method name, html_class, opts={}, &tag_block
+          add_tag_method name, html_class, opts.merge(tag: :div), &tag_block
+        end
+
+        # Defines a method that generates a html tag
+        # @param 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
+        #   add_tag_method :link, "known-link", tag: :a, id: "uniq-link"
+        #   link  # => <a class="known-link" id="uniq-link"></a>
+        def add_tag_method name, html_class, tag_opts={}, &tag_block
+          define_method name do |*args, &block|
+            process_tag tag_opts[:tag] || name do
+              content, opts, new_child_args = standardize_args args, &tag_block
+              add_classes opts, html_class, tag_opts.delete(:optional_classes)
+              if (attributes = tag_opts.delete(:attributes))
+                opts.merge! attributes
+              end
+
+              content = with_child_args new_child_args do
+                generate_content content,
+                                 tag_opts[:content_processor],
+                                 &block
+              end
+
+              [content, opts]
+            end
+          end
+        end
+
+        alias_method :def_div_method, :add_div_method
+        alias_method :def_tag_method, :add_tag_method
+      end
+
+      def render
+        @rendered = begin
+          render_content
+          @content[-1]
+        end
+      end
+
+      private
+
+      def process_tag tag_name, &content_block
+        @content.push "".html_safe
+        @append << []
+        @wrap << []
+
+        opts = process_content(&content_block)
+        process_collected_content tag_name, opts
+        process_append
+        ""
+      end
+
+      # include BasicTags
+      def html content
+        add_content String(content).html_safe
+        ""
+      end
+
+      add_div_method :div, nil do |opts, extra_args|
+        prepend_class opts, extra_args.first if extra_args.present?
+        opts
+      end
+
+      add_div_method :span, nil do |opts, extra_args|
+        prepend_class opts, extra_args.first if extra_args.present?
+        opts
+      end
+
+      add_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
+
+      include Delegate
+    end
+  end
+end

data/lib/card/bootstrap/tag_method.rb

@@ -0,0 +1,56 @@
+class Card
+  class Bootstrap
+    # support html tag generation
+    class TagMethod
+      include Content
+
+      def initialize component, name, html_class, tag_opts={}, &tag_block
+        @component = component
+        @name = name
+        @html_class = html_class
+        @tag_opts = tag_opts
+        @tag_block = tag_block
+        @append = []
+        @wrap = []
+        @xm = Builder::XmlMarkup.new
+      end
+
+      def call *_args, &content_block
+        component.content.push "".html_safe
+
+        opts = process_content(&content_block)
+        process_collected_content tag_name, opts
+        process_append
+        ""
+      end
+
+      def method_missing method, *args, &block
+        return super unless respond_to_missing? method
+
+        @component.send method, *args, &block
+      end
+
+      def respond_to_missing? method, _include_private=false
+        @component.respond_to? method
+      end
+
+      def prepend &block
+        tmp = @content.pop
+        instance_exec(&block)
+        @content << tmp
+      end
+
+      def wrap &block
+        instance_exec(&block)
+      end
+
+      def append &block
+        @append[-1] << block
+      end
+
+      def wrapInner tag=nil, &block
+        @wrap[-1] << (block_given? ? block : tag)
+      end
+    end
+  end
+end

data/lib/card/bootstrapper.rb

@@ -0,0 +1,17 @@
+class Card
+  module Bootstrapper
+    extend Bootstrap::ComponentLoader
+
+    def bootstrap
+      @bootstrap ||= Bootstrap.new(self)
+    end
+
+    def bs *args, &block
+      bootstrap.render(*args, &block)
+    end
+
+    components.each do |component|
+      delegate component, to: :bootstrap, prefix: :bs
+    end
+  end
+end

data/lib/card/tab.rb

@@ -5,11 +5,18 @@ class Card
     class << self
       def tab_objects format, tab_hash, active_name, klass=nil
         klass ||= Card::Tab
-        active_name ||= tab_hash.keys.first
+        active_name = active active_name, tab_hash.keys
         tab_hash.map do |name, config|
           klass.new format, name, active_name, config
         end
       end
+
+      private
+
+      def active requested, keys
+        r = requested.to_name
+        r && keys.find { |k| k.to_name == r } || keys.first
+      end
     end
 
     delegate :add_class, :wrap_with, :unique_id, :link_to, to: :format

data/lib/stylesheets/font_awesome.css

@@ -4588,8 +4588,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 400;
   font-display: block;
-  src: url([[/assets/card-mod-bootstrap/fonts/fa-brands-400.eot]]);
-  src: url([[/assets/card-mod-bootstrap/fonts/fa-brands-400.eot?#iefix]]) format("embedded-opentype"), url([[/assets/card-mod-bootstrap/fonts/fa-brands-400.woff2]]) format("woff2"), url([[/assets/card-mod-bootstrap/fonts/fa-brands-400.woff]]) format("woff"), url([[/assets/card-mod-bootstrap/fonts/fa-brands-400.ttf]]) format("truetype"), url([[/assets/card-mod-bootstrap/fonts/fa-brands-400.svg#fontawesome]]) format("svg"); }
+  src: url([[/mod/bootstrap/fonts/fa-brands-400.eot]]);
+  src: url([[/mod/bootstrap/fonts/fa-brands-400.eot?#iefix]]) format("embedded-opentype"), url([[/mod/bootstrap/fonts/fa-brands-400.woff2]]) format("woff2"), url([[/mod/bootstrap/fonts/fa-brands-400.woff]]) format("woff"), url([[/mod/bootstrap/fonts/fa-brands-400.ttf]]) format("truetype"), url([[/mod/bootstrap/fonts/fa-brands-400.svg#fontawesome]]) format("svg"); }
 
 .fab {
   font-family: 'Font Awesome 5 Brands';
@@ -4599,8 +4599,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 400;
   font-display: block;
-  src: url([[/assets/card-mod-bootstrap/fonts/fa-regular-400.eot]]);
-  src: url([[/assets/card-mod-bootstrap/fonts/fa-regular-400.eot?#iefix]]) format("embedded-opentype"), url([[/assets/card-mod-bootstrap/fonts/fa-regular-400.woff2]]) format("woff2"), url([[/assets/card-mod-bootstrap/fonts/fa-regular-400.woff]]) format("woff"), url([[/assets/card-mod-bootstrap/fonts/fa-regular-400.ttf]]) format("truetype"), url([[/assets/card-mod-bootstrap/fonts/fa-regular-400.svg#fontawesome]]) format("svg"); }
+  src: url([[/mod/bootstrap/fonts/fa-regular-400.eot]]);
+  src: url([[/mod/bootstrap/fonts/fa-regular-400.eot?#iefix]]) format("embedded-opentype"), url([[/mod/bootstrap/fonts/fa-regular-400.woff2]]) format("woff2"), url([[/mod/bootstrap/fonts/fa-regular-400.woff]]) format("woff"), url([[/mod/bootstrap/fonts/fa-regular-400.ttf]]) format("truetype"), url([[/mod/bootstrap/fonts/fa-regular-400.svg#fontawesome]]) format("svg"); }
 
 .far {
   font-family: 'FontAwesome';
@@ -4610,8 +4610,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 900;
   font-display: block;
-  src: url([[/assets/card-mod-bootstrap/fonts/fa-solid-900.eot]]);
-  src: url([[/assets/card-mod-bootstrap/fonts/fa-solid-900.eot?#iefix]]) format("embedded-opentype"), url([[/assets/card-mod-bootstrap/fonts/fa-solid-900.woff2]]) format("woff2"), url([[/assets/card-mod-bootstrap/fonts/fa-solid-900.woff]]) format("woff"), url([[/assets/card-mod-bootstrap/fonts/fa-solid-900.ttf]]) format("truetype"), url([[/assets/card-mod-bootstrap/fonts/fa-solid-900.svg#fontawesome]]) format("svg"); }
+  src: url([[/mod/bootstrap/fonts/fa-solid-900.eot]]);
+  src: url([[/mod/bootstrap/fonts/fa-solid-900.eot?#iefix]]) format("embedded-opentype"), url([[/mod/bootstrap/fonts/fa-solid-900.woff2]]) format("woff2"), url([[/mod/bootstrap/fonts/fa-solid-900.woff]]) format("woff"), url([[/mod/bootstrap/fonts/fa-solid-900.ttf]]) format("truetype"), url([[/mod/bootstrap/fonts/fa-solid-900.svg#fontawesome]]) format("svg"); }
 
 .fa,
 .fas {

data/lib/stylesheets/material_icons.css

@@ -2,12 +2,12 @@
   font-family: 'Material Icons';
   font-style: normal;
   font-weight: 400;
-  src: url([[/assets/card-mod-bootstrap/fonts/MaterialIcons-Regular.eot]]); /* For IE6-8 */
+  src: url([[/mod/bootstrap/fonts/MaterialIcons-Regular.eot]]); /* For IE6-8 */
   src: local('Material Icons'),
        local('MaterialIcons-Regular'),
-       url([[/assets/card-mod-bootstrap/fonts/MaterialIcons-Regular.woff2]]) format('woff2'),
-       url([[/assets/card-mod-bootstrap/fonts/MaterialIcons-Regular.woff]]) format('woff'),
-       url([[/assets/card-mod-bootstrap/fonts/MaterialIcons-Regular.ttf]]) format('truetype');
+       url([[/mod/bootstrap/fonts/MaterialIcons-Regular.woff2]]) format('woff2'),
+       url([[/mod/bootstrap/fonts/MaterialIcons-Regular.woff]]) format('woff'),
+       url([[/mod/bootstrap/fonts/MaterialIcons-Regular.ttf]]) format('truetype');
 }
 
 .material-icons {

data/set/abstract/bootswatch_theme.rb

@@ -77,14 +77,14 @@ def after_engine output
   Card::Auth.as_bot { update! db_content: output }
 end
 
-# needed to make the refresh_script_and_style method work with these cards
+# needed to make the refresh_assets method work with these cards
 def source_files
   extended_input_cards.map do |i_card|
     i_card.try(:source_files)
   end.flatten.compact
 end
 
-# needed to make the refresh_script_and_style method work with these cards
+# needed to make the refresh_assets method work with these cards
 def existing_source_paths
   extended_input_cards.map do |i_card|
     i_card.try(:existing_source_paths)

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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.13.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,70 +18,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.6
+        version: 1.103.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.6
+        version: 1.103.1
+- !ruby/object:Gem::Dependency
+  name: card-mod-assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: card-mod-edit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: card-mod-bar_and_box
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: card-mod-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: card-mod-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: 0.13.1
 description: ''
 email:
 - info@decko.org
@@ -103,6 +117,8 @@ files:
 - db/migrate_core_cards/20180516153037_add_style_select2_card.rb
 - db/migrate_core_cards/20180601133753_migrate_skins.rb
 - db/migrate_core_cards/20181129140917_fix_skin_images.rb
+- db/migrate_core_cards/20200809112346_add_mod_card.rb
+- db/migrate_core_cards/20201129140917_remove_script_cards.rb
 - db/migrate_core_cards/data/20181108181219_migrate_classic_skins_to_bootstrap.rb
 - db/migrate_core_cards/data/custom_theme/cards.scss
 - db/migrate_core_cards/data/custom_theme/colors.scss
@@ -166,6 +182,8 @@ files:
 - file/minty_skin_image/image-medium.png
 - file/minty_skin_image/image-original.png
 - file/minty_skin_image/image-small.png
+- file/mod_bootstrap_script_bootstrap_machine_output/file.js
+- file/mod_bootstrap_script_pointer_machine_output/file.js
 - file/paper_skin_image/image-icon.png
 - file/paper_skin_image/image-large.png
 - file/paper_skin_image/image-medium.png
@@ -226,57 +244,55 @@ 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/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/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
-- lib/javascript/script_load_select2.js.coffee
 - lib/javascript/smartmenu.js
 - lib/stylesheets/font_awesome.css
 - lib/stylesheets/material_icons.css
 - lib/stylesheets/smartmenu.css
 - lib/stylesheets/style_bootstrap_cards.scss
 - lib/stylesheets/style_select2_bootstrap.scss
-- public/assets/fonts/MaterialIcons-Regular.eot
-- public/assets/fonts/MaterialIcons-Regular.ijmap
-- public/assets/fonts/MaterialIcons-Regular.svg
-- public/assets/fonts/MaterialIcons-Regular.ttf
-- public/assets/fonts/MaterialIcons-Regular.woff
-- public/assets/fonts/MaterialIcons-Regular.woff2
-- public/assets/fonts/fa-brands-400.eot
-- public/assets/fonts/fa-brands-400.svg
-- public/assets/fonts/fa-brands-400.ttf
-- public/assets/fonts/fa-brands-400.woff
-- public/assets/fonts/fa-brands-400.woff2
-- public/assets/fonts/fa-regular-400.eot
-- public/assets/fonts/fa-regular-400.svg
-- public/assets/fonts/fa-regular-400.ttf
-- public/assets/fonts/fa-regular-400.woff
-- public/assets/fonts/fa-regular-400.woff2
-- public/assets/fonts/fa-solid-900.eot
-- public/assets/fonts/fa-solid-900.svg
-- public/assets/fonts/fa-solid-900.ttf
-- public/assets/fonts/fa-solid-900.woff
-- public/assets/fonts/fa-solid-900.woff2
-- public/assets/fonts/glyphicons-halflings-regular.eot
-- public/assets/fonts/glyphicons-halflings-regular.svg
-- public/assets/fonts/glyphicons-halflings-regular.ttf
-- public/assets/fonts/glyphicons-halflings-regular.woff
-- public/assets/fonts/glyphicons-halflings-regular.woff2
+- public/fonts/MaterialIcons-Regular.eot
+- public/fonts/MaterialIcons-Regular.ijmap
+- public/fonts/MaterialIcons-Regular.svg
+- public/fonts/MaterialIcons-Regular.ttf
+- public/fonts/MaterialIcons-Regular.woff
+- public/fonts/MaterialIcons-Regular.woff2
+- public/fonts/fa-brands-400.eot
+- public/fonts/fa-brands-400.svg
+- public/fonts/fa-brands-400.ttf
+- public/fonts/fa-brands-400.woff
+- public/fonts/fa-brands-400.woff2
+- public/fonts/fa-regular-400.eot
+- public/fonts/fa-regular-400.svg
+- public/fonts/fa-regular-400.ttf
+- public/fonts/fa-regular-400.woff
+- public/fonts/fa-regular-400.woff2
+- public/fonts/fa-solid-900.eot
+- public/fonts/fa-solid-900.svg
+- public/fonts/fa-solid-900.ttf
+- public/fonts/fa-solid-900.woff
+- public/fonts/fa-solid-900.woff2
+- public/fonts/glyphicons-halflings-regular.eot
+- public/fonts/glyphicons-halflings-regular.svg
+- public/fonts/glyphicons-halflings-regular.ttf
+- public/fonts/glyphicons-halflings-regular.woff
+- public/fonts/glyphicons-halflings-regular.woff2
 - set/abstract/bootstrap_code_file.rb
 - set/abstract/bootswatch_theme.rb
 - set/abstract/bootswatch_theme/html_views.rb
@@ -301,9 +317,7 @@ files:
 - set/self/bootstrap_functions.rb
 - set/self/font_awesome.rb
 - set/self/material_icons.rb
-- set/self/script_bootstrap.rb
 - set/self/script_load_select2.rb
-- set/self/script_select2.rb
 - set/self/smartmenu_css.rb
 - set/self/smartmenu_js.rb
 - set/self/style_bootstrap_cards.rb
@@ -2994,7 +3008,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Bootstrap