ui_bibz 2.0.0.alpha32 → 2.0.0.beta2

data/test/ui/core/forms/surrounds/surround_field_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+
+class SurroundFieldTest < ActionView::TestCase
+
+    test 'surround_field with glyph' do
+      actual = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new.tap do |sf|
+        sf.glyph 'pencil'
+      end.render
+      expected = "<div class=\"input-group\"><span class=\"input-group-addon\"><i class=\"glyph fa fa-pencil\"></i></span></div>"
+
+      assert_equal expected, actual
+    end
+
+    test 'surround_field with addon' do
+      actual = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new.tap do |sf|
+        sf.addon 'content addon'
+      end.render
+      expected = "<div class=\"input-group\"><span class=\"input-group-addon\">content addon</span></div>"
+
+      assert_equal expected, actual
+    end
+
+    test 'surround_field with dropdown' do
+      actual = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new.tap do |sf|
+        sf.dropdown "Dropdown" do |d|
+          d.link 'Link 1', url: '#link1', glyph: 'eye'
+          d.header 'header'
+          d.link 'Link 2', url: '#link2'
+          d.divider
+          d.link 'Link3', url: '#link3'
+        end
+      end.render
+      expected = "<div class=\"input-group\"><div class=\"dropdown btn-group input-group-btn\"><button class=\"btn btn-primary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">Dropdown <span class=\"caret\"></span></button><div class=\"dropdown-menu dropdown-menu-left\"><a class=\"dropdown-item\" href=\"#link1\"><i class=\"glyph fa fa-eye\"></i> Link 1</a><h6 class=\"dropdown-header\" role=\"presentation\">header</h6><a class=\"dropdown-item\" href=\"#link2\">Link 2</a><div class=\"dropdown-divider\"></div><a class=\"dropdown-item\" href=\"#link3\">Link3</a></div></div></div>"
+
+      assert_equal expected, actual
+    end
+
+    test 'surround_field with button' do
+      actual = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new.tap do |sf|
+        sf.button 'Submit'
+      end.render
+      expected = "<div class=\"input-group\"><div class=\"input-group-btn\"><button class=\"btn-primary btn\">Submit</button></div></div>"
+
+      assert_equal expected, actual
+    end
+
+   test 'surround_field with button, addon, glyph' do
+      actual = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new.tap do |sf|
+        sf.button 'Submit'
+        sf.addon '€'
+        sf.glyph 'pencil'
+      end.render
+      expected = "<div class=\"input-group\"><div class=\"input-group-btn\"><button class=\"btn-primary btn\">Submit</button></div><span class=\"input-group-addon\">€</span><span class=\"input-group-addon\"><i class=\"glyph fa fa-pencil\"></i></span></div>"
+
+      assert_equal expected, actual
+    end
+end
+

data/test/ui/core/forms/textareas/markdown_editor_field_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class MarkdownEditorFieldTest < ActionView::TestCase
 

data/test/ui/core/forms/texts/auto_complete_field_test.rb

@@ -1,12 +1,11 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class AutoCompleteFieldTest < ActionView::TestCase
 
   test 'auto_complete_field' do
     options  = options_for_select(2.times.map{ |i| "option #{i}" })
     actual = UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('test', { option_tags: options }, { id: 'test' }).render
-    expected = "<input type=\"text\" name=\"test\" id=\"test\" class=\"form-control\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
+    expected = "<input type=\"text\" name=\"test\" id=\"test\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
 <option value=\"option 1\">option 1</option></datalist>"
 
     assert_equal expected, actual
@@ -15,8 +14,26 @@ class AutoCompleteFieldTest < ActionView::TestCase
   test 'auto_complete_field with refresh button' do
     options  = options_for_select(2.times.map{ |i| "option #{i}" })
     actual = UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('test', { option_tags: options, refresh: { target: { url: '/'}} }, { id: 'test' }).render
