filterrific 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36dc749c095650e566eacee010e3021ee5aad1c3
-  data.tar.gz: dedcfb34441effe7dfde8fbb610b0dedcfcab461
+  metadata.gz: a5979a704b32638ef10a22bd4fd751df14a61b61
+  data.tar.gz: c3061aa6b0a62f45be9f3a8596dbc2832e7f4e7b
 SHA512:
-  metadata.gz: c92f6d1eae2d2a91ad1b00bc9cfb5c6bc2e84ea0889748042b4b295ede9a9741a14232e565b8ffad66a9ac7fd897f3f5e9e8140762649bbb6f155b99967845d1
-  data.tar.gz: caf3aca751fbc4d9dbe894530ac03ef4024d2d69ca1569fa29081ed89ddd361cb3e40c4f09738204a6c0a73a7f6898595242c6475a7d9493eca5338578055e7d
+  metadata.gz: 411881a8695384b3f9e1edc9f9c9db7ad8ccb4afb9416693f36d29a4861b6901e2896145f07a29aef51b20734449b568fd2c7bbeaf1e14c71a30f360e1ecd6b1
+  data.tar.gz: fe163f9cfc3fd45760522877415395f594e664d1f20726ae62a192584bedc1deba5c9aaafae4ce6dbec966736864bbba63d7388f257409b17a0375ef1ecf8bf9

data/CHANGELOG.md

@@ -39,6 +39,15 @@
       },
     )
 
+### 2.0.5
+
+* Feature: Allow disabling of session persistence by passing `false` as
+  `:persistence_id` option.
+* Fix: Direction indicators on sortable headers are now correct.
+* Fix: Make JS event observers work with TurboLinks.
+* Fix: Make reset_filterrific_url available in controller.
+
+
 
 ### 2.0.4
 

data/app/assets/javascripts/filterrific/filterrific-jquery.js

