wice_grid 3.4.14 → 3.5.0

data/lib/wice/kaminari_monkey_patching.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
 module Kaminari #:nodoc:
   module Helpers #:nodoc:

data/lib/wice/table_column_matrix.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice
   class TableColumnMatrix < Hash #:nodoc:
 

data/lib/wice/wice_grid_controller.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice
   module Controller
 
@@ -50,7 +49,6 @@ module Wice
     # * <tt>:after</tt> - defined a name of a controller method which would be called by the grid after all user input has been processed,
     #   with a single parameter which is a Proc object. Once called, the object returns a list of all records of the current selection
     #   throughout all pages. See section "Integration With The Application" in the README.
-    # * <tt>:total_entries</tt> - If not specified, <tt>will_paginate</tt> will run a <tt>select count</tt>
     # * <tt>:select</tt> - ActiveRecord <tt>:select</tt> option. Please do not forget that <tt>:select</tt> is ignored
     #   when <tt>:include</tt> is present. It is unlikely you would need <tt>:select</tt> with WiceGrid, but if you do,
     #   use it with care :)
@@ -90,7 +88,7 @@ module Wice
     # This convention can be easily overridden by supplying a hash parameter to +export_grid_if_requested+ where each key is the name of
     # a grid, and the value is the name of the template (like it is specified for +render+, i.e. without '_' and extensions):
     #
-    #   export_grid_if_requested(grid: => 'orders', 'grid2' => 'invoices')
+    #   export_grid_if_requested('grid' => 'orders', 'grid2' => 'invoices')
     #
     # If the request is not a CSV export request, the method does nothing and returns +false+, if it is a CSV export request,
     # the method returns +true+.
@@ -138,10 +136,10 @@ module Wice
     # * <tt>:value</tt> - the value of the column filter.
     def wice_grid_custom_filter_params(opts = {})
       options = {
-        :grid_name => 'grid',
-        :attribute => nil,
-        :model => nil,
-        :value => nil
+        grid_name: 'grid',
+        attribute: nil,
+        model:     nil,
+        value:     nil
       }
       options.merge!(opts)
 

data/lib/wice/wice_grid_core_ext.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 module Wice
   module WgHash #:nodoc:
     class << self #:nodoc:

data/lib/wice/wice_grid_misc.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice
 
   class << self

data/lib/wice/wice_grid_serialized_queries_controller.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Wice
   class <<self
     # Used in routes.rb to define routes to the query processing controller.

data/lib/wice/wice_grid_serialized_query.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 class WiceGridSerializedQuery < ActiveRecord::Base  #:nodoc:
   serialize :query
 

data/lib/wice/wice_grid_spreadsheet.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'csv'
 
 module Wice

data/lib/wice_grid.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'wice/wice_grid_misc.rb'
 require 'wice/wice_grid_core_ext.rb'
 require 'wice/grid_renderer.rb'
@@ -9,6 +7,7 @@ require 'wice/helpers/wice_grid_view_helpers.rb'
 require 'wice/helpers/wice_grid_misc_view_helpers.rb'
 require 'wice/helpers/wice_grid_serialized_queries_view_helpers.rb'
 require 'wice/helpers/wice_grid_view_helpers.rb'
+require 'wice/helpers/bs_calendar_helpers.rb'
 require 'wice/helpers/js_calendar_helpers.rb'
 require 'wice/grid_output_buffer.rb'
 require 'wice/wice_grid_controller.rb'
@@ -147,18 +146,17 @@ module Wice
       @status = HashWithIndifferentAccess.new
 
       if @options[:order]
-        @options[:order] = @options[:order].to_s
+        @options[:order]           = @options[:order].to_s
         @options[:order_direction] = @options[:order_direction].to_s
 
-        @status[:order_direction] = @options[:order_direction]
-        @status[:order] = @options[:order]
+        @status[:order_direction]  = @options[:order_direction]
+        @status[:order]            = @options[:order]
 
       end
-      @status[:total_entries] = @options[:total_entries]
-      @status[:per_page] = @options[:per_page]
-      @status[:page] = @options[:page]
-      @status[:conditions] = @options[:conditions]
-      @status[:f] = @options[:f]
+      @status[:per_page]      = @options[:per_page]
+      @status[:page]          = @options[:page]
+      @status[:conditions]    = @options[:conditions]
+      @status[:f]             = @options[:f]
 
       process_loading_query
       process_params
@@ -283,9 +281,17 @@ module Wice
       @ar_options[:group]   = @options[:group]
 
       if self.output_html?
