filterer 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31f109e6bfe9ea0564189c48c3cea45762202cdc
-  data.tar.gz: b0db1c21bb5cd14fe2672d294ee663bfc66a2886
+  metadata.gz: a5594041bdf01012c2ec2e828a7a553b1f211edd
+  data.tar.gz: 6ec0e36661c373bfba1f50fed9fe092c7bfea135
 SHA512:
-  metadata.gz: ad5add521ba1b92b2fe624ee8c06062dd4596a5ae68ffc01b33e34982bd8b42fdd631594b10cab38677914c709992bfe39f4216d5839a18e1a6ba96f8ea7de1f
-  data.tar.gz: 8af851433d0b36d46ba9bef2fd61d36baaf1cc25653485f0533d962760c653f06fa7573f9ef3187c5c17301be76c824828c17eb5b4e82c3d71ace4b3400321ee
+  metadata.gz: 639225bc7ff422f0079f829575d60d5baad174ec7a7a038385192a0bddde8fe51d37de3d10a1d63919c536fcb8f01f34bda502b2bf2ff2c2b9a7f46ed0d22d4e
+  data.tar.gz: 9ee0557b354736320cd1f7f0573464fa47cf1c1cdf775a2a3be44d50e0bdb4b7c8d0f257e06714bcad685dd153af355f4b11da622652965bf53aaaee996ca5aa

data/Rakefile

@@ -4,21 +4,7 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Formbuilder'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'

data/lib/filterer/base.rb

@@ -1,6 +1,6 @@
 module Filterer
   class Base
-    IGNORED_PARAMS = [:page]
+    IGNORED_PARAMS = %w(page)
 
     attr_accessor :results, :meta, :direction, :sort, :params, :opts
 
@@ -54,8 +54,12 @@ module Filterer
       end
     end
 
+    def defaults
+      {}
+    end
+
     def initialize(params = {}, opts = {})
-      @params, @opts = params, opts
+      @params, @opts = defaults.merge(params).with_indifferent_access, opts
       setup_meta
       find_results
     end
@@ -82,8 +86,9 @@ module Filterer
     def find_results
       @results = opts.delete(:starting_query) || starting_query
       add_params_to_query
-      return if @opts[:chainable]
+      return if @opts[:chainable] && !@opts[:include_ordering]
       order_results
+      return if @opts[:chainable]
       add_meta
       return if @opts[:meta_only]
 
@@ -101,7 +106,7 @@ module Filterer
     end
 
     def add_params_to_query
-      @params.reject { |k, v| k.in?(IGNORED_PARAMS) }
+      @params.reject { |k, v| k.to_s.in?(IGNORED_PARAMS) }
              .select { |k, v| v.present? }
              .each do |k, v|
 

data/lib/filterer/version.rb

@@ -1,3 +1,3 @@
 module Filterer
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filterer
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Adam Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -137,12 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Filterer lets your users easily filter results from your ActiveRecord
-  models. What does that mean? Let's imagine a page in your application that lists
-  the results of Person.all. What if you want to let your users filter the results
-  by name? Or email? Or whether or not the Person is an admin? Where does that logic
-  go? One answer could be your controller. That gets ugly fast. Another answer could
-  be in your models. But passing a bunch of query parameters to a model isn't really
-  a good practice either. Enter Filterer.
+  models.
 email:
 - adam@dobt.co
 executables: []