bootstrap_it 0.1.1 → 0.1.2

data/lib/bootstrap_it/view_helpers/grid.rb

@@ -4,8 +4,9 @@ module BootstrapIt
     #
     # Grid
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/css/#grid Bootstrap docs
     class Grid < WrapIt::Container
       html_class 'container'
       child :row, 'BootstrapIt::ViewHelpers::GridRow'
@@ -14,14 +15,15 @@ module BootstrapIt
     #
     # GridRow
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class GridRow < WrapIt::Container
       #
       # Clearfix
       #
-      # @author [alexiss]
+      # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
       #
+      # @see http://getbootstrap.com/css/#grid-responsive-resets Bootstrap docs
       class Clearfix < WrapIt::Base
         TYPES = %w(visible-xs visible-sm visible-md visible-lg
                    hidden-xs hidden-sm hidden-md hidden-lg)
@@ -30,7 +32,9 @@ module BootstrapIt
             [-_]?
             (?:(?:extra[-_]?small)|xs|small|sm|medium|md|large|lg)
           \z/xi
+
         html_class 'clearfix'
+
         after_initialize do
           type = @arguments.extract_first!(Symbol, String, and: [REGEXP]) ||
             'visible-md'
@@ -55,7 +59,7 @@ module BootstrapIt
     #
     # GridCell
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class GridCell < WrapIt::Container
       include SizableColumn
@@ -70,6 +74,6 @@ module BootstrapIt
       end
     end
 
-    WrapIt.register :grid, 'BootstrapIt::ViewHelpers::Grid'
+    register :grid, 'BootstrapIt::ViewHelpers::Grid'
   end
 end

data/lib/bootstrap_it/view_helpers/icon.rb

@@ -4,8 +4,10 @@ module BootstrapIt
     #
     # Icon
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#glyphicons Bootstrap docs
+    # @see http://fontawesome.io/icons/ Font awesome icon list
     class Icon < WrapIt::Base
       omit_content
 
@@ -19,6 +21,6 @@ module BootstrapIt
       end
     end
 
-    WrapIt.register :icon, 'BootstrapIt::ViewHelpers::Icon'
+    register :icon, 'BootstrapIt::ViewHelpers::Icon'
   end
 end

data/lib/bootstrap_it/view_helpers/list.rb

@@ -4,21 +4,21 @@ module BootstrapIt
     #
     # ListItem
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class ListItem < WrapIt::Base
-      default_tag 'li'
-
+      include WrapIt::TextContainer
       include Activable
       include Disableable
-      include WrapIt::TextContainer
+
+      default_tag 'li'
     end
 
 
     #
     # ListLinkItem
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class ListLinkItem < WrapIt::Link
       REGEXP = /\Ali_/

data/lib/bootstrap_it/view_helpers/misc.rb

@@ -4,15 +4,16 @@ module BootstrapIt
     #
     # Jumbotron
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#jumbotron Bootstrap docs
     class Jumbotron < WrapIt::Base
       html_class 'jumbotron'
       switch :full_width
 
       after_capture do
