filterrific 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 818d80584a2a4db43f268028613b856a6ef52528
-  data.tar.gz: 3744f644a940ddccbb6233027a7a4b919e009547
+  metadata.gz: dfb96075da4c30641cdfb5fdf747706a310f0324
+  data.tar.gz: fc4f107545fa2838949eb88be2b0beee14927d14
 SHA512:
-  metadata.gz: f7e1fe41394af2fc4e59e9daa1f0523d3b67a1d93288b047f5b76b8962adb84c7d0f61645639fa28d8cca5e6a2ed133fd01b927c7feea182040a4b9d35e0cc08
-  data.tar.gz: 61bf2d0d764c43a252b637ade5b0f4161541d9aeb8ed9b4623acf07a1a96e9dd67023bb8dcc1820df3a8d97c78ba2e15daf7bc5d41281a1be20dfd395473b238
+  metadata.gz: 32d36a46d02d7fd55951b41c05e54022696dcccee1cb184fdf6da63bf469104e8279141a7fd620a4dbb49a24c8f579a58a4646963ef632f3672f75c8478d95b2
+  data.tar.gz: 1d427b2a134182022656d1ef5cc3347e2c3f05d9fdcb4bb81cb8d8ad15a1f0cac7e6266f73670dd979df1afa30433e4ba93ca1ef380837a41ef4f79fa6f0c372

data/CHANGELOG.md

@@ -46,6 +46,9 @@ API changes
 * Dropped support for Rails <= 3.0.0 (because of ActiveRecord
   bug fixes in 3.1, and use of asset pipeline)
 
+### 1.4.3
+
+* Handle case where Filterrific filter params are empty.
 
 ### 1.4.2
 

data/README.md

@@ -1,8 +1,14 @@
 Filterrific
 ===========
 
-Filterrific is a Rails Engine plugin that makes it easy to add filtering,
-searching, and sorting to your ActiveRecord lists.
+Filterrific is a Rails Engine plugin that makes it easy to filter,
+search, and sort your ActiveRecord lists:
+
+***
+
+![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!
@@ -43,6 +49,7 @@ I'm happy to help you if you encounter problems when using filterrific. You'll m
     * what version of Ruby are you using? (run `ruby -v` in your app root)
 * If you get an exception, include the entire stack trace, including the error message.
 * Include any relevant code snippets (your model, controller, and view code).
+* When pasting code, please use [markdown code  formatting](https://help.github.com/articles/github-flavored-markdown/#fenced-code-blocks). It will be much easier to read.
 
 
 ### Resources
@@ -66,4 +73,4 @@ I'm happy to help you if you encounter problems when using filterrific. You'll m
 
 ### Copyright
 
-Copyright (c) 2010 - 2014 Jo Hund. See [(MIT) LICENSE](https://github.com/jhund/filterrific/blob/master/MIT-LICENSE) for details.
+Copyright (c) 2010 - 2015 Jo Hund. See [(MIT) LICENSE](https://github.com/jhund/filterrific/blob/master/MIT-LICENSE) for details.

data/doc/rails_conf_talk.md

@@ -0,0 +1,33 @@
+# Filterrific Rails Conf Talk
+
+
+Topics to cover:
+
+* filter and sort ActiveRecord lists end to end with lots of code
+* AR scope patterns
+* advanced use cases
+    * export to CSV/XLS
+    * saved searches
+    * full text search
+    * multiple form inputs for single scope
+    * checkbox arrays (collection_check_boxes)
+* filter persistence strategies
+    * session
+    * none (query param)
+    * database (saved searches)
+
+Target audience:
+
+* intermediate
+
+
+Title ideas:
+
+* Tame/awesomify your ActiveRecord lists with Filterrific
+* Dive deep into ActiveRecord scopes, and learn about Filterrific
+* Slice and dice your data in many ways with AR scopes and Filterrific
+
+Other talk ideas (possibly lightning talks?):
+
+* How to safely mutate objects in Rails
+* Service objects, DCI, processors: all dependencies go in one direction

data/doc/scratchpad.md

@@ -25,6 +25,7 @@ Ruby 1.8.7
 Ruby 1.9.3
 Ruby 2.0
 Ruby 2.1
+Ruby 2.2    No         No         No         No
 
 Each combination is also tested for postgres and mysql
 

data/lib/filterrific/action_view_extension.rb

@@ -58,6 +58,7 @@ module Filterrific
     def filterrific_sorting_link(filterrific, sort_key, options = {})
       options = {
         :active_column_class => 'filterrific_current_sort_column',
+        :inactive_column_class => 'filterrific_sort_column',
         :ascending_indicator => '⬆',
         :default_sort_direction => 'asc',
         :descending_indicator => '⬇',
@@ -96,6 +97,10 @@ module Filterrific
         # new sort column, change sort column
         new_sort_direction = options[:default_sort_direction]
         new_sorting = [new_sort_key, new_sort_direction].join('_')
+        css_classes = [
+          options[:inactive_column_class],
+          options[:html_attrs].delete(:class)
+        ].compact.join(' ')
         new_filterrific_params = filterrific.to_hash
                                             .with_indifferent_access
                                             .merge(options[:sorting_scope_name] => new_sorting)
@@ -103,7 +108,7 @@ module Filterrific
         link_to(
           options[:label],
           url_for(url_for_attrs),
-          options[:html_attrs].reverse_merge(:method => :get, :remote => true)
+          options[:html_attrs].reverse_merge(:class => css_classes, :method => :get, :remote => true)
         )
       end
     end

data/lib/filterrific/active_record_extension.rb

@@ -41,17 +41,26 @@ module Filterrific
         raise(ArgumentError, "Invalid Filterrific::ParamSet: #{ filterrific_param_set.inspect }")
       end
 
-      # set initial ar_proxy to including class
-      ar_proxy = self
+      # initialize active record relation
+      ar_rel = if ::ActiveRecord::Relation === self
+        # self is already an ActiveRecord::Relation, use as is
+        self
+      elsif 3 >= Rails::VERSION::MAJOR
+        # 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
       self.filterrific_filter_names.each do |filter_name|
         filter_param = filterrific_param_set.send(filter_name)
         next if filter_param.blank? # skip blank filter_params
-        ar_proxy = ar_proxy.send(filter_name, filter_param)
+        ar_rel = ar_rel.send(filter_name, filter_param)
       end
 
-      ar_proxy
+      ar_rel
     end
 
   protected

data/lib/filterrific/version.rb

@@ -1,3 +1,3 @@
 module Filterrific
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/spec/filterrific/active_record_extension_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'active_record'
 require 'filterrific/active_record_extension'
 
-ActiveRecord::Base.extend Filterrific::ActiveRecordExtension::ClassMethods
+ActiveRecord::Base.extend Filterrific::ActiveRecordExtension
 
 module Filterrific
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filterrific
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Jo Hund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,8 +80,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.5
-description: Filterrific is a Rails Engine plugin that makes it easy to add filtering,
-  searching, and sorting to your ActiveRecord lists.
+description: Filterrific is a Rails Engine plugin that makes it easy to filter, search,
+  and sort your ActiveRecord lists.
 email: jhund@clearcove.ca
 executables: []
 extensions: []
@@ -101,6 +101,7 @@ files:
 - doc/development_notes/model_api.rb
 - doc/development_notes/view_api.txt
 - doc/meta.md
+- doc/rails_conf_talk.md
 - doc/scratchpad.md
 - lib/filterrific.rb
 - lib/filterrific/action_view_extension.rb
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Rails engine plugin for filtering ActiveRecord lists.