apill 2.3.0 → 2.3.1

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c80e6572755af69fbfa5998dabbf1231921a72c9
4
- data.tar.gz: 2727edeb979c451907dbd1e3ef15cc1bf4fb98b5
3
+ metadata.gz: a558c6cac08ed3bcb8cc545d2ed9285ab1f2278b
4
+ data.tar.gz: 6cc7aa252c0083c9061bee710d27f492269e0a20
5
5
  SHA512:
6
- metadata.gz: a92ed1e2312cfca05317328b48c3e5e5b8bd93c2c246aefed7f479775744b9ab1ca31ea24d74d7a4de0c4421ac31848b50838089449f3ce503f80da441963ca1
7
- data.tar.gz: 5c6262450fcbd115923654bd86658e0378d566c98bdb46620df70f45129827e40aab6f74f86aba553217c1f8d56eb181a1e70614f4670be050e28c7d0ace3004
6
+ metadata.gz: cc80c8b5df352226353478a073a7a884c9c7198f414e453448966da1a7d746d4415581547f6cca70548ca27eeaa6ca428959e1793c6138abed4e4b45e1305162
7
+ data.tar.gz: 9100abadfc8420a9a22e37309ccb0c583f1e9916ad697158e70f07061c12331fb9382436108d677273b89374f42deb3a4f5ed4c5ba2b1e3074045c2d3a92ca17
@@ -15,6 +15,29 @@ module Queryable
15
15
 
16
16
  private
17
17
 
18
+ def query_params
19
+ @query_params ||= params.fetch(:query_params, {})
20
+ end
21
+
22
+ def sanitized_query_params
23
+ query_attrs = if defined?(:queryable_attributes)
24
+ queryable_attributes
25
+ else
26
+ []
27
+ end
28
+
29
+ query_params.
30
+ slice(*query_attrs)
31
+ end
32
+
33
+ def query_method_name_for(query_item, resource)
34
+ if resource.respond_to? "for_#{query_item}"
35
+ "for_#{query_item}"
36
+ elsif resource.respond_to? query_item
37
+ query_item
38
+ end
39
+ end
40
+
18
41
  def filtered_resource
19
42
  @filtered_resource ||= begin
20
43
  resource = if defined? super
@@ -31,23 +54,14 @@ module Queryable
31
54
  end
32
55
  end
33
56
 
34
- def query_params
35
- @query_params ||= params.fetch(:query_params, {})
36
- end
37
-
38
- def sanitized_query_params
39
- query_attrs = respond_to?(:queryable_attributes) ? queryable_attributes : {}
57
+ def filter_data
58
+ filter_data = defined?(super) ? super : {}
40
59
 
41
- query_params.
42
- slice(*query_attrs)
60
+ filter_data.merge(querying_data)
43
61
  end
44
62
 
45
- def query_method_name_for(query_item, resource)
46
- if resource.respond_to? "for_#{query_item}"
47
- "for_#{query_item}"
48
- elsif resource.respond_to? query_item
49
- query_item
50
- end
63
+ def querying_data
64
+ {}
51
65
  end
52
66
  end
53
67
  end
@@ -15,6 +15,10 @@ module Sortable
15
15
 
16
16
  private
17
17
 
18
+ def sorting_arguments
19
+ sorting_data.values.join(' ')
20
+ end
21
+
18
22
  def filtered_resource
19
23
  @filtered_resource ||= begin
20
24
  resource = if defined? super
@@ -28,10 +32,6 @@ module Sortable
28
32
  end
29
33
  end
30
34
 
31
- def sorting_arguments
32
- sorting_data.values.join(' ')
33
- end
34
-
35
35
  def filter_data
36
36
  filter_data = defined?(super) ? super : {}
37
37
 
data/lib/apill/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Apill
2
- VERSION = '2.3.0'
2
+ VERSION = '2.3.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: apill
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - jfelchner
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-28 00:00:00.000000000 Z
11
+ date: 2015-01-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: human_error