-    expected = "<div class=\"input-group field-refresh\"><input type=\"text\" name=\"test\" id=\"test\" class=\"form-control\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
-<option value=\"option 1\">option 1</option></datalist><span class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;&quot;,&quot;url&quot;:&quot;&quot;,&quot;data&quot;:[]}}\" class=\"btn-primary ui-bibz-connect input-refresh-button btn\"><i class=\"glyph fa fa-refresh\"></i> </span></span></div>"
+    expected = "<div class=\"field-refresh input-group\"><input type=\"text\" name=\"test\" id=\"test\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
+<option value=\"option 1\">option 1</option></datalist><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test-datalist&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}\" class=\"btn-primary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fa fa-refresh\"></i> </span></div></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'auto_complete_field with refresh button and append content' do
+    options  = options_for_select(2.times.map{ |i| "option #{i}" })
+    actual = UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('test', { option_tags: options, append: 'Append content', refresh: { target: { url: '/'}} }, { id: 'test' }).render
+    expected = "<div class=\"field-refresh input-group\"><span class=\"input-group-addon\">Append content</span><input type=\"text\" name=\"test\" id=\"test\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
+<option value=\"option 1\">option 1</option></datalist><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test-datalist&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}\" class=\"btn-primary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fa fa-refresh\"></i> </span></div></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'auto_complete_field with prepend content' do
+    options  = options_for_select(2.times.map{ |i| "option #{i}" })
+    actual = UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('test', { option_tags: options, prepend: 'Append content' }, { id: 'test' }).render
+    expected = "<div class=\"input-group\"><input type=\"text\" name=\"test\" id=\"test\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
+<option value=\"option 1\">option 1</option></datalist><span class=\"input-group-addon\">Append content</span></div>"
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/texts/text_field_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class TextFieldTest < ActionView::TestCase
+
+    test 'text_field without prepend and append' do
+      actual = UiBibz::Ui::Core::Forms::Texts::TextField.new('test').render
+      expected = "<input type=\"text\" name=\"test\" id=\"test\" class=\"form-control\" />"
+
+      assert_equal expected, actual
+    end
+
+    test 'text_field with prepend and append' do
+      actual = UiBibz::Ui::Core::Forms::Texts::TextField.new('test', append: '1', prepend: '2').render
+      expected = "<div class=\"input-group\"><span class=\"input-group-addon\">1</span><input type=\"text\" name=\"test\" id=\"test\" class=\"form-control\" /><span class=\"input-group-addon\">2</span></div>"
+
+      assert_equal expected, actual
+    end
+
+    test 'text_field size' do
+      actual = UiBibz::Ui::Core::Forms::Texts::TextField.new('test', size: :xs, append: '1', prepend: '2').render
+      expected = "<div class=\"input-group-xs input-group\"><span class=\"input-group-addon\">1</span><input type=\"text\" name=\"test\" id=\"test\" class=\"form-control\" /><span class=\"input-group-addon\">2</span></div>"
+
+      assert_equal expected, actual
+    end
+end

data/test/ui/{glyph_test.rb → core/glyph_test.rb}

@@ -1,28 +1,28 @@
 require 'test_helper'
 
-include UiBibz::Helpers
 class GlyphTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
 
   test 'create glyph with a name' do
-    actual   = UiBibz::Ui::Core::Glyph.new('add').render
+    actual   = ui_glyph('add')
     expected = '<i class="glyph fa fa-add"></i>'
     assert_equal expected, actual
   end
 
   test 'create glyph with hash' do
-    actual   = UiBibz::Ui::Core::Glyph.new({ name: 'add', size: 3, type: 'li'}).render
+    actual   = ui_glyph({ name: 'add', size: 3, type: 'li'})
     expected = '<i class="glyph fa fa-add fa-3x fa-li"></i>'
     assert_equal expected, actual
   end
 
   test 'create glyph with name and hash' do
-    actual   = UiBibz::Ui::Core::Glyph.new('add', { size: 3, type: 'li' }).render
+    actual   = ui_glyph('add', { size: 3, type: 'li' })
     expected = '<i class="glyph fa fa-add fa-3x fa-li"></i>'
     assert_equal expected, actual
   end
 
   test 'create glyph with label' do
-    actual   = UiBibz::Ui::Core::Glyph.new('add', { label: 'Example' }).render
+    actual   = ui_glyph('add', { label: 'Example' })
     expected = "<i class=\"glyph fa fa-add\"></i> Example"
     assert_equal expected, actual
   end

