filterrific 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 771515c7025eb50eb134294d03a3a92006e7bd13
-  data.tar.gz: 050cae50516c688d0decb04e42867ea6b850368e
+  metadata.gz: 71ecbc7a011b1dee80252eb991f52226d43b667c
+  data.tar.gz: d802da3c9c28703e80a4756e9ef2ef9f05c77d2a
 SHA512:
-  metadata.gz: 4acf9f6d39fa6c2aa6bd1820fbfe760ca39df1acd19494cd9010afc5ae027d625291a34ad42f5ded6b737ac3a60a5ca143e9559c79fa2f40dd87df6e38417024
-  data.tar.gz: 6c15ede2f3ab0f0cf36a885dbc4d9826c13fa37978a916aed0718e123644efee580b7468178edd339490975fb58605dc1dcb7737d6287e57f0f739ab2cef3a13
+  metadata.gz: 9db85bf8387da951cee9db1271adb80a9e0ac8df13050272c9764a8cce28d212de28fa1390ae93922906b9e14b75a98931e8bd54206a2bb3b30fc0e1aef151ef
+  data.tar.gz: 30f5409875bd7183bdfc66ab3339a1ecaa6170751cf803129c641d46f61311b7a6ce2b086e7c4dfb48aa331e79c56ee11235fe71b38ca6ecc2d0dee3e4e4af99

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Filterrific major versions match the Ruby on Rails major versions they work with.
 
+## [4.0.0] - Dec. 31, 2017
+
+* This is the first release of Filterrific specifically geared towards Rails 4.x. No functional changes, just new versioning system and removal of unused code.
+
 ## [3.0.0] - Dec. 31, 2017
 
 * This is the first release of Filterrific specifically geared towards Rails 3.x. No functional changes, just new versioning system and removal of unused code.

data/README.md

@@ -1,24 +1,17 @@
-# Filterrific
+Filterrific
+===========
 
 Filterrific is a Rails Engine plugin that makes it easy to filter,
 search, and sort your ActiveRecord lists:
 