-        @ar_options[:per_page] = @status[:per_page]
-        @ar_options[:page] = @status[:page]
-        @ar_options[:total_entries] = @status[:total_entries] if @status[:total_entries]
+        @ar_options[:per_page]      = @status[:per_page]
+        @ar_options[:page]          = @status[:page]
+
+        if (show_all_limit = Wice::ConfigurationProvider.value_for(:SHOW_ALL_ALLOWED_UP_TO, strict: false)) && all_record_mode?
+          if do_count > show_all_limit # force-reset SHOW-ALL to pagination
+            @status[:pp] = nil
+          else
+            # no resetting
+          end
+        end
+
       end
 
     end
@@ -311,7 +317,7 @@ module Wice
             group(   @ar_options[:group]).
             where(   @ar_options[:conditions])
           relation = add_references relation
-          
+
           relation
         else
           # p @ar_options
@@ -418,6 +424,10 @@ module Wice
 
     def count  #:nodoc:
       form_ar_options(skip_ordering: true, forget_generated_options: true)
+      do_count
+    end
+
+    def do_count
       @relation.count(
         conditions: @ar_options[:conditions],
         joins:      @ar_options[:joins],

data/release_notes/RELEASE_NOTES_3.2.pre1.rdoc

@@ -22,7 +22,7 @@
 
 5. Paths to various images used by WiceGrid have been removed from the configuration file
    and are now defined only in the css file. Developers are encouraged to modify
-   <tt>wice_grid.css.scss</tt> to use other images and to change the styles in general.
+   <tt>wice_grid.scss</tt> to use other images and to change the styles in general.
 
 6. The markup and css classes that WiceGrid generates have changed, and CSS for older versions
    of WiceGrid might not work. Inspect the source code.
@@ -79,4 +79,3 @@
     +wg-external-csv-export-button+:
 
       <button class="wg-external-csv-export-button" data-grid-name="grid">Export To CSV</button>
-

data/vendor/assets/javascripts/wice_grid_init.js.coffee

@@ -22,29 +22,31 @@ initWiceGrid = ->
 
     for filterDeclaration in filterDeclarations
       do (filterDeclaration) ->
-        gridProcessor.register
-          filterName : filterDeclaration.filterName
-          detached    : filterDeclaration.detached
-          templates   : filterDeclaration.declaration.templates
-          ids         : filterDeclaration.declaration.ids
+        if filterDeclaration?
+          gridProcessor.register
+            filterName : filterDeclaration.filterName
+            detached    : filterDeclaration.detached
+            templates   : filterDeclaration.declaration.templates
+            ids         : filterDeclaration.declaration.ids
 
     unless window[globalVarForAllGrids]
       window[globalVarForAllGrids] = {}
 
     window[globalVarForAllGrids][gridName] = gridProcessor
 
-    setupDatepicker()
-    setupSubmitReset wiceGridContainer, gridProcessor
-    setupCsvExport wiceGridContainer, gridProcessor
-    setupHidingShowingOfFilterRow wiceGridContainer
-    setupShowingAllRecords wiceGridContainer, gridProcessor
-    setupMultiSelectToggle wiceGridContainer
+    # setting up stuff for in the context of each grid
+    setupSubmitReset                   wiceGridContainer, gridProcessor
+    setupCsvExport                     wiceGridContainer, gridProcessor
+    setupHidingShowingOfFilterRow      wiceGridContainer
+    setupShowingAllRecords             wiceGridContainer, gridProcessor
+    setupMultiSelectToggle             wiceGridContainer
     setupAutoreloadsForInternalFilters wiceGridContainer, gridProcessor
-    setupBulkToggleForActionColumn wiceGridContainer
+    setupBulkToggleForActionColumn     wiceGridContainer
 
   setupAutoreloadsForExternalFilters()
   setupExternalSubmitReset()
   setupExternalCsvExport()
+  setupDatepicker()
 
   # for all grids on oage because it does not matter which grid it is
   setupMultiSelectToggle $('.wg-detached-filter')
@@ -61,23 +63,52 @@ moveDateBoundIfInvalidPeriod = (dataFieldNameWithTheOtherDatepicker, datepickerH
       theOtherDatepicker.next().next().html  $.datepicker.formatDate(dateFormat, selectedDate)
 
 
-
-# datepicker logic
 setupDatepicker = ->
-  # check if datepicker is loaded
-  if $('.wice-grid-container input.check-for-datepicker[type=hidden], .wg-detached-filter input.check-for-datepicker[type=hidden]').length != 0
-    unless $.datepicker
-      alert """Seems like you do not have jQuery datepicker (http://jqueryui.com/demos/datepicker/)
+  if $('.date-filter.wg-jquery-datepicker').length != 0
+    setupJqueryUiDatepicker()
+
+  if $('.date-filter.wg-bootstrap-datepicker').length != 0
+    setupBootstrapDatepicker()
+
+
+setupBootstrapDatepicker = ->
+  # check for bootstrap datepicker
+  unless $.fn.datepicker
+    alert """Seems like you do not have Bootstrap datepicker gem (https://github.com/Nerian/bootstrap-datepicker-rails)
+      installed. Either install it or set Wice::Defaults::HELPER_STYLE to :standard in
+      wice_grid_config.rb in order to use standard Rails date helpers
+    """
+    return
+
+  $('.date-filter.wg-bootstrap-datepicker input:text[data-provide=datepicker]').each (index, dateField) ->
+
+    $(dateField).datepicker().on 'hide', (event) ->
+      $self = $(event.currentTarget)
+
+      eventToTriggerOnChange = $self.data('close-calendar-event-name')
+
+      if eventToTriggerOnChange
+        $self.trigger(eventToTriggerOnChange)
+
+      else if $self.attr('id').split('_').pop() == 'fr'
+        $to = $self.parent().next().find('input:text.check-for-bsdatepicker')
+        if $to.length > 0
+          $to.datepicker 'show'
+
+
+setupJqueryUiDatepicker = ->
+  # check jquery ui datepickeer
+  unless $.datepicker
+    alert """Seems like you do not have jQuery datepicker (http://jqueryui.com/demos/datepicker/)
         installed. Either install it or set Wice::Defaults::HELPER_STYLE to :standard in
         wice_grid_config.rb in order to use standard Rails date helpers
       """
-
   # setting up the locale for datepicker
-  if locale = $('.wice-grid-container input[type=hidden], .wg-detached-filter input[type=hidden]').data('locale')
+  if locale = $('.date-filter.wg-jquery-datepicker input[type=hidden]').data('locale')
     $.datepicker.setDefaults($.datepicker.regional[locale]);
 
 
-  $('.wice-grid-container .date-label, .wg-detached-filter .date-label').each  (index, removeLink) ->
+  $('.date-filter.wg-jquery-datepicker .date-label').each  (index, removeLink) ->
     datepickerHiddenField  = $('#' + $(removeLink).data('dom-id'))
 
     eventToTriggerOnChange = datepickerHiddenField.data('close-calendar-event-name')
@@ -130,7 +161,7 @@ setupDatepicker = ->
 
         $(that).html(dateText)
         if eventToTriggerOnChange
-         datepickerHiddenField.trigger(eventToTriggerOnChange)
+          datepickerHiddenField.trigger(eventToTriggerOnChange)
 
 
 
@@ -164,7 +195,7 @@ setupSubmitReset = (wiceGridContainer, gridProcessor) ->
   $('.reset', wiceGridContainer).click ->
     gridProcessor.reset()
 
-  $('.wg-filter-row input[type=text]', wiceGridContainer).keydown (event) ->
+  $('.wg-filter-row input[type=text], .wg-filter-row input:text[data-provide=datepicker]', wiceGridContainer).keydown (event) ->
     if event.keyCode == 13
       event.preventDefault()
       gridProcessor.process()
@@ -250,6 +281,9 @@ setupBulkToggleForActionColumn = (wiceGridContainer) ->
   $('.deselect-all', wiceGridContainer).click ->
     $('.sel input', wiceGridContainer).prop('checked', false).trigger('change')
 
+  $('.wg-select-all', wiceGridContainer).click ->
+    $('.sel input', wiceGridContainer).prop('checked', $(this).prop('checked')).trigger('change')
+
 
 getGridProcessorForElement = (element) ->
   gridName = $(element).data('grid-name')
@@ -290,7 +324,7 @@ setupExternalSubmitReset =  ->
   $('.wg-detached-filter').each (index, detachedFilterContainer) ->
     gridProcessor = getGridProcessorForElement(detachedFilterContainer)
     if gridProcessor
-      $('input[type=text]', this).keydown (event) ->
+      $('input[type=text], input:text[data-provide=datepicker]', this).keydown (event) ->
         if event.keyCode == 13
           gridProcessor.process()
           event.preventDefault()

data/vendor/assets/javascripts/wice_grid_processor.js.coffee

@@ -128,6 +128,6 @@ class WiceGridProcessor
   this
 
 
-WiceGridProcessor._version = '3.2'
+WiceGridProcessor._version = '3.4'
 
 window['WiceGridProcessor'] = WiceGridProcessor

data/wice_grid.gemspec

@@ -1,35 +1,21 @@
 Gem::Specification.new do |s|
-  s.name          = 'wice_grid'
-  s.version       = '3.4.14'
-  s.homepage      = 'https://github.com/leikind/wice_grid'
-  s.date          = '2015-03-01'
-  s.summary       = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.'
-  s.description   = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.' +
-                    'One of the goals of this plugin was to allow the programmer to define the contents of the cell by himself, '  +
-                    'just like one does when rendering a collection via a simple table (and this is what differentiates WiceGrid ' +
-                    'from various scaffolding solutions), but automate implementation of filters, ordering, paginations, CSV '     +
-                    'export, and so on. Ruby blocks provide an elegant means for this.'
-  s.authors       = ['Yuri Leikind']
-  s.email         = 'yuri.leikind@gmail.com'
-  s.files         = `git ls-files`.split($/)
-  s.license    = 'MIT'
-
-  kaminary         = 'kaminari'
-  kaminary_version = '>= 0.13.0'
+  s.name          = "wice_grid"
+  s.version       = "3.5.0"
+  s.authors       = ["Yuri Leikind"]
+  s.email         = ["yuri.leikind@gmail.com"]
+  s.homepage      = "https://github.com/leikind/wice_grid"
+  s.summary       = "A Rails grid plugin to quickly create grids with sorting, pagination, and filters."
+  s.description   = "A Rails grid plugin to create grids with sorting, pagination, and filters generated automatically based on column types. " +
+                    "The contents of the cell are up for the developer, just like one does when rendering a collection via a simple table. "    +
+                    "WiceGrid automates implementation of filters, ordering, paginations, CSV export, and so on. "                              +
+                    "Ruby blocks provide an elegant means for this."
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files`.split($/)
+  s.license       = "MIT"
+  s.require_paths = ["lib"]
+  s.date          = "2015-08-14"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(kaminary, [kaminary_version])
-      s.add_runtime_dependency('coffee-rails')
-    else
-      s.add_dependency(kaminari, [kaminary_version])
-      s.add_dependency('coffee-rails')
-    end
-  else
-    s.add_dependency(kaminari, [kaminary_version])
-    s.add_dependency('coffee-rails')
-  end
+  s.add_dependency "kaminari",     ["~> 0.16"]
+  s.add_dependency "coffee-rails", ["~> 4.0"]
 
 end

metadata

@@ -1,50 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.4.14
+  version: 3.5.0
 platform: ruby
 authors:
 - Yuri Leikind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: A Rails grid plugin to create grids with sorting, pagination, and (automatically
-  generated) filters.One of the goals of this plugin was to allow the programmer to
-  define the contents of the cell by himself, just like one does when rendering a
-  collection via a simple table (and this is what differentiates WiceGrid from various
-  scaffolding solutions), but automate implementation of filters, ordering, paginations,
-  CSV export, and so on. Ruby blocks provide an elegant means for this.
-email: yuri.leikind@gmail.com
+        version: '4.0'
+description: A Rails grid plugin to create grids with sorting, pagination, and filters
+  generated automatically based on column types. The contents of the cell are up for
+  the developer, just like one does when rendering a collection via a simple table.
+  WiceGrid automates implementation of filters, ordering, paginations, CSV export,
+  and so on. Ruby blocks provide an elegant means for this.
+email:
+- yuri.leikind@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -64,7 +64,7 @@ files:
 - lib/generators/wice_grid/add_migration_for_serialized_queries_generator.rb
 - lib/generators/wice_grid/install_generator.rb
 - lib/generators/wice_grid/templates/create_wice_grid_serialized_queries.rb
-- lib/generators/wice_grid/templates/wice_grid.css.scss
+- lib/generators/wice_grid/templates/wice_grid.scss
 - lib/generators/wice_grid/templates/wice_grid.yml
 - lib/generators/wice_grid/templates/wice_grid_config.rb
 - lib/wice/active_record_column_wrapper.rb
@@ -81,6 +81,7 @@ files:
 - lib/wice/columns/column_string.rb
 - lib/wice/grid_output_buffer.rb
 - lib/wice/grid_renderer.rb
+- lib/wice/helpers/bs_calendar_helpers.rb
 - lib/wice/helpers/js_calendar_helpers.rb
 - lib/wice/helpers/wice_grid_misc_view_helpers.rb
 - lib/wice/helpers/wice_grid_serialized_queries_view_helpers.rb
@@ -137,7 +138,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: A Rails grid plugin to create grids with sorting, pagination, and (automatically
-  generated) filters.
+specification_version: 4
+summary: A Rails grid plugin to quickly create grids with sorting, pagination, and
+  filters.
 test_files: []