data/test/ui/core/jumbotron_test.rb

@@ -0,0 +1,20 @@
+# encoding: UTF-8
+require 'test_helper'
+
+class UiHelperTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test 'jumbotron with full_width' do
+    actual   = ui_jumbotron 'state', full_width: true
+    expected = "<div class=\"jumbotron\">state</div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'jumbotron' do
+    actual   = ui_jumbotron 'state'
+    expected = "<div class=\"jumbotron\">state</div>"
+
+    assert_equal expected, actual
+  end
+end

data/test/ui/core/layouts/col_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class ColTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test "col with options" do
+    actual   = ui_col('test', { num: 1, push: 2, offset: 3, pull: 4 }, { class: 'test' })
+    expected = "<div class=\"test col-md-1 col-md-push-2 offset-md-3 col-md-pull-4\">test</div>"
+
+    assert_equal expected, actual
+  end
+
+  test "col with several cols" do
+    actual   = ui_col(md: { num: 1, push: 2, pull: 4 }, xl: { num: 6, offset: 5 }, class: 'test') do
+      "test"
+    end
+    expected = "<div class=\"test col-md-1 col-md-push-2 col-md-pull-4 col-xl-6 offset-xl-5\">test</div>"
+
+    assert_equal expected, actual
+  end
+
+  test "col" do
+    actual   = ui_col do
+      "test"
+    end
+    expected = "<div class=\"col\">test</div>"
+
+    assert_equal expected, actual
+  end
+
+end

data/test/ui/core/layouts/container_test.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+require 'test_helper'
+
+class UiHelperTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test 'container' do
+    actual   = ui_container type: :fluid
+    expected = "<div class=\"container-fluid\"></div>"
+
+    assert_equal expected, actual
+  end
+end

data/test/ui/core/layouts/row_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class RowTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test 'row' do
+    actual = ui_row(class: 'test') do
+      'test'
+    end
+    expected = "<div class=\"test row\">test</div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'row form' do
+    actual = ui_row(type: :form) do
+      'test'
+    end
+    expected = "<div class=\"form-row\">test</div>"
+
+    assert_equal expected, actual
+  end
+
+end

data/test/ui/core/lists/list_group_test.rb

@@ -1,22 +1,23 @@
 require 'test_helper'
-include UiBibz::Helpers
+
 class ListGroupTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
 
   test 'list_group with link' do
-    actual = UiBibz::Ui::Core::Lists::ListGroup.new(type: :link).tap do |lg|
+    actual = ui_list_group(type: :link) do |lg|
       lg.list 'Momo', { status: :success, url: '#momo' }
       lg.list({ tap: true, active: true, url: '#state' }) do |l|
         l.header 'My title'
         l.body   'My body'
       end
-    end.render
+    end
     expected = "<div class=\"list-group\"><a class=\"list-group-item-success list-group-item\" href=\"#momo\">Momo</a><a type=\"link\" class=\"list-group-item\" href=\"#state\"><h4 class=\"list-group-item-heading\">My title</h4><p class=\"list-group-item-text\">My body</p></a></div>"
 
     assert_equal expected, actual
   end
 
   test 'list_group' do
-    actual = UiBibz::Ui::Core::Lists::ListGroup.new().tap do |lg|
+    actual = ui_list_group(type: :link) do |lg|
       lg.list 'Lulu'
       lg.list 'state'
     end.render

data/test/ui/core/navs/nav_test.rb

@@ -1,23 +1,22 @@
 require 'test_helper'
-include UiBibz::Helpers
 class NavTest < ActionView::TestCase
 
   test 'Nav with tab' do
-    actual = UiBibz::Ui::Core::Navs::Nav.new(type: :tabs).tap do |n|
+    actual = ui_nav(type: :tabs) do |n|
       n.link 'Home', state: :active, url: "#Home", selector: 'home'
       n.link 'Profile', url: "#profile", selector: 'profile'
       n.link 'Messages', url: "#messages", selector: 'messages'
-    end.render
+    end
     expected = "<ul class=\"nav nav-tabs\"><li class=\"nav-item\"><a class=\"active nav-link\" data-toggle=\"tab\" role=\"tab\" href=\"#Home\">Home</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" role=\"tab\" href=\"#profile\">Profile</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" role=\"tab\" href=\"#messages\">Messages</a></li></ul>"
     assert_equal expected, actual
   end
 
   test 'Nav with pills' do
