ui_bibz 1.2.1 → 1.2.2

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Sep 24 16:49:47 2015 by
+  Generated on Fri Oct  2 15:02:51 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-1.9.3).
 </div>

data/lib/ui_bibz/concerns/models/searchable.rb

@@ -18,6 +18,7 @@ module UiBibz::Concerns::Models::Searchable
       {
         controller:            @params[:controller],
         param_id:              @params[:id],
+        params:                @params,
         direction:             @params[:direction],
         search:                @params[:search],
         sort:                  @params[:sort],

data/lib/ui_bibz/ui/core/nav/components/nav_link.rb

@@ -60,7 +60,7 @@ module UiBibz::Ui::Core
 
     def link_html_options
       lho = @options[:link_html_options] || {}
-      if @options[:nav_type] == :tabs
+      if @options[:nav_type] == "nav-tabs"
         lho.merge({ "aria-controls" => @options[:selector], "role" => "tab", "data-toggle" => "tab" })
       else
         lho

data/lib/ui_bibz/ui/core/panel.rb

@@ -17,6 +17,7 @@ module UiBibz::Ui::Core
   # You can pass arguments in options attribute:
   # * +state+ - State of élement with symbol value:
   #   (+:default+, +:primary+, +:info+, +:warning+, +:danger+)
+  # * +tab+ - String | To link with the component nav
   #
   # ==== Signatures
   #
@@ -100,7 +101,9 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :div, class_and_html_options("panel") do
+      @html_options[:id] = @options[:tab] unless @options[:tab].nil?
+
+      content_tag :div, class_and_html_options(["panel", tab_pane]) do
         concat(header_html) unless @header.nil?
         concat(body_html)   if !@body.nil? || !@content.nil?
         concat(footer_html) unless @footer.nil?
@@ -127,5 +130,9 @@ module UiBibz::Ui::Core
       content_tag :div, @footer.render, @footer.class_and_html_options("panel-footer")
     end
 
+    def tab_pane
+      "tab-pane" if @options[:tab]
+    end
+
   end
 end

data/lib/ui_bibz/ui/ux/table/components/store.rb

@@ -68,6 +68,10 @@ module UiBibz::Ui::Ux
       @store.controller
     end
 
+    def parameters
+      @store.try(:params) || {}
+    end
+
     def action
       @store.action
     end

data/lib/ui_bibz/ui/ux/table/table_pagination.rb

@@ -35,8 +35,7 @@ module UiBibz::Ui::Ux
 
     # Render html tag with boostrap pagination theme
     def render
-      paginate_parameters = { controller: store.controller }
-      paginate_parameters = paginate_parameters.merge({ store_id: store.id }) unless store.id.nil?
+      paginate_parameters = { controller: store.controller }.merge(store.parameters)
       will_paginate(store.records, params: paginate_parameters,  renderer: BootstrapPagination::Rails)
     end
 

data/lib/ui_bibz/ui/ux/table/table_pagination_per_page.rb

@@ -62,6 +62,9 @@ module UiBibz::Ui::Ux
       content_tag :div, class: 'table-pagination-per-page' do
         concat results_count_html
         concat UiBibz::Utils::Internationalization.new("ui_bibz.table.pagination.per_page", default: "Per page: ").translate
+        store.parameters.each do |k,v|
+          concat tag(:input, type: 'hidden', name: k, value: v) unless default_parameters?(k)
+        end
         concat select_tag('per_page', options_for_select([5, 10, 20, 30, 50, 100, 200, 500], store.per_page), class: 'form-control')
         concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # If there is more 1 table in html page
       end
@@ -79,5 +82,9 @@ module UiBibz::Ui::Ux
       store.limit_value * store.current_page
     end
 
+    def default_parameters?(k)
+      %w(store_id search controller action utf8).include?(k)
+    end
+
   end
 end

data/lib/ui_bibz/ui/ux/table/table_search_field.rb

@@ -21,7 +21,8 @@ module UiBibz::Ui::Ux
   private
 
     def url_parameters
-      { controller: store.controller, action: store.action, id: store.param_id }
+      #{ controller: store.controller, action: store.action, id: store.param_id }
+      store.parameters
     end
 
     # Store must be generated by *table_search_pagination* method
@@ -38,6 +39,9 @@ module UiBibz::Ui::Ux
     def search_field_html
       content_tag :div, @search_field.class_and_html_options(div_class) do
         concat content_tag(:span, UiBibz::Ui::Core::Glyph.new('search').render, class: 'input-group-addon')
+        store.parameters.each do |k,v|
+          concat tag(:input, type: 'hidden', name: k, value: v) unless default_parameters?(k)
+        end
         concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in html page
         concat tag(:input, type: 'search', value: store.search, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
         concat content_tag(:span, UiBibz::Ui::Core::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-addon')
@@ -71,5 +75,9 @@ module UiBibz::Ui::Ux
       attr.kind_of?(Hash) ? "#{ attr.keys.first }_#{ attr.values.first }".to_sym : attr
     end
 
+    def default_parameters?(k)
+      %w(store_id search controller action utf8).include?(k)
+    end
+
   end
 end

data/lib/ui_bibz/version.rb

@@ -1,3 +1,3 @@
 module UiBibz
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/test/ui/nav_test.rb

@@ -8,7 +8,8 @@ class NavTest < ActionView::TestCase
       n.link 'Profile', url: "#profile", selector: 'profile'
       n.link 'Messages', url: "#messages", selector: 'messages'
     end.render
-    expected = "<ul class=\"nav nav-tabs\"><li class=\"active\" role=\"presentation\"><a href=\"#Home\">Home</a></li><li role=\"presentation\"><a href=\"#profile\">Profile</a></li><li role=\"presentation\"><a href=\"#messages\">Messages</a></li></ul>"
+    expected = "<ul class=\"nav nav-tabs\"><li class=\"active\" role=\"presentation\"><a aria-controls=\"home\" role=\"tab\" data-toggle=\"tab\" href=\"#Home\">Home</a></li><li role=\"presentation\"><a aria-controls=\"profile\" role=\"tab\" data-toggle=\"tab\" href=\"#profile\">Profile</a></li><li role=\"presentation\"><a aria-controls=\"messages\" role=\"tab\" data-toggle=\"tab\" href=\"#messages\">Messages</a></li></ul>"
+
     assert_equal expected, actual
   end
 

data/test/ui/table_test.rb

@@ -24,14 +24,14 @@ class TableTest < ActionView::TestCase
 
   test 'table search field' do
     actual   = UiBibz::Ui::Ux::TableSearchField.new({ store: @users}).render
-    expected = "<form class=\"form-table-search-field\" action=\"/users\" accept-charset=\"UTF-8\" method=\"get\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><div class=\"input-group input-group-sm table-search-field\"><span class=\"input-group-addon\"><i class=\"glyph fa fa-search\"></i></span><input type=\"search\" value=\"Name fr\" name=\"search\" class=\"form-control\" placeholder=\"Search by Name fr and Name en...\" /><span class=\"clear-search-btn input-group-addon\"><i class=\"glyph fa fa-times-circle\"></i></span></div></form>"
+    expected = "<form class=\"form-table-search-field\" action=\"/users?direction=asc&amp;page=1&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\" accept-charset=\"UTF-8\" method=\"get\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><div class=\"input-group input-group-sm table-search-field\"><span class=\"input-group-addon\"><i class=\"glyph fa fa-search\"></i></span><input type=\"hidden\" name=\"controller\" value=\"users\" /><input type=\"hidden\" name=\"action\" value=\"index\" /><input type=\"hidden\" name=\"sort\" value=\"users.name_fr\" /><input type=\"hidden\" name=\"direction\" value=\"asc\" /><input type=\"hidden\" name=\"search\" value=\"Name fr\" /><input type=\"hidden\" name=\"per_page\" value=\"2\" /><input type=\"hidden\" name=\"page\" value=\"1\" /><input type=\"search\" value=\"Name fr\" name=\"search\" class=\"form-control\" placeholder=\"Search by Name fr and Name en...\" /><span class=\"clear-search-btn input-group-addon\"><i class=\"glyph fa fa-times-circle\"></i></span></div></form>"
 
     assert_equal expected, actual
   end
 
   test 'table pagination' do
     actual = UiBibz::Ui::Ux::TablePagination.new({ store: @users }).render
-    expected = "<ul class=\"pagination pagination\"><li class=\"prev disabled\"><span>&#8592; Previous</span></li> <li class=\"active\"><span>1</span></li> <li><a rel=\"next\" href=\"/users?page=2\">2</a></li> <li><a href=\"/users?page=3\">3</a></li> <li><a href=\"/users?page=4\">4</a></li> <li><a href=\"/users?page=5\">5</a></li> <li><a href=\"/users?page=6\">6</a></li> <li><a href=\"/users?page=7\">7</a></li> <li><a href=\"/users?page=8\">8</a></li> <li><a href=\"/users?page=9\">9</a></li> <li class=\"disabled\"><span>&hellip;</span></li> <li><a href=\"/users?page=12\">12</a></li> <li><a href=\"/users?page=13\">13</a></li> <li class=\"next\"><a rel=\"next\" href=\"/users?page=2\">Next &#8594;</a></li></ul>"
+    expected = "<ul class=\"pagination pagination\"><li class=\"prev disabled\"><span>&#8592; Previous</span></li> <li class=\"active\"><span>1</span></li> <li><a rel=\"next\" href=\"/users?direction=asc&amp;page=2&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">2</a></li> <li><a href=\"/users?direction=asc&amp;page=3&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">3</a></li> <li><a href=\"/users?direction=asc&amp;page=4&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">4</a></li> <li><a href=\"/users?direction=asc&amp;page=5&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">5</a></li> <li><a href=\"/users?direction=asc&amp;page=6&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">6</a></li> <li><a href=\"/users?direction=asc&amp;page=7&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">7</a></li> <li><a href=\"/users?direction=asc&amp;page=8&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">8</a></li> <li><a href=\"/users?direction=asc&amp;page=9&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">9</a></li> <li class=\"disabled\"><span>&hellip;</span></li> <li><a href=\"/users?direction=asc&amp;page=12&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">12</a></li> <li><a href=\"/users?direction=asc&amp;page=13&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">13</a></li> <li class=\"next\"><a rel=\"next\" href=\"/users?direction=asc&amp;page=2&amp;per_page=2&amp;search=Name+fr&amp;sort=users.name_fr\">Next &#8594;</a></li></ul>"
 
     assert_equal expected, actual
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Thooams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails