From f3165cd9ddf90ccae72817faa1d6911364dfab2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Jachymczyk?= <lukasz@sology.eu>
Date: Fri, 26 Aug 2016 18:46:19 +0200
Subject: [PATCH 01/20] Fix handling view arguments.

---
 app/helpers/smart_listing/helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/smart_listing/helper.rb b/app/helpers/smart_listing/helper.rb
index 4266f7f..8886548 100644
--- a/app/helpers/smart_listing/helper.rb
+++ b/app/helpers/smart_listing/helper.rb
@@ -230,7 +230,7 @@ def smart_listing_for name, *args, &block
     end
 
     def smart_listing_render name = controller_name, *args
-      options = args.extract_options!
+      options = args.dup.extract_options!
       smart_listing_for(name, *args) do |smart_listing|
         concat(smart_listing.render_list(options[:locals]))
       end

From 58e7924e730c2530b9bce85a9600efd20e0ae855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Jachymczyk?= <lukasz@sology.eu>
Date: Mon, 29 Aug 2016 15:18:14 +0200
Subject: [PATCH 02/20] Version bump to 1.2.0

---
 Changes.md                   | 4 ++++
 lib/smart_listing/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index cb4fdd8..3ed01b3 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,6 @@
+1.2.0
+-----------
+
 - Rails 5 support and Kaminari update [akostadinov]
 - Better handling of nested controls params
 - Fix controls not fading out list. Related to #51
@@ -6,6 +9,7 @@
 
 1.1.2
 -----------
+
 - Some bugfixing: #20, #46, #58
 
 1.1.0
diff --git a/lib/smart_listing/version.rb b/lib/smart_listing/version.rb
index 8b37f25..1b3116a 100644
--- a/lib/smart_listing/version.rb
+++ b/lib/smart_listing/version.rb
@@ -1,3 +1,3 @@
 module SmartListing
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

From 6d728f81281f5f3736aacfa4e5b927464d597fb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Jachymczyk?= <lukasz@sology.eu>
Date: Mon, 29 Aug 2016 15:23:50 +0200
Subject: [PATCH 03/20] Update Gemfile.lock

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bf9b436..ee369ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smart_listing (1.1.2)
+    smart_listing (1.2.0)
       coffee-rails
       jquery-rails
       kaminari (~> 0.17)

From 4deac17d405dc3ef15b6920a63c3a89c70c9d1cf Mon Sep 17 00:00:00 2001
From: Brandon Valentine <brandon@brandonvalentine.com>
Date: Tue, 4 Oct 2016 14:44:00 -0500
Subject: [PATCH 04/20] Allow to render outside of controllers. Closes #106

---
 Changes.md                          | 2 ++
 app/helpers/smart_listing/helper.rb | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Changes.md b/Changes.md
index 3ed01b3..be33338 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,5 @@
+- Allow to render outside of controllers [bval]
+
 1.2.0
 -----------
 
diff --git a/app/helpers/smart_listing/helper.rb b/app/helpers/smart_listing/helper.rb
index 8886548..f437b49 100644
--- a/app/helpers/smart_listing/helper.rb
+++ b/app/helpers/smart_listing/helper.rb
@@ -11,6 +11,7 @@ def smart_listing_create *args
         name = (args[0] || options[:name] || controller_name).to_sym
         collection = args[1] || options[:collection] || smart_listing_collection
 
+        view_context = self.respond_to?(:controller) ? controller.view_context : self.view_context
         options = {:config_profile => view_context.smart_listing_config_profile}.merge(options)
 
         list = SmartListing::Base.new(name, collection, options)

From cdc248edac10afbcf4c66cfd451e9888eadfeacf Mon Sep 17 00:00:00 2001
From: Christian Segura <blackcofla@gmail.com>
Date: Mon, 17 Oct 2016 17:05:09 -0700
Subject: [PATCH 05/20] Fixing documentation for filter search icon to be
 displayed correctly.

---
 README.md | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 0eeed43..dcfba79 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ smart_listing_render(:users)
 - unless smart_listing.empty?
   %table
     %thead
-      %tr 
+      %tr
         %th User name
         %th Email
     %tbody
@@ -82,7 +82,7 @@ smart_listing_render(:users)
           %td= user.name
           %td= user.email
 
-  = smart_listing.paginate 
+  = smart_listing.paginate
 - else
   %p.warning No records!
 ```
@@ -112,7 +112,7 @@ SmartListing supports two modes of sorting: implicit and explicit. Implicit mode
 - unless smart_listing.empty?
   %table
     %thead
-      %tr 
+      %tr
         %th= smart_listing.sortable "User name", :name
         %th= smart_listing.sortable "Email", :email
     %tbody
@@ -121,12 +121,12 @@ SmartListing supports two modes of sorting: implicit and explicit. Implicit mode
           %td= user.name
           %td= user.email
 
-  = smart_listing.paginate 
+  = smart_listing.paginate
 - else
   %p.warning No records!
 ```
 
-In this case `:name` and `:email` are sorting column names. `Builder#sortable` renders special link containing column name and sort order (either `asc`, `desc`, or empty value). 
+In this case `:name` and `:email` are sorting column names. `Builder#sortable` renders special link containing column name and sort order (either `asc`, `desc`, or empty value).
 
 You can also specify default sort order in the controller:
 
@@ -136,7 +136,7 @@ You can also specify default sort order in the controller:
 
 Implicit mode is convenient with simple data sets. In case you want to sort by joined column names, we advise you to use explicit sorting:
 ```ruby
-@users = smart_listing_create :users, User.active.joins(:stats), partial: "users/listing", 
+@users = smart_listing_create :users, User.active.joins(:stats), partial: "users/listing",
                               sort_attributes: [[:last_signin, "stats.last_signin_at"]],
                               default_sort: {last_signin: "desc"}
 ```
@@ -153,7 +153,7 @@ In order to allow managing and editing list items, we need to reorganize our vie
 - unless smart_listing.empty?
   %table
     %thead
-      %tr 
+      %tr
         %th= smart_listing.sortable "User name", "name"
         %th= smart_listing.sortable "Email", "email"
         %th
@@ -161,9 +161,9 @@ In order to allow managing and editing list items, we need to reorganize our vie
       - smart_listing.collection.each do |user|
         %tr.editable{data: {id: user.id}}
           = smart_listing.render partial: 'users/user', locals: {user: user}
-      = smart_listing.item_new colspan: 3, link: new_user_path 
+      = smart_listing.item_new colspan: 3, link: new_user_path
 
-  = smart_listing.paginate 
+  = smart_listing.paginate
 - else
   %p.warning No records!
 ```
@@ -174,7 +174,7 @@ In order to allow managing and editing list items, we need to reorganize our vie
 <%= smart_listing_item :users, :new, @new_user, "users/form" %>
 ```
 
-Note that `new` action does not need to create SmartListing (via `smart_listing_create`). It just initializes `@new_user` and renders JS view. 
+Note that `new` action does not need to create SmartListing (via `smart_listing_create`). It just initializes `@new_user` and renders JS view.
 
 New partial for user (`users/user`) may look like this:
 ```haml
@@ -204,10 +204,10 @@ Partial name supplied to `smart_listing_item` (`users/form`) references `@user`
 
   = form_for object, url: object.new_record? ? users_path : user_path(object), remote: true do |f|
     %p
-      Name: 
+      Name:
       = f.text_field :name
     %p
-      Email: 
+      Email:
       = f.text_field :email
     %p= f.submit "Save"
 ```
@@ -228,7 +228,7 @@ SmartListing controls allow you to change somehow presented data. This is typica
   .filter.input-append
     = text_field_tag :filter, '', class: "search", placeholder: "Type name here", autocomplete: "off"
     %button.btn.disabled{type: "submit"}
-      %i.icon.icon-search
+      %span.glyphicon.glyphicon-search
 ```
 
 This gives you nice Bootstrap-enabled filter field with keychange handler. Of course you can use any other form fields in controls too.
@@ -262,7 +262,7 @@ SmartListing.configure(:awesome_profile) do |config|
 end
 ```
 
-In order to use this profile, create helper method named `smart_listing_config_profile` returning profile name and put into your JS `SmartListing.config.merge()` function call. `merge()` function expects parameter with config attributes hash or reads body data-attribute named `smart-listing-config`. Hash of config attributes can be obtained by using helper method `SmartListing.config(:awesome_profile).to_json`. 
+In order to use this profile, create helper method named `smart_listing_config_profile` returning profile name and put into your JS `SmartListing.config.merge()` function call. `merge()` function expects parameter with config attributes hash or reads body data-attribute named `smart-listing-config`. Hash of config attributes can be obtained by using helper method `SmartListing.config(:awesome_profile).to_json`.
 
 ## Not enough?
 

