card 1.91 → 1.92

data/mod/bootstrap/lib/bootstrap/basic_tags.rb

@@ -7,17 +7,17 @@ class Bootstrap
       ""
     end
 
-    Component.add_div_method :div, nil do |opts, extra_args|
+    Component.def_div_method :div, nil do |opts, extra_args|
       prepend_class opts, extra_args.first if extra_args.present?
       opts
     end
 
-    Component.add_div_method :span, nil do |opts, extra_args|
+    Component.def_div_method :span, nil do |opts, extra_args|
       prepend_class opts, extra_args.first if extra_args.present?
       opts
     end
 
-    Component.add_tag_method :tag, nil, tag: :yield do |opts, extra_args|
+    Component.def_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

data/mod/bootstrap/lib/bootstrap/component.rb

@@ -1,5 +1,67 @@
 #! no set module
 class Bootstrap
+  class TagMethod
+    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
+
+      content, opts = content_block.call
+      wrappers = @wrap.pop
+      if wrappers.present?
+        while wrappers.present? do
+          wrapper = wrappers.shift
+          if wrapper.is_a? Symbol
+            send wrapper, &content_block
+          else
+            instance_exec(content, &wrappers.shift)
+          end
+        end
+      else
+        add_content content
+      end
+
+      collected_content = @content.pop
+      tag_name = opts.delete(:tag) if tag_name == :yield
+      add_content content_tag(tag_name, collected_content, opts, false)
+      @append.pop.each do |block|
+        add_content instance_exec(&block)
+      end
+      ""
+    end
+
+    def method_missing method, *args, &block
+      @component.send method, *args, &block
+    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
+
   class Component
     def initialize context, *args, &block
       @context = context
@@ -7,7 +69,9 @@ class Bootstrap
       @args = args
       @child_args = []
       @append = []
+      @wrap = []
       @build_block = block
+      @html = Builder::XmlMarkup.new
     end
 
     class << self
@@ -15,35 +79,70 @@ class Bootstrap
         new(format, *args, &block).render
       end
 
-      def add_div_method name, html_class, opts={}, &tag_block
-        add_tag_method name, html_class, opts.merge(tag: :div), &tag_block
+      # 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
 
-      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]
+      # 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
+      #   def_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
+      #   @tag_method = TagMethod.new self,name, html_class, tag_opts, &tag_block
+      #   define_method name do |*args, &block|
+      #     @tag_method.call *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
+
+      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]
+        # @content[-1]
       end
     end
 
@@ -61,10 +160,9 @@ class Bootstrap
       @append[-1] << block
     end
 
-    # def wrap
-    #   tmp = @content.pop
-    #   @content << yield(tmp)
-    # end
+    def wrap tag=nil, &block
+      @wrap[-1] << (block_given? ? block : tag)
+    end
 
     private
 
@@ -76,7 +174,7 @@ class Bootstrap
     def generate_content content, processor, &block
       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
 
@@ -91,24 +189,13 @@ class Bootstrap
       @content[-1] << "\n#{content}".html_safe if content.present?
     end
 
-    def process_tag tag_name
-      @content.push "".html_safe
-      @append << []
-      content, opts = yield
-      add_content content
-      collected_content = @content.pop
-      tag_name = opts.delete(:tag) if tag_name == :yield
-      add_content content_tag(tag_name, collected_content, opts, false)
-      @append.pop.each do |block|
-        add_content instance_exec(&block)
-      end
-      ""
+    def process_tag tag_name, &content_block
     end
 
     def standardize_args args, &block
       opts = args.last.is_a?(Hash) ? args.pop : {}
       items = ((args.one? && args.last.is_a?(String)) || args.last.is_a?(Array)) &&
-              args.pop
+        args.pop
       if block.present?
         opts, args = instance_exec opts, args, &block
         unless opts.is_a?(Hash)

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

@@ -0,0 +1,68 @@
+class Bootstrap
+  class Component
+    class Carousel < Component
+      def render_content
+        carousel *@args, &@build_block
+      end
+
+      def carousel id, active_index, &block
+        @id = id
+        @active_item_index = active_index
+        @items = []
+        instance_exec &block
+
+        @html.div class: "carousel slide", id: id, data: { ride: "carousel" } do
+          indicators
+          items
+          control_prev
+          control_next
+        end
+      end
+
+      def item content=nil, &block
+        @items << (content || block)
+      end
+
+      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.text!(item) if item.is_a?(String)
+            end
+          end
+        end
+      end
+
+      def control_prev
+        @html.a class: "carousel-control-prev", href: "##{@id}", role: "button",
+                data: { slide: "prev" } do
+          @html.span class: "carousel-control-prev-icon", "aria-hidden" => "true"
+          @html.span "Previous", class: "sr-only"
+        end
+      end
+
+      def control_next
+        @html.a class: "carousel-control-next", href: "##{@id}", role: "button",
+                data: { slide: "next" } do
+          @html.span class: "carousel-control-next-icon", "aria-hidden" => "true"
+          @html.span "Next", class: "sr-only"
+        end
+      end
+
+      def indicators
+        @html.ol class: "carousel-indicators" do
+          @items.size.times { |i| indicator i }
+        end
+      end
+
+      def indicator index
+        html_opts = { "data-slide-to" => index, "data-target": "##{@id}" }
+        add_class html_opts, "active" if index == @active_item_index
+        @html.li html_opts
+      end
+    end
+  end
+end