ui_bibz 1.1.0 → 1.1.1

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

@@ -25,9 +25,10 @@ module UiBibz::Ui::Ux
   # You can pass arguments in options attribute:
   # * +store+ - Store generate by '+table_search_pagination+' method
   # * +url+ - String
-  # * tap - Boolean
-  # * columns - Add column
-  # * actions - Add action by row
+  # * +tap+ - Boolean
+  # * +actionable+ - Boolean
+  # * +sortable+ - Boolean
+  # * +searchable+ - Boolean
   #
   # ==== Signatures
   #
@@ -35,7 +36,7 @@ module UiBibz::Ui::Ux
   #
   #   UiBibz::Ui::Ux::Table.new(store: @store, tap: true) do |t|
   #     t.columns do |c|
-  #       c.column name: '#', data_index: '#'
+  #       c.column :id, name: '#'
   #     end
   #     t.actions do |a|
   #       a.action '', url: url, glyph: ''
@@ -48,10 +49,10 @@ module UiBibz::Ui::Ux
   #
   #   UiBibz::Ui::Ux::Table.new(store: @users).tap do |t|
   #     t.columns do |c|
-  #       c.column '#', { data_index: 'id' }
-  #       c.column 'Name fr', { data_index: 'name_fr', link: edit_user_path(:id), order: 2 }
-  #       c.column 'Name en', { data_index: 'name_en', order: 1 }
-  #       c.column 'Name en', { data_index: 'name_en', format: lambda{ |records, record| "name #{ record.id}"} }
+  #       c.column :id, { name: '#' }
+  #       c.column :name_fr', { link: edit_user_path(:id), order: 2 }
+  #       c.column :name_en'
+  #       c.column :status_id, { name: 'Status', format: lambda{ |records, record| "Test #{ record.id}"} }
   #     end
   #     t.actions do |a|
   #       a.action 'toto', url: users_path(:id), glyph: 'eye'
@@ -82,24 +83,34 @@ module UiBibz::Ui::Ux
 
     attr_accessor :columns
 
+    # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
       @columns = Columns.new
       @actions = Actions.new store
     end
 
+    # Add table columns items
     def columns &block
       @columns.tap(&block)
     end
 
+    # Add table actions items
     def actions &block
       @actions.tap(&block)
     end
 
+    # for test
+    def actions_list
+      @actions
+    end
+
+    # Render html tag
     def render
       table_html
     end
 
+    # Store must be generated by *table_search_pagination* method
     def store
       @store ||= if @options[:store].nil?
         raise 'Store is nil!'

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

@@ -27,16 +27,23 @@ module UiBibz::Ui::Ux
   class TablePagination < UiBibz::Ui::Base
     include WillPaginate::ActionView
 
+    # Initialize pagination with component item
+    # pagination require WillPaginate gem
     def initialize options = nil, html_options = nil
       @pagination = UiBibz::Ui::Core::Component.new nil, options, html_options
     end
 
+    # Render html tag with boostrap pagination theme
     def render
-      will_paginate(store.records, params: { controller: store.controller },  renderer: BootstrapPagination::Rails)
+      paginate_parameters = { controller: store.controller }
+      paginate_parameters = paginate_parameters.merge({ store_id: store.id }) unless store.id.nil?
+      will_paginate(store.records, params: paginate_parameters,  renderer: BootstrapPagination::Rails)
     end
 
   private
 
+
+    # Store must be generated by *table_search_pagination* method
     def store
       @store ||= if @pagination.options[:store].nil?
         raise 'Store is nil!'

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

@@ -25,13 +25,16 @@ module UiBibz::Ui::Ux
   class TablePaginationPerPage < UiBibz::Ui::Base
     include WillPaginate::ActionView
 
+    # Initialize per_page_field with component item
+    # per_page_field require WillPaginate gem
     def initialize options = nil, html_options = nil
       @per_page_field = UiBibz::Ui::Core::Component.new nil, options, html_options
     end
 