-
-### Features
-
-* Makes heavy use of ActiveRecord Scopes
-* ActionController helpers to shuttle filter params from ActionView forms to ActiveRecord based models, and to return matching records back from ActiveRecord to ActionView.
-* Form helpers to build powerful search and filter forms with ease.
-* Javascript assets to auto-submit filter form on change via AJAX.
-* Image asset to show a spinner in the Filterrific form when new records are being loaded via AJAX.
-* API option to use Filterrific with Rails API mode. Just use `gem 'filterrific', require: 'filterrific_api'` in your Gemfile.
-
 ***
 
 ![A filterrific enhanced list](https://github.com/jhund/filterrific/blob/gh-pages/images/screenshot_s.png)
 
 ***
 
+Make sure to go to the fantastic [Filterrific documentation](http://filterrific.clearcove.ca)
+to find out more!
 
 ### Installation
 
@@ -29,12 +22,6 @@ or with bundler in your Gemfile:
 `gem 'filterrific'`
 
 
-### Usage
-
-Make sure to go to the fantastic [Filterrific documentation](http://filterrific.clearcove.ca)
-to find out more!
-
-
 ### Compatibility
 
 Every commit to Filterrific is automatically tested against the following scenarios:
@@ -42,16 +29,11 @@ Every commit to Filterrific is automatically tested against the following scenar
 | Rails version | Ruby environments              | Database adapters                  | Build status |
 |---------------|--------------------------------|------------------------------------|--------------|
 | Rails 5.x     | MRI 2.0.0, 2.1.7, 2.2.3, 2.3.1 | mysql2, postgresql                 |[![Build Status](https://travis-ci.org/jhund/filterrific_demo.svg?branch=rails-5.x)](https://travis-ci.org/jhund/filterrific_demo)|
-| Rails 4.2     | MRI 2.0.0, 2.1.7, 2.2.3, 2.3.1 | mysql, mysql2, postgresql, sqlite3 |[![Build Status](https://travis-ci.org/jhund/filterrific_demo.svg?branch=rails-4.2)](https://travis-ci.org/jhund/filterrific_demo)|
-| Rails 4.1     | MRI 2.0.0, 2.1.7, 2.2.3, 2.3.1 | mysql, mysql2, postgresql, sqlite3 |[![Build Status](https://travis-ci.org/jhund/filterrific_demo.svg?branch=rails-4.1)](https://travis-ci.org/jhund/filterrific_demo)|
-| Rails 4.0     | MRI 2.0.0, 2.1.7, 2.2.3, 2.3.1 | mysql, mysql2, postgresql, sqlite3 |[![Build Status](https://travis-ci.org/jhund/filterrific_demo.svg?branch=rails-4.0)](https://travis-ci.org/jhund/filterrific_demo)|
-| Rails 3.2     | MRI 2.0.0, 2.1.7               | mysql, mysql2, postgresql, sqlite3 |[![Build Status](https://travis-ci.org/jhund/filterrific_demo.svg?branch=rails-3.2)](https://travis-ci.org/jhund/filterrific_demo)|
-
-Filterrific version 1.x should work on older versions of Rails and Ruby, however
-the 1.x branch is not supported any more.
+| Rails 4.x     | MRI 2.0.0, 2.1.7, 2.2.3, 2.3.1 | mysql2, postgresql                 |[![Build Status](https://travis-ci.org/jhund/filterrific_demo.svg?branch=rails-4.x)](https://travis-ci.org/jhund/filterrific_demo)|
 
-Filterrific up to version 2.1.0 should work on Ruby 1.9.3, however we're not testing it any more. Time to move on to a more current version of Ruby.
+Filterrific up to version 2.1.x should work on Rails 3.2 and Ruby 1.9.3. I stopped testing it though as it became too cumbersome to manage gem dependencies.
 
+Filterrific version 1.x should work on versions prior to Rails 3.2 and older Rubies, however the 1.x branch is not supported any more.
 
 ### Guidelines for submitting issues
 
@@ -91,4 +73,4 @@ If you think you've found a bug, or have a feature request, then create an issue
 
 ### Copyright
 
-Copyright (c) 2010 - 2018 Jo Hund. See [(MIT) LICENSE](https://github.com/jhund/filterrific/blob/master/MIT-LICENSE) for details.
+Copyright (c) 2010 - 2017 Jo Hund. See [(MIT) LICENSE](https://github.com/jhund/filterrific/blob/master/MIT-LICENSE) for details.

data/doc/meta.md

@@ -9,10 +9,7 @@ For more info see: https://github.com/svenfuchs/gem-release#usage
 ## Steps for an update
 
 1. Update code and commit it.
-2. Add entry to CHANGELOG and commit it:
-   * h1 for major release
-   * h2 for minor release
-   * h3 for patch release
+2. Add entry to CHANGELOG and commit it.
 3. Bump the version with one of these commands:
    * `gem bump --version 1.1.1` # Bump the gem version to the given version number
    * `gem bump --version major` # 0.0.1 -> 1.0.0

data/lib/filterrific.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-if Rails::VERSION::MAJOR != 3
-  raise "\n\nThis version of Filterrific only works with Rails 3.x.\nPlease see the Filterrific README for the correct version of Filterrific to use with your version of Rails!\n\n"
+if Rails::VERSION::MAJOR != 4
+  raise "\n\nThis version of Filterrific only works with Rails 4.x.\nPlease see the Filterrific README for the correct version of Filterrific to use with your version of Rails!\n\n"
 end
 
 require 'filterrific/version'

data/lib/filterrific/action_controller_extension.rb

@@ -27,6 +27,8 @@ module Filterrific
     #   dynamic values.
     # @return [Filterrific::ParamSet]
     def initialize_filterrific(model_class, filterrific_params, opts = {})
+      # We used #deep_stringify_keys, however that breaks on Rails 3.x, so we
+      # went back to #stringify_keys which should be sufficient.
       f_params = (filterrific_params || {}).stringify_keys
       opts = opts.stringify_keys
       pers_id = if false == opts['persistence_id']

data/lib/filterrific/active_record_extension.rb

@@ -54,9 +54,12 @@ module Filterrific
       ar_rel = if ActiveRecord::Relation === self
         # self is already an ActiveRecord::Relation, use as is
         self
-      else
-        # Send `:scoped` to class to get an ActiveRecord::Relation
+      elsif Rails::VERSION::MAJOR <= 3
+        # Active Record 3: send `:scoped` to class to get an ActiveRecord::Relation
         scoped
+      else
+        # Active Record 4 and later: Send `:all` to class to get an ActiveRecord::Relation
+        all
       end
 
       # Apply filterrific params

data/lib/filterrific/param_set.rb

@@ -29,7 +29,17 @@ module Filterrific
       # will be already initialized with the defaults.
       filterrific_params = model_class.filterrific_default_filter_params  if filterrific_params.blank?
       if defined?(ActionController::Parameters) && filterrific_params.is_a?(ActionController::Parameters)
-        filterrific_params = filterrific_params.permit(model_class.filterrific_available_filters).to_h.stringify_keys
+        permissible_filter_params = []
+        model_class.filterrific_available_filters.each do |p|
+          if filterrific_params[p].is_a?(ActionController::Parameters)
+            permissible_filter_params << { p => filterrific_params[p].keys }
+          elsif filterrific_params[p].is_a?(Array)
+            permissible_filter_params << { p => [] }
+          else
+            permissible_filter_params << p
+          end
+        end
+        filterrific_params = filterrific_params.permit(permissible_filter_params).to_h.stringify_keys
       else
         filterrific_params.stringify_keys!
       end

data/lib/filterrific/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filterrific
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Jo Hund