-    actual = UiBibz::Ui::Core::Navs::Nav.new(type: :pills, position: :justified).tap do |n|
+    actual = ui_nav(type: :pills, position: :justified) do |n|
       n.link 'Home', state: :active, url: "#Home", selector: 'home'
       n.link 'Profile', url: "#profile", selector: 'profile', label: 16
       n.link 'Messages', url: "#messages", selector: 'messages', state: :disabled
-    end.render
+    end
     expected = "<ul class=\"nav nav-pills pull-justified\"><li class=\"nav-item\"><a class=\"active nav-link\" href=\"#Home\">Home</a></li><li class=\"nav-item\"><a class=\"nav-link\" href=\"#profile\">Profile</a></li><li class=\"nav-item\"><a class=\"disabled nav-link\" href=\"#messages\">Messages</a></li></ul>"
 
     assert_equal expected, actual

data/test/ui/core/navs/navbar_test.rb

@@ -0,0 +1,39 @@
+require 'test_helper'
+class NavbarTest < ActionView::TestCase
+
+  test 'Navbar' do
+    actual = UiBibz::Ui::Core::Navs::Navbar.new.tap do |nb|
+    end
+    expected = "<nav class=\"navbar navbar-light navbar-expand-lg\"><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-toggle=\"collapse\" data-target=\"##{ actual.id }\">☰</button><div class=\"collapse navbar-collapse\" id=\"#{ actual.id }\"></div></nav>"
+
+    assert_equal expected, actual.render
+  end
+
+  test 'Navbar with options' do
+    actual = UiBibz::Ui::Core::Navs::Navbar.new(title: 'Brand', expand_size: :xs, status: :primary, position: :top, brand_position: :right).tap do |nb|
+    end
+    expected = "<nav class=\"bg-primary navbar navbar-light fixed-top navbar-expand-xs\"><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-toggle=\"collapse\" data-target=\"##{ actual.id }\">☰</button><a class=\"navbar-brand\" href=\"/\">Brand</a><div class=\"collapse navbar-collapse\" id=\"#{ actual.id }\"></div></nav>"
+
+    assert_equal expected, actual.render
+  end
+
+  test 'Navbar with brand, nav, form and text' do
+    actual = UiBibz::Ui::Core::Navs::Navbar.new.tap do |nb|
+      nb.brand "Brand"
+      nb.nav do |n|
+        n.link 'Home', state: :active, url: "#Home", selector: 'home'
+        n.link 'Profile', url: "#profile", selector: 'profile'
+        n.link 'Messages', url: "#messages", selector: 'messages'
+      end
+      nb.form "#", { type: :form_tag, position: :right } do
+        UiBibz::Ui::Core::Forms::Texts::TextField.new('search').render
+        UiBibz::Ui::Core::Forms::Buttons::Button.new('Search').render
+      end
+      nb.text 'test'
+    end
+    expected = "<nav class=\"navbar navbar-light navbar-expand-lg\"><a class=\"navbar-brand\" href=\"/\">Brand</a><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-toggle=\"collapse\" data-target=\"##{ actual.id }\">☰</button><div class=\"collapse navbar-collapse\" id=\"#{ actual.id }\"><ul class=\"navbar-nav mr-auto\"><li class=\"nav-item\"><a class=\"active nav-link\" href=\"#Home\">Home</a></li><li class=\"nav-item\"><a class=\"nav-link\" href=\"#profile\">Profile</a></li><li class=\"nav-item\"><a class=\"nav-link\" href=\"#messages\">Messages</a></li></ul><form type=\"form_tag\" position=\"right\" class=\"navbar-form form-inline pull-right\" action=\"#\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><button class=\"btn-primary btn\">Search</button></form><span class=\"navbar-text\">test</span></div></nav>"
+
+    assert_equal expected, actual.render
+  end
+
+end