@@ -79,12 +79,12 @@ Filterrific.submitFilterForm = function(){
 
 
 
-// Initialize event observers on document ready
-jQuery(document).ready(function($) {
+// Initialize event observers on document ready and turbolinks page:load
+jQuery(document).on('ready page:load', function() {
   // Add change event handler to all Filterrific filter inputs.
-  $(document).on(
+  $('#filterrific_filter').on(
     "change",
-    "#filterrific_filter :input",
+    ":input",
     Filterrific.submitFilterForm
   );
 

data/doc/scratchpad.md

@@ -3,6 +3,7 @@
 ## TODO
 
 * add check that no filter_name conflicts with existing methods on included ActiveRecord class (See https://github.com/jhund/filterrific/issues/17)
+* fix reset url, make controller method, helper method
 
 ## Travis
 

data/lib/filterrific/action_controller_extension.rb

@@ -5,6 +5,8 @@
 module Filterrific
   module ActionControllerExtension
 
+    include HasResetFilterrificUrlMixin
+
   protected
 
     # @param model_class [Class]
@@ -19,7 +21,7 @@ module Filterrific
     # @option opts [String, Symbol, optional] :persistence_id
     #   defaults to "namespace/controller#action" string, used for session key
     #   and saved searches to isolate different filters' persisted params from
-    #   each other.
+    #   each other. Set to false to turn off session persistence.
     # @option opts [Hash, optional] :select_options
     #   these are available in the view to populate select lists and other
     #   dynamic values.
@@ -29,19 +31,23 @@ module Filterrific
       # went back to #stringify_keys which should be sufficient.
       f_params = (filterrific_params || {}).stringify_keys
       opts = opts.stringify_keys
-      pi = opts['persistence_id'] || compute_default_persistence_id
+      pers_id = if false == opts['persistence_id']
+        nil
+      else
+        opts['persistence_id'] || compute_default_persistence_id
+      end
 
       if (f_params.delete('reset_filterrific'))
         # Reset query and session_persisted params
-        session[pi] = nil
+        session[pers_id] = nil  if pers_id
         redirect_to url_for({})  and return false # requires `or return` in calling action.
       end
 
-      f_params = compute_filterrific_params(model_class, f_params, opts, pi)
+      f_params = compute_filterrific_params(model_class, f_params, opts, pers_id)
 
       filterrific = Filterrific::ParamSet.new(model_class, f_params)
       filterrific.select_options = opts['select_options']
-      session[pi] = filterrific.to_hash
+      session[pers_id] = filterrific.to_hash  if pers_id
       filterrific
     end
 
@@ -55,11 +61,11 @@ module Filterrific
     # @param model_class [ActiveRecord::Base]
     # @param filterrific_params [Hash]
     # @param opts [Hash]
-    # @param persistence_id [String]
+    # @param persistence_id [String, nil]
     def compute_filterrific_params(model_class, filterrific_params, opts, persistence_id)
       r = (
         filterrific_params.presence || # start with passed in params
-        session[persistence_id].presence || # then try session persisted params
+        (persistence_id && session[persistence_id].presence) || # then try session persisted params if persistence_id is present
         opts['default_filter_params'] || # then use passed in opts
         model_class.filterrific_default_filter_params # finally use model_class defaults
       ).stringify_keys

data/lib/filterrific/action_view_extension.rb

@@ -5,6 +5,8 @@
 module Filterrific
   module ActionViewExtension
 
+    include HasResetFilterrificUrlMixin
+
     # Sets all options on form_for to defaults that work with Filterrific
     # @param record [Filterrific] the @filterrific object
     # @param options [Hash] standard options for form_for
@@ -75,9 +77,10 @@ module Filterrific
       }.merge(opts)
       opts.merge!(
         :html_attrs => opts[:html_attrs].with_indifferent_access,
-        :current_sorting => filterrific.send(opts[:sorting_scope_name]),
+        :current_sorting => (current_sorting = filterrific.send(opts[:sorting_scope_name])),
         :current_sort_key => current_sorting ? current_sorting.gsub(/_asc|_desc/, '') : nil,
         :current_sort_direction => current_sorting ? (current_sorting =~ /_desc\z/ ? 'desc' : 'asc') : nil,
+        :current_sort_direction_indicator => (current_sorting =~ /_desc\z/ ? opts[:descending_indicator] : opts[:ascending_indicator]),
       )
       new_sort_key = sort_key.to_s
       if new_sort_key == opts[:current_sort_key]
@@ -89,13 +92,6 @@ module Filterrific
       end
     end
 
-    # Returns a url that can be used to reset the Filterrific params
-    def reset_filterrific_url(opts = {})
-      url_for(
-        { filterrific: { reset_filterrific: true } }.merge(opts)
-      )
-    end
-
   protected
 
     # Renders HTML to reverse sort order on currently sorted column.

data/lib/filterrific/engine.rb

@@ -2,6 +2,8 @@
 
 require 'filterrific/param_set'
 
+require 'filterrific/has_reset_filterrific_url_mixin'
+
 require 'filterrific/action_controller_extension'
 require 'filterrific/action_view_extension'
 require 'filterrific/active_record_extension'

data/lib/filterrific/has_reset_filterrific_url_mixin.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+#
+# Adds reset_filterrific_url to controllers and views
+#
+module Filterrific
+  module HasResetFilterrificUrlMixin
+
+    # Returns a url that can be used to reset the Filterrific params
+    def reset_filterrific_url(opts = {})
+      url_for(
+        { filterrific: { reset_filterrific: true } }.merge(opts)
+      )
+    end
+
+  end
+end

data/lib/filterrific/param_set.rb

@@ -90,12 +90,12 @@ module Filterrific
           fp[key] = val.call
         when val.is_a?(Array)
           # type cast integers in the array
-          fp[key] = fp[key].map { |e| e =~ /^[1-9]\d*$/ ? e.to_i : e }
+          fp[key] = fp[key].map { |e| e =~ /^[1-9\-]\d*$/ ? e.to_i : e }
         when val.is_a?(Hash)
           # type cast Hash to OpenStruct so that nested params render correctly
           # in the form
           fp[key] = OpenStruct.new(fp[key])
-        when val =~ /^[1-9]\d*$/
+        when val =~ /^[1-9\-]\d*$/
           # type cast integer
           fp[key] = fp[key].to_i
         end

data/lib/filterrific/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Filterrific
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/spec/filterrific/action_controller_extension_spec.rb

@@ -102,5 +102,15 @@ module Filterrific
 
     end
 
+    describe '#reset_filterrific_url' do
+
+      it 'responds to #reset_filterrific_url' do
+        TestController.new.must_respond_to(:reset_filterrific_url)
+      end
+
+    end
+
   end
 end
+
+

data/spec/filterrific/param_set_spec.rb

@@ -13,6 +13,7 @@ module Filterrific
         filter_array_string
         filter_hash
         filter_int
+        filter_negative_int
         filter_proc
         filter_string
       ]
@@ -29,6 +30,7 @@ module Filterrific
         'filter_array_string' => %w[one two three],
         'filter_hash' => { a: 1, b: 2 },
         'filter_int' => '42',
+        'filter_negative_int' => '-42',
         'filter_proc' => lambda { 1 + 1 },
         'filter_string' => 'forty-two',
       }
@@ -41,6 +43,7 @@ module Filterrific
         'filter_array_string' => %w[one two three],
         'filter_hash' => OpenStruct.new(a: 1, b: 2),
         'filter_int' => 42,
+        'filter_negative_int' => -42,
         'filter_proc' => 2,
         'filter_string' => 'forty-two',
       }
@@ -53,6 +56,7 @@ module Filterrific
         'filter_array_string' => %w[one two three],
         'filter_hash' => { a: 1, b: 2 },
         'filter_int' => 42,
+        'filter_negative_int' => -42,
         'filter_proc' => 2,
         'filter_string' => 'forty-two',
       }
@@ -167,6 +171,7 @@ module Filterrific
         [{ an_array: [1, 'a'] }, { an_array: [1, 'a'] }],
         [{ a_hash: { 'a' => 1, 'b' => 2 } }, { a_hash: OpenStruct.new({ 'a' => 1, 'b' => 2 }) }],
         [{ a_string_that_looks_like_int: '123' }, { a_string_that_looks_like_int: 123 }],
+        [{ a_string_that_looks_like_a_negative_int: '-123' }, { a_string_that_looks_like_a_negative_int: -123 }],
         [{ a_string_that_almost_looks_like_int: '0123' }, { a_string_that_almost_looks_like_int: '0123' }],
         [{ an_array_with_almost_int: ['0123', '123'] }, { an_array_with_almost_int: ['0123', 123] }],
         [{ a_string: 'abc' }, { a_string: 'abc' }],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filterrific
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Jo Hund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,6 +107,7 @@ files:
 - lib/filterrific/action_view_extension.rb
 - lib/filterrific/active_record_extension.rb
 - lib/filterrific/engine.rb
+- lib/filterrific/has_reset_filterrific_url_mixin.rb
 - lib/filterrific/param_set.rb
 - lib/filterrific/version.rb
 - spec/filterrific/action_controller_extension_spec.rb