From 0e98a1a91d0c5fc7dd8347c1d89f29511fa7110e Mon Sep 17 00:00:00 2001
From: sevgibson <sevgibson@gmail.com>
Date: Thu, 5 Jan 2017 21:19:44 -0500
Subject: [PATCH 06/20] Use id.to_json so integers and uuids will both work.
 Closes #113

---
 Changes.md                                           | 2 ++
 app/views/smart_listing/item/_create.js.erb          | 2 +-
 app/views/smart_listing/item/_create_continue.js.erb | 2 +-
 app/views/smart_listing/item/_destroy.js.erb         | 2 +-
 app/views/smart_listing/item/_edit.js.erb            | 2 +-
 app/views/smart_listing/item/_remove.js.erb          | 2 +-
 app/views/smart_listing/item/_update.js.erb          | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Changes.md b/Changes.md
index be33338..46f48ce 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,4 +1,6 @@
 - Allow to render outside of controllers [bval]
+- Documentation fixes [blackcofla]
+- Use id.to_json so integers and uuids will both work [sevgibson]
 
 1.2.0
 -----------
diff --git a/app/views/smart_listing/item/_create.js.erb b/app/views/smart_listing/item/_create.js.erb
index b54101e..55addf2 100644
--- a/app/views/smart_listing/item/_create.js.erb
+++ b/app/views/smart_listing/item/_create.js.erb
@@ -1,3 +1,3 @@
 var smart_listing = $('#<%= name %>').smart_listing();
 smart_listing.setAutoshow(false);
