bootstrap_it 0.1.1 → 0.1.2

data/lib/bootstrap_it/view_helpers/pagination.rb

@@ -4,8 +4,9 @@ module BootstrapIt
     #
     # Pagination
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#pagination Bootstrap docs
     class Pagination < WrapIt::Container
       include Sizable
 
@@ -18,17 +19,18 @@ module BootstrapIt
     #
     # Pager
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#pagination-pager Bootstrap docs
     class Pager < WrapIt::Container
       default_tag 'ul'
       html_class 'pager'
       child :link_item, ListLinkItem
-      child :previous, ListLinkItem, [li_class: 'previous']
-      child :next, ListLinkItem, [li_class: 'next']
+      child :previous, ListLinkItem, li_class: 'previous'
+      child :next, ListLinkItem, li_class: 'next'
     end
 
-    WrapIt.register :pagination, 'BootstrapIt::ViewHelpers::Pagination'
-    WrapIt.register :pager, 'BootstrapIt::ViewHelpers::Pager'
+    register :pagination, 'BootstrapIt::ViewHelpers::Pagination'
+    register :pager, 'BootstrapIt::ViewHelpers::Pager'
   end
 end

data/lib/bootstrap_it/view_helpers/table.rb

@@ -4,8 +4,9 @@ module BootstrapIt
     #
     # Table
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/css/#tables Bootstrap docs
     class Table < WrapIt::Container
       html_class 'table'
       html_class_prefix 'table-'
@@ -21,17 +22,12 @@ module BootstrapIt
       child :row, 'BootstrapIt::ViewHelpers::TableRow'
 
       after_initialize { @tag = 'table' }
-
-      # TODO: remove it since WrapIt 0.1.5
-      def unwrap
-        @wrapper = nil
-      end
     end
 
     #
     # TableRow
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class TableRow < WrapIt::Container
       include Contextual
@@ -39,7 +35,7 @@ module BootstrapIt
       child :cell, 'BootstrapIt::ViewHelpers::TableCell'
       alias_method :td, :cell
 
-      child :head, 'BootstrapIt::ViewHelpers::TableCell', [tag: 'th']
+      child :head, 'BootstrapIt::ViewHelpers::TableCell', tag: 'th'
       alias_method :th, :head
       alias_method :header, :head
 
@@ -49,7 +45,7 @@ module BootstrapIt
     #
     # TableCell
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class TableCell < WrapIt::Base
       include WrapIt::TextContainer
@@ -67,6 +63,6 @@ module BootstrapIt
       end
     end
 
-    WrapIt.register :table, 'BootstrapIt::ViewHelpers::Table'
+    register :table, 'BootstrapIt::ViewHelpers::Table'
   end
 end

data/lib/bootstrap_it/view_helpers/text.rb

@@ -4,7 +4,7 @@ module BootstrapIt
     #
     # Text
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
     class Text < WrapIt::Base
       include WrapIt::TextContainer
@@ -16,8 +16,9 @@ module BootstrapIt
     #
     # Label
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#labels Bootstrap docs
     class Label < Text
       default_tag 'span'
       html_class 'label'
@@ -29,18 +30,19 @@ module BootstrapIt
     #
     # Badge
     #
-    # @author [alexiss]
+    # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
     #
+    # @see http://getbootstrap.com/components/#badges Bootstrap docs
     # TODO: right-alignment
     class Badge < Text
       default_tag 'span'
       html_class 'badge'
     end
 
-    WrapIt.register :text, 'BootstrapIt::ViewHelpers::Text'
-    WrapIt.register :p, 'BootstrapIt::ViewHelpers::Text'
-    WrapIt.register :span, 'BootstrapIt::ViewHelpers::Text'
-    WrapIt.register :label, 'BootstrapIt::ViewHelpers::Label'
-    WrapIt.register :badge, 'BootstrapIt::ViewHelpers::Badge'
+    register :text, 'BootstrapIt::ViewHelpers::Text'
+    register :p, 'BootstrapIt::ViewHelpers::Text'
+    register :span, 'BootstrapIt::ViewHelpers::Text'
+    register :label, 'BootstrapIt::ViewHelpers::Label'
+    register :badge, 'BootstrapIt::ViewHelpers::Badge'
   end
 end

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
 require 'rubygems'
 require 'bundler'
