filterrific 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11a56a1d6587f1b007103d3f23906fe5cda61466
-  data.tar.gz: 7f33fc8e000fe7f7969cc6b8dfd057e6364c0518
+  metadata.gz: 22973115fb8e2d33a1d7e745f9fa8ec4e1fdb2f4
+  data.tar.gz: f08ad266412fa07cae094360180a0a02ec2e2ddd
 SHA512:
-  metadata.gz: 812ea2580b378e23db574823a3fa561d116773392698a7b5fa51e3bbbc90a7053fe000dc98622e15666d85b6e81a11e4560b08d578e7449e84a3d1de50a2728e
-  data.tar.gz: df6c4d694d297697fd3befc2702af6b65094a0631e457f22732cc44e216fb5c98b29c520a1ca23e754917675f46cca349d69ec6bb87f76ababed04791797bd8d
+  metadata.gz: e0bbf1cebbbd731472e6cdf21e20b42c1134df780bb00bf12c37f49af828f101c47c77a9e9f1efcf5bfbbfa7f04fd667e4c3c751a6c1bdb14a251ca73f1563a0
+  data.tar.gz: b93b3eff9d9b1f278237d65ecaaaeef9a5897bd53acd78c0d86426aed9bbdd95a9b5640684a5fd44a356d56af4ab9da26547ca6162e92b1d3a6e3e3085f6ae11

data/CHANGELOG.md

@@ -39,6 +39,13 @@
       },
     )
 
