bootstrap_it 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc1f7b0639470e6de1802ae9fdcebf97317633ac
-  data.tar.gz: 4d45a97704df12ddcc0ae0ddce3cd5404d654817
+  metadata.gz: e5774b34f81adf31f3b4b049ecd85fe339f03a02
+  data.tar.gz: 96cf31d8278893dee53b19a990886a53b2a94b8b
 SHA512:
-  metadata.gz: 9dbca1c886bf4d4445b971c0881d02fe4cc90e60f4b052c6ebc83693f24cf97083010ba31608ded023e6c4cda78ff56a6169016315b6424aa744980e797407e6
-  data.tar.gz: d6b22751fbc013aea7f9d70d5cdf262ac402bdac47dbce189fd7d7e2218f05d7a41d569a7aed89a059dad2cec8008542cfa000216b88af91f04535f865d1eff4
+  metadata.gz: 4dc4b603556ec14825b124c335dcbeb9059cc0326ccf4409aca87ef97ff1d366570d8f87329014a440d73d18dff9ae46cde71543951c033689063feebcdd5d97
+  data.tar.gz: d5b303cc16719485b8d65cf742f3df733e33b7fd484b09807a3d0702b15666b9892da8f559c06cf26372a8faf2056203d72868510169fd4b1936737c6a0cd483

data/README.md

@@ -57,7 +57,7 @@ Full Rails-style configuration is not implemented yet. So, to change config opti
 
 ## Bootstrap assets
 
