queryko 2.0.3 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7a1db564e6e43fa53da1c172a0ca7c1e2fb24c24426b445ca01f375a72535b6d
4
- data.tar.gz: 4080ea03b15552026a8fca962667d15eb029c5a3b14733d5bdb5a1af410912bc
3
+ metadata.gz: 51f819e7bdea393aea4ad03b269cb49f705fc2b8790bc0f496b15e1fd076b62f
4
+ data.tar.gz: 5810065a5f38b89cd4d4fb7e8147d112e22eeb5c9d7ca4deae6d6f0b850d8bcf
5
5
  SHA512:
6
- metadata.gz: 3077810579201ba74caecf3f312673be3194ffe42cd42a1a2d7eac9df0b2c1dcdfa1beba41d7d38858003b6110c4d9b5bb8179ed451f58a24e1ff95c8e060b6a
7
- data.tar.gz: 4f06f4d115275505e16b35bf75c08a76761b5ef8ef94c6a90d56028ab6556b30ec6fc89882f26d94b74e28987eb8ab675f8cbb8c5da65163a1830ad81627c2da
6
+ metadata.gz: 3bcecefa6ca454d65e6cf38d677e43a9d4acc517369d660ce0aed08741129673920f59804a831fc56010864ac89ac73241fc06a888a886763d2b24c5116bf177
7
+ data.tar.gz: db398278f9fd3adf46ae4669f949233df71c623881ee3716aba71fdef41add5cd2709436bdd2f82d5c169ada6ad81faad689238edc1a62e9dd5df53b7f24b20c
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- queryko (2.0.2)
4
+ queryko (2.0.4)
5
5
  activerecord (>= 4.0)
6
6
  activesupport (>= 4.0)
7
7
 
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
 
@@ -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
 
@@ -1,3 +1,3 @@
1
1
  module Queryko
2
- VERSION = "2.0.3"
2
+ VERSION = "2.0.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: queryko
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.3
4
+ version: 2.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joseph Nelson Valeros