queryko 2.0.3 → 2.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/queryko/base.rb +4 -3
- data/lib/queryko/feature.rb +3 -1
- data/lib/queryko/filter_classes.rb +8 -8
- data/lib/queryko/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 51f819e7bdea393aea4ad03b269cb49f705fc2b8790bc0f496b15e1fd076b62f
|
4
|
+
data.tar.gz: 5810065a5f38b89cd4d4fb7e8147d112e22eeb5c9d7ca4deae6d6f0b850d8bcf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3bcecefa6ca454d65e6cf38d677e43a9d4acc517369d660ce0aed08741129673920f59804a831fc56010864ac89ac73241fc06a888a886763d2b24c5116bf177
|
7
|
+
data.tar.gz: db398278f9fd3adf46ae4669f949233df71c623881ee3716aba71fdef41add5cd2709436bdd2f82d5c169ada6ad81faad689238edc1a62e9dd5df53b7f24b20c
|
data/Gemfile.lock
CHANGED
data/lib/queryko/base.rb
CHANGED
@@ -23,11 +23,12 @@ module Queryko
|
|
23
23
|
end
|
24
24
|
|
25
25
|
def initialize(params = {}, rel=nil)
|
26
|
+
self.defaults ||= {} # Ensure an empty hash. It keeps on raising an error
|
26
27
|
@relation = @original_relation = rel || self.class.model_class.all
|
27
28
|
@params = self.defaults.merge(params)
|
28
29
|
end
|
29
30
|
|
30
|
-
def self.call(params = {}, rel)
|
31
|
+
def self.call(params = {}, rel = nil)
|
31
32
|
new(params, rel).call
|
32
33
|
end
|
33
34
|
|
@@ -46,7 +47,7 @@ module Queryko
|
|
46
47
|
end
|
47
48
|
|
48
49
|
|
49
|
-
def self.total_count(params = {}, rel)
|
50
|
+
def self.total_count(params = {}, rel = nil)
|
50
51
|
new(params, rel).total_count
|
51
52
|
end
|
52
53
|
|
@@ -55,7 +56,7 @@ module Queryko
|
|
55
56
|
countable_resource.count
|
56
57
|
end
|
57
58
|
|
58
|
-
def self.count(params = {}, rel)
|
59
|
+
def self.count(params = {}, rel = nil)
|
59
60
|
new(params, rel).count
|
60
61
|
end
|
61
62
|
|
data/lib/queryko/feature.rb
CHANGED
@@ -20,6 +20,8 @@ class Queryko::Feature
|
|
20
20
|
end
|
21
21
|
|
22
22
|
def filter_class_for(filter_name)
|
23
|
-
self.query_object.filters.fetch(filter_name.to_sym)
|
23
|
+
filter_class = self.query_object.filters.fetch(filter_name.to_sym)
|
24
|
+
return filter_class.constantize if filter_class.class == String
|
25
|
+
return filter_class
|
24
26
|
end
|
25
27
|
end
|
@@ -21,14 +21,14 @@ module Queryko
|
|
21
21
|
module ClassMethods
|
22
22
|
def load_defaults
|
23
23
|
self.filters = {
|
24
|
-
after: Queryko::Filters::After,
|
25
|
-
before: Queryko::Filters::Before,
|
26
|
-
min: Queryko::Filters::Min,
|
27
|
-
max: Queryko::Filters::Max,
|
28
|
-
search: Queryko::Filters::Search,
|
29
|
-
order: Queryko::Filters::Order,
|
30
|
-
batch: Queryko::Filters::Batch,
|
31
|
-
paginate: Queryko::Filters::Paginate
|
24
|
+
after: "Queryko::Filters::After",
|
25
|
+
before: "Queryko::Filters::Before",
|
26
|
+
min: "Queryko::Filters::Min",
|
27
|
+
max: "Queryko::Filters::Max",
|
28
|
+
search: "Queryko::Filters::Search",
|
29
|
+
order: "Queryko::Filters::Order",
|
30
|
+
batch: "Queryko::Filters::Batch",
|
31
|
+
paginate: "Queryko::Filters::Paginate"
|
32
32
|
}
|
33
33
|
end
|
34
34
|
|
data/lib/queryko/version.rb
CHANGED