+    # Render html tag
     def render
       if @per_page_field.options[:wrap_form] != false
-        form_tag(url_for(controller: store.controller, action: store.action), method: :get) do
+        form_tag(url_for(url_parameters), method: :get) do
           per_page_html
         end
       else
@@ -51,11 +54,16 @@ module UiBibz::Ui::Ux
       end
     end
 
+    def url_parameters
+      { controller: store.controller, action: store.action, id: store.param_id }
+    end
+
     def per_page_html
       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
-        concat select_tag('per_page', options_for_select([25, 50, 100], store.per_page), class: 'form-control')
+        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
     end
 

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

@@ -16,9 +16,11 @@ module UiBibz::Ui::Ux
   # You can pass arguments in options attribute:
   # * +store+ - Store generate by '+table_search_pagination+' method
   # * +url+ - String
-  # * tap - Boolean
-  # * columns - Add column
-  # * actions - Add action by row
+  # * +tap+ - Boolean
+  # * +table_options+ - Hash
+  #   * +actionable+ - Boolean
+  #   * +sortable+ - Boolean
+  #   * +searchable+ - Boolean
   #
   # ==== Signatures
   #
@@ -35,15 +37,15 @@ module UiBibz::Ui::Ux
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Ux::TablePanel.new(store: @users, pagination).render
+  #   UiBibz::Ui::Ux::TablePanel.new(store: @users, table_options: { actionable: false }).render
   #
   #   UiBibz::Ui::Ux::TablePanel.new(store: @users).tap do |t|
   #     t.header 'My Table panel'
   #     t.columns do |c|
-  #       c.column '#', { data_index: 'id' }, { class: 'column-id' }
-  #       c.column 'Name fr', { data_index: 'name_fr', link: edit_user_path(:id), order: 2 }
-  #       c.column 'Name en', { data_index: 'name_en', order: 1 }
-  #       c.column 'Name en', { data_index: 'name_en', format: lambda{ |records, record| "name #{ record.id}"} }
+  #       c.column :id, { name: '# }, { class: 'column-id' }
+  #       c.column :name_fr, { name: 'Name FR', link: edit_user_path(:id), order: 2 }
+  #       c.column :name_en
+  #       c.column :status_id, { name: 'Status', format: lambda{ |records, record| "Test #{ record.id}"} }
   #     end
   #     t.actions do |a|
   #       a.action 'toto', url: users_path(:id), glyph: 'eye'
@@ -92,6 +94,7 @@ module UiBibz::Ui::Ux
 
     attr_accessor :columns
 
+    # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
       @store        = @options.delete(:store) if @options[:store]
@@ -99,30 +102,42 @@ module UiBibz::Ui::Ux
       @table        = UiBibz::Ui::Ux::Table.new(table_options, @options[:table_html_options])
     end
 
+    # Render html tag
     def render
       initialize_header
       initialize_footer
 
       content_tag :div, class_and_html_options(panel_classes) do |f|
-        form_tag(url_for(controller: @store.controller, action: @store.action), method: :get) do
-          concat(header_html)   unless @header.nil?
-          concat(body_html)     unless @body.nil?
-          concat(table_html)    unless @store.nil?
-          concat(footer_html)   unless @footer.nil?
+        form_tag(url_for(url_parameters), method: :get) do
+          concat(header_html) unless @header.nil?
+          concat(body_html)   unless @body.nil?
+          concat(table_html)  unless @store.nil?
+          concat(footer_html) unless @footer.nil?
         end
       end
     end
 
+    # Add table columns item
     def columns &block
       @table.columns &block
     end
 
+    # Add table actions item
     def actions &block
       @table.actions &block
     end
 
+    # for test
+    def actions_list
+      @table.actions_list
+    end
+
   private
 
+    def url_parameters
+      { controller: @store.controller, action: @store.action, id: @store.param_id }
+    end
+
     def table_html
       content_tag :div, @table.render, class: 'panel-table'
     end

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