+
+require 'rspec-html-matchers'
+
 #Bundler.require :default, :development
 #Bundler.require :development
 #puts "--- #{Object.constants}"
 
 require 'combustion'
-require 'capybara/rspec'
+# require 'capybara/rspec'
 
 Dir[File.join File.dirname(__FILE__), 'support', '**', '*.rb'].each {|file| require file}
 
@@ -14,7 +17,7 @@ Combustion.initialize! :action_controller, :action_view, :sprockets do |app|
 #  app.config.sass.cache = false
 end
 
-Capybara.app = Combustion::Application
+# Capybara.app = Combustion::Application
 
 require 'rspec/rails'
 #require 'capybara/rails'

data/spec/support/example_groups/view_helpers_example_group.rb

@@ -41,15 +41,14 @@ module ViewHelpersExampleGroup
       end
     end
 
+=begin
     RSpec::Matchers.define :render_with do |selector, options = {}|
       match_for_should do |actual|
-        Capybara::Node::Simple.new(actual.render)
-          .has_selector?(selector, options)
+        actual.render.has_tag?(selector, options)
       end
 
       match_for_should_not do |actual|
-        Capybara::Node::Simple.new(actual.render)
-          .has_no_selector?(selector, options)
+        actual.render.has_no_tag?(selector, options)
       end
 
       failure_message_for_should do |actual|
@@ -60,7 +59,7 @@ module ViewHelpersExampleGroup
         "expected that #{actual.render} would not have selector #{selector}"
       end
     end
-
+=end
     RSpec::Matchers.define :have_flag do |flag|
       chain :with do |options|
         @options = options

data/spec/view_helpers/breadcrumb_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::Breadcrumb do
-  it { expect(helper).to render_with 'ol.breadcrumb' }
+  it { expect(helper.render).to have_tag 'ol.breadcrumb' }
   it { expect(helper).to be_kind_of WrapIt::Container }
-  it { expect(helper { |h| h.item :active }).to render_with 'ol > li.active' }
+
+  it 'renders active items' do
+    expect(helper { |h| h.item :active }.render).to have_tag 'ol > li.active'
+  end
+
   it 'reders links' do
     expect(
-      helper { |h| h.link_item 'test', 'http://url' }
-    ).to render_with 'ol > li > a[@href="http://url"][text()="test"]'
+      helper { |h| h.link_item 'test', 'http://url' }.render
+    ).to have_tag 'ol > li > a[@href="http://url"][text()="test"]'
   end
 end

data/spec/view_helpers/button_group_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::ButtonGroup do
-  it { expect(helper).to render_with 'div.btn-group' }
+  it { expect(helper.render).to have_tag 'div.btn-group' }
 
   # behaviour
   it { expect(helper).to be_kind_of BootstrapIt::ViewHelpers::Sizable }
@@ -16,20 +16,20 @@ describe BootstrapIt::ViewHelpers::ButtonGroup do
 
   # buttons
   it 'renders buttons' do