-        full_width? && @content = content_tag(
-          'div', @content, class: 'container'
+        full_width? && self[:content] = content_tag(
+          'div', render_sections, class: 'container'
         )
       end
     end
@@ -20,8 +21,9 @@ module BootstrapIt
     #
     # PageHeader
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#page-header Bootstrap docs
     class PageHeader < WrapIt::Base
       html_class 'page-header'
     end
@@ -29,8 +31,9 @@ module BootstrapIt
     #
     # Alert
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#alerts Bootstrap docs
     class Alert < WrapIt::Container
       include WrapIt::TextContainer
 
@@ -40,18 +43,20 @@ module BootstrapIt
       enum :appearence, %i(success info warning danger),
            default: :success, html_class: true
       switch :dismissable, html_class: true
-      child :link, 'WrapIt::Link', [class: 'alert-link']
+      child :link, 'WrapIt::Link', class: 'alert-link'
+      section :dismissable
+      place :dismissable, before: :content
 
-      before_render do
+      after_capture do
         if dismissable?
-          @content = content_tag(
+          self[:dismissable] = content_tag(
             'button',
             html_safe('&times;'),
             type: 'button',
             class: 'close',
             data: {dismiss: 'alert'},
             'aria-hidden' => true
-          ) + @content
+          )
         end
       end
     end
@@ -59,8 +64,9 @@ module BootstrapIt
     #
     # ProgressBar
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#progress Bootstrap docs
     class ProgressBar < WrapIt::Base
       include WrapIt::TextContainer
 
@@ -85,24 +91,27 @@ module BootstrapIt
         @options[:style] = "width: #{@completed}%"
       end
 
-      before_render do
+      after_capture do
+        rendered = render_sections
         text =
-          if @content.empty?
+          if rendered.empty?
             I18n.translate(
               'bootstrap_it.progress_bar.text', completed: @completed
             )
           else
-            @content
+            rendered
           end
-        @content = content_tag('span', text, class: 'sr-only')
+        # TODO: do it with wrap when simple wrapping will be coded
+        self[:content] = content_tag('span', text, class: 'sr-only')
       end
     end
 
     #
     # Progress
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#progress Bootstrap docs
     class Progress < WrapIt::Container
       include Activable
 
@@ -110,35 +119,27 @@ module BootstrapIt
       html_class_prefix 'progress-'
 
       child :bar, 'BootstrapIt::ViewHelpers::ProgressBar'
-
       switch :striped, html_class: true
+      section :first_bar
+      place :first_bar, before: :content
 
       after_initialize do
-        @first_bar_args = @arguments.clone
+        self.deffered_render = true
+        args = @arguments.clone
         # TODO: PORTABILITY: replace deep_dup (Rails)
         opts = @options.deep_dup
         opts[:class].select! { |o| o != 'progress' && o != 'progress-striped' }
-        @first_bar_args.push(opts)
+        opts[:section] = :first_bar
+        args.push(opts)
+        bar(*args)
       end
-
-      after_capture do
-        @content = capture do
-          ProgressBar.new(@template, *@first_bar_args).render
-        end + @content
-      end
-
-#      after_capture do
-#        @content = capture do
-#          @bars.reduce(empty_html) { |a, e| a += e.render }
-#        end + @content
-#      end
     end
 
-    WrapIt.register :jumbotron, 'BootstrapIt::ViewHelpers::Jumbotron'
-    WrapIt.register :jumbo, 'BootstrapIt::ViewHelpers::Jumbotron'
-    WrapIt.register :page_header, 'BootstrapIt::ViewHelpers::PageHeader'
-    WrapIt.register :alert_box, 'BootstrapIt::ViewHelpers::Alert'
-    WrapIt.register :progress_bar, 'BootstrapIt::ViewHelpers::Progress'
-    WrapIt.register :progress, 'BootstrapIt::ViewHelpers::Progress'
+    register :jumbotron, 'BootstrapIt::ViewHelpers::Jumbotron'
+    register :jumbo, 'BootstrapIt::ViewHelpers::Jumbotron'
+    register :page_header, 'BootstrapIt::ViewHelpers::PageHeader'
+    register :alert_box, 'BootstrapIt::ViewHelpers::Alert'
+    register :progress_bar, 'BootstrapIt::ViewHelpers::Progress'
+    register :progress, 'BootstrapIt::ViewHelpers::Progress'
   end
 end

data/lib/bootstrap_it/view_helpers/mixin.rb

@@ -4,7 +4,7 @@ module BootstrapIt
     #
     # SizableColumn
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     module SizableColumn
       extend ActiveSupport::Concern
@@ -56,7 +56,7 @@ module BootstrapIt
     #
     # PlacableColumn
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     module PlacableColumn
       extend ActiveSupport::Concern
@@ -122,7 +122,7 @@ module BootstrapIt
     #
     # Contextual
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     module Contextual
       extend ActiveSupport::Concern
@@ -134,7 +134,7 @@ module BootstrapIt
     #
     # Activable
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     module Activable
       extend ActiveSupport::Concern
@@ -146,7 +146,7 @@ module BootstrapIt
     #
     # Disablable
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     module Disableable
       extend ActiveSupport::Concern
@@ -172,7 +172,7 @@ module BootstrapIt
     #
     # Sizable
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     module Sizable
       extend ActiveSupport::Concern
@@ -219,7 +219,7 @@ module BootstrapIt
     #
     # Justifable
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     module Justifable
       extend ActiveSupport::Concern
@@ -231,43 +231,35 @@ module BootstrapIt
     #
     # DropdownMenuWrapper
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     module DropdownMenuWrapper
       extend ActiveSupport::Concern
 
       included do |base|
-        # puts "--- #{base.name}"
         base <= WrapIt::Container || fail(
           TypeError, 'Can be included only into WrapIt::Container subclasses'
         )
-        # delegate :divider, :header, :link_item, to: :dropdown_menu
+
         child :dropdown_menu, 'BootstrapIt::ViewHelpers::DropdownMenu'
+
         after_initialize do
-          @dropdown_items = []
-        end
-        after_render do
-          unless @dropdown_items.empty?
-            @content += capture do
-              items = @dropdown_items
-              dropdown_menu do |menu|
-                items.each { |item| menu.send(item[0], *item[1], &item[2]) }
-              end
-            end
-          end
+          self.deffered_render = true
+          dropdown_menu deffered_render: true
+          @dropdown_menu = children.first
         end
       end
 
       def header(*args, &block)
-        @dropdown_items << [:header, args, block]
+        @dropdown_menu.header(*args, &block)
       end
 
       def divider(*args, &block)
-        @dropdown_items << [:divider, args, block]
+        @dropdown_menu.divider(*args, &block)
       end
 
       def link_item(*args, &block)
-        @dropdown_items << [:link_item, args, block]
+        @dropdown_menu.link_item(*args, &block)
       end
     end
 

data/lib/bootstrap_it/view_helpers/nav.rb

@@ -4,7 +4,7 @@ module BootstrapIt
     #
     # DropdownNavItem
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class DropdownNavItem < WrapIt::Container
       include WrapIt::TextContainer
@@ -14,16 +14,14 @@ module BootstrapIt
 
       default_tag 'li'
       html_class 'dropdown'
+      place :children, before: :end
 
       after_capture do
-        # TODO: TextContainer should include body into content, but content
-        # empty at this point
-        @content += @body.html_safe unless @body.nil?
-        body = @content + html_safe(' ') +
-          content_tag('span', '', class: 'caret')
-        # TODO: Replace 'link_to'
-        @content = @template.link_to(
-          body, '#', class: 'dropdown-toggle', data: {toggle: 'dropdown'}
+        rendered = render_sections(except: :children)
+        rendered << html_safe(' ') << content_tag('span', '', class: 'caret')
+        self[:content] = @template.content_tag(
+          'a', rendered, href: '#', class: 'dropdown-toggle',
+          data: {toggle: 'dropdown'}
         )
       end
     end
@@ -31,8 +29,9 @@ module BootstrapIt
     #
     # Nav
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#nav Bootstrap docs
     class Nav < WrapIt::Container
       include Justifable
 
@@ -46,8 +45,9 @@ module BootstrapIt
     #
     # NavPills
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#nav-pills Bootstrap docs
     class NavPills < Nav
       default_tag 'ul'
       switch :stacked, html_class: 'nav-stacked'
@@ -57,8 +57,9 @@ module BootstrapIt
     #
     # NavTabs
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#nav-tabs Bootstrap docs
     class NavTabs < Nav
       default_tag 'ul'
       html_class 'nav-tabs'
@@ -67,8 +68,9 @@ module BootstrapIt
     #
     # NavBar
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#navbar Bootstrap docs
     class NavBar < WrapIt::Container
       default_tag 'nav'
       html_class 'navbar'
@@ -81,16 +83,16 @@ module BootstrapIt
         @options[:role] = 'navigation'
       end
 
-      child :button, 'BootstrapIt::ViewHelpers::Button', [class: 'navbar-btn']
-      child :text, 'BootstrapIt::ViewHelpers::Text', [class: 'navbar-text']
+      child :button, 'BootstrapIt::ViewHelpers::Button', class: 'navbar-btn'
+      child :text, 'BootstrapIt::ViewHelpers::Text', class: 'navbar-text'
       alias_method :p, :text
-      child :span, 'BootstrapIt::ViewHelpers::Text', [class: 'navbar-text']
+      child :span, 'BootstrapIt::ViewHelpers::Text', class: 'navbar-text'
     end
 
-    WrapIt.register :nav_pills, 'BootstrapIt::ViewHelpers::NavPills'
-    WrapIt.register :pills, 'BootstrapIt::ViewHelpers::NavPills'
-    WrapIt.register :nav_tabs, 'BootstrapIt::ViewHelpers::NavTabs'
-    WrapIt.register :tabs, 'BootstrapIt::ViewHelpers::NavTabs'
-    WrapIt.register :navbar, 'BootstrapIt::ViewHelpers::NavBar'
+    register :nav_pills, 'BootstrapIt::ViewHelpers::NavPills'
+    register :pills, 'BootstrapIt::ViewHelpers::NavPills'
+    register :nav_tabs, 'BootstrapIt::ViewHelpers::NavTabs'
+    register :tabs, 'BootstrapIt::ViewHelpers::NavTabs'
+    register :navbar, 'BootstrapIt::ViewHelpers::NavBar'
   end
 end