filterer 1.0.2 → 2.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8c5e4ebbe2716f8bbb6b199fa58db26d536cdaa
-  data.tar.gz: 3dbe734ec47b6942f1632995cf6481024d721b48
+  metadata.gz: e4c80e1f46cf7a449a248bd2098a0cf25a2533f3
+  data.tar.gz: ed7d30e5cb98b8b906d8c92d5c0c0a351bcc4566
 SHA512:
-  metadata.gz: 36d5f7860944f04ce7c22c3118ae45367625472a7c414191a7f0771e32e593b63b20a1aa6f30136026a08860436f42c21c4443a0e9284873135068037feb0aa5
-  data.tar.gz: 54aaf732a80fe0fa6ac8142e839dd8380011bd6819c9f7bea7acd56eeab944832d63917a1538daa9f0d2ee4aad00671d38b4c134ca08070e38a64af1a821f295
+  metadata.gz: f264ae332fd44cf42559a460a4455e58a737b106a5e3979473107fec4cafa6654b9606643990d5f9cb66b69554840030080fcc2c171fe9d7bd98cff5ae7a5ada
+  data.tar.gz: dfe8ec0acd0c53303729459f521a4c7314782d00de12c859e25b569e2b70dcb887b00101f9a4234d1e473cd5c9c4e3d7b71d8b2c124d2113651c9a124baf561d

data/lib/filterer/active_record.rb

@@ -2,18 +2,23 @@ module Filterer
   module ActiveRecord
     extend ActiveSupport::Concern
 
-    included do
-      def self.filter(params = {}, opts = {})
-        filterer_class(opts[:filterer_class]).
-          filter(params, { starting_query: all }.merge(opts))
+    class_methods do
+      def filter(params = {}, opts = {})
+        delegate_to_filterer(:filter, params, opts)
+      end
+
+      def chain(params = {}, opts = {})
+        delegate_to_filterer(:chain, params, opts)
       end
 
-      def self.chain(params = {}, opts = {})
+      private
+
+      def delegate_to_filterer(method, params, opts)
         filterer_class(opts[:filterer_class]).
-          chain(params, { starting_query: all }.merge(opts))
+          send(method, params, { starting_query: all }.merge(opts))
       end
 
-      def self.filterer_class(override)
+      def filterer_class(override)
         if override
           override.constantize
         else

data/lib/filterer/base.rb

@@ -72,11 +72,12 @@ module Filterer
 
     def initialize(params = {}, opts = {})
       self.opts = opts
-      self.params = defaults.merge(params).with_indifferent_access
+      self.params = defaults.merge(parse_strong_parameters(params)).
+                      with_indifferent_access
       self.results = opts[:starting_query] || starting_query
       self.results = apply_default_filters || results
       add_params_to_query
-      order_results unless opts[:skip_ordering]
+      self.results = ordered_results unless opts[:skip_ordering]
       paginate_results unless opts[:skip_pagination]
       extend_active_record_relation
     end
@@ -137,7 +138,7 @@ module Filterer
         method_name = "param_#{k}"
 
         if respond_to?(method_name)
-          self.results = send(method_name, v)
+          self.results = send(method_name, v) || results
         end
       end
     end
@@ -148,22 +149,14 @@ module Filterer
       end
     end
 
-    def order_results
-      self.results = if !sort_option
-                       order_by_sort_option(default_sort_option)
-                     elsif sort_option[:string_or_proc].is_a?(String)
-                       order_by_sort_option(sort_option)
-                     elsif sort_option[:string_or_proc].is_a?(Proc)
-                       sort_string = sort_proc_to_string(sort_option)
-
-                       if sort_string
-                         order_by_sort_option(sort_option.merge(
-                           string_or_proc: sort_string
-                         ))
-                       else
-                         order_by_sort_option(filterer_default_sort_option)
-                       end
-                     end
+    def ordered_results
+      if sort_option && sort_option[:string_or_proc].is_a?(String)
+        order_by_sort_option(sort_option)
+      elsif sort_option && sort_option[:string_or_proc].is_a?(Proc)
+        order_by_sort_proc
+      else
+        order_by_sort_option(default_sort_option)
+      end
     end
 
     def per_page
@@ -194,6 +187,16 @@ module Filterer
       end
     end
 
+    def order_by_sort_proc
+      if (sort_string = sort_proc_to_string(sort_option))
+        order_by_sort_option(sort_option.merge(
+          string_or_proc: sort_string
+        ))
+      else
+        order_by_sort_option(filterer_default_sort_option)
+      end
+    end
+
     def order_by_sort_option(opt)
       results.order %{
         #{opt[:string_or_proc]}
@@ -238,5 +241,9 @@ module Filterer
         end
       end
     end
+
+    def parse_strong_parameters(params)
+      params.try(:to_unsafe_h) || params
+    end
   end
 end

data/lib/filterer/version.rb

@@ -1,3 +1,3 @@
 module Filterer
-  VERSION = '1.0.2'
+  VERSION = '2.0.0.beta.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filterer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0.beta.1
 platform: ruby
 authors:
 - Adam Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Filterer lets your users easily filter results from your ActiveRecord
   models.
 email:
@@ -199,9 +171,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -209,4 +181,3 @@ signing_key:
 specification_version: 4
 summary: Easily filter results from your ActiveRecord models.
 test_files: []
-has_rdoc: