query_dam 0.1.2 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.travis.yml +1 -1
- data/README.md +8 -0
- data/lib/query_dam.rb +24 -17
- data/lib/query_dam/concerns/trackable.rb +14 -12
- data/lib/query_dam/version.rb +1 -1
- data/spec/query_dam_spec.rb +30 -0
- metadata +26 -26
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9fb87fd1ffa39623b5adcb2ec69a061b3bdc0900
|
4
|
+
data.tar.gz: 09d263f82734c093d57a7ac2810a3b35dcbe2d1b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c2b1dd2cb8e77c6e00dd83ef81736640cd4a3e871936fcdaf7de3236db5456c9641438047c625924a498b503e89ae1b43a149a01cd869c017cd9e90e0ae4ee31
|
7
|
+
data.tar.gz: 533a36a6251442c1fc25c9c3868ed7e402aea8619ee27883642c7d3809791e61213fd40885dbd56367a607d3c3da3747affae973d741c21c8865a121391cdc7e
|
data/.gitignore
CHANGED
data/.travis.yml
CHANGED
data/README.md
CHANGED
@@ -2,6 +2,7 @@
|
|
2
2
|
[![Build Status](https://travis-ci.org/romankuznietsov/query_dam.svg)](https://travis-ci.org/romankuznietsov/query_dam)
|
3
3
|
|
4
4
|
QueryDam is a tool for observing changes in ActiveRecord relation results.
|
5
|
+
It uses Redis to store changes metadata.
|
5
6
|
|
6
7
|
## Installation
|
7
8
|
|
@@ -57,6 +58,13 @@ QueryDam.get_updates(tracking_key)
|
|
57
58
|
# :exclusions=>[1]}
|
58
59
|
~~~
|
59
60
|
|
61
|
+
If updates are not requested for a certain amount of time (5 minutes by default),
|
62
|
+
QueryDam will stop observing changes. You can set up expiration time (in an initializer, for example).
|
63
|
+
|
64
|
+
~~~ruby
|
65
|
+
QueryDam.expiration = 5.minutes
|
66
|
+
~~~
|
67
|
+
|
60
68
|
## Contributing
|
61
69
|
|
62
70
|
1. Fork it ( https://github.com/[my-github-username]/query_dam/fork )
|
data/lib/query_dam.rb
CHANGED
@@ -7,45 +7,52 @@ require 'query_dam/concerns/trackable'
|
|
7
7
|
|
8
8
|
module QueryDam
|
9
9
|
|
10
|
-
|
10
|
+
DEFAULT_EXPIRATION = 5.minutes
|
11
11
|
|
12
12
|
class << self
|
13
13
|
def watch_relation(relation)
|
14
|
-
|
14
|
+
tracking_key = SecureRandom.uuid
|
15
15
|
query = relation.select("`#{relation.model.table_name}`.`id`").to_sql
|
16
|
-
query_hash = Redis::HashKey.new(
|
16
|
+
query_hash = Redis::HashKey.new(tracking_key)
|
17
17
|
query_hash.bulk_set(model: relation.model.name, query: query)
|
18
|
-
|
19
|
-
Redis::Set.new(relation.model.name) <<
|
20
|
-
|
18
|
+
query_hash.expire(expiration)
|
19
|
+
Redis::Set.new(relation.model.name) << tracking_key
|
20
|
+
tracking_key
|
21
21
|
end
|
22
22
|
|
23
|
-
def get_updates(
|
24
|
-
query_hash = Redis::HashKey.new(
|
23
|
+
def get_updates(tracking_key)
|
24
|
+
query_hash = Redis::HashKey.new(tracking_key)
|
25
25
|
return nil unless query_hash.exists?
|
26
|
+
query_hash.expire(expiration)
|
26
27
|
|
27
28
|
model = query_hash[:model].constantize
|
29
|
+
additions_set, updates_set, removals_set = query_sets(tracking_key)
|
28
30
|
|
29
|
-
updated_ids = (additions_set
|
30
|
-
|
31
|
-
removed_ids = removals_set(key).members
|
31
|
+
updated_ids = (additions_set.members + updates_set.members).uniq
|
32
|
+
removed_ids = removals_set.members
|
32
33
|
|
33
34
|
result = {
|
34
35
|
model: model,
|
35
36
|
updates: model.where(id: updated_ids),
|
36
37
|
exclusions: removed_ids.map(&:to_i) }
|
37
38
|
|
38
|
-
additions_set(
|
39
|
-
updates_set(key).clear
|
40
|
-
removals_set(key).clear
|
39
|
+
[additions_set, updates_set, removals_set].each(&:clear)
|
41
40
|
|
42
41
|
result
|
43
42
|
end
|
44
43
|
|
45
|
-
|
46
|
-
|
47
|
-
Redis::Set.new("#{
|
44
|
+
def query_sets(tracking_key)
|
45
|
+
%w[additions updates removals].map do |set_type|
|
46
|
+
Redis::Set.new("#{tracking_key} #{set_type}")
|
48
47
|
end
|
49
48
|
end
|
49
|
+
|
50
|
+
def expiration=(value)
|
51
|
+
@expiration = value
|
52
|
+
end
|
53
|
+
|
54
|
+
def expiration
|
55
|
+
@expiration || DEFAULT_EXPIRATION
|
56
|
+
end
|
50
57
|
end
|
51
58
|
end
|
@@ -11,21 +11,20 @@ module QueryDam
|
|
11
11
|
def get_prior_results
|
12
12
|
@_prior_results = {}
|
13
13
|
|
14
|
-
queries.each do |
|
15
|
-
@_prior_results[
|
14
|
+
queries.each do |tracking_key, query|
|
15
|
+
@_prior_results[tracking_key] =
|
16
16
|
self.class.connection.select_values(query).map(&:to_i)
|
17
17
|
end
|
18
18
|
end
|
19
19
|
|
20
20
|
def update_queries
|
21
|
-
queries.each do |
|
21
|
+
queries.each do |tracking_key, query|
|
22
22
|
result = self.class.connection.select_values(query).map(&:to_i)
|
23
|
-
added = result - @_prior_results[
|
24
|
-
removed = @_prior_results[
|
23
|
+
added = result - @_prior_results[tracking_key]
|
24
|
+
removed = @_prior_results[tracking_key] - result
|
25
25
|
|
26
|
-
additions_set =
|
27
|
-
|
28
|
-
removals_set = QueryDam.removals_set(key)
|
26
|
+
additions_set, updates_set, removals_set =
|
27
|
+
QueryDam.query_sets(tracking_key)
|
29
28
|
|
30
29
|
updates_set.add(id) if result.include?(id)
|
31
30
|
|
@@ -46,17 +45,20 @@ module QueryDam
|
|
46
45
|
removals_set.add(record_id)
|
47
46
|
end
|
48
47
|
end
|
48
|
+
|
49
|
+
[additions_set, updates_set, removals_set]
|
50
|
+
.each { |set| set.expire(QueryDam.expiration) }
|
49
51
|
end
|
50
52
|
end
|
51
53
|
|
52
54
|
def queries
|
53
55
|
queries_set = Redis::Set.new(self.class.name)
|
54
|
-
queries_set.members.reduce({}) do |acc,
|
55
|
-
query_hash = Redis::HashKey.new(
|
56
|
+
queries_set.members.reduce({}) do |acc, tracking_key|
|
57
|
+
query_hash = Redis::HashKey.new(tracking_key)
|
56
58
|
if query_hash.exists?
|
57
|
-
acc.merge(
|
59
|
+
acc.merge(tracking_key => query_hash[:query])
|
58
60
|
else
|
59
|
-
queries_set.delete(
|
61
|
+
queries_set.delete(tracking_key)
|
60
62
|
acc
|
61
63
|
end
|
62
64
|
end
|
data/lib/query_dam/version.rb
CHANGED
data/spec/query_dam_spec.rb
CHANGED
@@ -103,4 +103,34 @@ describe QueryDam do
|
|
103
103
|
{model: Item, updates: [], exclusions: []})
|
104
104
|
end
|
105
105
|
end
|
106
|
+
|
107
|
+
describe 'expiration' do
|
108
|
+
before :all do
|
109
|
+
QueryDam.expiration = 2
|
110
|
+
end
|
111
|
+
|
112
|
+
let!(:relation) { Item.where(name: 'pen') }
|
113
|
+
let!(:key) { QueryDam.watch_relation(relation) }
|
114
|
+
|
115
|
+
it 'returns nil if expiration time since creation passed' do
|
116
|
+
sleep QueryDam.expiration
|
117
|
+
expect(QueryDam.get_updates(key)).to be_nil
|
118
|
+
|
119
|
+
expect(Redis::HashKey.new(key).exists?).to be_falsey
|
120
|
+
QueryDam.query_sets(key).each do |set|
|
121
|
+
expect(set.exists?).to be_falsey
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
it 'returns nil if expiration time since last request passed' do
|
126
|
+
expect(QueryDam.get_updates(key)).to be_present
|
127
|
+
sleep QueryDam.expiration
|
128
|
+
expect(QueryDam.get_updates(key)).to be_nil
|
129
|
+
|
130
|
+
expect(Redis::HashKey.new(key).exists?).to be_falsey
|
131
|
+
QueryDam.query_sets(key).each do |set|
|
132
|
+
expect(set.exists?).to be_falsey
|
133
|
+
end
|
134
|
+
end
|
135
|
+
end
|
106
136
|
end
|
metadata
CHANGED
@@ -1,139 +1,139 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: query_dam
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Roman Kuznietsov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-09-
|
11
|
+
date: 2014-09-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: redis
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 3.1.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
26
|
version: 3.1.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: redis-objects
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- -
|
31
|
+
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: 0.8.0
|
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
40
|
version: 0.8.0
|
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
47
|
version: 4.0.0
|
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
54
|
version: 4.0.0
|
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
61
|
version: '1.6'
|
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
68
|
version: '1.6'
|
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
75
|
version: '0'
|
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
82
|
version: '0'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: rspec
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- - ~>
|
87
|
+
- - "~>"
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: 3.0.0
|
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
96
|
version: 3.0.0
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: sqlite3
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- -
|
101
|
+
- - ">="
|
102
102
|
- !ruby/object:Gem::Version
|
103
103
|
version: '0'
|
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
110
|
version: '0'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: fakeredis
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
|
-
- -
|
115
|
+
- - ">="
|
116
116
|
- !ruby/object:Gem::Version
|
117
117
|
version: '0'
|
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
124
|
version: '0'
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: pry
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
|
-
- -
|
129
|
+
- - ">="
|
130
130
|
- !ruby/object:Gem::Version
|
131
131
|
version: '0'
|
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
138
|
version: '0'
|
139
139
|
description: ''
|
@@ -143,9 +143,9 @@ executables: []
|
|
143
143
|
extensions: []
|
144
144
|
extra_rdoc_files: []
|
145
145
|
files:
|
146
|
-
- .gitignore
|
147
|
-
- .rspec
|
148
|
-
- .travis.yml
|
146
|
+
- ".gitignore"
|
147
|
+
- ".rspec"
|
148
|
+
- ".travis.yml"
|
149
149
|
- Gemfile
|
150
150
|
- LICENSE.txt
|
151
151
|
- README.md
|
@@ -167,17 +167,17 @@ require_paths:
|
|
167
167
|
- lib
|
168
168
|
required_ruby_version: !ruby/object:Gem::Requirement
|
169
169
|
requirements:
|
170
|
-
- -
|
170
|
+
- - ">="
|
171
171
|
- !ruby/object:Gem::Version
|
172
172
|
version: '0'
|
173
173
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
174
174
|
requirements:
|
175
|
-
- -
|
175
|
+
- - ">="
|
176
176
|
- !ruby/object:Gem::Version
|
177
177
|
version: '0'
|
178
178
|
requirements: []
|
179
179
|
rubyforge_project:
|
180
|
-
rubygems_version: 2.
|
180
|
+
rubygems_version: 2.2.2
|
181
181
|
signing_key:
|
182
182
|
specification_version: 4
|
183
183
|
summary: Detecting query result changes
|