-    expect(helper { |h| h.button 'test' }).to render_with(
+    expect(helper { |h| h.button 'test' }.render).to have_tag(
       'div.btn-group > button.btn.btn-default[text()="test"]'
     )
   end
 
   it 'renders radios' do
-    expect(helper { |h| h.radio 'test' }).to render_with(
+    expect(helper { |h| h.radio 'test' }.render).to have_tag(
       'div.btn-group[@data-toggle="buttons"]' \
       ' > label.btn.btn-default[text()="test"] > input[@type="radio"]'
     )
   end
 
   it 'renders checkboxes' do
-    expect(helper { |h| h.checkbox 'test' }).to render_with(
+    expect(helper { |h| h.checkbox 'test' }.render).to have_tag(
       'div.btn-group[@data-toggle="buttons"]' \
       ' > label.btn.btn-default[text()="test"] > input[@type="checkbox"]'
     )

data/spec/view_helpers/button_spec.rb

@@ -1,32 +1,32 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::Button do
-  it { expect(helper).to render_with 'button.btn.btn-default[@type="button"]' }
+  it { expect(helper.render).to have_tag 'button.btn.btn-default[@type="button"]' }
 
   it 'allows `submit` type' do
-    expect(helper type: 'submit').to render_with(
+    expect(helper(type: 'submit').render).to have_tag(
       'button.btn.btn-default[@type="submit"]'
     )
   end
 
   it 'allows `a` tag' do
-    expect(helper tag: :a).to render_with 'a.btn.btn-default[@role="button"]'
+    expect(helper(tag: :a).render).to have_tag 'a.btn.btn-default[@role="button"]'
   end
 
   it 'allows `input` tag' do
-    expect(helper tag: :input).to render_with(
+    expect(helper(tag: :input).render).to have_tag(
       'input.btn.btn-default[@type="button"]'
     )
   end
 
   it 'allows `input` with `submit` type' do
-    expect(helper tag: :input, type: :submit).to render_with(
+    expect(helper(tag: :input, type: :submit).render).to have_tag(
       'input.btn.btn-default[@type="submit"]'
     )
   end
 
   it 'changes custom tags to `button`' do
-    expect(helper tag: :p).to render_with 'button.btn.btn-default'
+    expect(helper(tag: :p).render).to have_tag 'button.btn.btn-default'
   end
 
   # method returns safety
@@ -43,13 +43,13 @@ describe BootstrapIt::ViewHelpers::Button do
 
   # icons
   it 'renders icon throw options' do
-    expect(helper icon: :bell).to render_with(
+    expect(helper(icon: :bell).render).to have_tag(
       'button.btn.btn-default > i.fa.fa-bell'
     )
   end
 
   it 'renders icon with helper' do
-    expect(helper { |b| b.icon :star }).to render_with(
+    expect(helper { |b| b.icon :star }.render).to have_tag(
       'button.btn.btn-default > i.fa.fa-star'
     )
   end
@@ -66,7 +66,7 @@ describe BootstrapIt::ViewHelpers::Button do
       value: 'v1',
       class: 'someclass',
       helper_name: 'radio'
-    )).to render_with(
+    ).render).to have_tag(
       'label.btn.btn-default.someclass[text()="text"][@label_for="option1"]' \
       ' > input[@type="radio"][@name="group-name"][@id="option1"]' \
       '[@value="v1"]'
@@ -82,7 +82,7 @@ describe BootstrapIt::ViewHelpers::Button do
       value: 'v1',
       class: 'someclass',
       helper_name: 'checkbox'
-    )).to render_with(
+    ).render).to have_tag(
       'label.btn.btn-default.someclass[text()="text"] >' \
       ' input[@type="checkbox"][@name="group-name"]' \
       '[@id="option1"][@value="v1"]'
@@ -91,11 +91,13 @@ describe BootstrapIt::ViewHelpers::Button do
 
   # toggling
   it { expect(helper).to have_flag :toggle }
-  it { expect(helper :toggle).to render_with 'button[@data-toggle="button"]' }
+  it 'renders button with toggle data' do
+    expect(helper(:toggle).render).to have_tag 'button[@data-toggle="button"]'
+  end
 
   # state text
   it 'extracts state text from options' do
-    expect(helper loading_text: 'text').to render_with(
+    expect(helper(loading_text: 'text').render).to have_tag(
       'button[@data-loading-text="text"]'
     )
   end
@@ -122,14 +124,14 @@ describe BootstrapIt::ViewHelpers::DropdownButton do
 
   # dropdown
   it 'renders dropdown toggle' do
-    expect(helper('action text') { |b| b.divider }).to render_with(
+    expect(helper('action text') { |b| b.divider }.render).to have_tag(
       'div.btn-group > button.dropdown-toggle[@data-toggle="dropdown"]' \
-      '[text()="action text"] > span.caret'
+      '[text()="action text "] > span.caret'
     )
   end
 
   it 'renders dropdown menu' do
-    expect(helper('action text') { |b| b.divider }).to render_with(
+    expect(helper('action text') { |b| b.divider }.render).to have_tag(
       'div.btn-group > button + ul.dropdown-menu > li.divider'
     )
   end
@@ -138,14 +140,14 @@ describe BootstrapIt::ViewHelpers::DropdownButton do
 
   it 'renders splitted toggle button' do
     expect(
-      helper(:splitted, :danger, 'action') { |b| b.divider }
-    ).to render_with 'div.btn-group > button.btn-danger[text()="action"]'
+      helper(:splitted, :danger, 'action') { |b| b.divider }.render
+    ).to have_tag 'div.btn-group > button.btn-danger[text()="action"]'
   end
 
   it 'renders spliited toggle' do
     expect(
-      helper(:splitted, :danger, 'action') { |b| b.divider }
-    ).to render_with(
+      helper(:splitted, :danger, 'action') { |b| b.divider }.render
+    ).to have_tag(
       'div.btn-group' \
       ' > button.btn-danger.dropdown-toggle[@data-toggle="dropdown"]' \
       ' > span.caret'
@@ -154,8 +156,8 @@ describe BootstrapIt::ViewHelpers::DropdownButton do
 
   it 'renders splitted dropdown menu' do
     expect(
-      helper(:splitted, :danger, 'action') { |b| b.divider }
-    ).to render_with 'div.btn-group > ul.dropdown-menu > li.divider'
+      helper(:splitted, :danger, 'action') { |b| b.divider }.render
+    ).to have_tag 'div.btn-group > ul.dropdown-menu > li.divider'
   end
 
   # dropup
@@ -163,7 +165,7 @@ describe BootstrapIt::ViewHelpers::DropdownButton do
 
   it 'renders dropup' do
     expect(
-      helper(:dropup) { |b| b.divider }
-    ).to render_with 'div.btn-group.dropup'
+      helper(:dropup) { |b| b.divider }.render
+    ).to have_tag 'div.btn-group.dropup'
   end
 end

data/spec/view_helpers/button_toolbar_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::ButtonToolbar do
-  it { expect(helper).to render_with 'div.btn-toolbar[@role="toolbar"]' }
+  it { expect(helper.render).to have_tag 'div.btn-toolbar[@role="toolbar"]' }
 
   it 'reders button group' do
     expect(
-      helper { |h| h.button_group { |g| g.button 'test' } }
-    ).to render_with(
+      helper { |h| h.button_group { |g| g.button 'test' } }.render
+    ).to have_tag(
       'div.btn-toolbar > div.btn-group' \
       ' > button.btn.btn-default[text()="test"]'
     )

data/spec/view_helpers/dropdown_menu_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe BootstrapIt::ViewHelpers::DropdownMenu do
-  it { expect(helper).to render_with 'ul.dropdown-menu[@role="menu"]' }
+  it { expect(helper.render).to have_tag 'ul.dropdown-menu[@role="menu"]' }
 
   it 'reders devider' do
-    expect(helper { |h| h.divider }).to render_with(
+    expect(helper { |h| h.divider }.render).to have_tag(
       'ul > li.divider[@role="presentation"]'
     )
   end
 
   it 'renders header' do
-    expect(helper { |h| h.header 'test' }).to render_with(
+    expect(helper { |h| h.header 'test' }.render).to have_tag(
       'ul > li.dropdown-header[@role="presentation"]'
     )
   end
 
   it 'renders link item' do
-    expect(helper { |h| h.link_item 'test', 'http://url' }).to render_with(
+    expect(helper { |h| h.link_item 'test', 'http://url' }.render).to have_tag(
       'ul > li[@role="presentation"]' \
       ' > a[@href="http://url"][@role="menuitem"][@tabindex="-1"]'
     )
@@ -24,18 +24,18 @@ describe BootstrapIt::ViewHelpers::DropdownMenu do
 
   it 'renders disabled link item' do
     expect(
-      helper { |h| h.link_item 'test', :disabled, 'http://url' }
-    ).to render_with(
+      helper { |h| h.link_item 'test', :disabled, 'http://url' }.render
+    ).to have_tag(
       'ul > li.disabled[@role="presentation"]' \
       ' > a[@href="http://url"][@role="menuitem"][@tabindex="-1"]'
     )
   end
 
   it 'supports right-align' do
-    expect(helper align: :right).to render_with 'ul.dropdown-menu.pull-right'
+    expect(helper(align: :right).render).to have_tag 'ul.dropdown-menu.pull-right'
   end
 
   # options cleaning
-  it { expect(helper align: 'right').to_not have_option :align }
-  it { expect(helper align: :none).to_not have_option :align }
+  it { expect(helper(align: 'right')).to_not have_option :align }
+  it { expect(helper(align: :none)).to_not have_option :align }
 end