data/test/ui/core/notifications/alert_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+class AlertTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test 'alert' do
+    actual = ui_alert 'state'
+    expected = "<div class=\"alert-info alert alert-dismissible\" role=\"alert\">state</div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'alert with more informaton' do
+    actual = ui_alert(tap: true, status: :success, glyph: 'thumbs-o-up', closable: true) do |a|
+      a.header 'Information'
+      a.body 'Body text'
+    end
+    expected = "<div class=\"alert-success alert alert-dismissible\" role=\"alert\"><h4 class=\"alert-header\"><i class=\"glyph fa fa-thumbs-o-up\"></i> Information<button type=\"button\" class=\"close\" data-dismiss=\"alert\" aria-label=\"Close\"><span aria-hidden=\"true\">×</span><span class=\"sr-only\">Close</span></button></h4><hr /><p class=\"alert-body mb-0\">Body text</p></div>"
+
+    assert_equal expected, actual
+  end
+
+end

data/test/ui/core/paths/breadcrumb_test.rb

@@ -1,26 +1,37 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class BreadcrumbTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
 
   test 'breadcrumb' do
-    actual = UiBibz::Ui::Core::Paths::Breadcrumb.new.tap do |b|
+    actual = ui_breadcrumb do |b|
       b.link 'Home', url: '#home', glyph: 'home'
       b.link 'state', { url: '#state', state: :active }
-    end.render
+    end
     expected = "<ol class=\"breadcrumb\"><li class=\"breadcrumb-item\"><a href=\"#home\"><i class=\"glyph fa fa-home\"></i> Home</a></li><li class=\"active breadcrumb-item\"><a href=\"#state\">state</a></li></ol>"
 
     assert_equal expected, actual
   end
 
+  #test 'breadcrumb with nav' do
+    #actual = UiBibz::Ui::Core::Paths::Breadcrumb.new(type: :nav).tap do |b|
+      #b.link 'Home', url: '#home', glyph: 'home'
+      #b.link 'state', { url: '#state', state: :active }
+    #end.render
+    #expected = ""
+
+    #assert_equal expected, actual
+  #end
+
   test 'breadcrumb with store' do
     users    = create_list(:user, 3)
-    actual   = UiBibz::Ui::Core::Paths::Breadcrumb.new(store: users, link_label: :name_fr, link_url: user_path(:id)).render
+    actual   = ui_breadcrumb(store: users, link_label: :name_fr, link_url: user_path(:id))
     expected = "<ol class=\"breadcrumb\"><li class=\"breadcrumb-item\"><a href=\"/users/1/\">Name fr</a></li><li class=\"breadcrumb-item\"><a href=\"/users/2/\">Name fr</a></li><li class=\"breadcrumb-item\">Name fr</li></ol>"
 
     assert_equal expected, actual
   end
 
 
+
 end
 

data/test/ui/core/progress_test.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+require 'test_helper'
+
+class UiHelperTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test 'progress bar' do
+    actual = ui_progress(20)
+    expected = "<progress class=\"progress\" max=\"100\" value=\"20\">20</progress>"
+
+    assert_equal expected, actual
+  end
+
+end

data/test/ui/{star_test.rb → core/star_test.rb}

@@ -1,40 +1,39 @@
 require 'test_helper'
 
-include UiBibz::Helpers
 class StarTest < ActionView::TestCase
 
     test "stars with 1" do
-      actual   = UiBibz::Ui::Core::Star.new(1).render
+      actual   = ui_star(1)
       expected = "<span class=\"stars-notation\"><i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i></span>"
       assert_equal expected, actual
     end
 
     test "stars with 2.1" do
-      actual   = UiBibz::Ui::Core::Star.new(2.1).render
+      actual   = ui_star(2.1)
       expected = "<span class=\"stars-notation\"><i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star-half-o\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i></span>"
       assert_equal expected, actual
     end
 
     test "stars with 3.6 with status danger" do
-      actual   = UiBibz::Ui::Core::Star.new(3.6, { status: :danger }).render
+      actual   = ui_star(3.6, { status: :danger })
       expected = "<span class=\"stars-notation\"><i class=\"glyph-danger glyph fa fa-star\"></i> <i class=\"glyph-danger glyph fa fa-star\"></i> <i class=\"glyph-danger glyph fa fa-star\"></i> <i class=\"glyph-danger glyph fa fa-star-half-o\"></i> <i class=\"glyph-danger glyph fa fa-star-o\"></i></span>"
       assert_equal expected, actual
     end
 
     test "stars with 4.9" do
