clearly-query 1.0.0 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +2 -1
  3. data/CHANGELOG.md +12 -17
  4. data/README.md +3 -0
  5. data/clearly-query.gemspec +13 -11
  6. data/lib/clearly/query/composer.rb +4 -2
  7. data/lib/clearly/query/version.rb +1 -1
  8. metadata +32 -33
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8b1fc977200d949ff4d1aa8db533b56d6d987a91
4
- data.tar.gz: 0e5dc84af5e9b77647bfcb3ffe6dd77d1daf356b
3
+ metadata.gz: bd7b21bdcf541217b9fab0f7cc9a8fcaefe3640c
4
+ data.tar.gz: e3ba62e6252ba11349e76aa5d3f6aba1f5d36390
5
5
  SHA512:
6
- metadata.gz: 83e6b022830e7026f87eebfc3ef8f27a9053127493b8c4aaa327843a2eaeadebd9177f27f81cb91d77a1d1386b27af4f829645e77711f97bfc63c53bb61fba5f
7
- data.tar.gz: abcaf272739a41933356e229ff6b4a2d3a5a04ebf90bebd2ecd3bd501c2ab65a9fee76f885fba8abc70ce714e695e0d51e850e34a66cfe96b1c1cffd005aeb5c
6
+ metadata.gz: aca1cf78b35b7142e16e7c8a93beb4b333b2406212d1722e5592333c3e0272242a28a71cf15796a87285a6bee06f1c652e1ff1f51db286a11b102df7e464338b
7
+ data.tar.gz: fe5767a05d0c7e03968e7191e9b814ad9398fb18c727581f3668df584960b53b0077f9d9b397253b54ec95f194184d4763ddf4d7bb5ce3419d585df3c6d235e5
data/.travis.yml CHANGED
@@ -2,7 +2,8 @@ language: ruby
2
2
  cache: bundler
3
3
  sudo: false
4
4
  rvm:
5
- - 2.2.3
5
+ - 2.2.5
6
+ - 2.3.1
6
7
  script:
7
8
  - bin/rspec
8
9
  addons:
