filterameter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97bc00d12d3a953cbedcfa92a1b8c469ef442936ebaac28157fd4a88cb8dc62c
-  data.tar.gz: f7233773047377d725a047e3b01b159f097ecbece898b83d824b197e6146db61
+  metadata.gz: 6a523b898a73ce9f67d723e9dcbf1131748bf7d431c8cab11dc6faa00ac9409a
+  data.tar.gz: 428a21db90c7823118037fe7fd698dda522644a3cf47bcb1b5c3e0b0d8a7418e
 SHA512:
-  metadata.gz: e19b7c776809225651165bf7714ca7820cb5c3824138ff798842d4b99cf67c58d92eb077070d9959874aa6ebf2352c2b5cf34f6c223241c64b36d4dc7b2ee59e
-  data.tar.gz: d24c6b1abe68ef70cbb03c8abecda1147f1dc889b2b7cd90062c35245f1c442d07ff6562866cb4d097b0bc2e3572cc02c5c5a406a146f7af91fa85b3abc883c9
+  metadata.gz: 82db4c9d6db4b7bf27815e97ff3479fe2e0afc85ec66ea69db6807ba2ff0a98b2b61fe82975b61164c22eed53b07e59678dcd0098912d89f02909a4276ba44f9
+  data.tar.gz: 53401b585ec11bc664c8268425720e890bbce6197606366059d46c9eb78fd72350217860fb2cf54f1c16fd055a2c88b3fe81789e4a45cf97c0d618b89be400ef

data/lib/filterameter/controller_filters.rb

@@ -40,8 +40,8 @@ module Filterameter
       @query_variable_name ||= model_class.model_name.plural
     end
 
-    def build_query(filter_params)
-      valid_filters(filter_params).reduce(model_class.all) do |query, (name, value)|
+    def build_query(filter_params, starting_query)
+      valid_filters(filter_params).reduce(starting_query || model_class.all) do |query, (name, value)|
         @filters[name].apply(query, value)
       end
     end

data/lib/filterameter/declarative_filters.rb

@@ -39,8 +39,12 @@ module Filterameter
     private
 
     def build_filtered_query
-      instance_variable_set("@#{self.class.controller_filters.query_variable_name}",
-                            self.class.controller_filters.build_query(params.to_unsafe_h.fetch(:filter, {})))
+      var_name = "@#{self.class.controller_filters.query_variable_name}"
+      instance_variable_set(
+        var_name,
+        self.class.controller_filters.build_query(params.to_unsafe_h.fetch(:filter, {}),
+                                                  instance_variable_get(var_name))
+      )
     end
   end
 end

data/lib/filterameter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Filterameter
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filterameter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Todd Kummer