queryko 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b862ce0b8c1300695261f98fd5cd6d4a4467cd986b69d31cce41c9c28321d562
-  data.tar.gz: a05e7440df4df0a52d5d7aaa32f17568826a270f995c9a24894ddad88d6b773d
+  metadata.gz: f4c6a1a8f126e4c967db992da19bf331ab1b987af32f4d8082bb3700dc3552e5
+  data.tar.gz: 00001343c14f91d133a5239e9c82394ad266aa2846772b8bcb561a785a4a0959
 SHA512:
-  metadata.gz: f0c6055eb8304e1a3e70dac2794c1ec57e31bf06c452768df60293d231d15c821799ea2eff63138e8a4b4dd9dc674fc6b81b82a3db3f317977fa2c98ff71f414
-  data.tar.gz: 45b02b396e069afd6c9996cc9e08f256c24b3f43de421f68e3dac80c9c8da1042c21f7e42b10b47df756d205c43e0abde8602be8e3e710d11f048383f9c9ee88
+  metadata.gz: 99195d6d3dc5ae69bb891d547be3bcef0a3d2320a6dfc1ba4e21e61691d561a7a817d783a40445d6fb03d6f9b8292abd5b9dc589c07d7d897b7e23b7b02ef95c
+  data.tar.gz: 4228f9368e72d91215c614c15dfe20b67ea60ca750b9a5b108e39ffc4fce27446e60d3ff45cbd8691efb7b10bf9fd54fb7d66d79f1ecfe1cccd3c1e658c2623b

data/.gitignore

@@ -11,3 +11,4 @@
 .rspec_status
 .ruby-version
 sandbox
+.byebug_history

data/lib/queryko/filterer.rb

@@ -1,11 +1,21 @@
 module Queryko
   module Filterer
+    # def filter_by_filters
+    #   fields.each do |field, filter|
+    #     if field == 'limit' || field == 'page'
+    #       paginate(filter, )
+    #     end
+    #     self.relation = filter.first.call(relation, params[field], self) if params[field]
+    #   end
+    # end
+
     def filter_by_filters
       fields.each do |field, filter|
-        if field == 'limit' || field == 'page'
-          paginate(filter, )
+        paginate(filter) if ['limit', 'page'].include?(field.to_s)
+
+        filter.each do |f|
+          self.relation = f.call(relation, params[field], self) if params[field]
         end
-        self.relation = filter.first.call(relation, params[field], self) if params[field]
       end
     end
 

data/lib/queryko/filters/base.rb

@@ -1,10 +1,12 @@
 module Queryko
   module Filters
     class Base
-      attr_reader :table_name, :column_name, :feature, :as, :field, :query_object
+      attr_reader :table_name, :column_name, :feature, :as, :field,
+                  :query_object, :table_name_override
 
       def initialize(options = {}, feature)
         @feature = feature
+        @table_name_override = options[:table_name]
         @table_name = options[:table_name]
         @column_name = options.fetch(:column_name) { @feature.name }
         @as = options[:as]
@@ -12,7 +14,7 @@ module Queryko
 
       def call(collection, token, query_object)
         @query_object = query_object
-        @table_name ||= query_object.class.table_name
+        @table_name = table_name_override || query_object.class.table_name
 
         perform(collection, token, query_object)
       end

data/lib/queryko/naming.rb

@@ -35,8 +35,6 @@ module Queryko
           self.defined_model_class = inferred_model(self)
         end
 
-        # require 'byebug'
-        # byebug
         return self.defined_model_class
       end
 

data/lib/queryko/version.rb

@@ -1,3 +1,3 @@
 module Queryko
-  VERSION = "2.0.6"
+  VERSION = "2.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: queryko
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Joseph Nelson Valeros
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord