filterrific 5.2.3 → 5.2.4

data/spec/filterrific/param_set_spec.rb

@@ -1,153 +1,136 @@
-require 'spec_helper'
-require 'filterrific/param_set'
+require "spec_helper"
+require "filterrific/param_set"
 
 module Filterrific
+  # Container for test data
+  class TestData
+    def self.filterrific_available_filters
+      %w[
+        filter_almost_int
+        filter_array_int
+        filter_array_string
+        filter_hash
+        filter_hyphen
+        filter_int
+        filter_negative_int
+        filter_proc
+        filter_string
+        filter_zero
+      ]
+    end
 
-  describe ParamSet do
-
-    # Container for test data
-    class TestData
-
-      def self.filterrific_available_filters
-        %w[
-          filter_almost_int
-          filter_array_int
-          filter_array_string
-          filter_hash
-          filter_hyphen
-          filter_int
-          filter_negative_int
-          filter_proc
-          filter_string
-          filter_zero
-        ]
-      end
-
-      def self.filterrific_default_filter_params
-        { 'filter_int' => 42 }
-      end
-
-      def self.filterrific_params
-        {
-          'filter_almost_int' => '042',
-          'filter_array_int' => %w[1 2 3],
-          'filter_array_string' => %w[one two three],
-          'filter_hash' => { a: 1, b: 2 },
-          'filter_hyphen' => '-',
-          'filter_int' => '42',
-          'filter_negative_int' => '-42',
-          'filter_proc' => lambda { 1 + 1 },
-          'filter_string' => 'forty-two',
-          'filter_zero' => '0',
-        }
-      end
-
-      def self.filterrific_params_after_conditioning
-        {
-          'filter_almost_int' => '042',
-          'filter_array_int' => [1, 2, 3],
-          'filter_array_string' => %w[one two three],
-          'filter_hash' => OpenStruct.new(a: 1, b: 2),
-          'filter_hyphen' => '-',
-          'filter_int' => 42,
-          'filter_negative_int' => -42,
-          'filter_proc' => 2,
-          'filter_string' => 'forty-two',
-          'filter_zero' => 0,
-        }
-      end
+    def self.filterrific_default_filter_params
+      {"filter_int" => 42}
+    end
 
-      def self.filterrific_params_as_hash
-        {
-          'filter_almost_int' => '042',
-          'filter_array_int' => [1, 2, 3],
-          'filter_array_string' => %w[one two three],
-          'filter_hash' => { a: 1, b: 2 },
-          'filter_hyphen' => '-',
-          'filter_int' => 42,
-          'filter_negative_int' => -42,
-          'filter_proc' => 2,
-          'filter_string' => 'forty-two',
-          'filter_zero' => 0,
-        }
-      end
+    def self.filterrific_params
+      {
+        "filter_almost_int" => "042",
+        "filter_array_int" => %w[1 2 3],
+        "filter_array_string" => %w[one two three],
+        "filter_hash" => {a: 1, b: 2},
+        "filter_hyphen" => "-",
+        "filter_int" => "42",
+        "filter_negative_int" => "-42",
+        "filter_proc" => lambda { 1 + 1 },
+        "filter_string" => "forty-two",
+        "filter_zero" => "0"
+      }
+    end
 
+    def self.filterrific_params_after_conditioning
+      {
+        "filter_almost_int" => "042",
+        "filter_array_int" => [1, 2, 3],
+        "filter_array_string" => %w[one two three],
+        "filter_hash" => OpenStruct.new(a: 1, b: 2),
+        "filter_hyphen" => "-",
+        "filter_int" => 42,
+        "filter_negative_int" => -42,
+        "filter_proc" => 2,
+        "filter_string" => "forty-two",
+        "filter_zero" => 0
+      }
     end
 
-    # Simulates a class that would include the filterrific directive
-    class ModelClass
+    def self.filterrific_params_as_hash
+      {
+        "filter_almost_int" => "042",
+        "filter_array_int" => [1, 2, 3],
+        "filter_array_string" => %w[one two three],
+        "filter_hash" => {a: 1, b: 2},
+        "filter_hyphen" => "-",
+        "filter_int" => 42,
+        "filter_negative_int" => -42,
+        "filter_proc" => 2,
+        "filter_string" => "forty-two",
+        "filter_zero" => 0
+      }
+    end
+  end
 
-      def self.filterrific_default_filter_params
-        TestData.filterrific_default_filter_params
-      end
-      def self.filterrific_available_filters
-        TestData.filterrific_available_filters
-      end
+  # Simulates a class that would include the filterrific directive
+  class ModelClass
+    def self.filterrific_default_filter_params
+      TestData.filterrific_default_filter_params
+    end
 
+    def self.filterrific_available_filters
+      TestData.filterrific_available_filters
     end
+  end
 