-Now, you have two choises: at first, CDN source of CSS and JavaScript. And second is minified versions of assets, downloaded from official sites. Third options - compile from LESS source will be available soon. So, you can configure bootstrap_it in `application.rb` linke this:
+Now, you have two choises: at first, CDN source of CSS and JavaScript. And second is minified versions of assets, downloaded from official sites. Third options - compile from LESS source will be available soon. So, you can configure bootstrap_it in `application.rb` like this:
 
 ```ruby
 BootstrapIt.config.assets_source = :cdn # or :precompiled for minified version
@@ -553,6 +553,11 @@ This and all other stuff are in development.
 
 # Changes
 
+`0.1.2`
+* switched to wrap_it 0.2.0
+* code refactoring
+* testing improvements
+
 `0.1.1`
 * fixed: bootstrap version uninitialized constant
 

data/bootstrap_it.gemspec

@@ -19,15 +19,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails', '~> 4.0.0'
-  spec.add_dependency 'wrap_it'
+  spec.add_runtime_dependency 'rails', '~> 4.0'
+  spec.add_runtime_dependency 'wrap_it', '~> 0.2'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 10.1'
   spec.add_development_dependency 'redcarpet', '~> 1.17'
-  spec.add_development_dependency 'yard', '~> 0.7.5'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'combustion'
-  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'yard', '~> 0.7'
+  spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'rspec-rails', '~> 2.14'
+  spec.add_development_dependency 'combustion', '~> 0.5'
+#  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'rspec-html-matchers', '~> 0.4'
 end

data/lib/bootstrap_it/config.rb

@@ -3,7 +3,7 @@ module BootstrapIt
   #
   # Configuration
   #
-  # @author [alexiss]
+  # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
   #
   module Config
     ASSETS_SOURCES = %i[cdn precompiled]

data/lib/bootstrap_it/engine.rb

@@ -9,8 +9,8 @@ module BootstrapIt
 
     initializer 'bootstrap_it.configure_view_controller' do |app|
       ActiveSupport.on_load(:action_view) do
-        include WrapIt.helpers
         include BootstrapIt::LayoutHelpers
+        include BootstrapIt::ViewHelpers
       end
 
 #      ActiveSupport.on_load :action_controller do

data/lib/bootstrap_it/version.rb

@@ -1,6 +1,6 @@
 #
 module BootstrapIt
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   BOOTSTRAP_LATEST = '3.0.3'
   FONTAWESOME_LATEST = '4.0.3'
 end

data/lib/bootstrap_it/view_helpers.rb

@@ -36,6 +36,10 @@ module BootstrapIt
       bootstrap_it_stylesheets << bootstrap_it_javascripts
     end
   end
+
+  module ViewHelpers; end
+
+  WrapIt.register_module ViewHelpers
 end
 
 require 'bootstrap_it/view_helpers/mixin'
@@ -47,7 +51,6 @@ require 'bootstrap_it/view_helpers/list'
 require 'bootstrap_it/view_helpers/dropdown_menu'
 require 'bootstrap_it/view_helpers/button'
 require 'bootstrap_it/view_helpers/button_group'
-require 'bootstrap_it/view_helpers/button_toolbar'
 require 'bootstrap_it/view_helpers/form'
 require 'bootstrap_it/view_helpers/nav'
 require 'bootstrap_it/view_helpers/breadcrumb'

data/lib/bootstrap_it/view_helpers/breadcrumb.rb

@@ -2,9 +2,10 @@ module BootstrapIt
   #
   module ViewHelpers
     #
+    # @see http://getbootstrap.com/components/#breadcrumbs Bootstrap docs
     # Breadcrumb
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class Breadcrumb < WrapIt::Container
       default_tag 'ol'
@@ -14,6 +15,6 @@ module BootstrapIt
       child :item, 'BootstrapIt::ViewHelpers::ListItem'
     end
 
-    WrapIt.register :breadcrumb, 'BootstrapIt::ViewHelpers::Breadcrumb'
+    register :breadcrumb, 'BootstrapIt::ViewHelpers::Breadcrumb'
   end
 end

data/lib/bootstrap_it/view_helpers/button.rb

@@ -4,13 +4,15 @@ module BootstrapIt
     #
     # Button
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/css/#buttons Bootstrap docs
+    # @see http://getbootstrap.com/javascript/#buttons Bootstrap docs
     class Button < WrapIt::Container
+      include WrapIt::TextContainer
       include Activable
       include Disableable
       include Sizable
-      include WrapIt::TextContainer
 
       html_class 'btn'
       html_class_prefix 'btn-'
@@ -24,11 +26,14 @@ module BootstrapIt
            default: :default, html_class: true
 
       child :icon, 'BootstrapIt::ViewHelpers::Icon'
+      extract_from_options icon: :icon
+      section :space_separator, :input
+      place :children, after: :begin
+      place :space_separator, after: :children
+      place :input, before: :content
 
-      before_render do
-        unless @icon.nil?
-          @content = capture { @icon.render } + html_safe(' ') + @content
-        end
+      after_capture do
+        children.size > 0 && self[:space_separator] = html_safe(' ')
 
         if @helper_name == :radio || @helper_name == :checkbox
           @tag = 'label'
@@ -37,35 +42,29 @@ module BootstrapIt
             next if k == :class || k == :type
             input_options[k] = @options.delete(k)
           end
-          input_options.key?(:checked) && input_options[:checked] != false &&
+          if input_options.key?(:checked) && input_options[:checked] != false
             input_options[:checked] = 'checked'
-          @content = content_tag('input', '', input_options) + @content
-          input_options[:id].blank? ||
+          end
+          self[:input] = content_tag('input', '', input_options)
+          unless input_options[:id].blank?
             @options[:label_for] = input_options[:id]
+          end
         end
-        true
-      end
-
-      after_capture do
-        @icon.nil? && !@content.empty? && @content += html_safe(' ')
       end
 
       after_initialize do
-        @tag = 'button' unless @tag == 'a' || @tag == 'input'
+        @tag == 'a' || @tag == 'input' || @tag = 'button'
         if @tag == 'a'
           @options[:role] = 'button'
         else
-          @options[:type] = 'button' unless @options.include?(:type)
+          @options.include?(:type) || @options[:type] = 'button'
           @options[:type] = @options[:type].to_s.downcase
         end
 
-        @options.key?(:icon) &&
-          @icon = Icon.new(@template, @options.delete(:icon))
-
         @options.keys.each do |key|
-          next unless /_text$/ =~ key
+          /_text$/ =~ key || next
           value = @options.delete(key)
-          next unless value.is_a?(String)
+          value.is_a?(String) || next
           set_html_data(key.to_s.gsub(/_/, '-'), value)
         end
       end
@@ -74,43 +73,52 @@ module BootstrapIt
     #
     # DropdownButton
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#btn-dropdowns Bootstrap docs
     class DropdownButton < Button
       include DropdownMenuWrapper
 
       switch :splitted
       switch :dropup
+      section :caret, :splitted
+      place :caret, after: :content
+      place :splitted, after: :caret
+      place :space_separator, before: :caret
+      place :children, before: :end
 
       after_capture do
-        unless @dropdown_items.empty?
-          unless splitted?
-            @content += content_tag('span', '', class: 'caret')
-            add_html_class('dropdown-toggle')
-            set_html_data(:toggle, 'dropdown')
-          end
-        end
-      end
-
-      after_render do
-        unless @dropdown_items.empty?
+        if !@dropdown_menu.nil?
+          caret = content_tag('span', empty_html, class: 'caret')
           if splitted?
             toggle = WrapIt::Base.new(@template, @options.merge(tag: 'button'))
             toggle.add_html_class('dropdown-toggle')
             toggle.set_html_data(:toggle, 'dropdown')
-            @content += capture do
-              toggle.render(content_tag('span', '', class: 'caret'))
-            end
+            self[:splitted] = capture { toggle.render(caret) }
+            self[:space_separator] = empty_html
+          else
+            self[:caret] = caret
+            self[:space_separator] = html_safe(' ')
+            add_html_class('dropdown-toggle')
+            set_html_data(:toggle, 'dropdown')
           end
+          #puts "--- #{self.class.placement}"
+          #puts "--> #{instance_variable_get(:@sections)}"
+          self[:content] = render_sections(except: [:children, :splitted])
+          @after_render = render_sections(:children, :splitted)
+          #puts "RENDERED: #{self[:content]} #{@}"
           wrapper_class = ['btn-group']
           wrapper_class << 'dropup' if dropup?
           wrap(class: wrapper_class)
         end
       end
+
+      after_render do
+        @after_render.nil? || @rendered << @after_render
+      end
     end
 
-    WrapIt.register :button, :radio, :checkbox,
-                    'BootstrapIt::ViewHelpers::Button'
-    WrapIt.register :dropdown_button, 'BootstrapIt::ViewHelpers::DropdownButton'
+    register :button, :radio, :checkbox, 'BootstrapIt::ViewHelpers::Button'
+    register :dropdown_button, 'BootstrapIt::ViewHelpers::DropdownButton'
   end
 end

data/lib/bootstrap_it/view_helpers/button_group.rb

@@ -4,8 +4,9 @@ module BootstrapIt
     #
     # ButtonGroup
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#btn-groups Bootstrap docs
     class ButtonGroup < WrapIt::Container
       include Sizable
       include Justifable
@@ -18,15 +19,33 @@ module BootstrapIt
       child :button, 'BootstrapIt::ViewHelpers::Button'
       child :dropdown, 'BootstrapIt::ViewHelpers::DropdownButton'
 
-      child :radio, 'BootstrapIt::ViewHelpers::Button' do |button|
+      child :radio, 'BootstrapIt::ViewHelpers::Button' do |_|
         set_html_data(:toggle, 'buttons')
       end
 
-      child :checkbox, 'BootstrapIt::ViewHelpers::Button' do |button|
+      child :checkbox, 'BootstrapIt::ViewHelpers::Button' do |_|
         set_html_data(:toggle, 'buttons')
       end
     end
 
-    WrapIt.register :button_group, 'BootstrapIt::ViewHelpers::ButtonGroup'
+    #
+    # Button Toolbar
+    #
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
+    #
+    # @see http://getbootstrap.com/components/#btn-groups-toolbar Bootstrap
+    #   docs
+    class ButtonToolbar < WrapIt::Container
+      html_class 'btn-toolbar'
+
+      child :button_group, 'BootstrapIt::ViewHelpers::ButtonGroup'
+      alias_method :group, :button_group
+
+      after_initialize { @options[:role] = 'toolbar' }
+    end
+
+    register :button_group, 'BootstrapIt::ViewHelpers::ButtonGroup'
+    register :button_toolbar, 'BootstrapIt::ViewHelpers::ButtonToolbar'
+    register :toolbar, 'BootstrapIt::ViewHelpers::ButtonToolbar'
   end
 end

data/lib/bootstrap_it/view_helpers/dropdown_menu.rb

@@ -4,18 +4,19 @@ module BootstrapIt
     #
     # Dropdown Menu
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#dropdowns Bootstrap docs
     class DropdownMenu < WrapIt::Container
       default_tag 'ul'
       html_class 'dropdown-menu'
 
       child :divider, ListItem,
-            [tag: 'li', class: 'divider', role: 'presentation']
+            tag: 'li', class: 'divider', role: 'presentation'
       child :header, ListItem,
-            [tag: 'li', class: 'dropdown-header', role: 'presentation']
+            tag: 'li', class: 'dropdown-header', role: 'presentation'
       child :link_item, ListLinkItem,
-            [li_role: 'presentation', role: 'menuitem', tabindex: '-1']
+            li_role: 'presentation', role: 'menuitem', tabindex: '-1'
 
       after_initialize do
         @options['role'] = 'menu'
@@ -25,6 +26,6 @@ module BootstrapIt
       end
     end
 
-    WrapIt.register :dropdown_menu, 'BootstrapIt::ViewHelpers::DropdownMenu'
+    register :dropdown_menu, 'BootstrapIt::ViewHelpers::DropdownMenu'
   end
 end

data/lib/bootstrap_it/view_helpers/form.rb

@@ -4,8 +4,9 @@ module BootstrapIt
     #
     # Input
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/css/#forms Bootstrap docs
     class Input < WrapIt::Base
       include WrapIt::TextContainer
       TYPES = %w(text password datetime datetime-local date month time
@@ -20,16 +21,15 @@ module BootstrapIt
         @saved_args = @arguments.clone
       end
 
-      before_render do
-        @options.key?(:value) || @options[:value] = @content
-        @content = empty_html
+      after_capture do
+        @options.key?(:value) || @options[:value] = render_sections
       end
     end
 
     #
     # FormLabel
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class FormLabel < WrapIt::Base
       include WrapIt::TextContainer
@@ -42,60 +42,56 @@ module BootstrapIt
     #
     # FormGroup
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class FormGroup < WrapIt::Container
       html_class 'form-group'
 
+      section :label, :input
+
+      child :label, 'BootstrapIt::ViewHelpers::FormLabel', section: :label
       child :input, 'BootstrapIt::ViewHelpers::Input' do |input|
         input_args = input.instance_variable_get(:@saved_args)
-        @control_size = input_args.extract!(
+        control_size = input_args.extract!(
           Symbol, and: [SizableColumn::COLUMN_SIZE_REGEXP]
         )
-        @control_place = input_args.extract!(
+        control_place = input_args.extract!(
           Symbol, and: [PlacableColumn::COLUMN_PLACE_REGEXP]
         )
-        @control_size.empty? && @control_size = @form.control_size
-
-        label_args = input.options.delete(:label)
-        unless label_args.nil?
-          label_args.is_a?(Array) || label_args = [label_args]
-          @label = FormLabel.new(@template, *label_args)
-          if @form.kind == :horizontal && !@label.column_size_defined?
-            @label.column_size = @form.label_size
-          end
-          unless input.options[:id].nil?
-            @label.options[:label_for] = input.options[:id]
-          end
-        end
-      end
+        control_size.empty? && control_size = parent.control_size
 
-      after_initialize do
-        @form = @options.delete :form
-        # @form.is_a? Form || fail(
-        #   ArgumentError,
-        #   'Required option `form` for `form_group` is not specified'
-        # )
-      end
-
-      after_capture do
-        if @form.kind == :horizontal
-          input_wrapper = Base.new(@template)
+        if parent.kind == :horizontal
+          input_wrapper = WrapIt::Base.new(@template)
           input_wrapper.extend SizableColumn
           input_wrapper.extend PlacableColumn
-          input_wrapper.column_size = @control_size
-          input_wrapper.column_place = @control_place
-          @content = capture { input_wrapper.render(@content) }
+          input_wrapper.column_size = control_size
+          input_wrapper.column_place = control_place
+          input.wrap(input_wrapper)
+        end
+
+        args = input.options.delete(:label)
+        unless args.nil?
+          args.is_a?(Array) || args = [args]
+          options = args.extract_options!
+          unless input.options[:id].nil?
+            options[:label_for] = input.options[:id]
+          end
+          args << options
+          label(*args)
+          l = children.last
+          if parent.kind == :horizontal && !l.column_size_defined?
+            l.column_size = @form.label_size
+          end
         end
-        @label.nil? || @content = capture { @label.render } + @content
       end
     end
 
     #
     # Form
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/css/#forms Bootstrap docs
     class Form < WrapIt::Container
       DEFAULT_LABEL_SIZE = %i(xs2 sm2 md2 lg2)
       DEFAULT_CONTROL_SIZE = %i(xs10 sm10 md10 lg10)
@@ -107,9 +103,11 @@ module BootstrapIt
       attr_reader :label_size
       attr_reader :control_size
 
+      child :group, 'BootstrapIt::ViewHelpers::FormGroup',
+            deffered_render: true
+
       def input(*args, &block)
-        group = BootstrapIt::ViewHelpers::FormGroup.new(@template, form: self)
-        group.input(*args, &block)
+        group { |g| g.input(*args, &block) }
       end
 
       after_initialize do
@@ -119,9 +117,10 @@ module BootstrapIt
           @label_size = options.delete(:label_size) || DEFAULT_LABEL_SIZE
           @control_size = options.delete(:control_size) || DEFAULT_CONTROL_SIZE
         end
+        self.deffered_render = true
       end
     end
 
-    WrapIt.register :form, 'BootstrapIt::ViewHelpers::Form'
+    register :form, 'BootstrapIt::ViewHelpers::Form'
   end
 end