@@ -2,13 +2,15 @@ require "ui_bibz/ui/ux/table/components/store"
 module UiBibz::Ui::Ux
   class TableSearchField < UiBibz::Ui::Base
 
+    # Initialize search_field with component item
     def initialize options = nil, html_options = nil
       @search_field = UiBibz::Ui::Core::Component.new nil, options, html_options
     end
 
+    # Render html tag
     def render
       if @search_field.options[:wrap_form] != false
-        form_tag(url_for(controller: store.controller, action: store.action), method: :get, class: 'form-table-search-field') do
+        form_tag(url_for(url_parameters), method: :get, class: 'form-table-search-field') do
           search_field_html
         end
       else
@@ -18,6 +20,11 @@ module UiBibz::Ui::Ux
 
   private
 
+    def url_parameters
+      { controller: store.controller, action: store.action, id: store.param_id }
+    end
+
+    # Store must be generated by *table_search_pagination* method
     def store
       @store ||= if @search_field.options[:store].nil?
         raise 'Store is nil!'
@@ -32,6 +39,7 @@ module UiBibz::Ui::Ux
       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')
         concat tag(:input, type: 'search', value: store.search, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
+        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 content_tag(:span, UiBibz::Ui::Core::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-addon')
       end
     end

data/lib/ui_bibz/version.rb

@@ -1,3 +1,3 @@
 module UiBibz
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/ui_bibz.rb

@@ -31,6 +31,7 @@ module UiBibz
       autoload :Panel,                   "ui_bibz/ui/core/panel"
       autoload :ProgressBar,             "ui_bibz/ui/core/progress_bar/progress_bar"
       autoload :Row,                     "ui_bibz/ui/core/row"
+      autoload :Stars,                   "ui_bibz/ui/core/stars"
       autoload :Tab,                     "ui_bibz/ui/core/nav/tab"
     end
 

data/test/test_helper.rb

@@ -2,6 +2,11 @@
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
+#require 'color_pound_spec_reporter'
+
+#Minitest::Reporters.use! [ColorPoundSpecReporter.new]
+require 'minitest/line/describe_track'
+
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 

data/test/ui/dropdown_test.rb

@@ -4,13 +4,13 @@ class DropdownTest < ActionView::TestCase
 
   test 'Dropdown' do
     actual = UiBibz::Ui::Core::Dropdown.new("Dropdown", type: :dropup, state: :success).tap do |d|
-      d.list 'toto'
+      d.link 'Link 1', url: '#link1', glyph: 'eye'
       d.list 'header', type: :header
-      d.list 'momo'
+      d.link 'Link 2', url: '#link2'
       d.list '---'
-      d.list 'lolo'
+      d.link 'Link3', url: '#link3'
     end.render
-    expected = "<div class=\"dropup\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-expanded=\"false\">Dropdown <span class=\"caret\"></span></button><ul class=\"dropdown-menu dropdown-menu-left\" role=\"menu\"><li role=\"presentation\">toto</li><li class=\"dropdown-header\" role=\"presentation\">header</li><li role=\"presentation\">momo</li><li class=\"divider\" role=\"presentation\"></li><li role=\"presentation\">lolo</li></ul></div>"
+    expected = "<div class=\"dropup\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-expanded=\"false\">Dropdown <span class=\"caret\"></span></button><ul class=\"dropdown-menu dropdown-menu-left\" role=\"menu\"><li role=\"presentation\"><a href=\"#link1\"><i class=\"glyph fa fa-eye\"></i> Link 1</a></li><li class=\"dropdown-header\" role=\"presentation\">header</li><li role=\"presentation\"><a href=\"#link2\">Link 2</a></li><li class=\"divider\" role=\"presentation\"></li><li role=\"presentation\"><a href=\"#link3\">Link3</a></li></ul></div>"
 
     assert_equal expected, actual
   end

data/test/ui/stars_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+include UiBibz::Helpers
+class StarsTest < ActionView::TestCase
+
+    test "stars with 1" do
+      actual   = UiBibz::Ui::Core::Stars.new(1).render
+      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::Stars.new(2.1).render
+      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 state danger" do
+      actual   = UiBibz::Ui::Core::Stars.new(3.6, { state: :danger }).render
+      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::Stars.new(4.9).render
+      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::Stars.new(5).render
+      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::Stars.new(2.5, { num: 11.2 }).render
+      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
+
+end

data/test/ui/table_test.rb

@@ -65,9 +65,14 @@ class TableTest < ActionView::TestCase
     options      = { paginable: true }
     pagination   = UiBibz::Ui::Ux::Paginable.new(@store, options)
     actual       = pagination.render if pagination.paginable?
-    expected     = "<div><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><form action=\"/users\" accept-charset=\"UTF-8\" method=\"get\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><div class=\"table-pagination-per-page\">Displaying User <b>1&nbsp;-&nbsp;2</b> of <b>25</b> in total | Per page: <select name=\"per_page\" id=\"per_page\" class=\"form-control\"><option value=\"25\">25</option>
+    expected     = "<div><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><form action=\"/users\" accept-charset=\"UTF-8\" method=\"get\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><div class=\"table-pagination-per-page\">Displaying User <b>1&nbsp;-&nbsp;2</b> of <b>25</b> in total | Per page: <select name=\"per_page\" id=\"per_page\" class=\"form-control\"><option value=\"5\">5</option>
+<option value=\"10\">10</option>
+<option value=\"20\">20</option>
+<option value=\"30\">30</option>
 <option value=\"50\">50</option>
-<option value=\"100\">100</option></select></div></form><br class=\"ui-bibz-clear\" /></div>"
+<option value=\"100\">100</option>
+<option value=\"200\">200</option>
+<option value=\"500\">500</option></select></div></form><br class=\"ui-bibz-clear\" /></div>"
 
     assert_equal expected, actual
   end
@@ -161,10 +166,10 @@ class TableTest < ActionView::TestCase
         'Test body'
       end
       pane.columns do |c|
-        c.column('#', { data_index: 'id' })
-        c.column('Name fr', { data_index: 'name_fr', link: edit_user_path(:id), order: 2 })
-        c.column('Name en', { data_index: 'name_en', order: 1 })
-        c.column('Name en', { data_index: 'name_en', format: lambda{ |records, record| "name #{ record.id}"}})
+        c.column(:id, { name: '#' })
+        c.column(:name_fr, { name: 'Name fr', link: edit_user_path(:id), order: 2 })
+        c.column(:name_en, { name: 'Name en', order: 1 })
+        c.column(:name_en, { name: 'Name en', format: lambda{ |records, record| "name #{ record.id}"}})
       end
       pane.actions do |a|
         a.action 'toto', url: users_path(:id), glyph: 'eye'
@@ -174,4 +179,18 @@ class TableTest < ActionView::TestCase
     end.render
   end
 
+  test 'format action' do
+    actual = UiBibz::Ui::Ux::TablePanel.new(store: @users, tap: true).tap do |pane|
+      pane.columns do |cls|
+        cls.column :id, name: '#'
+      end
+      pane.actions do |acs|
+        acs.format do |record|
+          acs.action 'Action statique', url: '#'
+          acs.action "Action dynamique #{record.id}", url: '#'
+        end
+      end
+    end
+  end
+
 end

data/ui_bibz.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ["lib", "vendor"]
 
   # rails
   s.add_dependency 'rails', '~> 4.2.0'
@@ -29,6 +29,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'sass-rails', '~> 5.0.1'
 
   s.add_development_dependency "minitest"
+  s.add_development_dependency "minitest-line"
+  s.add_development_dependency "minitest-reporters"
+  s.add_development_dependency "color_pound_spec_reporter"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "factory_girl_rails", "~> 4.0"