ui_bibz 1.2.2 → 1.2.3

data/doc/top-level-namespace.html

@@ -103,9 +103,9 @@
 </div>
 
     <div id="footer">
-  Generated on Fri Oct  2 15:02:51 2015 by
+  Generated on Mon Oct 19 15:25:14 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).
+  0.8.7.6 (ruby-2.2.3).
 </div>
 
   </body>

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

@@ -10,8 +10,8 @@ module UiBibz::Ui::Ux
     # Render html tag
     def render
       content_tag :div do
-        concat UiBibz::Ui::Ux::TablePagination.new(store: @store).render
-        concat UiBibz::Ui::Ux::TablePaginationPerPage.new(store: @store).render
+        concat UiBibz::Ui::Ux::TablePagination.new(@options.merge({ store: @store })).render
+        concat UiBibz::Ui::Ux::TablePaginationPerPage.new(@options.merge({ store: @store })).render
         concat tag(:br, class: 'ui-bibz-clear')
       end
     end

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

@@ -35,7 +35,9 @@ module UiBibz::Ui::Ux
 
     # Render html tag with boostrap pagination theme
     def render
-      paginate_parameters = { controller: store.controller }.merge(store.parameters)
+      paginate_parameters = { controller: store.controller }
+      paginate_parameters = paginate_parameters.merge({ store_id: store.id }) unless store.id.nil?
+      paginate_parameters = paginate_parameters.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

@@ -35,7 +35,7 @@ module UiBibz::Ui::Ux
     def render
       if @per_page_field.options[:wrap_form] != false
         form_tag(url_for(url_parameters), method: :get) do
-          per_page_html
+          per_page_html_in_wrap
         end
       else
         per_page_html
@@ -59,11 +59,19 @@ module UiBibz::Ui::Ux
     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([5, 10, 20, 30, 50, 100, 200, 500], store.per_page), class: 'form-control')
+      end
+    end
+
+    def per_page_html_in_wrap
       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)
+          concat tag(:input, type: 'hidden', name: k, value: v) if !default_parameters?(k) && !v.blank?
         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

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

@@ -1,3 +1,4 @@
+require "ui_bibz/ui/ux/table/components/store"
 module UiBibz::Ui::Ux
 
   # Create a TablePanel
@@ -97,8 +98,7 @@ module UiBibz::Ui::Ux
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
-      @store        = @options.delete(:store) if @options[:store]
-      table_options = (@options[:table_options] || {}).merge({ store: @store })
+      table_options = (@options[:table_options] || {}).merge({ store: store })
       @table        = UiBibz::Ui::Ux::Table.new(table_options, @options[:table_html_options])
     end
 
@@ -109,9 +109,13 @@ module UiBibz::Ui::Ux
 
       content_tag :div, class_and_html_options(panel_classes) do |f|
         form_tag(url_for(url_parameters), method: :get) do
+          store.parameters.each do |k,v|
+            concat tag(:input, type: 'hidden', name: k, value: v) if !default_parameters?(k) && !v.blank?
+          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(header_html) unless @header.nil?
           concat(body_html)   unless @body.nil?
-          concat(table_html)  unless @store.nil?
+          concat(table_html)  unless store.nil?
           concat(footer_html) unless @footer.nil?
         end
       end
@@ -134,8 +138,22 @@ module UiBibz::Ui::Ux
 
   private
 
+    def store
+      @store ||= if @options[:store].nil?
+        raise 'Store is nil!'
+      elsif @options[:store].try(:records).nil?
+        raise 'Store can be created only with "table_search_pagination" method!'
+      else
+        Store.new @options.delete(:store) if @options[:store]
+      end
+    end
+
+    def default_parameters?(k)
+      %w(store_id per_page search utf8 search controller action utf8).include?(k)
+    end
+
     def url_parameters
-      { controller: @store.controller, action: @store.action, id: @store.param_id }
+      { controller: store.controller, action: store.action, id: store.param_id }
     end
 
     def table_html
@@ -147,11 +165,11 @@ module UiBibz::Ui::Ux
     end
 
     def search
-      @search ||= Searchable.new @store, @options
+      @search ||= Searchable.new store, @options.merge({ wrap_form: false })
     end
 
     def pagination
-      @pagination ||= Paginable.new @store, @options
+      @pagination ||= Paginable.new store, @options.merge({ wrap_form: false })
     end
 
     def initialize_footer

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

@@ -11,7 +11,7 @@ module UiBibz::Ui::Ux
     def render
       if @search_field.options[:wrap_form] != false
         form_tag(url_for(url_parameters), method: :get, class: 'form-table-search-field') do
-          search_field_html
+          search_field_html_in_wrap
         end
       else
         search_field_html
@@ -37,6 +37,14 @@ module UiBibz::Ui::Ux
     end
 
     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')
+        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')
+      end
+    end
+
+    def search_field_html_in_wrap
       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|

data/lib/ui_bibz/version.rb

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

metadata

@@ -1,209 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Thooams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: will-paginate-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Rails Boostrap framework...
@@ -213,12 +213,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardoc/checksums
-- .yardoc/object_types
-- .yardoc/objects/root.dat
-- .yardoc/proxy_types
+- ".gitignore"
+- ".travis.yml"
+- ".yardoc/checksums"
+- ".yardoc/object_types"
+- ".yardoc/objects/root.dat"
+- ".yardoc/proxy_types"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -476,17 +476,17 @@ require_paths:
 - vendor
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Rails Bootstrap framework...