data/CHANGELOG.md CHANGED
@@ -6,6 +6,12 @@ and [keeps a change log](http://keepachangelog.com/) (you're reading it!).
6
6
 
7
7
  ## Unreleased
8
8
 
9
+ ## Release [v1.1.0](https://github.com/cofiem/clearly-query/releases/tag/v1.1.0) (2016-09-23)
10
+
11
+ ### Added
12
+
13
+ - Now supports ActiveRecord 4.2 and 5, and Arel 6 and 7.
14
+
9
15
  ## Release [v1.0.0](https://github.com/cofiem/clearly-query/releases/tag/v1.0.0) (2015-11-10)
10
16
 
11
17
  ### Added
@@ -48,20 +54,9 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
48
54
 
49
55
  ## Change log categories
50
56
 
51
- ### Added
52
- new features
53
-
54
- ### Changed
55
- changes in existing functionality
56
-
57
- ### Deprecated
58
- once-stable features removed in upcoming releases
59
-
60
- ### Removed
61
- deprecated features removed in this release
62
-
63
- ### Fixed
64
- bug fixes
65
-
66
- ### Security
67
- vulnerabilities or other problems that should be highlighted
57
+ - Added: new features
58
+ - Changed: changes in existing functionality
59
+ - Deprecated: once-stable features removed in upcoming releases
60
+ - Removed: deprecated features removed in this release
61
+ - Fixed: bug fixes
62
+ - Security: vulnerabilities or other problems that should be highlighted
data/README.md CHANGED
@@ -18,6 +18,9 @@ Uses [Arel](https://github.com/rails/arel) and [ActiveRecord](https://github.com
18
18
  [![Join the chat at https://gitter.im/cofiem/clearly-query](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cofiem/clearly-query?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
19
19
  [![Gem Version](https://badge.fury.io/rb/clearly-query.svg)](https://badge.fury.io/rb/clearly-query)
20
20
 
21
+
22
+ Compatible with ActiveRecord 4.2 and 5, and Arel 6 & 7.
23
+
21
24
  ## Installation
22
25
 
23
26
  Add this line to your application's Gemfile:
data/clearly-query.gemspec CHANGED
@@ -17,17 +17,19 @@ Gem::Specification.new do |spec|
17
17
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ['lib']
20
+
21
+ spec.required_ruby_version = '>= 2.0.0'
20
22
 
21
- spec.add_runtime_dependency 'arel', '~> 6'
22
- spec.add_runtime_dependency 'activesupport', '~> 4'
23
- spec.add_runtime_dependency 'activerecord', '~> 4'
23
+ spec.add_runtime_dependency 'arel', '>= 6.0'
24
+ spec.add_runtime_dependency 'activesupport', '>= 4.2'
25
+ spec.add_runtime_dependency 'activerecord', '>= 4.2'
24
26
 
25
- spec.add_development_dependency 'bundler', '~> 1'
26
- spec.add_development_dependency 'rake', '~> 10'
27
- spec.add_development_dependency 'guard-rspec', '~> 4'
28
- spec.add_development_dependency 'guard-yard', '~> 2'
29
- spec.add_development_dependency 'simplecov', '~> 0'
30
- spec.add_development_dependency 'sqlite3', '~> 1'
31
- spec.add_development_dependency 'zonebie', '~> 0'
32
- spec.add_development_dependency 'database_cleaner', '~> 1'
27
+ spec.add_development_dependency 'bundler', '~> 1.12'
28
+ spec.add_development_dependency 'rake', '~> 11.2'
29
+ spec.add_development_dependency 'guard-rspec', '~> 4.6'
30
+ spec.add_development_dependency 'guard-yard', '~> 2.1'
31
+ spec.add_development_dependency 'simplecov', '~> 0.11'
32
+ spec.add_development_dependency 'sqlite3', '~> 1.3'
33
+ spec.add_development_dependency 'zonebie', '~> 0.5'
34
+ spec.add_development_dependency 'database_cleaner', '~> 1.5'
33
35
  end
data/lib/clearly/query/composer.rb CHANGED
@@ -35,14 +35,16 @@ module Clearly
35
35
  .uniq { |d| d.arel_table.name }
36
36
 
37
37
  definitions = models.map do |d|
38
- if d.name.include?('HABTM_')
38
+ if d.name.include?('::InternalMetadata')
39
+ # ignore the AR metadata
40
+ elsif d.name.include?('HABTM_')
39
41
  Clearly::Query::Definition.new({table: d.arel_table})
40
42
  else
41
43
  Clearly::Query::Definition.new({model: d, hash: d.clearly_query_def})
42
44
  end
43
45
  end
44
46
 
45
- Composer.new(definitions)
47
+ Composer.new(definitions.compact)
46
48
  end
47
49
 
48
50
  # Composes a query from a parsed filter hash.
data/lib/clearly/query/version.rb CHANGED
@@ -3,6 +3,6 @@ module Clearly
3
3
  # Clearly Query namespace
4
4
  module Query
5
5
  # Gem version
6
- VERSION = '1.0.0'
6
+ VERSION = '1.1.0'
7
7
  end
8
8
  end
metadata CHANGED
@@ -1,169 +1,169 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: clearly-query
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mark Cottman-Fields
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-10 00:00:00.000000000 Z
11
+ date: 2016-09-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: arel
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '6'
19
+ version: '6.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: '6'
26
+ version: '6.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activesupport
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '4'
33
+ version: '4.2'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '4'
40
+ version: '4.2'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: activerecord
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '4'
47
+ version: '4.2'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: '4'
54
+ version: '4.2'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '1'
61
+ version: '1.12'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '1'
68
+ version: '1.12'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '10'
75
+ version: '11.2'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '10'
82
+ version: '11.2'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: guard-rspec
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '4'
89
+ version: '4.6'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '4'
96
+ version: '4.6'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: guard-yard
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: '2'
103
+ version: '2.1'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: '2'
110
+ version: '2.1'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: simplecov
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: '0'
117
+ version: '0.11'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: '0'
124
+ version: '0.11'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: sqlite3
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: '1'
131
+ version: '1.3'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: '1'
138
+ version: '1.3'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: zonebie
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: '0'
145
+ version: '0.5'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: '0'
152
+ version: '0.5'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: database_cleaner
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: '1'
159
+ version: '1.5'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: '1'
166
+ version: '1.5'
167
167
  description: A library for constructing an sql query from a hash. Uses a strict, yet
168
168
  flexible specification.
169
169
  email:
@@ -232,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
232
232
  requirements:
233
233
  - - ">="
234
234
  - !ruby/object:Gem::Version
235
- version: '0'
235
+ version: 2.0.0
236
236
  required_rubygems_version: !ruby/object:Gem::Requirement
237
237
  requirements:
238
238
  - - ">="
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
240
240
  version: '0'
241
241
  requirements: []
242
242
  rubyforge_project:
243
- rubygems_version: 2.4.8
243
+ rubygems_version: 2.5.1
244
244
  signing_key:
245
245
  specification_version: 4
246
246
  summary: A library for constructing an sql query from a hash.
@@ -260,4 +260,3 @@ test_files:
260
260
  - spec/support/models/part.rb
261
261
  - spec/support/models/product.rb
262
262
  - spec/support/shared_setup.rb
263
- has_rdoc: