filterer 1.0.0.beta.2 → 1.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14259ef77061c26e563a431f2aee2b43d4f0828c
-  data.tar.gz: 1f1c53649481c320639e4cb64fe2e01cbe3d33d8
+  metadata.gz: 7b64e1009c98554934753968a12b66710e022918
+  data.tar.gz: ead6c3855b4285718d8a1bf503adb342eb4ae476
 SHA512:
-  metadata.gz: 7c64ec8f29c0f2e7d1f19388afa7dc4c5fc3e9bacc55a484647783106de139acdb677a950c42a3d6f85d86a7161c8baf77f4143d87e451656034513a64eba82f
-  data.tar.gz: 6da12838083832a22f23d841c022a91852998587cd83e19245805b424be2569a5dbd032f4f97411c51b6c013bc898e69cecf385c25326c9bb3e8dc778b5221d1
+  metadata.gz: 6dfa2494a649caec1aa3cd17bd7a8ba74a5d63611f3d3eb53a824fc9e44c05855f9dccdd25f97c29a60c84f568018eb94c1240f6df044577e498fdf8bb07ff89
+  data.tar.gz: f3fe30e437c2719d3ea7ebfbe30947c69f8ecdf6d646f193da2daf43d061d88393190e2435d75814a61e73a98e5819811e54c68799eaf3f5e35ec6b04baeea54

data/lib/filterer/base.rb

@@ -86,12 +86,13 @@ module Filterer
       params[:direction].try(:downcase) == 'desc' ? 'desc' : 'asc'
     end
 
+    # @return [String] the key for the applied sort option.
     def sort
       @sort ||= begin
         if params[:sort] && find_sort_option_from_param(params[:sort])
           params[:sort]
         else
-          default_sort_option.try(:[], :key)
+          default_sort_option[:key]
         end
       end
     end
@@ -142,11 +143,19 @@ module Filterer
 
     def order_results
       self.results = if !sort_option
-                       results.order(default_sort_sql)
+                       order_by_sort_option(default_sort_option)
                      elsif sort_option[:string_or_proc].is_a?(String)
-                       results.order(basic_sort_sql)
+                       order_by_sort_option(sort_option)
                      elsif sort_option[:string_or_proc].is_a?(Proc)
-                       apply_sort_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
     end
 
@@ -166,6 +175,8 @@ module Filterer
       @sort_option ||= find_sort_option_from_param(sort)
     end
 
+    # @param x [String]
+    # @return [Hash] sort_option
     def find_sort_option_from_param(x)
       self.class.sort_options.detect do |sort_option|
         if sort_option[:key].is_a?(Regexp)
@@ -176,29 +187,33 @@ module Filterer
       end
     end
 
-    def default_sort_sql
-      "#{results.model.table_name}.id asc"
-    end
-
-    def basic_sort_sql
-      %{
-        #{sort_option[:string_or_proc]}
+    def order_by_sort_option(opt)
+      results.order %{
+        #{opt[:string_or_proc]}
         #{direction}
-        #{sort_option[:opts][:nulls_last] ? 'NULLS LAST' : ''}
+        #{opt[:opts][:nulls_last] ? 'NULLS LAST' : ''}
         #{tiebreaker_sort_string ? ', ' + tiebreaker_sort_string : ''}
       }.squish
     end
 
-    def apply_sort_proc
-      sort_key = sort_option[:key]
+    def sort_proc_to_string(opt)
+      sort_key = opt[:key]
       matches = sort_key.is_a?(Regexp) && params[:sort].match(sort_key)
-      sort_option[:string_or_proc].call(results, matches, self)
+      opt[:string_or_proc].call(matches)
     end
 
     def default_sort_option
       self.class.sort_options.detect do |sort_option|
         sort_option[:opts][:default]
-      end
+      end || filterer_default_sort_option
+    end
+
+    def filterer_default_sort_option
+      {
+        key: 'default',
+        string_or_proc: "#{results.model.table_name}.id",
+        opts: {}
+      }
     end
 
     def tiebreaker_sort_string

data/lib/filterer/version.rb

@@ -1,3 +1,3 @@
 module Filterer
-  VERSION = '1.0.0.beta.2'
+  VERSION = '1.0.0.beta.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filterer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
 platform: ruby
 authors:
 - Adam Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails