will_paginate 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03efd9ec8134ac6ec1d457f73d9ec4713d1e662d
-  data.tar.gz: fe630d7d564896e2a4c1227a43bbbf03859ebf0a
+  metadata.gz: fef2cd8f47f945a1b5d7378a4c66ceba6dc49cdb
+  data.tar.gz: af9aa669e248488ec198d5239172fcf08fead4a1
 SHA512:
-  metadata.gz: 252057e359f0fd4715d807ece1dbb6d52d497bb6188150782bf90664478c1161a1ca7ba5a0d80d29005469f3cbf7167f1180f08d1f474a71f181d516aef5aa70
-  data.tar.gz: c8757581f95a806f7926e0cc88fd3245227998022c684c063320a0f6093eb09be1f46e92ddcd393ccc0e3611924f7b5d1e26cb2af9dca3b649a9c73fd8d85bbb
+  metadata.gz: ea9ced53320267da3646dad5102f408ed8cc5ad7d973f0a91893035d6ef671c1d57ab5b8793b6002d84ca71363618948718f3ee8cfdd4f3b01e0628eebb96434
+  data.tar.gz: c0571c50659366d61692379a97fbaff6f012529f38dc617a5efba1a24a1d9a3a687e95777ef4da6c96b9f0f94ee8380d6ce80b62b8ce7a2b36d95fb66c352eb3

data/lib/will_paginate/railtie.rb

@@ -18,8 +18,6 @@ module WillPaginate
         require 'will_paginate/view_helpers/action_view'
       end
 
-      self.class.add_locale_path config
-
       # early access to ViewHelpers.pagination_options
       require 'will_paginate/view_helpers'
     end
@@ -31,10 +29,6 @@ module WillPaginate
       ActionController::Base.extend ControllerRescuePatch
     end
 
-    def self.add_locale_path(config)
-      config.i18n.load_path.unshift(*WillPaginate::I18n.load_path)
-    end
-
     # Extending the exception handler middleware so it properly detects
     # WillPaginate::InvalidPage regardless of it being a tag module.
     module ShowExceptionsPatch
@@ -69,3 +63,7 @@ module WillPaginate
     end
   end
 end
+
+ActiveSupport.on_load :i18n do
+  I18n.load_path.concat(WillPaginate::I18n.load_path)
+end

data/lib/will_paginate/version.rb

@@ -2,7 +2,7 @@ module WillPaginate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/will_paginate/view_helpers/link_renderer.rb

@@ -115,12 +115,12 @@ module WillPaginate
       end
 
       def symbolized_update(target, other, blacklist = nil)
-        other.each do |key, value|
+        other.each_pair do |key, value|
           key = key.to_sym
           existing = target[key]
           next if blacklist && blacklist.include?(key)
 
-          if value.is_a?(Hash) and (existing.is_a?(Hash) or existing.nil?)
+          if value.respond_to?(:each_pair) and (existing.is_a?(Hash) or existing.nil?)
             symbolized_update(existing || (target[key] = {}), value)
           else
             target[key] = value

data/spec/view_helpers/action_view_spec.rb

@@ -416,7 +416,7 @@ class DummyRequest
   def initialize(controller)
     @controller = controller
     @get = true
-    @params = {}
+    @params = {}.with_indifferent_access
     @symbolized_path_parameters = { :controller => 'foo', :action => 'bar' }
   end
 
@@ -442,7 +442,11 @@ class DummyRequest
 
   def params(more = nil)
     @params.update(more) if more
-    @params
+    if defined?(ActionController::Parameters)
+      ActionController::Parameters.new(@params)
+    else
+      @params
+    end
   end
   
   def host_with_port
@@ -458,3 +462,7 @@ class DummyRequest
     'http:'
   end
 end
+
+if defined?(ActionController::Parameters)
+  ActionController::Parameters.permit_all_parameters = false
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies: []
 description: will_paginate provides a simple API for performing paginated queries
   with Active Record, DataMapper and Sequel, and includes helpers for rendering pagination