-    let(:filterrific_param_set){
-      Kernel::silence_warnings {
+  describe ParamSet do
+    let(:filterrific_param_set) {
+      Kernel.silence_warnings {
         Filterrific::ParamSet.new(ModelClass, TestData.filterrific_params)
       }
     }
 
     describe "initialization" do
-
       it "assigns resource class" do
         filterrific_param_set.model_class.must_equal(ModelClass)
       end
 
       describe "dynamic filter_name attr_accessors" do
-
         TestData.filterrific_available_filters.each do |filter_name|
-
-          it "defines a getter for '#{ filter_name }'" do
+          it "defines a getter for '#{filter_name}'" do
             filterrific_param_set.must_respond_to(filter_name)
           end
 
-          it "defines a setter for '#{ filter_name }'" do
-            filterrific_param_set.must_respond_to("#{ filter_name }=")
+          it "defines a setter for '#{filter_name}'" do
+            filterrific_param_set.must_respond_to("#{filter_name}=")
           end
-
         end
 
         TestData.filterrific_params.keys.each do |key|
-
-          it "assigns conditioned param to '#{ key }' attr" do
+          it "assigns conditioned param to '#{key}' attr" do
             filterrific_param_set.send(key).must_equal(TestData.filterrific_params_after_conditioning[key])
           end
-
         end
-
       end
-
     end
 
-    describe 'find' do
-      it 'responds to #find' do
+    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_as_hash
         )
       end
-
     end
 
     describe "to_json" do
-
       it "returns all filterrific_params as json string" do
         filterrific_param_set.to_json.must_equal(
           TestData.filterrific_params_as_hash.to_json
         )
       end
-
     end
 
     describe "#select_options" do
@@ -175,26 +158,23 @@ module Filterrific
     end
 
     describe "#condition_filterrific_params" do
-
       [
-        [{ a_proc: lambda { 1 + 1 } }, { a_proc: 2 }],
-        [{ 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' }],
+        [{a_proc: lambda { 1 + 1 }}, {a_proc: 2}],
+        [{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"}]
       ].each do |test_params, xpect|
-        it "Handles #{ test_params.inspect }" do
+        it "Handles #{test_params.inspect}" do
           filterrific_param_set.send(
             :condition_filterrific_params,
             test_params
           ).must_equal(xpect)
         end
       end
-
     end
-
   end
 end

data/spec/filterrific_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Filterrific do
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 ENV["RAILS_ENV"] = "test"
-require 'bundler/setup'
-require 'minitest/autorun'
-require 'rails'
-require 'filterrific'
+require "bundler/setup"
+require "minitest/autorun"
+require "rails"
+require "filterrific"
 
-#MiniTest::Unit.autorun
+# MiniTest::Unit.autorun

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filterrific
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.2.4
 platform: ruby
 authors:
 - Jo Hund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies: []
 description: Filterrific is a Rails Engine plugin that makes it easy to filter, search,
   and sort your ActiveRecord lists.
@@ -22,7 +22,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/filterrific/filterrific-spinner.gif
-- app/assets/javascripts/filterrific/filterrific-jquery.js
+- app/assets/javascripts/filterrific/filterrific.js
 - bin/rails
 - doc/Overview diagram.graffle/data.plist
 - doc/Overview diagram.graffle/image1.tiff

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

@@ -1,118 +0,0 @@
-/**
- * Javascript behaviors for Filterrific.
- * http://filterrific.clearcove.ca
- *
- * Requires jQuery 1.7.0 or later.
- *
- * Released under the MIT license
- *
- */
-
-
-
-// Create global Filterrific namespace
-if (typeof Filterrific === 'undefined') {
-  var Filterrific = {};
-}
-
-
-
-// Define function to submit Filterrific filter form
-Filterrific.submitFilterForm = function(){
-  var form = $(this).parents("form"),
-      url = form.attr("action");
-  // send before event
-  $(form).trigger('loadingFilterrificResults');
-  // turn on spinner
-  $('.filterrific_spinner').show();
-
-  // Abort previous ajax request
-  if (Filterrific.lastRequest && Filterrific.lastRequest.readyState != 4) {
-    Filterrific.lastRequest.abort();
-  }
-
-  // Submit ajax request
-  Filterrific.lastRequest = $.ajax({
-    url: url,
-    data: form.serialize(),
-    type: 'GET',
-    dataType: 'script'
-  }).done(function( msg ) {
-    // send after event
-    $(form).trigger('loadedFilterrificResults');
-    $('.filterrific_spinner').hide();
-  });
-};
-
-
-
-//
-// Embed jquery.observe_field.js to observe Filterrific filter inputs
-//
-// Copied from https://github.com/splendeo/jquery.observe_field
-// Wrap in immediately invoked function for compatibility with other js libraries
-//
-(function($) {
-
-  $.fn.filterrific_observe_field = function(frequency, callback) {
-    frequency = frequency * 1000; // translate to milliseconds
-    return this.each(function(){
-      var $this = $(this);
-      var prev = $this.val();
-      var check = function() {
-        if(removed()){ // if removed clear the interval and don't fire the callback
-          if(ti) clearInterval(ti);
-          return;
-        }
-        var val = $this.val();
-        if(prev != val){
-          prev = val;
-          $this.map(callback); // invokes the callback on $this
-        }
-      };
-      var removed = function() {
-        return $this.closest('html').length == 0
-      };
-      var reset = function() {
-        if(ti){
-          clearInterval(ti);
-          ti = setInterval(check, frequency);
-        }
-      };
-      check();
-      var ti = setInterval(check, frequency); // invoke check periodically
-      // reset counter after user interaction
-      $this.bind('keyup click mousemove', reset); //mousemove is for selects
-    });
-  };
-})(jQuery);
-
-
-Filterrific.init = function() {
-  // Add change event handler to all Filterrific filter inputs.
-  $('#filterrific_filter').on(
-    "change",
-    ":input",
-    Filterrific.submitFilterForm
-  );
-
-  // Add periodic observer to selected inputs.
-  // Use this for text fields you want to observe for change, e.g., a search input.
-  $(".filterrific-periodically-observed").filterrific_observe_field(
-    0.5,
-    Filterrific.submitFilterForm
-  );
-};
-
-
-// Initialize event observers on document ready and turbolinks page:load
-jQuery(document).on('turbolinks:load', function() {
-  // Prevent double initilisation. With turbolinks 5 this function
-  // will be called twice: on 'ready' and 'turbolinks:load'
-  jQuery(document).off('ready page:load')
-  Filterrific.init();
-});
-
-jQuery(document).on('ready page:load', function() {
-  Filterrific.init();
-});