card-mod-bootstrap 0.11.7 → 0.12.0

data/lib/{bootstrap/component/component_class.rb → card/bootstrap/component_klass.rb}

@@ -1,7 +1,7 @@
-class Bootstrap
-  class Component
+class Card
+  class Bootstrap
     # class methods for Bootstrap::Component
-    module ComponentClass
+    module ComponentKlass
       def render format, *args, &block
         new(format, *args, &block).render
       end
@@ -26,7 +26,8 @@ class Bootstrap
       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
+          @html.tag! tag,
+                     tag_method_opts(args, html_class, tag_opts, &tag_opts_block) do
             instance_exec(&content_block)
           end
         end

data/lib/card/bootstrap/component_loader.rb

@@ -0,0 +1,30 @@
+class Card
+  class Bootstrap
+    module ComponentLoader
+      def load_components
+        components.each do |component|
+          require_relative "component/#{component}"
+          include_component component
+        end
+      end
+
+      def include_component component
+        component_class = to_const component.camelcase
+        define_method component do |*args, &block|
+          component_class.render self, *args, &block
+        end
+      end
+
+      def components
+        path = File.expand_path "component/*.rb", __dir__
+        Dir.glob(path).map do |file|
+          File.basename file, ".rb"
+        end
+      end
+
+      def to_const name
+        self.class.const_get "::Card::Bootstrap::Component::#{name.camelcase}"
+      end
+    end
+  end
+end

data/lib/card/bootstrap/content.rb

@@ -0,0 +1,42 @@
+class Card
+  class Bootstrap
+    # shared methods for OldComponent and TagMethod
+    module Content
+      private
+
+      def process_collected_content tag_name, opts
+        collected_content = @content.pop
+        tag_name = opts.delete(:tag) if tag_name == :yield
+        add_content content_tag(tag_name, collected_content, opts, false)
+      end
+
+      def process_content &content_block
+        content, opts = yield
+        wrappers = @wrap.pop
+        if wrappers.present?
+          process_wrappers wrappers, content, &content_block
+        else
+          add_content content
+        end
+        opts
+      end
+
+      def process_append
+        @append.pop.each do |block|
+          add_content instance_exec(&block)
+        end
+      end
+
+      def process_wrappers wrappers, content, &content_block
+        while wrappers.present?
+          wrapper = wrappers.shift
+          if wrapper.is_a? Symbol
+            send wrapper, &content_block
+          else
+            instance_exec content, &wrappers.shift
+          end
+        end
+      end
+    end
+  end
+end

data/lib/card/bootstrap/delegate.rb

@@ -0,0 +1,18 @@
+class Card
+  class Bootstrap
+    module Delegate
+      def method_missing method_name, *args, &block
+        # return super unless @context.respond_to? method_name
+        if block_given?
+          @context.send(method_name, *args, &block)
+        else
+          @context.send(method_name, *args)
+        end
+      end
+
+      def respond_to_missing? method_name, _include_private=false
+        @context.respond_to? method_name
+      end
+    end
+  end
+end

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/bootstrap.rb

@@ -0,0 +1,17 @@
+class Card
+  class Bootstrap
+    include Delegate
+    extend ComponentLoader
+    load_components
+
+    attr_reader :context
+
+    def initialize context=nil
+      @context = context
+    end
+
+    def render *args, &block
+      instance_exec(*args, &block)
+    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/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.7
+  version: 0.12.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-01 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.7
+        version: 1.102.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.7
+        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.7
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.7
+        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.7
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.7
+        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.7
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.7
+        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.7
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.7
+        version: 0.12.0
 description: ''
 email:
 - info@decko.org
@@ -226,21 +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/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
@@ -2994,7 +2994,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Bootstrap