+### 2.0.2
+
+* Fixed bugs in ActionControllerExtension
+* Improved test coverage
+
+
+
 ### 2.0.1
 
 * Fixed regression with Rails 3.2 (doesn't support `#deep_stringify_keys`)

data/lib/filterrific/action_controller_extension.rb

@@ -37,7 +37,7 @@ module Filterrific
         redirect_to url_for({})  and return false # works with `or return` in calling action.
       end
 
-      f_params = compute_filterrific_params(model_class, f_params, opts)
+      f_params = compute_filterrific_params(model_class, f_params, opts, pi)
 
       filterrific = Filterrific::ParamSet.new(model_class, f_params)
       filterrific.select_options = opts['select_options']
@@ -55,14 +55,15 @@ module Filterrific
     # @param model_class [ActiveRecord::Base]
     # @param filterrific_params [Hash]
     # @param opts [Hash]
-    def compute_filterrific_params(model_class, filterrific_params, opts)
+    # @param persistence_id [String]
+    def compute_filterrific_params(model_class, filterrific_params, opts, persistence_id)
       r = (
         filterrific_params.presence || # start with passed in params
-        session[pi].presence || # then try session persisted params
+        session[persistence_id].presence || # then try session persisted params
         opts['default_filter_params'] || # then use passed in opts
         model_class.filterrific_default_filter_params # finally use model_class defaults
       ).stringify_keys
-      r.slice!(opts['available_filters'].map(&:to_s))  if opts['available_filters']
+      r.slice!(*opts['available_filters'].map(&:to_s))  if opts['available_filters']
       r
     end
 

data/lib/filterrific/version.rb

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

data/spec/filterrific/action_controller_extension_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+require 'filterrific/action_controller_extension'
+
+module Filterrific
+
+  class TestController
+    include ActionControllerExtension
+    def action_name; 'index'; end
+    def controller_name; 'test_controller'; end
+    def session
+      {
+        'test_controller#index' => {
+          'filter1' => '1_from_session',
+          'filter2' => '2_from_session',
+        }
+      }
+    end
+  end
+
+  class TestModelClass
+    def self.filterrific_available_filters; %w[filter1 filter2]; end
+    def self.filterrific_default_filter_params
+      { 'filter1' => '1_from_model_defaults' }
+    end
+  end
+
+  describe ActionControllerExtension do
+
+    describe '#initialize_filterrific' do
+
+      it 'returns a Filterrific::ParamSet' do
+        TestController.new.send(
+          :initialize_filterrific,
+          TestModelClass,
+          { 'filter1' => 1, 'filter2' => 2 },
+        ).must_be_instance_of(ParamSet)
+      end
+
+    end
+
+    describe '#compute_default_persistence_id' do
+
+      it 'computes the default persistence id from controller_name and action_name' do
+        TestController.new.send(
+          :compute_default_persistence_id
+        ).must_equal('test_controller#index')
+      end
+
+    end
+
+    describe '#compute_filterrific_params' do
+
+      it 'uses filterrific_params if given' do
+        TestController.new.send(
+          :compute_filterrific_params,
+          TestModelClass,
+          { 'filter1' => 1, 'filter2' => 2 },
+          { },
+          'test_controller#index'
+        ).must_equal({ 'filter1' => 1, 'filter2' => 2 })
+      end
+
+      it 'uses session if filterrific_params are blank' do
+        TestController.new.send(
+          :compute_filterrific_params,
+          TestModelClass,
+          {},
+          { },
+          'test_controller#index',
+        ).must_equal({ 'filter1' => '1_from_session', 'filter2' => '2_from_session' })
+      end
+
+      it "uses opts['default_filter_params'] if session is blank" do
+        TestController.new.send(
+          :compute_filterrific_params,
+          TestModelClass,
+          {},
+          { 'default_filter_params' => { 'filter1' => '1_from_opts' } },
+          'non existent persistence id to skip session',
+        ).must_equal({ 'filter1' => '1_from_opts' })
+      end
+
+      it "uses model default_filter_params if opts is blank" do
+        TestController.new.send(
+          :compute_filterrific_params,
+          TestModelClass,
+          {},
+          { },
+          'non existent persistence id to skip session',
+        ).must_equal({ 'filter1' => '1_from_model_defaults' })
+      end
+
+      it "limits filter params to opts['available_filters']" do
+        TestController.new.send(
+          :compute_filterrific_params,
+          TestModelClass,
+          { 'filter1' => 1, 'filter2' => 2 },
+          { 'available_filters' => %w[filter1] },
+          'test_controller#index'
+        ).must_equal({ 'filter1' => 1 })
+      end
+
+    end
+
+  end
+end

data/spec/filterrific/action_view_extension_spec.rb

@@ -9,15 +9,20 @@ module Filterrific
 
   describe ActionViewExtension do
 
-    describe '#render_filterrific_spinner' do
-      it "renders filterrific spinner" do
-        ViewContext.new.must_respond_to(:render_filterrific_spinner)
-      end
+    it 'responds to #form_for_filterrific' do
+      ViewContext.new.must_respond_to(:form_for_filterrific)
     end
 
-    describe '#filterrific_sorting_link' do
-      it 'changes sorting on new column' do
-      end
+    it 'responds to #render_filterrific_spinner' do
+      ViewContext.new.must_respond_to(:render_filterrific_spinner)
+    end
+
+    it 'responds to #filterrific_sorting_link' do
+      ViewContext.new.must_respond_to(:filterrific_sorting_link)
+    end
+
+    it 'responds to #reset_filterrific_url' do
+      ViewContext.new.must_respond_to(:reset_filterrific_url)
     end
 
   end

data/spec/filterrific/active_record_extension_spec.rb

@@ -45,11 +45,15 @@ module Filterrific
     describe "Filterrific initialization" do
 
       it "initializes filterrific_available_filters" do
-        filterrific_class.filterrific_available_filters.must_equal(TestData.filterrific_available_filters)
+        filterrific_class.filterrific_available_filters.must_equal(
+          TestData.filterrific_available_filters
+        )
       end
 
       it "initializes filterrific_default_filter_params" do
-        filterrific_class.filterrific_default_filter_params.must_equal(TestData.filterrific_default_filter_params)
+        filterrific_class.filterrific_default_filter_params.must_equal(
+          TestData.filterrific_default_filter_params
+        )
       end
 
       it "raises when no filter_names are given" do

data/spec/filterrific/param_set_spec.rb

@@ -92,10 +92,18 @@ module Filterrific
 
     end
 
+    describe 'find' do
+      it 'responds to #find' do
+        filterrific_param_set.must_respond_to(:find)
+      end
+    end
+
     describe "to_hash" do
 
       it "returns all filterrific_params as hash" do
-        filterrific_param_set.to_hash.must_equal(TestData.filterrific_params_after_sanitizing)
+        filterrific_param_set.to_hash.must_equal(
+          TestData.filterrific_params_after_sanitizing
+        )
       end
 
     end
@@ -103,7 +111,9 @@ module Filterrific
     describe "to_json" do
 
       it "returns all filterrific_params as json string" do
-        filterrific_param_set.to_json.must_equal(TestData.filterrific_params_after_sanitizing.to_json)
+        filterrific_param_set.to_json.must_equal(
+          TestData.filterrific_params_after_sanitizing.to_json
+        )
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filterrific
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jo Hund
@@ -109,6 +109,7 @@ files:
 - lib/filterrific/engine.rb
 - lib/filterrific/param_set.rb
 - lib/filterrific/version.rb
+- spec/filterrific/action_controller_extension_spec.rb
 - spec/filterrific/action_view_extension_spec.rb
 - spec/filterrific/active_record_extension_spec.rb
 - spec/filterrific/param_set_spec.rb