wice_grid 3.4.7 → 3.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86104c55ad7c39afcbeede0d70eec14a954b5497
-  data.tar.gz: 1b4ae6d4a83a84a5edbb6d9efd467dc46279d261
+  metadata.gz: 56c4efa80c0a6215fc1061dd5194651b13628416
+  data.tar.gz: 8f53a3c0bc5c10ab9792f9fbefab14072b6b0aa6
 SHA512:
-  metadata.gz: 4d0958d90066286fb45c88f5b15e7814bb7f5811b36e137e4a8a65cbfb7a2c8c123d78659498d2958ad587f98dd4a43a8f451b95e63d32dfedc7231b2d91a5fa
-  data.tar.gz: 10dfac4dacf0d6e4b2b7d9dcf3d6737899329ea8ee2d8fe9bc995e44fecbd6b060b32a96bb1ad345ebcd6a5a7baab0ef3bf803c65b6a843e651afa71bbf44189
+  metadata.gz: 57575d15eabd156f2a51c9ccf88d0ba2992ccd2170dcb482d39a924989324ca676f556f2aefc9d47bd1ffea8bd4ee2c7b3353ae175a11919fa8aba7d41af5357
+  data.tar.gz: 068a7f6eb8d7680534ba57fc81946930ecda55b4453097c644f5bf751e06214b53af0aca848638cf39c42b0af57970a60806dbbeb65148bdcf8d7d931bedac9c

data/README.rdoc

@@ -1,6 +1,6 @@
 = WiceGrid
 
-Version:: 3.4.7
+Version:: 3.4.8
 Author::  Yuri Leikind
 Sources:: https://github.com/leikind/wice_grid/
 Examples online:: http://wicegrid.herokuapp.com

data/lib/generators/wice_grid/templates/wice_grid_config.rb

@@ -166,4 +166,6 @@ if defined?(Wice::Defaults)
   # popup calendar will be shown relative to the popup trigger element or to the mouse pointer
   Wice::Defaults::POPUP_PLACEMENT_STRATEGY = :trigger # :pointer
 
-end
+  # The name of the page method (should correspond to Kaminari.config.page_method_name)
+  Wice::Defaults::PAGE_METHOD_NAME = :page
+end

data/lib/wice_grid.rb

@@ -92,27 +92,33 @@ module Wice
         raise WiceGridArgumentError.new(":order_direction must be either 'asc' or 'desc'.")
       end
 
-      # options that are understood
-      @options = {
-        :conditions           => nil,
-        :csv_file_name        => nil,
-        :csv_field_separator  => Defaults::CSV_FIELD_SEPARATOR,
-        :custom_order         => {},
-        :enable_export_to_csv => Defaults::ENABLE_EXPORT_TO_CSV,
-        :group                => nil,
-        :include              => nil,
-        :joins                => nil,
-        :name                 => Defaults::GRID_NAME,
-        :order                => nil,
-        :order_direction      => Defaults::ORDER_DIRECTION,
-        :page                 => 1,
-        :per_page             => Defaults::PER_PAGE,
-        :saved_query          => nil,
-        :total_entries        => nil,
-        :with_paginated_resultset  => nil,
-        :with_resultset       => nil
-      }
-
+      begin
+        # options that are understood
+        @options = {
+          :conditions           => nil,
+          :csv_file_name        => nil,
+          :csv_field_separator  => Defaults::CSV_FIELD_SEPARATOR,
+          :custom_order         => {},
+          :enable_export_to_csv => Defaults::ENABLE_EXPORT_TO_CSV,
+          :group                => nil,
+          :include              => nil,
+          :joins                => nil,
+          :name                 => Defaults::GRID_NAME,
+          :order                => nil,
+          :order_direction      => Defaults::ORDER_DIRECTION,
+          :page                 => 1,
+          :page_method_name     => Defaults::PAGE_METHOD_NAME,
+          :per_page             => Defaults::PER_PAGE,
+          :saved_query          => nil,
+          :total_entries        => nil,
+          :with_paginated_resultset  => nil,
+          :with_resultset       => nil
+        }
+      rescue NameError
+        raise NameError.new('A constant is missing in wice_grid_config.rb: ' + $!.message +
+          '. This can happen when you upgrade the WiceGrid to a newer version with a new configuration constant. ' +
+          'Add the constant manually or re-run `bundle exec rails g wice_grid:install`.')
+      end
       # validate parameters
       opts.assert_valid_keys(@options.keys)
 
@@ -301,7 +307,7 @@ module Wice
         else
           # p @ar_options
           relation = @relation.
-            page(    @ar_options[:page]).
+            send(    @options[:page_method_name], @ar_options[:page]).
             per(     @ar_options[:per_page]).
             includes(@ar_options[:include]).
             joins(   @ar_options[:joins]).

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

@@ -12,8 +12,13 @@ class WiceGridProcessor
 
 
   process : (domIdToFocus)->
-    window.location = @buildUrlWithParams(domIdToFocus)
+    @visit @buildUrlWithParams(domIdToFocus)
 
+  visit : (path) ->
+    if Turbolinks?
+      Turbolinks.visit path
+    else
+      window.location = path
 
   setProcessTimer : (domIdToFocus)->
 
@@ -30,7 +35,7 @@ class WiceGridProcessor
 
   reloadPageForGivenGridState : (gridState)->
     requestPath = @gridStateToRequest(gridState)
-    window.location = @appendToUrl(@baseLinkForShowAllRecords, requestPath)
+    @visit @appendToUrl(@baseLinkForShowAllRecords, requestPath)
 
 
   gridStateToRequest : (gridState)->
@@ -75,11 +80,11 @@ class WiceGridProcessor
 
 
   reset : ->
-    window.location = @baseRequestForFilter
+    @visit @baseRequestForFilter
 
 
   exportToCsv : ->
-    window.location = @linkForExport
+    @visit @linkForExport
 
 
   register : (func)->

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

@@ -25,7 +25,7 @@ loadQuery = (loadLink, event) ->
       gridProcessor.parameterNameForQueryLoading +  encodeURIComponent(queryId)
     )
 
-    window.location = request
+    gridProcessor.visit request
 
   event.preventDefault()
   event.stopPropagation()

data/wice_grid.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name          = 'wice_grid'
-  s.version       = '3.4.7'
+  s.version       = '3.4.8'
   s.homepage      = 'https://github.com/leikind/wice_grid'
-  s.date          = '2014-08-25'
+  s.date          = '2014-08-27'
   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, '  +

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.4.7
+  version: 3.4.8
 platform: ruby
 authors:
 - Yuri Leikind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-27 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
 description: A Rails grid plugin to create grids with sorting, pagination, and (automatically
@@ -35,7 +35,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
@@ -112,17 +112,17 @@ require_paths:
 - lib
 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.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: A Rails grid plugin to create grids with sorting, pagination, and (automatically