-smart_listing.create(<%= id || 0 %>, <%= object.persisted? %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
+smart_listing.create(<%= (id || 0).to_json.html_safe %>, <%= object.persisted? %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
diff --git a/app/views/smart_listing/item/_create_continue.js.erb b/app/views/smart_listing/item/_create_continue.js.erb
index 4d520cf..cc787b5 100644
--- a/app/views/smart_listing/item/_create_continue.js.erb
+++ b/app/views/smart_listing/item/_create_continue.js.erb
@@ -1,6 +1,6 @@
 var smart_listing = $('#<%= name %>').smart_listing();
 smart_listing.setAutoshow(true);
-smart_listing.create(<%= id || 0 %>, <%= object.persisted? %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
+smart_listing.create(<%= (id || 0).to_json.html_safe %>, <%= object.persisted? %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
 <% if object.persisted? %>
   smart_listing.new_item("<%= escape_javascript(render(:partial => new.last, :locals => {object_key => new.first})) %>");
 <% end %>
diff --git a/app/views/smart_listing/item/_destroy.js.erb b/app/views/smart_listing/item/_destroy.js.erb
index 31c601e..5caace4 100644
--- a/app/views/smart_listing/item/_destroy.js.erb
+++ b/app/views/smart_listing/item/_destroy.js.erb
@@ -1,2 +1,2 @@
 var smart_listing = $('#<%= name.to_s %>').smart_listing();
-smart_listing.destroy(<%= id %>, <%= object.destroyed? %>);
+smart_listing.destroy(<%= id.to_json.html_safe %>, <%= object.destroyed? %>);
diff --git a/app/views/smart_listing/item/_edit.js.erb b/app/views/smart_listing/item/_edit.js.erb
index 00b0625..c2873a3 100644
--- a/app/views/smart_listing/item/_edit.js.erb
+++ b/app/views/smart_listing/item/_edit.js.erb
@@ -1,2 +1,2 @@
 var smart_listing = $('#<%= name %>').smart_listing();
-smart_listing.edit(<%= id %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
+smart_listing.edit(<%= id.to_json.html_safe %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
diff --git a/app/views/smart_listing/item/_remove.js.erb b/app/views/smart_listing/item/_remove.js.erb
index 7263d19..d876559 100644
--- a/app/views/smart_listing/item/_remove.js.erb
+++ b/app/views/smart_listing/item/_remove.js.erb
@@ -1,2 +1,2 @@
 var smart_listing = $('#<%= name %>').smart_listing();
-smart_listing.remove(<%= id %>);
+smart_listing.remove(<%= id.to_json.html_safe %>);
diff --git a/app/views/smart_listing/item/_update.js.erb b/app/views/smart_listing/item/_update.js.erb
index 69780d6..c8a678c 100644
--- a/app/views/smart_listing/item/_update.js.erb
+++ b/app/views/smart_listing/item/_update.js.erb
@@ -1,2 +1,2 @@
 var smart_listing = $('#<%= name %>').smart_listing();
-smart_listing.update(<%= id %>, <%= valid.nil? ? object.valid? : valid %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
+smart_listing.update(<%= id.to_json.html_safe %>, <%= valid.nil? ? object.valid? : valid %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");

From c4d4874f0e7152667e1275265df2a194e9d872b1 Mon Sep 17 00:00:00 2001
From: sevgibson <sevgibson@gmail.com>
Date: Thu, 5 Jan 2017 23:13:30 -0500
Subject: [PATCH 07/20] Allow boostrap 4 compatibility. Closes #114

---
 Changes.md                                            |  1 +
 app/assets/javascripts/smart_listing.coffee.erb       | 11 +++++++----
 lib/generators/smart_listing/templates/initializer.rb |  4 ++++
 lib/smart_listing/config.rb                           |  3 +++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Changes.md b/Changes.md
index 46f48ce..e0badb3 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,6 +1,7 @@
 - Allow to render outside of controllers [bval]
 - Documentation fixes [blackcofla]
 - Use id.to_json so integers and uuids will both work [sevgibson]
+- Fix popover in bootstrap 4 [sevgibson]
 
 1.2.0
 -----------
diff --git a/app/assets/javascripts/smart_listing.coffee.erb b/app/assets/javascripts/smart_listing.coffee.erb
index 040a8dc..db8de25 100644
--- a/app/assets/javascripts/smart_listing.coffee.erb
+++ b/app/assets/javascripts/smart_listing.coffee.erb
@@ -24,6 +24,9 @@ class window.SmartListing
     @element_template: (name)->
       @options["constants"]["element_templates"][name]
 
+    @bootstrap_commands: (name)->
+      @options["constants"]["bootstrap_commands"][name]
+
   @config: Config
 
 
@@ -319,8 +322,8 @@ $.fn.smart_listing.observeField = (field, opts = {}) ->
      , 400)
 
 $.fn.smart_listing.showPopover = (elem, body) ->
-  elem.popover("destroy")
-  elem.popover(content: body, html: true, trigger: "manual", title: null)
+  elem.popover(SmartListing.config.bootstrap_commands("popover_destroy"))
+  elem.popover(content: body, html: true, trigger: "manual")
   elem.popover("show")
 
 $.fn.smart_listing.showConfirmation = (confirmation_elem, msg, confirm_callback) ->
@@ -333,12 +336,12 @@ $.fn.smart_listing.showConfirmation = (confirmation_elem, msg, confirm_callback)
         editable = $(event.currentTarget).closest(SmartListing.config.class_name("editable"))
         confirm_callback(confirmation_elem)
         $(confirmation_elem).click()
-        $(confirmation_elem).popover("destroy")
+        $(confirmation_elem).popover(SmartListing.config.bootstrap_commands("popover_destroy"))
       )
       .append(" ")
       .append($("<button/>").html("No").addClass("btn btn-small").click (event) =>
         editable = $(event.currentTarget).closest(SmartListing.config.class_name("editable"))
-        $(confirmation_elem).popover("destroy")
+        $(confirmation_elem).popover(SmartListing.config.bootstrap_commands("popover_destroy"))
       )
     )
 
diff --git a/lib/generators/smart_listing/templates/initializer.rb b/lib/generators/smart_listing/templates/initializer.rb
index 8073aae..2665b0d 100644
--- a/lib/generators/smart_listing/templates/initializer.rb
+++ b/lib/generators/smart_listing/templates/initializer.rb
@@ -85,4 +85,8 @@
   config.constants :element_templates, {
     #:row => "<tr />",
   }
+
+  config.constants :bootstrap_commands, {
+    #:popover_destroy       => "destroy", # Bootstrap 4 requries dipsose instead of destroy
+  }
 end
diff --git a/lib/smart_listing/config.rb b/lib/smart_listing/config.rb
index 89ce928..75b6cda 100644
--- a/lib/smart_listing/config.rb
+++ b/lib/smart_listing/config.rb
@@ -97,6 +97,9 @@ class Configuration
         },
         :element_templates => {
           :row => "<tr />",
+        },
+        :bootstrap_commands => {
+          :popover_destroy => "destroy",
         }
       }
     }.freeze

From ceda647520580b0334749b1acc02cc00fb25c35b Mon Sep 17 00:00:00 2001
From: Tyler Hunt <tyler@tylerhunt.com>
Date: Tue, 17 Jan 2017 09:54:25 -0500
Subject: [PATCH 08/20] Fix Kaminari #num_pages deprecation warning. Closes
 #115

---
 Changes.md           | 1 +
 lib/smart_listing.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index e0badb3..3ec6791 100644
--- a/Changes.md
+++ b/Changes.md
@@ -2,6 +2,7 @@
 - Documentation fixes [blackcofla]
 - Use id.to_json so integers and uuids will both work [sevgibson]
 - Fix popover in bootstrap 4 [sevgibson]
+- Fix Kaminari #num_pages deprecation warning [tylerhunt]
 
 1.2.0
 -----------
diff --git a/lib/smart_listing.rb b/lib/smart_listing.rb
index 4f9e9f9..a7bd8e9 100644
--- a/lib/smart_listing.rb
+++ b/lib/smart_listing.rb
@@ -94,7 +94,7 @@ def setup params, cookies
         if @options[:paginate] && @per_page > 0
           @collection = ::Kaminari.paginate_array(@collection).page(@page).per(@per_page)
           if @collection.length == 0
-            @collection = @collection.page(@collection.num_pages)
+            @collection = @collection.page(@collection.total_pages)
           end
         end
       else

From 012c8d02b305924be58a45a79e79934425b505cd Mon Sep 17 00:00:00 2001
From: Fabian Winkler <wynksaiddestroy@users.noreply.github.com>
Date: Tue, 28 Feb 2017 15:08:39 +0100
Subject: [PATCH 09/20] Add support for Turbolinks 5. Closes #117

With Turbolinks 5 `page:load` is renamed to `turbolinks:ready`.
See https://github.com/turbolinks/turbolinks#running-javascript-when-a-page-loads for example.
---
 Changes.md                                      | 1 +
 app/assets/javascripts/smart_listing.coffee.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index 3ec6791..7b5a708 100644
--- a/Changes.md
+++ b/Changes.md
@@ -3,6 +3,7 @@
 - Use id.to_json so integers and uuids will both work [sevgibson]
 - Fix popover in bootstrap 4 [sevgibson]
 - Fix Kaminari #num_pages deprecation warning [tylerhunt]
+- Add support for Turbolinks 5 [wynksaiddestroy]
 
 1.2.0
 -----------
diff --git a/app/assets/javascripts/smart_listing.coffee.erb b/app/assets/javascripts/smart_listing.coffee.erb
index db8de25..302a830 100644
--- a/app/assets/javascripts/smart_listing.coffee.erb
+++ b/app/assets/javascripts/smart_listing.coffee.erb
@@ -441,4 +441,4 @@ ready = ->
   $(SmartListing.config.class_name("controls")).smart_listing_controls()
 
 $(document).ready ready
-$(document).on "page:load", ready
+$(document).on "page:load turbolinks:load", ready

From b0ae77431cc30db7172d1cd964a128e2ca4bd761 Mon Sep 17 00:00:00 2001
From: Paul Hoffer <git@paulhoffer.com>
Date: Wed, 28 Jun 2017 10:31:20 -0600
Subject: [PATCH 10/20] Use #empty? for AC::Params. Closes #122

ActionController::Params does not forward to hash in Rails 5.1.
This uses !empty? instead of any?
Fixes #121

fix .first on AC::Params for sorting

Update changelog
---
 Changes.md           | 1 +
 lib/smart_listing.rb | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Changes.md b/Changes.md
index 7b5a708..cffc0a4 100644
--- a/Changes.md
+++ b/Changes.md
@@ -4,6 +4,7 @@
 - Fix popover in bootstrap 4 [sevgibson]
 - Fix Kaminari #num_pages deprecation warning [tylerhunt]
 - Add support for Turbolinks 5 [wynksaiddestroy]
+- Use #empty? for AC::Params [phoffer]
 
 1.2.0
 -----------
diff --git a/lib/smart_listing.rb b/lib/smart_listing.rb
index a7bd8e9..c7360f0 100644
--- a/lib/smart_listing.rb
+++ b/lib/smart_listing.rb
@@ -68,8 +68,8 @@ def setup params, cookies
       end
 
       if @options[:array]
-        if @sort && @sort.any? # when array we sort only by first attribute
-          i = sort_keys.index{|x| x[0] == @sort.first[0]}
+        if @sort && !@sort.empty? # when array we sort only by first attribute
+          i = sort_keys.index{|x| x[0] == @sort.to_h.first[0]}
           @collection = @collection.sort do |x, y|
             xval = x
             yval = y
@@ -83,7 +83,7 @@ def setup params, cookies
             if xval.nil? || yval.nil?
               xval.nil? ? 1 : -1
             else
-              if @sort.first[1] == "asc"
+              if @sort.to_h.first[1] == "asc"
                 (xval <=> yval) || (xval && !yval ? 1 : -1)
               else
                 (yval <=> xval) || (yval && !xval ? 1 : -1)
@@ -100,7 +100,7 @@ def setup params, cookies
       else
         # let's sort by all attributes
         #
-        @collection = @collection.order(sort_keys.collect{|s| "#{s[1]} #{@sort[s[0]]}" if @sort[s[0]]}.compact) if @sort && @sort.any?
+        @collection = @collection.order(sort_keys.collect{|s| "#{s[1]} #{@sort[s[0]]}" if @sort[s[0]]}.compact) if @sort && !@sort.empty?
 
         if @options[:paginate] && @per_page > 0
           @collection = @collection.page(@page).per(@per_page)

From a6ce63e92da91457dbf2c5ce48ef3126d70fc705 Mon Sep 17 00:00:00 2001
From: Boy Papan <boy@iwa.fi>
Date: Thu, 7 Sep 2017 00:14:39 +0700
Subject: [PATCH 11/20] Fix indentation. Closes #130

changelog
---
 Changes.md                                        | 1 +
 lib/generators/smart_listing/install_generator.rb | 6 +++---
 lib/generators/smart_listing/views_generator.rb   | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Changes.md b/Changes.md
index cffc0a4..9079354 100644
--- a/Changes.md
+++ b/Changes.md
@@ -5,6 +5,7 @@
 - Fix Kaminari #num_pages deprecation warning [tylerhunt]
 - Add support for Turbolinks 5 [wynksaiddestroy]
 - Use #empty? for AC::Params [phoffer]
+- Fix indentation in some files [boy-papan]
 
 1.2.0
 -----------
diff --git a/lib/generators/smart_listing/install_generator.rb b/lib/generators/smart_listing/install_generator.rb
index c715145..db28f84 100644
--- a/lib/generators/smart_listing/install_generator.rb
+++ b/lib/generators/smart_listing/install_generator.rb
@@ -5,7 +5,7 @@ class InstallGenerator < Rails::Generators::Base
 
       def self.banner #:nodoc:
         <<-BANNER.chomp
-rails g smart_listing:install 
+rails g smart_listing:install
 
     Copies initializer file
 BANNER
@@ -15,6 +15,6 @@ def self.banner #:nodoc:
       def copy_views
         template 'initializer.rb', 'config/initializers/smart_listing.rb'
       end
-		end
-	end
+    end
+  end
 end
diff --git a/lib/generators/smart_listing/views_generator.rb b/lib/generators/smart_listing/views_generator.rb
index c60f799..7167590 100644
--- a/lib/generators/smart_listing/views_generator.rb
+++ b/lib/generators/smart_listing/views_generator.rb
@@ -5,7 +5,7 @@ class ViewsGenerator < Rails::Generators::Base
 
       def self.banner #:nodoc:
         <<-BANNER.chomp
-rails g smart_listing:views 
+rails g smart_listing:views
 
     Copies all smart listing partials templates to your application.
 BANNER
@@ -18,6 +18,6 @@ def copy_views
           copy_file f, "app/views/smart_listing/#{f}"
         end
       end
-		end
-	end
+    end
+  end
 end

From d2bfc036dcec8702252bb5925fbecb13ef8bd526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Jachymczyk?= <lukasz@sology.eu>
Date: Thu, 28 Sep 2017 16:10:22 +0200
Subject: [PATCH 12/20] Version bump.

---
 Changes.md                   | 3 +++
 lib/smart_listing/version.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index 9079354..6e3407b 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,6 @@
+1.2.1
+-----------
+
 - Allow to render outside of controllers [bval]
 - Documentation fixes [blackcofla]
 - Use id.to_json so integers and uuids will both work [sevgibson]
diff --git a/lib/smart_listing/version.rb b/lib/smart_listing/version.rb
index 1b3116a..11a0c93 100644
--- a/lib/smart_listing/version.rb
+++ b/lib/smart_listing/version.rb
@@ -1,3 +1,3 @@
 module SmartListing
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

From f4f0541eb71f8cb57cbf8eb5f81bd68415e53c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Mizi=C5=84ski?= <kuba@sology.eu>
Date: Mon, 15 Jan 2018 14:06:00 +0100
Subject: [PATCH 13/20] Update Readme for Rails >= 5.1 Users

---
 Changes.md   | 2 ++
 Gemfile.lock | 2 +-
 README.md    | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index 6e3407b..b577976 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,5 @@
+- Update Readme for Rails >= 5.1 Users [mizinsky]
+
 1.2.1
 -----------
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ee369ee..f7cebc1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smart_listing (1.2.0)
+    smart_listing (1.2.1)
       coffee-rails
       jquery-rails
       kaminari (~> 0.17)
diff --git a/README.md b/README.md
index dcfba79..8774147 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,12 @@ Also, you need to add SmartListing to your asset pipeline:
 //= require smart_listing
 ```
 
+__Rails >= 5.1 users__: Rails 5.1 has dropped jQuery dependency from the default stack in favour of `rails-ujs`. SmartListing still requires jQuery so make sure that you use `jquery_ujs` from `jquery-rails` gem and have following requires in your asset pipeline before `smart_listing`:
+```
+//= require jquery
+//= require jquery_ujs
+```
+
 ### Initializer
 
 Optionally you can also install some configuration initializer:

From afb19e849120630f1e7dea763b8bf32f3ecb2117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Mizi=C5=84ski?= <kuba@sology.eu>
Date: Fri, 19 Jan 2018 15:20:23 +0100
Subject: [PATCH 14/20] Kaminari update. Closes #139

---
 Changes.md            |  1 +
 Gemfile.lock          | 36 +++++++++++++++++-------------------
 smart_listing.gemspec |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Changes.md b/Changes.md
index b577976..7487880 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,4 @@
+- Kaminari update [mizinsky]
 - Update Readme for Rails >= 5.1 Users [mizinsky]
 
 1.2.1
diff --git a/Gemfile.lock b/Gemfile.lock
index f7cebc1..1ae0493 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,7 +4,7 @@ PATH
     smart_listing (1.2.1)
       coffee-rails
       jquery-rails
-      kaminari (~> 0.17)
+      kaminari (>= 0.17)
       rails (>= 3.2)
 
 GEM
@@ -49,32 +49,32 @@ GEM
     capybara-webkit (1.3.1)
       capybara (>= 2.0.2, < 2.5.0)
       json
-    coffee-rails (4.1.0)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+      railties (>= 4.0.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
     database_cleaner (1.3.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.2.2)
-    hike (1.2.3)
+    execjs (2.7.0)
     i18n (0.6.11)
-    jquery-rails (3.1.2)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     mime-types (2.4.3)
+    mini_mime (1.0.0)
     mini_portile2 (2.1.0)
     minitest (5.4.2)
-    multi_json (1.10.1)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
@@ -115,19 +115,16 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     sass (3.4.7)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.9)
     thor (0.19.1)
     thread_safe (0.3.4)
-    tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     xpath (2.0.0)
@@ -141,9 +138,10 @@ DEPENDENCIES
   capybara (~> 2.4.4)
   capybara-webkit (~> 1.3.1)
   database_cleaner
+  kaminari (= 0.17)
   rspec-rails
   smart_listing!
   sqlite3
 
 BUNDLED WITH
-   1.12.5
+   1.15.4
diff --git a/smart_listing.gemspec b/smart_listing.gemspec
index e5e76c5..b828151 100644
--- a/smart_listing.gemspec
+++ b/smart_listing.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">=3.2"
   s.add_dependency "coffee-rails"
-  s.add_dependency "kaminari", "~> 0.17"
+  s.add_dependency "kaminari", ">= 0.17"
   s.add_dependency "jquery-rails"
 
   s.add_development_dependency "bootstrap-sass"

From 7ac2c6f6d06214d3f5606348b9f603c4b170756c Mon Sep 17 00:00:00 2001
From: Tatsuya Kitabatake <e2tod2@gmail.com>
Date: Sun, 8 Oct 2017 18:24:55 +0900
Subject: [PATCH 15/20] Enable to configure global remote option. Closes #131

---
 Changes.md                                 | 1 +
 app/helpers/smart_listing/helper.rb        | 3 ++-
 app/views/smart_listing/_sortable.html.erb | 2 +-
 lib/smart_listing/config.rb                | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changes.md b/Changes.md
index 7487880..1238527 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,4 @@
+- Enable to configure global remote option and it to affects sortable helper #131 [kitabatake]
 - Kaminari update [mizinsky]
 - Update Readme for Rails >= 5.1 Users [mizinsky]
 
diff --git a/app/helpers/smart_listing/helper.rb b/app/helpers/smart_listing/helper.rb
index f437b49..deb3d4e 100644
--- a/app/helpers/smart_listing/helper.rb
+++ b/app/helpers/smart_listing/helper.rb
@@ -103,7 +103,8 @@ def sortable title, attribute, options = {}
           :url => @template.url_for(sanitize_params(@template.params.merge(@smart_listing.all_params(:sort => sort_params)))),
           :container_classes => [@template.smart_listing_config.classes(:sortable)],
           :attribute => attribute,
-          :title => title
+          :title => title,
+          :remote => @smart_listing.remote?
         }
 
         @template.render(:partial => 'smart_listing/sortable', :locals => default_locals.merge(locals))
diff --git a/app/views/smart_listing/_sortable.html.erb b/app/views/smart_listing/_sortable.html.erb
index 66b05ac..92e85d8 100644
--- a/app/views/smart_listing/_sortable.html.erb
+++ b/app/views/smart_listing/_sortable.html.erb
@@ -11,7 +11,7 @@
     builder:            current builder instance
 -%>
 
-<%= link_to url, :class => container_classes, :data => {:attr => attribute}, :remote => true do %>
+<%= link_to url, :class => container_classes, :data => {:attr => attribute}, :remote => remote do %>
   <%= title %>
   <% if order %>
     <span class="<%= order == "asc" ? smart_listing_config.classes(:icon_sort_up) : smart_listing_config.classes(:icon_sort_down) %>"></span>
diff --git a/lib/smart_listing/config.rb b/lib/smart_listing/config.rb
index 75b6cda..191d57e 100644
--- a/lib/smart_listing/config.rb
+++ b/lib/smart_listing/config.rb
@@ -31,6 +31,7 @@ class Configuration
         :page_sizes                     => DEFAULT_PAGE_SIZES.dup,      # set available page sizes array
         :kaminari_options               => {:theme => "smart_listing"}, # Kaminari's paginate helper options
         :sort_dirs                      => [nil, "asc", "desc"],        # Default sorting directions cycle of sortables
+        :remote                         => true,                        # Default remote mode
       },
       :constants => {
         :classes => {

From 0e8e8c87925cd132bac6590b16babb34b3911952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Mizi=C5=84ski?= <kuba@sology.eu>
Date: Fri, 12 Jan 2018 08:35:50 +0100
Subject: [PATCH 16/20] Fix sanitize_params method. Closes #137

---
 Changes.md                          |  1 +
 app/helpers/smart_listing/helper.rb | 13 +++----------
 lib/smart_listing.rb                |  7 ++++++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Changes.md b/Changes.md
index 1238527..68d7206 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,4 @@
+- Fix sanitize_params method #137 [mizinsky]
 - Enable to configure global remote option and it to affects sortable helper #131 [kitabatake]
 - Kaminari update [mizinsky]
 - Update Readme for Rails >= 5.1 Users [mizinsky]
diff --git a/app/helpers/smart_listing/helper.rb b/app/helpers/smart_listing/helper.rb
index deb3d4e..8de25ee 100644
--- a/app/helpers/smart_listing/helper.rb
+++ b/app/helpers/smart_listing/helper.rb
@@ -33,8 +33,6 @@ def _prefixes
     end
 
     class Builder
-      # Params that should not be visible in pagination links (pages, per-page, sorting, etc.)
-      UNSAFE_PARAMS = {:authenticity_token => nil, :utf8 => nil}
 
       class_attribute :smart_listing_helpers
 
@@ -48,7 +46,7 @@ def name
 
       def paginate options = {}
         if @smart_listing.collection.respond_to? :current_page
-          @template.paginate @smart_listing.collection, {:remote => @smart_listing.remote?, :param_name => @smart_listing.param_name(:page), :params => UNSAFE_PARAMS}.merge(@smart_listing.kaminari_options)
+          @template.paginate @smart_listing.collection, {:remote => @smart_listing.remote?, :param_name => @smart_listing.param_name(:page)}.merge(@smart_listing.kaminari_options)
         end
       end
 
@@ -78,7 +76,7 @@ def pagination_per_page_links options = {}
 
       def pagination_per_page_link page
         if @smart_listing.per_page.to_i != page
-          url = @template.url_for(sanitize_params(@template.params.merge(@smart_listing.all_params(:per_page => page, :page => 1))))
+          url = @template.url_for(@smart_listing.params.merge(@smart_listing.all_params(:per_page => page, :page => 1)))
         end
 
         locals = {
@@ -100,7 +98,7 @@ def sortable title, attribute, options = {}
 
         locals = {
           :order => @smart_listing.sort_order(attribute),
-          :url => @template.url_for(sanitize_params(@template.params.merge(@smart_listing.all_params(:sort => sort_params)))),
+          :url => @template.url_for(@smart_listing.params.merge(@smart_listing.all_params(:sort => sort_params))),
           :container_classes => [@template.smart_listing_config.classes(:sortable)],
           :attribute => attribute,
           :title => title,
@@ -181,11 +179,6 @@ def max_count?
 
       private
 
-      def sanitize_params params
-        params = params.permit! if params.respond_to?(:permit!)
-        params.merge(UNSAFE_PARAMS)
-      end
-
       def default_locals
         {:smart_listing => @smart_listing, :builder => self}
       end
diff --git a/lib/smart_listing.rb b/lib/smart_listing.rb
index c7360f0..a2c4e5f 100644
--- a/lib/smart_listing.rb
+++ b/lib/smart_listing.rb
@@ -21,7 +21,9 @@ def page_param(page)
 
 module SmartListing
   class Base
-    attr_reader :name, :collection, :options, :per_page, :sort, :page, :partial, :count
+    attr_reader :name, :collection, :options, :per_page, :sort, :page, :partial, :count, :params
+    # Params that should not be visible in pagination links (pages, per-page, sorting, etc.)
+    UNSAFE_PARAMS = [:authenticity_token, :commit, :utf8, :_method, :script_name].freeze
 
     def initialize name, collection, options = {}
       @name = name
@@ -46,6 +48,9 @@ def initialize name, collection, options = {}
 
     def setup params, cookies
       @params = params
+      @params = @params.to_unsafe_h if @params.respond_to?(:to_unsafe_h)
+      @params = @params.with_indifferent_access
+      @params.except!(*UNSAFE_PARAMS)
 
       @page = get_param :page
       @per_page = !get_param(:per_page) || get_param(:per_page).empty? ? (@options[:memorize_per_page] && get_param(:per_page, cookies).to_i > 0 ? get_param(:per_page, cookies).to_i : page_sizes.first) : get_param(:per_page).to_i

From 20fde8636a085ccfba02f21a62144a4aad09dada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Mizi=C5=84ski?= <kuba@sology.eu>
Date: Thu, 25 Jan 2018 12:08:29 +0100
Subject: [PATCH 17/20] Update Dummy and Dev Environment to Rails 5.1. Closes
 #140

---
 .gitignore                                    |   2 +
 Changes.md                                    |   1 +
 Gemfile.lock                                  | 256 +++++++++------
 Guardfile                                     |  70 +++++
 .../javascripts/smart_listing.coffee.erb      |   7 +
 smart_listing.gemspec                         |   6 +-
 spec/dummy/Gemfile.lock                       | 292 +++++++++++-------
 .../assets/stylesheets/application.css.scss   |   8 +
 .../app/controllers/admin/users_controller.rb |   8 +-
 spec/dummy/app/models/application_record.rb   |   3 +
 spec/dummy/app/models/user.rb                 |   3 +
 .../app/views/admin/users/_item.html.erb      |   7 +
 .../app/views/admin/users/_list.html.erb      |   7 +-
 .../app/views/admin/users/index.html.erb      |  17 +
 spec/dummy/config/environments/test.rb        |   2 +-
 .../config/initializers/smart_listing.rb      |   2 +-
 spec/dummy/db/migrate/20141028214800_user.rb  |   4 -
 .../db/migrate/20180126065408_create_user.rb  |   9 +
 spec/dummy/db/schema.rb                       |   6 +-
 spec/dummy/db/seeds.rb                        |   8 +
 spec/dummy/fixtures/users.yml                 |  40 +++
 spec/features/custom_filters_spec.rb          |  69 +++++
 spec/features/manage_items_spec.rb            |   2 +-
 spec/features/view_items_spec.rb              |  41 ++-
 spec/rails_helper.rb                          |   7 +-
 spec/support/capybara/wait_for_ajax.rb        |  11 +
 26 files changed, 656 insertions(+), 232 deletions(-)
 create mode 100644 Guardfile
 create mode 100644 spec/dummy/app/models/application_record.rb
 delete mode 100644 spec/dummy/db/migrate/20141028214800_user.rb
 create mode 100644 spec/dummy/db/migrate/20180126065408_create_user.rb
 create mode 100644 spec/dummy/db/seeds.rb
 create mode 100644 spec/dummy/fixtures/users.yml
 create mode 100644 spec/features/custom_filters_spec.rb
 create mode 100644 spec/support/capybara/wait_for_ajax.rb

diff --git a/.gitignore b/.gitignore
index 336b921..32522ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
 tags
+
+.byebug_history
diff --git a/Changes.md b/Changes.md
index 68d7206..a3e0d24 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,4 @@
+- Development environment update #140 [mizinsky]
 - Fix sanitize_params method #137 [mizinsky]
 - Enable to configure global remote option and it to affects sortable helper #131 [kitabatake]
 - Kaminari update [mizinsky]
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ae0493..33e050e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,45 +10,64 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
+    actioncable (5.1.4)
+      actionpack (= 5.1.4)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
-      builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
-      arel (~> 5.0.0)
-    activesupport (4.1.6)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    bootstrap-sass (3.3.0.1)
-      sass (~> 3.2)
-    builder (3.2.2)
-    capybara (2.4.4)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (8.0.0)
+    autoprefixer-rails (7.2.5)
+      execjs
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
+    builder (3.2.3)
+    byebug (9.1.0)
+    capybara (2.13.0)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-webkit (1.3.1)
-      capybara (>= 2.0.2, < 2.5.0)
+    capybara-webkit (1.14.0)
+      capybara (>= 2.3.0, < 2.14.0)
       json
+    coderay (1.1.2)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -57,77 +76,141 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
+    crass (1.0.3)
+    database_cleaner (1.6.2)
+    diff-lcs (1.3)
+    erubi (1.7.0)
     execjs (2.7.0)
-    i18n (0.6.11)
-    jquery-rails (3.1.4)
-      railties (>= 3.0, < 5.0)
+    ffi (1.9.18)
+    formatador (0.2.5)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    guard (2.14.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    i18n (0.9.3)
+      concurrent-ruby (~> 1.0)
+    jquery-rails (4.3.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (2.1.0)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    lumberjack (1.0.12)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
-    mime-types (2.4.3)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_mime (1.0.0)
-    mini_portile2 (2.1.0)
-    minitest (5.4.2)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    pkg-config (1.1.7)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
-      sprockets-rails (~> 2.0)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
+    mini_portile2 (2.3.0)
+    minitest (5.11.2)
+    nenv (0.3.0)
+    nio4r (2.2.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.1)
+    rack (2.0.3)
+    rack-test (0.8.2)
+      rack (>= 1.0, < 3)
+    rails (5.1.4)
+      actioncable (= 5.1.4)
+      actionmailer (= 5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      activemodel (= 5.1.4)
+      activerecord (= 5.1.4)
+      activesupport (= 5.1.4)
+      bundler (>= 1.3.0)
+      railties (= 5.1.4)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rake (12.3.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    sass (3.4.7)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    ruby_dep (1.5.0)
+    sass (3.5.5)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    shellany (0.0.1)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.9)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    xpath (2.0.0)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -135,13 +218,14 @@ PLATFORMS
 
 DEPENDENCIES
   bootstrap-sass
-  capybara (~> 2.4.4)
-  capybara-webkit (~> 1.3.1)
+  byebug
+  capybara (< 2.14)
+  capybara-webkit (~> 1.14)
   database_cleaner
-  kaminari (= 0.17)
+  guard-rspec
   rspec-rails
   smart_listing!
   sqlite3
 
 BUNDLED WITH
-   1.15.4
+   1.16.1
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..3215f01
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,70 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Rails files
+  rails = dsl.rails(view_extensions: %w(erb haml slim))
+  dsl.watch_spec_files_for(rails.app_files)
+  dsl.watch_spec_files_for(rails.views)
+
+  watch(rails.controllers) do |m|
+    [
+      rspec.spec.call("routing/#{m[1]}_routing"),
+      rspec.spec.call("controllers/#{m[1]}_controller"),
+      rspec.spec.call("acceptance/#{m[1]}")
+    ]
+  end
+
+  # Rails config changes
+  watch(rails.spec_helper)     { rspec.spec_dir }
+  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
+  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
+
+  # Capybara features specs
+  watch(rails.view_dirs)     { |m| rspec.spec.call("features/#{m[1]}") }
+  watch(rails.layouts)       { |m| rspec.spec.call("features/#{m[1]}") }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  end
+end
diff --git a/app/assets/javascripts/smart_listing.coffee.erb b/app/assets/javascripts/smart_listing.coffee.erb
index 302a830..26313e0 100644
--- a/app/assets/javascripts/smart_listing.coffee.erb
+++ b/app/assets/javascripts/smart_listing.coffee.erb
@@ -1,3 +1,10 @@
+# endsWith polyfill
+if !String::endsWith
+  String::endsWith = (search, this_len) ->
+    if this_len == undefined or this_len > @length
+      this_len = @length
+    @substring(this_len - (search.length), this_len) == search
+
 # Useful when SmartListing target url is different than current one
 $.rails.href = (element) ->
   element.attr("href") || element.data("<%= SmartListing.config.data_attributes(:href) %>") || window.location.pathname
diff --git a/smart_listing.gemspec b/smart_listing.gemspec
index b828151..a2296ea 100644
--- a/smart_listing.gemspec
+++ b/smart_listing.gemspec
@@ -23,8 +23,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "byebug"
 
-  s.add_development_dependency "capybara", "~> 2.4.4"
-  s.add_development_dependency "capybara-webkit", "~> 1.3.1"
+  s.add_development_dependency "capybara", "< 2.14"
+  s.add_development_dependency "capybara-webkit", "~> 1.14"
   s.add_development_dependency "database_cleaner"
 end
diff --git a/spec/dummy/Gemfile.lock b/spec/dummy/Gemfile.lock
index 8ae6a80..7fa9a1e 100644
--- a/spec/dummy/Gemfile.lock
+++ b/spec/dummy/Gemfile.lock
@@ -1,147 +1,231 @@
 PATH
   remote: ../..
   specs:
-    smart_listing (1.0.0)
-      bootstrap-sass
-      coffee-rails
+    smart_listing (1.2.1)
       coffee-rails
       jquery-rails
-      kaminari (~> 0.16.1)
+      kaminari (~> 0.17)
       rails (>= 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
+    actioncable (5.1.4)
+      actionpack (= 5.1.4)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
       builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
-      arel (~> 5.0.0)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    bootstrap-sass (3.3.0.1)
-      sass (~> 3.2)
-    builder (3.2.2)
-    capybara (2.4.4)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (8.0.0)
+    autoprefixer-rails (7.2.5)
+      execjs
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
+    builder (3.2.3)
+    byebug (10.0.0)
+    capybara (2.13.0)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-webkit (1.3.1)
-      capybara (>= 2.0.2, < 2.5.0)
+    capybara-webkit (1.14.0)
+      capybara (>= 2.3.0, < 2.14.0)
       json
-    coffee-rails (4.1.0)
+    coderay (1.1.2)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+      railties (>= 4.0.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    execjs (2.2.2)
-    hike (1.2.3)
-    i18n (0.6.11)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.3)
+    database_cleaner (1.6.2)
+    diff-lcs (1.3)
+    erubi (1.7.0)
+    execjs (2.7.0)
+    ffi (1.9.18)
+    formatador (0.2.5)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    guard (2.14.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    i18n (0.9.3)
+      concurrent-ruby (~> 1.0)
+    jquery-rails (4.3.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    kaminari (0.16.1)
+    json (2.1.0)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
-    multi_json (1.10.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
-      sprockets-rails (~> 2.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    lumberjack (1.0.12)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.1)
+    nenv (0.3.0)
+    nio4r (2.2.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.1)
+    rack (2.0.3)
+    rack-test (0.8.2)
+      rack (>= 1.0, < 3)
+    rails (5.1.4)
+      actioncable (= 5.1.4)
+      actionmailer (= 5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      activemodel (= 5.1.4)
+      activerecord (= 5.1.4)
+      activesupport (= 5.1.4)
+      bundler (>= 1.3.0)
+      railties (= 5.1.4)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rake (12.3.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    sass (3.4.7)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    turbolinks (2.5.1)
-      coffee-rails
-    tzinfo (1.2.2)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    ruby_dep (1.5.0)
+    sass (3.5.5)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    shellany (0.0.1)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    xpath (2.0.0)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara
-  capybara-webkit
+  bootstrap-sass
+  byebug
+  capybara (< 2.14)
+  capybara-webkit (~> 1.14)
   database_cleaner
+  guard-rspec
   rspec-rails
   smart_listing!
   sqlite3
+
+BUNDLED WITH
+   1.16.1
diff --git a/spec/dummy/app/assets/stylesheets/application.css.scss b/spec/dummy/app/assets/stylesheets/application.css.scss
index 4a592e0..f4cd2d0 100644
--- a/spec/dummy/app/assets/stylesheets/application.css.scss
+++ b/spec/dummy/app/assets/stylesheets/application.css.scss
@@ -15,3 +15,11 @@
  */
 @import "bootstrap-sprockets";
 @import "bootstrap";
+
+// This is needed to fix overlapping icons of items on the capybara-webkit.
+// https://github.com/thoughtbot/capybara-webkit/issues/494
+td.actions {
+  i, a, span {
+    min-width: 20px;
+  }
+}
diff --git a/spec/dummy/app/controllers/admin/users_controller.rb b/spec/dummy/app/controllers/admin/users_controller.rb
index 94fcde1..25ed906 100644
--- a/spec/dummy/app/controllers/admin/users_controller.rb
+++ b/spec/dummy/app/controllers/admin/users_controller.rb
@@ -2,10 +2,14 @@ class Admin::UsersController < ApplicationController
   include SmartListing::Helper::ControllerExtensions
   helper  SmartListing::Helper
 
-  before_filter :find_user, except: [:index, :new, :create]
+  before_action :find_user, except: [:index, :new, :create]
 
   def index
-    smart_listing_create partial: "admin/users/list"
+    @users = User.all
+    @users = @users.like(params[:filter]) if params[:filter]
+    @users = @users.by_boolean if params[:boolean] == "1"
+    smart_listing_create(:users, @users, partial: "admin/users/list")
+
     respond_to do |format|
       format.html
       format.js { render formats: :js }
diff --git a/spec/dummy/app/models/application_record.rb b/spec/dummy/app/models/application_record.rb
new file mode 100644
index 0000000..10a4cba
--- /dev/null
+++ b/spec/dummy/app/models/application_record.rb
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/spec/dummy/app/models/user.rb b/spec/dummy/app/models/user.rb
index 29ce2da..1e50c38 100644
--- a/spec/dummy/app/models/user.rb
+++ b/spec/dummy/app/models/user.rb
@@ -1,4 +1,7 @@
 class User < ActiveRecord::Base
+  scope :by_boolean, -> { where(:boolean => true) }
+  scope :like, -> (filter) { where("UPPER(name) LIKE UPPER(?) OR UPPER(email) LIKE UPPER(?)", "%#{filter}%", "%#{filter}%")}
+
   def self.search(word)
     where('name LIKE :word OR email LIKE :word', word: "%#{word}%")
   end
diff --git a/spec/dummy/app/views/admin/users/_item.html.erb b/spec/dummy/app/views/admin/users/_item.html.erb
index 4eaa1bc..60c38b7 100644
--- a/spec/dummy/app/views/admin/users/_item.html.erb
+++ b/spec/dummy/app/views/admin/users/_item.html.erb
@@ -4,6 +4,13 @@
 <td>
   <%= object.email %>
 </td>
+<td>
+  <% if object.boolean? %>
+    <i class="glyphicon glyphicon-ok"></i>
+  <% else %>
+    <i class="glyphicon glyphicon-remove"></i>
+  <% end %>
+</td>
 <td class="actions">
   <%= smart_listing_item_actions [
     {name: :edit, url: edit_admin_user_path(object)},
diff --git a/spec/dummy/app/views/admin/users/_list.html.erb b/spec/dummy/app/views/admin/users/_list.html.erb
index 1c0346f..bc75a02 100644
--- a/spec/dummy/app/views/admin/users/_list.html.erb
+++ b/spec/dummy/app/views/admin/users/_list.html.erb
@@ -1,7 +1,8 @@
 <table class="table table-striped">
   <thead>
-    <th class="col-md-5">Name</th>
-    <th class="col-md-5">Email</th>
+    <th class="col-md-4 name"><%= smart_listing.sortable "Name", "name"%></th> 
+    <th class="col-md-4 email"><%= smart_listing.sortable "Email", "email"%></th>
+    <th class="col-md-2">Boolean</th>
     <th class="col-md-2"></th>
   </thead>
   <tbody>
@@ -11,7 +12,7 @@
           locals: { object: user } %>
       </tr>
     <% end %>
-    <%= smart_listing.item_new colspan: 3, link: new_admin_user_path %>
+    <%= smart_listing.item_new colspan: 4, link: new_admin_user_path %>
   </tbody>
 </table>
 <% # Render nice pagination links fitted for Bootstrap 3 by default %>
diff --git a/spec/dummy/app/views/admin/users/index.html.erb b/spec/dummy/app/views/admin/users/index.html.erb
index 598ce6f..2c26b27 100644
--- a/spec/dummy/app/views/admin/users/index.html.erb
+++ b/spec/dummy/app/views/admin/users/index.html.erb
@@ -1 +1,18 @@
+<%= smart_listing_controls_for(:users, {:class => "form-inline text-right"}) do %>
+  <div class="checkbox">
+    <label class="checkbox inline" for="boolean">
+      <%= hidden_field_tag :boolean, "0", :id => "boolean" %>
+      <%= check_box_tag :boolean %>
+      <%= "Boolean?" %>
+    </label>
+  </div>
+  &nbsp;
+  <div class="form-group filter input-append">
+    <%= text_field_tag :filter, '', :class => "search form-control", :placeholder => "Search...", :autocomplete => :off %>
+  </div>
+  <button class="btn btn-primary disabled" type="submit">
+    <span class="glyphicon glyphicon-search"></span>
+  </button>
+<% end %>
+
 <%= smart_listing_render %>
diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb
index 053f5b6..82ca386 100644
--- a/spec/dummy/config/environments/test.rb
+++ b/spec/dummy/config/environments/test.rb
@@ -5,7 +5,7 @@
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
diff --git a/spec/dummy/config/initializers/smart_listing.rb b/spec/dummy/config/initializers/smart_listing.rb
index da8b46b..c5bff54 100644
--- a/spec/dummy/config/initializers/smart_listing.rb
+++ b/spec/dummy/config/initializers/smart_listing.rb
@@ -10,7 +10,7 @@
     #:unlimited_per_page             => false,                       # allow infinite page size
     #:paginate                       => true,                        # allow pagination
     #:memorize_per_page              => false,                       # save per page settings in the cookie
-    #:page_sizes                     => DEFAULT_PAGE_SIZES,          # set available page sizes array
+    :page_sizes                     => [3, 10],          # set available page sizes array
     #:kaminari_options               => {:theme => "smart_listing"}, # Kaminari's paginate helper options
     #:sort_dirs                      => [nil, "asc", "desc"],        # Default sorting directions cycle of sortables
   })
diff --git a/spec/dummy/db/migrate/20141028214800_user.rb b/spec/dummy/db/migrate/20141028214800_user.rb
deleted file mode 100644
index 895bd36..0000000
--- a/spec/dummy/db/migrate/20141028214800_user.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class User < ActiveRecord::Migration
-  def change
-  end
-end
diff --git a/spec/dummy/db/migrate/20180126065408_create_user.rb b/spec/dummy/db/migrate/20180126065408_create_user.rb
new file mode 100644
index 0000000..1832a64
--- /dev/null
+++ b/spec/dummy/db/migrate/20180126065408_create_user.rb
@@ -0,0 +1,9 @@
+class CreateUser < ActiveRecord::Migration[5.1]
+  def change
+    create_table :users do |t|
+      t.string :name
+      t.string :email
+      t.boolean :boolean
+    end
+  end
+end
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
index 30d31d6..187761d 100644
--- a/spec/dummy/db/schema.rb
+++ b/spec/dummy/db/schema.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,11 +10,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141028214800) do
+ActiveRecord::Schema.define(version: 20180126065408) do
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.string "name"
     t.string "email"
+    t.boolean "boolean"
   end
 
 end
diff --git a/spec/dummy/db/seeds.rb b/spec/dummy/db/seeds.rb
new file mode 100644
index 0000000..e632b37
--- /dev/null
+++ b/spec/dummy/db/seeds.rb
@@ -0,0 +1,8 @@
+User.find_or_create_by(id: 1, name: "Betty", email: "betty@email.com", boolean: false)
+User.find_or_create_by(id: 2, name: "Aaron", email: "aaron@email.com", boolean: true)
+User.find_or_create_by(id: 3, name: "Jane", email: "jane@test.eu", boolean: false)
+User.find_or_create_by(id: 4, name: "Edward", email: "edward@test.eu", boolean: true)
+User.find_or_create_by(id: 5, name: "Nicholas", email: "salohcin@email.com", boolean: false)
+User.find_or_create_by(id: 6, name: "Lisa", email: "asil@email.com", boolean: true)
+User.find_or_create_by(id: 7, name: "Sara", email: "aras@test.eu", boolean: false)
+User.find_or_create_by(id: 8, name: "Robin", email: "nibor@test.eu", boolean: true)
diff --git a/spec/dummy/fixtures/users.yml b/spec/dummy/fixtures/users.yml
new file mode 100644
index 0000000..d332125
--- /dev/null
+++ b/spec/dummy/fixtures/users.yml
@@ -0,0 +1,40 @@
+user1:
+  id: 1
+  name: "Betty"
+  email: "betty@email.com"
+  boolean: false
+user2:
+  id: 2
+  name: "Aaron"
+  email: "aaron@email.com"
+  boolean: true
+user3:
+  id: 3
+  name: "Jane"
+  email: "jane@test.eu"
+  boolean: false
+user4:
+  id: 4
+  name: "Edward"
+  email: "edward@test.eu"
+  boolean: true
+user5:
+  id: 5
+  name: "Nicholas"
+  email: "salohcin@email.com"
+  boolean: false
+user6:
+  id: 6
+  name: "Lisa"
+  email: "asil@email.com"
+  boolean: true
+user7:
+  id: 7
+  name: "Sara"
+  email: "aras@test.eu"
+  boolean: false
+user8:
+  id: 8
+  name: "Robin"
+  email: "nibor@test.eu"
+  boolean: true
diff --git a/spec/features/custom_filters_spec.rb b/spec/features/custom_filters_spec.rb
new file mode 100644
index 0000000..d54e041
--- /dev/null
+++ b/spec/features/custom_filters_spec.rb
@@ -0,0 +1,69 @@
+require 'rails_helper'
+
+feature 'Combine custom filtering' do
+  fixtures :users
+
+  scenario 'The user search user, change pagination and change page', js: true do
+
+    visit admin_users_path
+    #page_sizes => [3, 10]
+    within(".pagination-per-page") { click_on "10" }
+    expect(page).to have_selector('tr.editable', count: 8)
+    fill_in "filter", with: "test"
+    expect(page).to have_selector('tr.editable', count: 4)
+    within(".pagination-per-page") { click_on "3" }
+    within(".pagination") { click_on "2" }
+    expect(page).to have_selector('tr.editable', count: 1)
+
+  end
+
+  scenario 'The user sort users and change page', js: true do
+
+    visit admin_users_path
+    find('.name a.sortable').click
+    expect(page).to have_content("Aaron")
+    expect(page).to_not have_content("Jane")
+    within(".pagination") { click_on "2" }
+    expect(page).to have_content("Jane")
+    expect(page).to_not have_content("Aaron")
+
+  end
+
+  scenario 'The user combine filters', js: true do
+
+    visit admin_users_path
+    fill_in "filter", with: "email"
+    find('input#boolean').click
+    expect(page).to have_selector('tr.editable', count: 2)
+
+  end
+
+  scenario 'The user combine filters and sort users', js: true do
+
+    visit admin_users_path
+    fill_in "filter", with: "test"
+    find('input#boolean').click
+    wait_for_ajax
+    expect(page).to have_selector('tr.editable', count: 2)
+    click_link 'Name'
+    expect(page).to have_selector('tr.editable', count: 2)
+    expect(page.find(:css, "tbody > tr:nth-child(1)")).to have_content("Edward")
+    expect(page.find(:css, "tbody > tr:nth-child(2)")).to have_content("Robin")
+
+  end
+
+  scenario 'The user combine filters, sort and change page', js: true do
+
+    visit admin_users_path
+    check 'boolean'
+    wait_for_ajax
+    expect(find(:css, '.email a.sortable')[:href]).to include("boolean")
+    click_link 'Email'
+    expect(page.find(:css, "tbody > tr:nth-child(2)")).to have_content("Lisa")
+    within(".pagination") { click_on "2" }
+    expect(page.find(:css, "tbody > tr:nth-child(1)")).to have_content("Robin")
+    expect(page.find(:css, '.count')).to have_content("4")
+
+  end
+
+end
diff --git a/spec/features/manage_items_spec.rb b/spec/features/manage_items_spec.rb
index 1fea7ae..3607173 100644
--- a/spec/features/manage_items_spec.rb
+++ b/spec/features/manage_items_spec.rb
@@ -41,6 +41,6 @@
     visit admin_users_path
     find('.change_name').click
 
-    expect(page).to_not have_content("Changed Name")
+    expect(page).to have_content("Changed Name")
   end
 end
diff --git a/spec/features/view_items_spec.rb b/spec/features/view_items_spec.rb
index c0b4442..00e2fb4 100644
--- a/spec/features/view_items_spec.rb
+++ b/spec/features/view_items_spec.rb
@@ -1,49 +1,44 @@
 require 'rails_helper'
 
 feature 'View a list of items' do
+  fixtures :users
   scenario 'The user navigate through users', js: true do
-    11.times { |i| User.create!(name: "Name#{i}", email: "Email#{i}") }
 
     visit root_path
-
-    expect(page).to have_content("Name0")
-    expect(page).to_not have_content("Name10")
+    #page_sizes => [3, 10]
+    expect(page).to have_content("Betty")
+    expect(page).to_not have_content("Edward")
 
     within(".pagination") { click_on "2" }
 
-    expect(page).to have_content("Name10")
-    expect(page).to_not have_content("Name0")
+    expect(page).to have_content("Edward")
+    expect(page).to_not have_content("Betty")
   end
 
   scenario "The user sort users", js: true do
-    User.create(name: "aaaName", email: "bbbEmail")
-    User.create(name: "bbbName", email: "aaaEmail")
 
     visit sortable_users_path
 
-    expect(find(:xpath, "//table/tbody/tr[1]")).to have_content("bbbName")
-    expect(find(:xpath, "//table/tbody/tr[2]")).to have_content("aaaName")
-
     find('.name a').click
+    expect(find(:xpath, "//table/tbody/tr[1]")).to have_content("Aaron")
+    expect(find(:xpath, "//table/tbody/tr[2]")).to have_content("Betty")
 
-    expect(find(:xpath, "//table/tbody/tr[1]")).to have_content("aaaName")
-    expect(find(:xpath, "//table/tbody/tr[2]")).to have_content("bbbName")
+    find('.name a').click
+    expect(find(:xpath, "//table/tbody/tr[1]")).to have_content("Sara")
+    expect(find(:xpath, "//table/tbody/tr[2]")).to have_content("Robin")
   end
 
   scenario "The user search user", js: true do
-    User.create(name: "Name1", email: "Email1")
-    User.create(name: "Name2", email: "Email2")
-
-    visit searchable_users_path
+    visit admin_users_path
 
-    fill_in "filter", with: "1"
+    fill_in "filter", with: "ja"
 
-    expect(page).to have_content("Name1")
-    expect(page).to_not have_content("Name2")
+    expect(page).to have_content("Jane")
+    expect(page).to_not have_content("Aaron")
 
-    fill_in "filter", with: "3"
+    fill_in "filter", with: "ni"
 
-    expect(page).to_not have_content("Name1")
-    expect(page).to_not have_content("Name2")
+    expect(page).to_not have_content("Nicholas")
+    expect(page).to_not have_content("Jane")
   end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4c69e00..11a1850 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -12,7 +12,8 @@
 # run twice. It is recommended that you do not name files matching this glob to
 # end with _spec.rb. You can configure this pattern with the --pattern
 # option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+Dir[Rails.root.join("../support/**/*.rb")].each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
@@ -20,7 +21,7 @@
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.fixture_path = "#{::Rails.root}/fixtures"
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -42,6 +43,8 @@
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 
+  config.include WaitForAjax, type: :feature
+
   config.before :each do
     DatabaseCleaner.start
   end
diff --git a/spec/support/capybara/wait_for_ajax.rb b/spec/support/capybara/wait_for_ajax.rb
new file mode 100644
index 0000000..b90fc11
--- /dev/null
+++ b/spec/support/capybara/wait_for_ajax.rb
@@ -0,0 +1,11 @@
+module WaitForAjax
+  def wait_for_ajax
+    Timeout.timeout(Capybara.default_max_wait_time) do
+      loop until finished_all_ajax_requests?
+    end
+  end
+
+  def finished_all_ajax_requests?
+    page.evaluate_script('jQuery.active').zero?
+  end
+end

From a087e33ce4ee049235895dfafab82a0c794ce43b Mon Sep 17 00:00:00 2001
From: AakLak <30278646+AakLak@users.noreply.github.com>
Date: Thu, 15 Feb 2018 00:40:01 -0800
Subject: [PATCH 18/20] Replace deprecated .any? with .present?. Closes #143

"DEPRECATION WARNING: Method any? is deprecated and will be removed in Rails 5.1, as ActionController::Parameters no longer inherits from hash. Using this deprecated behavior exposes potential security problems. If you continue to use this method you may be creating a security vulnerability in your app that can be exploited. Instead, consider using one of these documented methods which are not deprecated: http://api.rubyonrails.org/v5.0.0.rc1/classes/ActionController/Parameters.html"
---
 Changes.md                          | 1 +
 app/helpers/smart_listing/helper.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index a3e0d24..a05df8c 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,4 @@
+- Replace deprecated .any? with .present? #143 [AakLak]
 - Development environment update #140 [mizinsky]
 - Fix sanitize_params method #137 [mizinsky]
 - Enable to configure global remote option and it to affects sortable helper #131 [kitabatake]
diff --git a/app/helpers/smart_listing/helper.rb b/app/helpers/smart_listing/helper.rb
index 8de25ee..707554a 100644
--- a/app/helpers/smart_listing/helper.rb
+++ b/app/helpers/smart_listing/helper.rb
@@ -312,7 +312,7 @@ def smart_listing_update *args
       smart_listing = @smart_listings[name]
 
       # don't update list if params are missing (prevents interfering with other lists)
-      if params.keys.select{|k| k.include?("smart_listing")}.any? && !params[smart_listing.base_param]
+      if params.keys.select{|k| k.include?("smart_listing")}.present? && !params[smart_listing.base_param]
         return unless options[:force]
       end
 

From cce03033059980adcc5137f26fb2611071e74ed2 Mon Sep 17 00:00:00 2001
From: Nicolas Filzi <nfilzi.webservices@gmail.com>
Date: Sat, 10 Mar 2018 22:45:50 +0100
Subject: [PATCH 19/20] Remove duplicated href key from config template. Closes
 #146

---
 Changes.md                                            | 1 +
 lib/generators/smart_listing/templates/initializer.rb | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index a05df8c..df5b76d 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,4 @@
+- Remove duplicated href key from config template #146 [nfilzi]
 - Replace deprecated .any? with .present? #143 [AakLak]
 - Development environment update #140 [mizinsky]
 - Fix sanitize_params method #137 [mizinsky]
diff --git a/lib/generators/smart_listing/templates/initializer.rb b/lib/generators/smart_listing/templates/initializer.rb
index 2665b0d..a2ba229 100644
--- a/lib/generators/smart_listing/templates/initializer.rb
+++ b/lib/generators/smart_listing/templates/initializer.rb
@@ -65,7 +65,6 @@
     #:inline_edit_backup    => "smart-listing-edit-backup",
     #:params                => "params",
     #:observed              => "observed",
-    #:href                  => "href",
     #:autoshow              => "autoshow",
     #:popover               => "slpopover",
   }

From 4dbc51606505f0c64ce115d8c83f5b194559cef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Jachymczyk?= <lukasz@sology.eu>
Date: Sun, 11 Mar 2018 17:22:10 +0100
Subject: [PATCH 20/20] Version bump.

---
 Changes.md                   | 3 +++
 lib/smart_listing/version.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index df5b76d..b7af0c1 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,6 @@
+1.2.2
+-----------
+
 - Remove duplicated href key from config template #146 [nfilzi]
 - Replace deprecated .any? with .present? #143 [AakLak]
 - Development environment update #140 [mizinsky]
diff --git a/lib/smart_listing/version.rb b/lib/smart_listing/version.rb
index 11a0c93..058af58 100644
--- a/lib/smart_listing/version.rb
+++ b/lib/smart_listing/version.rb
@@ -1,3 +1,3 @@
 module SmartListing
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end