-      actual   = UiBibz::Ui::Core::Star.new(4.9).render
+      actual   = ui_star(4.9)
       expected = "<span class=\"stars-notation\"><i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star-half-o\"></i></span>"
       assert_equal expected, actual
     end
 
     test "stars with 5" do
-      actual   = UiBibz::Ui::Core::Star.new(5).render
+      actual   = ui_star.new(5)
       expected = "<span class=\"stars-notation\"><i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star\"></i></span>"
       assert_equal expected, actual
     end
 
     test "stars with number options 11.2" do
-      actual   = UiBibz::Ui::Core::Star.new(2.5, { num: 11.2 }).render
+      actual   = ui_star(2.5, { num: 11.2 })
       expected = "<span class=\"stars-notation\"><i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star\"></i> <i class=\"glyph fa fa-star-half-o\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i> <i class=\"glyph fa fa-star-o\"></i></span>"
       assert_equal expected, actual
     end

data/test/ui/core/windows/modal_test.rb

@@ -0,0 +1,20 @@
+# encoding: UTF-8
+require 'test_helper'
+
+class UiHelperTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test 'modal' do
+    actual = ui_modal do |m|
+      m.header 'My title'
+      m.body 'My body'
+      m.footer do
+        concat ui_button_link 'Close', url: '#', status: :link
+        concat ui_button_link 'Save', url: '#', status: :primary
+      end
+    end
+    expected = "<div class=\"modal\"><div class=\"modal-dialog \" role=\"document\"><div class=\"modal-content\"><div class=\"modal-header\"><button class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\"><span aria-hidden=\"true\">×</span><span class=\"sr-only\">Close</span></button><h4 class=\"modal-title\">My title</h4></div><div class=\"modal-body\">My body</div><div class=\"modal-footer\"><a class=\"btn-link btn\" href=\"#\">Close</a><a class=\"btn-primary btn\" href=\"#\">Save</a></div></div></div></div>"
+
+    assert_equal expected, actual
+  end
+end

data/test/ui/ux/tables/table_test.rb

@@ -4,7 +4,6 @@ require "ui_bibz/ui/ux/tables/extensions/paginable"
 require "ui_bibz/ui/ux/tables/extensions/searchable"
 require "ui_bibz/ui/ux/tables/extensions/sortable"
 require "ui_bibz/ui/ux/tables/extensions/actionable"
-include UiBibz::Helpers
 
 class TableTest < ActionView::TestCase
 
@@ -154,7 +153,7 @@ class TableTest < ActionView::TestCase
   test 'complex table_card' do
     actual = UiBibz::Ui::Ux::Tables::TableCard.new({ store: @users, tap: true }, { class: 'state' }).tap do |pane|
       pane.header 'Test header'
-      pane.block class: 'ui' do
+      pane.body class: 'ui' do
         'Test body'
       end
     end.render
@@ -163,7 +162,7 @@ class TableTest < ActionView::TestCase
   test 'complex table_card with custom actions' do
     actual = UiBibz::Ui::Ux::Tables::TableCard.new({ store: @users, tap: true }, { class: 'state'}).tap do |pane|
       pane.header 'Test header'
-      pane.block cls: 'ui' do
+      pane.body cls: 'ui' do
         'Test body'
       end
       pane.columns do |c|

data/ui_bibz.gemspec

@@ -32,10 +32,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'will-paginate-i18n'
   s.add_dependency 'will_paginate-bootstrap4'
   s.add_dependency 'haml'
+  s.add_dependency 'jquery-rails', '>= 3.1.0'
   s.add_dependency 'haml-rails'
   s.add_dependency 'sass-rails', '>= 5.0.0'
   s.add_dependency 'font-awesome-sass'
-  s.add_dependency 'bootstrap', '4.0.0.alpha5'
+  s.add_dependency 'bootstrap', '4.0.0.beta2'
 
   # Javascript gems (rails-assets.org)
   #s.add_dependency 'rails-assets-tether', '>= 1.1.0'