ts-resque-delta 1.2.2 → 1.2.3
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +3 -1
- data/.travis.yml +18 -0
- data/Appraisals +8 -0
- data/Gemfile +8 -6
- data/Gemfile.lock +134 -0
- data/README.markdown +3 -1
- data/Rakefile +1 -0
- data/features/support/env.rb +10 -0
- data/gemfiles/activerecord2.gemfile +7 -0
- data/gemfiles/activerecord2.gemfile.lock +119 -0
- data/gemfiles/activerecord3.gemfile +8 -0
- data/gemfiles/activerecord3.gemfile.lock +128 -0
- data/lib/thinking_sphinx/deltas/resque_delta/flag_as_deleted_set.rb +11 -8
- data/lib/thinking_sphinx/deltas/resque_delta/version.rb +1 -1
- data/spec/bin/false.rb +3 -0
- data/spec/bin/true.rb +3 -0
- data/spec/spec_helper.rb +2 -0
- data/spec/thinking_sphinx/deltas/resque_delta/core_index_spec.rb +2 -2
- data/ts-resque-delta.gemspec +5 -4
- metadata +153 -41
data/.gitignore
CHANGED
data/.travis.yml
ADDED
@@ -0,0 +1,18 @@
|
|
1
|
+
language: ruby
|
2
|
+
before_install: gem update --system
|
3
|
+
before_script:
|
4
|
+
- mysql -e 'create database thinking_sphinx;'
|
5
|
+
rvm:
|
6
|
+
- 1.8.7
|
7
|
+
- ree
|
8
|
+
- 1.9.2
|
9
|
+
- 1.9.3
|
10
|
+
gemfile:
|
11
|
+
- gemfiles/activerecord2.gemfile
|
12
|
+
- gemfiles/activerecord3.gemfile
|
13
|
+
matrix:
|
14
|
+
exclude:
|
15
|
+
- rvm: 1.9.2
|
16
|
+
gemfile: gemfiles/activerecord2.gemfile
|
17
|
+
- rvm: 1.9.3
|
18
|
+
gemfile: gemfiles/activerecord2.gemfile
|
data/Appraisals
ADDED
data/Gemfile
CHANGED
@@ -20,9 +20,11 @@ group :development do
|
|
20
20
|
end
|
21
21
|
end
|
22
22
|
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
23
|
+
# Provided as an example for developers to use
|
24
|
+
# group :test do
|
25
|
+
# if RUBY_VERSION >= '1.9'
|
26
|
+
# gem 'debugger'
|
27
|
+
# else
|
28
|
+
# gem 'ruby-debug'
|
29
|
+
# end
|
30
|
+
# end
|
data/Gemfile.lock
ADDED
@@ -0,0 +1,134 @@
|
|
1
|
+
PATH
|
2
|
+
remote: .
|
3
|
+
specs:
|
4
|
+
ts-resque-delta (1.2.2)
|
5
|
+
resque (~> 1.10)
|
6
|
+
resque-lock-timeout (~> 0.4)
|
7
|
+
riddle (>= 1.5)
|
8
|
+
thinking-sphinx (>= 1.4.1)
|
9
|
+
|
10
|
+
GEM
|
11
|
+
remote: http://rubygems.org/
|
12
|
+
specs:
|
13
|
+
activemodel (3.2.9)
|
14
|
+
activesupport (= 3.2.9)
|
15
|
+
builder (~> 3.0.0)
|
16
|
+
activerecord (3.2.9)
|
17
|
+
activemodel (= 3.2.9)
|
18
|
+
activesupport (= 3.2.9)
|
19
|
+
arel (~> 3.0.2)
|
20
|
+
tzinfo (~> 0.3.29)
|
21
|
+
activesupport (3.2.9)
|
22
|
+
i18n (~> 0.6)
|
23
|
+
multi_json (~> 1.0)
|
24
|
+
appraisal (0.4.1)
|
25
|
+
bundler
|
26
|
+
rake
|
27
|
+
arel (3.0.2)
|
28
|
+
builder (3.0.4)
|
29
|
+
cucumber (1.2.1)
|
30
|
+
builder (>= 2.1.2)
|
31
|
+
diff-lcs (>= 1.1.3)
|
32
|
+
gherkin (~> 2.11.0)
|
33
|
+
json (>= 1.4.6)
|
34
|
+
database_cleaner (0.9.1)
|
35
|
+
diff-lcs (1.1.3)
|
36
|
+
fakefs (0.4.2)
|
37
|
+
faraday (0.8.4)
|
38
|
+
multipart-post (~> 1.1)
|
39
|
+
faraday_middleware (0.9.0)
|
40
|
+
faraday (>= 0.7.4, < 0.9)
|
41
|
+
ffi (1.2.0)
|
42
|
+
flying-sphinx (0.8.4)
|
43
|
+
faraday_middleware (~> 0.7)
|
44
|
+
multi_json (>= 1.0.1)
|
45
|
+
rash (~> 0.3.0)
|
46
|
+
riddle (>= 1.5.0)
|
47
|
+
thinking-sphinx
|
48
|
+
gherkin (2.11.5)
|
49
|
+
json (>= 1.4.6)
|
50
|
+
guard (0.8.8)
|
51
|
+
thor (~> 0.14.6)
|
52
|
+
guard-bundler (0.1.3)
|
53
|
+
bundler (>= 1.0.0)
|
54
|
+
guard (>= 0.2.2)
|
55
|
+
guard-cucumber (0.7.5)
|
56
|
+
cucumber (>= 0.10)
|
57
|
+
guard (>= 0.8.3)
|
58
|
+
guard-rspec (0.5.11)
|
59
|
+
guard (>= 0.8.4)
|
60
|
+
hashie (1.2.0)
|
61
|
+
i18n (0.6.1)
|
62
|
+
json (1.7.5)
|
63
|
+
libnotify (0.8.0)
|
64
|
+
ffi (>= 1.0.11)
|
65
|
+
mock_redis (0.3.0)
|
66
|
+
multi_json (1.3.7)
|
67
|
+
multipart-post (1.1.5)
|
68
|
+
mysql2 (0.3.11)
|
69
|
+
rack (1.4.1)
|
70
|
+
rack-protection (1.2.0)
|
71
|
+
rack
|
72
|
+
rake (10.0.2)
|
73
|
+
rash (0.3.2)
|
74
|
+
hashie (~> 1.2.0)
|
75
|
+
rb-fsevent (0.9.2)
|
76
|
+
rb-inotify (0.8.8)
|
77
|
+
ffi (>= 0.5.0)
|
78
|
+
redis (3.0.2)
|
79
|
+
redis-namespace (1.2.1)
|
80
|
+
redis (~> 3.0.0)
|
81
|
+
resque (1.23.0)
|
82
|
+
multi_json (~> 1.0)
|
83
|
+
redis-namespace (~> 1.0)
|
84
|
+
sinatra (>= 0.9.2)
|
85
|
+
vegas (~> 0.1.2)
|
86
|
+
resque-lock-timeout (0.4.1)
|
87
|
+
resque (>= 1.8.0)
|
88
|
+
riddle (1.5.3)
|
89
|
+
rspec (2.10.0)
|
90
|
+
rspec-core (~> 2.10.0)
|
91
|
+
rspec-expectations (~> 2.10.0)
|
92
|
+
rspec-mocks (~> 2.10.0)
|
93
|
+
rspec-core (2.10.1)
|
94
|
+
rspec-expectations (2.10.0)
|
95
|
+
diff-lcs (~> 1.1.3)
|
96
|
+
rspec-mocks (2.10.1)
|
97
|
+
ruby_gntp (0.3.4)
|
98
|
+
sinatra (1.3.3)
|
99
|
+
rack (~> 1.3, >= 1.3.6)
|
100
|
+
rack-protection (~> 1.2)
|
101
|
+
tilt (~> 1.3, >= 1.3.3)
|
102
|
+
thinking-sphinx (2.0.13)
|
103
|
+
activerecord (>= 3.0.3)
|
104
|
+
builder (>= 2.1.2)
|
105
|
+
riddle (>= 1.5.3)
|
106
|
+
thor (0.14.6)
|
107
|
+
tilt (1.3.3)
|
108
|
+
tzinfo (0.3.35)
|
109
|
+
vegas (0.1.11)
|
110
|
+
rack (>= 1.0.0)
|
111
|
+
|
112
|
+
PLATFORMS
|
113
|
+
ruby
|
114
|
+
|
115
|
+
DEPENDENCIES
|
116
|
+
activerecord (~> 3.2.0)
|
117
|
+
appraisal (~> 0.4.1)
|
118
|
+
cucumber
|
119
|
+
database_cleaner (>= 0.5.2)
|
120
|
+
fakefs (~> 0.4.0)
|
121
|
+
flying-sphinx (>= 0.5.1)
|
122
|
+
guard (~> 0.8.8)
|
123
|
+
guard-bundler (~> 0.1.3)
|
124
|
+
guard-cucumber (~> 0.7.4)
|
125
|
+
guard-rspec (~> 0.5.8)
|
126
|
+
libnotify
|
127
|
+
mock_redis (~> 0.3.0)
|
128
|
+
mysql2 (~> 0.3.11)
|
129
|
+
rake (>= 0.8.7)
|
130
|
+
rb-fsevent
|
131
|
+
rb-inotify
|
132
|
+
rspec (~> 2.10.0)
|
133
|
+
ruby_gntp
|
134
|
+
ts-resque-delta!
|
data/README.markdown
CHANGED
@@ -1,5 +1,7 @@
|
|
1
1
|
Delayed Deltas for Thinking Sphinx (with Resque)
|
2
2
|
================================================
|
3
|
+
[![Build Status](https://secure.travis-ci.org/agibralter/ts-resque-delta.png?branch=master)](http://travis-ci.org/agibralter/ts-resque-delta)
|
4
|
+
|
3
5
|
**This code is HEAVILY borrowed from
|
4
6
|
[ts-delayed-delta](https://github.com/freelancing-god/ts-delayed-delta).**
|
5
7
|
|
@@ -64,7 +66,7 @@ locking all the delta indexes at once while the main indexer runs, will lock
|
|
64
66
|
each delta index independently and sequentially. Thay way, your delta indexer
|
65
67
|
can run while the main indexer is processing large core indexes.
|
66
68
|
|
67
|
-
Contributors (for ts-
|
69
|
+
Contributors (for ts-resque-delta)
|
68
70
|
-----------------------------------
|
69
71
|
* [Aaron Gibralter](https://github.com/agibralter)
|
70
72
|
* [Ryan Schlesinger](https://github.com/ryansch) (Locking/`smart_index`)
|
data/Rakefile
CHANGED
data/features/support/env.rb
CHANGED
@@ -19,8 +19,18 @@ world.configure_database
|
|
19
19
|
require 'thinking_sphinx'
|
20
20
|
require 'thinking_sphinx/deltas/resque_delta'
|
21
21
|
|
22
|
+
ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord)
|
23
|
+
|
24
|
+
ActiveSupport::Inflector.inflections do |inflect|
|
25
|
+
inflect.plural /^(.*)beta$/i, '\1betas'
|
26
|
+
inflect.singular /^(.*)betas$/i, '\1beta'
|
27
|
+
end
|
28
|
+
|
22
29
|
world.setup
|
23
30
|
|
31
|
+
ThinkingSphinx.updates_enabled = true
|
32
|
+
ThinkingSphinx.deltas_enabled = true
|
33
|
+
|
24
34
|
Resque.redis = MockRedis.new
|
25
35
|
Before do
|
26
36
|
Resque.redis.flushall
|
@@ -0,0 +1,119 @@
|
|
1
|
+
PATH
|
2
|
+
remote: /Users/ryansch/dev/ts-resque-delta
|
3
|
+
specs:
|
4
|
+
ts-resque-delta (1.2.2)
|
5
|
+
resque (~> 1.10)
|
6
|
+
resque-lock-timeout (~> 0.3.1)
|
7
|
+
riddle (>= 1.5)
|
8
|
+
thinking-sphinx (>= 1.4.1)
|
9
|
+
|
10
|
+
GEM
|
11
|
+
remote: http://rubygems.org/
|
12
|
+
specs:
|
13
|
+
activerecord (2.3.14)
|
14
|
+
activesupport (= 2.3.14)
|
15
|
+
activesupport (2.3.14)
|
16
|
+
addressable (2.2.8)
|
17
|
+
after_commit (1.0.10)
|
18
|
+
activerecord (>= 1.15.6, < 3.0.0)
|
19
|
+
appraisal (0.4.1)
|
20
|
+
bundler
|
21
|
+
rake
|
22
|
+
builder (3.0.0)
|
23
|
+
cucumber (1.2.1)
|
24
|
+
builder (>= 2.1.2)
|
25
|
+
diff-lcs (>= 1.1.3)
|
26
|
+
gherkin (~> 2.11.0)
|
27
|
+
json (>= 1.4.6)
|
28
|
+
database_cleaner (0.8.0)
|
29
|
+
diff-lcs (1.1.3)
|
30
|
+
fakefs (0.4.0)
|
31
|
+
faraday (0.7.6)
|
32
|
+
addressable (~> 2.2)
|
33
|
+
multipart-post (~> 1.1)
|
34
|
+
rack (~> 1.1)
|
35
|
+
faraday_middleware (0.7.0)
|
36
|
+
faraday (~> 0.7.3)
|
37
|
+
flying-sphinx (0.6.5)
|
38
|
+
faraday_middleware (~> 0.7.0)
|
39
|
+
multi_json (>= 1.0.1)
|
40
|
+
net-ssh (>= 2.0.23)
|
41
|
+
rash (~> 0.3.0)
|
42
|
+
riddle (>= 1.5.0)
|
43
|
+
thinking-sphinx
|
44
|
+
gherkin (2.11.0)
|
45
|
+
json (>= 1.4.6)
|
46
|
+
guard (0.8.8)
|
47
|
+
thor (~> 0.14.6)
|
48
|
+
guard-bundler (0.1.3)
|
49
|
+
bundler (>= 1.0.0)
|
50
|
+
guard (>= 0.2.2)
|
51
|
+
guard-cucumber (0.7.5)
|
52
|
+
cucumber (>= 0.10)
|
53
|
+
guard (>= 0.8.3)
|
54
|
+
guard-rspec (0.5.11)
|
55
|
+
guard (>= 0.8.4)
|
56
|
+
hashie (1.2.0)
|
57
|
+
json (1.7.3)
|
58
|
+
mock_redis (0.3.0)
|
59
|
+
multi_json (1.3.6)
|
60
|
+
multipart-post (1.1.5)
|
61
|
+
mysql2 (0.2.18)
|
62
|
+
net-ssh (2.5.2)
|
63
|
+
rack (1.4.1)
|
64
|
+
rack-protection (1.2.0)
|
65
|
+
rack
|
66
|
+
rake (0.9.2.2)
|
67
|
+
rash (0.3.2)
|
68
|
+
hashie (~> 1.2.0)
|
69
|
+
redis (2.2.2)
|
70
|
+
redis-namespace (1.0.3)
|
71
|
+
redis (< 3.0.0)
|
72
|
+
resque (1.20.0)
|
73
|
+
multi_json (~> 1.0)
|
74
|
+
redis-namespace (~> 1.0.2)
|
75
|
+
sinatra (>= 0.9.2)
|
76
|
+
vegas (~> 0.1.2)
|
77
|
+
resque-lock-timeout (0.3.3)
|
78
|
+
resque (>= 1.8.0)
|
79
|
+
riddle (1.5.2)
|
80
|
+
rspec (2.10.0)
|
81
|
+
rspec-core (~> 2.10.0)
|
82
|
+
rspec-expectations (~> 2.10.0)
|
83
|
+
rspec-mocks (~> 2.10.0)
|
84
|
+
rspec-core (2.10.1)
|
85
|
+
rspec-expectations (2.10.0)
|
86
|
+
diff-lcs (~> 1.1.3)
|
87
|
+
rspec-mocks (2.10.1)
|
88
|
+
sinatra (1.3.2)
|
89
|
+
rack (~> 1.3, >= 1.3.6)
|
90
|
+
rack-protection (~> 1.2)
|
91
|
+
tilt (~> 1.3, >= 1.3.3)
|
92
|
+
thinking-sphinx (1.4.12)
|
93
|
+
activerecord (>= 1.15.6, < 3.0.0)
|
94
|
+
after_commit (>= 1.0.7)
|
95
|
+
riddle (>= 1.5.2)
|
96
|
+
thor (0.14.6)
|
97
|
+
tilt (1.3.3)
|
98
|
+
vegas (0.1.11)
|
99
|
+
rack (>= 1.0.0)
|
100
|
+
|
101
|
+
PLATFORMS
|
102
|
+
ruby
|
103
|
+
|
104
|
+
DEPENDENCIES
|
105
|
+
activerecord (= 2.3.14)
|
106
|
+
appraisal (~> 0.4.1)
|
107
|
+
cucumber
|
108
|
+
database_cleaner (>= 0.5.2)
|
109
|
+
fakefs (~> 0.4.0)
|
110
|
+
flying-sphinx (>= 0.5.1)
|
111
|
+
guard (~> 0.8.8)
|
112
|
+
guard-bundler (~> 0.1.3)
|
113
|
+
guard-cucumber (~> 0.7.4)
|
114
|
+
guard-rspec (~> 0.5.8)
|
115
|
+
mock_redis (~> 0.3.0)
|
116
|
+
mysql2 (~> 0.2.7)
|
117
|
+
rake (>= 0.8.7)
|
118
|
+
rspec (~> 2.10.0)
|
119
|
+
ts-resque-delta!
|
@@ -0,0 +1,128 @@
|
|
1
|
+
PATH
|
2
|
+
remote: /Users/ryansch/dev/ts-resque-delta
|
3
|
+
specs:
|
4
|
+
ts-resque-delta (1.2.2)
|
5
|
+
resque (~> 1.10)
|
6
|
+
resque-lock-timeout (~> 0.3.1)
|
7
|
+
riddle (>= 1.5)
|
8
|
+
thinking-sphinx (>= 1.4.1)
|
9
|
+
|
10
|
+
GEM
|
11
|
+
remote: http://rubygems.org/
|
12
|
+
specs:
|
13
|
+
activemodel (3.2.6)
|
14
|
+
activesupport (= 3.2.6)
|
15
|
+
builder (~> 3.0.0)
|
16
|
+
activerecord (3.2.6)
|
17
|
+
activemodel (= 3.2.6)
|
18
|
+
activesupport (= 3.2.6)
|
19
|
+
arel (~> 3.0.2)
|
20
|
+
tzinfo (~> 0.3.29)
|
21
|
+
activesupport (3.2.6)
|
22
|
+
i18n (~> 0.6)
|
23
|
+
multi_json (~> 1.0)
|
24
|
+
addressable (2.2.8)
|
25
|
+
appraisal (0.4.1)
|
26
|
+
bundler
|
27
|
+
rake
|
28
|
+
arel (3.0.2)
|
29
|
+
builder (3.0.0)
|
30
|
+
cucumber (1.2.1)
|
31
|
+
builder (>= 2.1.2)
|
32
|
+
diff-lcs (>= 1.1.3)
|
33
|
+
gherkin (~> 2.11.0)
|
34
|
+
json (>= 1.4.6)
|
35
|
+
database_cleaner (0.8.0)
|
36
|
+
diff-lcs (1.1.3)
|
37
|
+
fakefs (0.4.0)
|
38
|
+
faraday (0.7.6)
|
39
|
+
addressable (~> 2.2)
|
40
|
+
multipart-post (~> 1.1)
|
41
|
+
rack (~> 1.1)
|
42
|
+
faraday_middleware (0.7.0)
|
43
|
+
faraday (~> 0.7.3)
|
44
|
+
flying-sphinx (0.6.5)
|
45
|
+
faraday_middleware (~> 0.7.0)
|
46
|
+
multi_json (>= 1.0.1)
|
47
|
+
net-ssh (>= 2.0.23)
|
48
|
+
rash (~> 0.3.0)
|
49
|
+
riddle (>= 1.5.0)
|
50
|
+
thinking-sphinx
|
51
|
+
gherkin (2.11.0)
|
52
|
+
json (>= 1.4.6)
|
53
|
+
guard (0.8.8)
|
54
|
+
thor (~> 0.14.6)
|
55
|
+
guard-bundler (0.1.3)
|
56
|
+
bundler (>= 1.0.0)
|
57
|
+
guard (>= 0.2.2)
|
58
|
+
guard-cucumber (0.7.5)
|
59
|
+
cucumber (>= 0.10)
|
60
|
+
guard (>= 0.8.3)
|
61
|
+
guard-rspec (0.5.11)
|
62
|
+
guard (>= 0.8.4)
|
63
|
+
hashie (1.2.0)
|
64
|
+
i18n (0.6.0)
|
65
|
+
json (1.7.3)
|
66
|
+
mock_redis (0.3.0)
|
67
|
+
multi_json (1.3.6)
|
68
|
+
multipart-post (1.1.5)
|
69
|
+
mysql2 (0.3.11)
|
70
|
+
net-ssh (2.5.2)
|
71
|
+
rack (1.4.1)
|
72
|
+
rack-protection (1.2.0)
|
73
|
+
rack
|
74
|
+
rake (0.9.2.2)
|
75
|
+
rash (0.3.2)
|
76
|
+
hashie (~> 1.2.0)
|
77
|
+
redis (2.2.2)
|
78
|
+
redis-namespace (1.0.3)
|
79
|
+
redis (< 3.0.0)
|
80
|
+
resque (1.20.0)
|
81
|
+
multi_json (~> 1.0)
|
82
|
+
redis-namespace (~> 1.0.2)
|
83
|
+
sinatra (>= 0.9.2)
|
84
|
+
vegas (~> 0.1.2)
|
85
|
+
resque-lock-timeout (0.3.3)
|
86
|
+
resque (>= 1.8.0)
|
87
|
+
riddle (1.5.2)
|
88
|
+
rspec (2.10.0)
|
89
|
+
rspec-core (~> 2.10.0)
|
90
|
+
rspec-expectations (~> 2.10.0)
|
91
|
+
rspec-mocks (~> 2.10.0)
|
92
|
+
rspec-core (2.10.1)
|
93
|
+
rspec-expectations (2.10.0)
|
94
|
+
diff-lcs (~> 1.1.3)
|
95
|
+
rspec-mocks (2.10.1)
|
96
|
+
sinatra (1.3.2)
|
97
|
+
rack (~> 1.3, >= 1.3.6)
|
98
|
+
rack-protection (~> 1.2)
|
99
|
+
tilt (~> 1.3, >= 1.3.3)
|
100
|
+
thinking-sphinx (2.0.12)
|
101
|
+
activerecord (>= 3.0.3)
|
102
|
+
builder (>= 2.1.2)
|
103
|
+
riddle (>= 1.5.2)
|
104
|
+
thor (0.14.6)
|
105
|
+
tilt (1.3.3)
|
106
|
+
tzinfo (0.3.33)
|
107
|
+
vegas (0.1.11)
|
108
|
+
rack (>= 1.0.0)
|
109
|
+
|
110
|
+
PLATFORMS
|
111
|
+
ruby
|
112
|
+
|
113
|
+
DEPENDENCIES
|
114
|
+
activerecord (= 3.2.6)
|
115
|
+
appraisal (~> 0.4.1)
|
116
|
+
cucumber
|
117
|
+
database_cleaner (>= 0.5.2)
|
118
|
+
fakefs (~> 0.4.0)
|
119
|
+
flying-sphinx (>= 0.5.1)
|
120
|
+
guard (~> 0.8.8)
|
121
|
+
guard-bundler (~> 0.1.3)
|
122
|
+
guard-cucumber (~> 0.7.4)
|
123
|
+
guard-rspec (~> 0.5.8)
|
124
|
+
mock_redis (~> 0.3.0)
|
125
|
+
mysql2 (~> 0.3.11)
|
126
|
+
rake (>= 0.8.7)
|
127
|
+
rspec (~> 2.10.0)
|
128
|
+
ts-resque-delta!
|
@@ -35,14 +35,17 @@ class ThinkingSphinx::Deltas::ResqueDelta < ThinkingSphinx::Deltas::DefaultDelta
|
|
35
35
|
end
|
36
36
|
|
37
37
|
def get_subset_for_processing(core_name)
|
38
|
-
#
|
39
|
-
Resque.redis.
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
38
|
+
# Use a transaction to keep from losing set members if interrupted
|
39
|
+
Resque.redis.multi do
|
40
|
+
# Copy set to temp
|
41
|
+
Resque.redis.sunionstore temp_name(core_name), set_name(core_name)
|
42
|
+
# Store (set - temp) into set. This removes all items we copied into temp from set.
|
43
|
+
Resque.redis.sdiffstore set_name(core_name), set_name(core_name), temp_name(core_name)
|
44
|
+
# Merge processing and temp together and store into processing.
|
45
|
+
Resque.redis.sunionstore processing_name(core_name), processing_name(core_name), temp_name(core_name)
|
46
|
+
|
47
|
+
Resque.redis.del temp_name(core_name)
|
48
|
+
end
|
46
49
|
end
|
47
50
|
|
48
51
|
def processing_members(core_name)
|
data/spec/bin/false.rb
ADDED
data/spec/bin/true.rb
ADDED
data/spec/spec_helper.rb
CHANGED
@@ -95,7 +95,7 @@ describe ThinkingSphinx::Deltas::ResqueDelta::CoreIndex do
|
|
95
95
|
config.stub(:searchd_file_path => test_path)
|
96
96
|
config.stub_chain(:controller, :index) do
|
97
97
|
# Set $? to 0
|
98
|
-
|
98
|
+
`#{File.join(SPEC_BIN_PATH, 'true.rb')}`
|
99
99
|
end
|
100
100
|
|
101
101
|
# Silence Generating config message
|
@@ -188,7 +188,7 @@ describe ThinkingSphinx::Deltas::ResqueDelta::CoreIndex do
|
|
188
188
|
before :each do
|
189
189
|
config.stub_chain(:controller, :index) do
|
190
190
|
# Set $? to 1
|
191
|
-
|
191
|
+
`#{File.join(SPEC_BIN_PATH, 'false.rb')}`
|
192
192
|
end
|
193
193
|
end
|
194
194
|
|
data/ts-resque-delta.gemspec
CHANGED
@@ -22,14 +22,14 @@ Gem::Specification.new do |s|
|
|
22
22
|
s.add_dependency "thinking-sphinx", ">= 1.4.1"
|
23
23
|
s.add_dependency "riddle", ">= 1.5"
|
24
24
|
s.add_dependency "resque", "~> 1.10"
|
25
|
-
s.add_dependency "resque-lock-timeout", "~> 0.
|
25
|
+
s.add_dependency "resque-lock-timeout", "~> 0.4"
|
26
26
|
|
27
|
-
s.add_development_dependency "rspec", "~> 2.
|
27
|
+
s.add_development_dependency "rspec", "~> 2.10.0"
|
28
28
|
s.add_development_dependency "cucumber", ">= 0"
|
29
29
|
s.add_development_dependency "database_cleaner", ">= 0.5.2"
|
30
|
-
s.add_development_dependency "mysql2", "~> 0.
|
30
|
+
s.add_development_dependency "mysql2", "~> 0.3.11"
|
31
31
|
s.add_development_dependency "rake", ">= 0.8.7"
|
32
|
-
s.add_development_dependency "activerecord", "~> 2.
|
32
|
+
s.add_development_dependency "activerecord", "~> 3.2.0"
|
33
33
|
s.add_development_dependency "flying-sphinx", ">= 0.5.1"
|
34
34
|
s.add_development_dependency "mock_redis", "~> 0.3.0"
|
35
35
|
s.add_development_dependency "guard", "~> 0.8.8"
|
@@ -37,4 +37,5 @@ Gem::Specification.new do |s|
|
|
37
37
|
s.add_development_dependency "guard-bundler", "~> 0.1.3"
|
38
38
|
s.add_development_dependency "guard-cucumber", "~> 0.7.4"
|
39
39
|
s.add_development_dependency "fakefs", "~> 0.4.0"
|
40
|
+
s.add_development_dependency "appraisal", "~> 0.4.1"
|
40
41
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ts-resque-delta
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
4
|
+
version: 1.2.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-11-26 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: thinking-sphinx
|
16
|
-
requirement:
|
16
|
+
requirement: !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,15 @@ dependencies:
|
|
21
21
|
version: 1.4.1
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements:
|
24
|
+
version_requirements: !ruby/object:Gem::Requirement
|
25
|
+
none: false
|
26
|
+
requirements:
|
27
|
+
- - ! '>='
|
28
|
+
- !ruby/object:Gem::Version
|
29
|
+
version: 1.4.1
|
25
30
|
- !ruby/object:Gem::Dependency
|
26
31
|
name: riddle
|
27
|
-
requirement:
|
32
|
+
requirement: !ruby/object:Gem::Requirement
|
28
33
|
none: false
|
29
34
|
requirements:
|
30
35
|
- - ! '>='
|
@@ -32,10 +37,15 @@ dependencies:
|
|
32
37
|
version: '1.5'
|
33
38
|
type: :runtime
|
34
39
|
prerelease: false
|
35
|
-
version_requirements:
|
40
|
+
version_requirements: !ruby/object:Gem::Requirement
|
41
|
+
none: false
|
42
|
+
requirements:
|
43
|
+
- - ! '>='
|
44
|
+
- !ruby/object:Gem::Version
|
45
|
+
version: '1.5'
|
36
46
|
- !ruby/object:Gem::Dependency
|
37
47
|
name: resque
|
38
|
-
requirement:
|
48
|
+
requirement: !ruby/object:Gem::Requirement
|
39
49
|
none: false
|
40
50
|
requirements:
|
41
51
|
- - ~>
|
@@ -43,32 +53,47 @@ dependencies:
|
|
43
53
|
version: '1.10'
|
44
54
|
type: :runtime
|
45
55
|
prerelease: false
|
46
|
-
version_requirements:
|
56
|
+
version_requirements: !ruby/object:Gem::Requirement
|
57
|
+
none: false
|
58
|
+
requirements:
|
59
|
+
- - ~>
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: '1.10'
|
47
62
|
- !ruby/object:Gem::Dependency
|
48
63
|
name: resque-lock-timeout
|
49
|
-
requirement:
|
64
|
+
requirement: !ruby/object:Gem::Requirement
|
50
65
|
none: false
|
51
66
|
requirements:
|
52
67
|
- - ~>
|
53
68
|
- !ruby/object:Gem::Version
|
54
|
-
version: 0.
|
69
|
+
version: '0.4'
|
55
70
|
type: :runtime
|
56
71
|
prerelease: false
|
57
|
-
version_requirements:
|
72
|
+
version_requirements: !ruby/object:Gem::Requirement
|
73
|
+
none: false
|
74
|
+
requirements:
|
75
|
+
- - ~>
|
76
|
+
- !ruby/object:Gem::Version
|
77
|
+
version: '0.4'
|
58
78
|
- !ruby/object:Gem::Dependency
|
59
79
|
name: rspec
|
60
|
-
requirement:
|
80
|
+
requirement: !ruby/object:Gem::Requirement
|
61
81
|
none: false
|
62
82
|
requirements:
|
63
83
|
- - ~>
|
64
84
|
- !ruby/object:Gem::Version
|
65
|
-
version: 2.
|
85
|
+
version: 2.10.0
|
66
86
|
type: :development
|
67
87
|
prerelease: false
|
68
|
-
version_requirements:
|
88
|
+
version_requirements: !ruby/object:Gem::Requirement
|
89
|
+
none: false
|
90
|
+
requirements:
|
91
|
+
- - ~>
|
92
|
+
- !ruby/object:Gem::Version
|
93
|
+
version: 2.10.0
|
69
94
|
- !ruby/object:Gem::Dependency
|
70
95
|
name: cucumber
|
71
|
-
requirement:
|
96
|
+
requirement: !ruby/object:Gem::Requirement
|
72
97
|
none: false
|
73
98
|
requirements:
|
74
99
|
- - ! '>='
|
@@ -76,10 +101,15 @@ dependencies:
|
|
76
101
|
version: '0'
|
77
102
|
type: :development
|
78
103
|
prerelease: false
|
79
|
-
version_requirements:
|
104
|
+
version_requirements: !ruby/object:Gem::Requirement
|
105
|
+
none: false
|
106
|
+
requirements:
|
107
|
+
- - ! '>='
|
108
|
+
- !ruby/object:Gem::Version
|
109
|
+
version: '0'
|
80
110
|
- !ruby/object:Gem::Dependency
|
81
111
|
name: database_cleaner
|
82
|
-
requirement:
|
112
|
+
requirement: !ruby/object:Gem::Requirement
|
83
113
|
none: false
|
84
114
|
requirements:
|
85
115
|
- - ! '>='
|
@@ -87,21 +117,31 @@ dependencies:
|
|
87
117
|
version: 0.5.2
|
88
118
|
type: :development
|
89
119
|
prerelease: false
|
90
|
-
version_requirements:
|
120
|
+
version_requirements: !ruby/object:Gem::Requirement
|
121
|
+
none: false
|
122
|
+
requirements:
|
123
|
+
- - ! '>='
|
124
|
+
- !ruby/object:Gem::Version
|
125
|
+
version: 0.5.2
|
91
126
|
- !ruby/object:Gem::Dependency
|
92
127
|
name: mysql2
|
93
|
-
requirement:
|
128
|
+
requirement: !ruby/object:Gem::Requirement
|
94
129
|
none: false
|
95
130
|
requirements:
|
96
131
|
- - ~>
|
97
132
|
- !ruby/object:Gem::Version
|
98
|
-
version: 0.
|
133
|
+
version: 0.3.11
|
99
134
|
type: :development
|
100
135
|
prerelease: false
|
101
|
-
version_requirements:
|
136
|
+
version_requirements: !ruby/object:Gem::Requirement
|
137
|
+
none: false
|
138
|
+
requirements:
|
139
|
+
- - ~>
|
140
|
+
- !ruby/object:Gem::Version
|
141
|
+
version: 0.3.11
|
102
142
|
- !ruby/object:Gem::Dependency
|
103
143
|
name: rake
|
104
|
-
requirement:
|
144
|
+
requirement: !ruby/object:Gem::Requirement
|
105
145
|
none: false
|
106
146
|
requirements:
|
107
147
|
- - ! '>='
|
@@ -109,21 +149,31 @@ dependencies:
|
|
109
149
|
version: 0.8.7
|
110
150
|
type: :development
|
111
151
|
prerelease: false
|
112
|
-
version_requirements:
|
152
|
+
version_requirements: !ruby/object:Gem::Requirement
|
153
|
+
none: false
|
154
|
+
requirements:
|
155
|
+
- - ! '>='
|
156
|
+
- !ruby/object:Gem::Version
|
157
|
+
version: 0.8.7
|
113
158
|
- !ruby/object:Gem::Dependency
|
114
159
|
name: activerecord
|
115
|
-
requirement:
|
160
|
+
requirement: !ruby/object:Gem::Requirement
|
116
161
|
none: false
|
117
162
|
requirements:
|
118
163
|
- - ~>
|
119
164
|
- !ruby/object:Gem::Version
|
120
|
-
version: 2.
|
165
|
+
version: 3.2.0
|
121
166
|
type: :development
|
122
167
|
prerelease: false
|
123
|
-
version_requirements:
|
168
|
+
version_requirements: !ruby/object:Gem::Requirement
|
169
|
+
none: false
|
170
|
+
requirements:
|
171
|
+
- - ~>
|
172
|
+
- !ruby/object:Gem::Version
|
173
|
+
version: 3.2.0
|
124
174
|
- !ruby/object:Gem::Dependency
|
125
175
|
name: flying-sphinx
|
126
|
-
requirement:
|
176
|
+
requirement: !ruby/object:Gem::Requirement
|
127
177
|
none: false
|
128
178
|
requirements:
|
129
179
|
- - ! '>='
|
@@ -131,10 +181,15 @@ dependencies:
|
|
131
181
|
version: 0.5.1
|
132
182
|
type: :development
|
133
183
|
prerelease: false
|
134
|
-
version_requirements:
|
184
|
+
version_requirements: !ruby/object:Gem::Requirement
|
185
|
+
none: false
|
186
|
+
requirements:
|
187
|
+
- - ! '>='
|
188
|
+
- !ruby/object:Gem::Version
|
189
|
+
version: 0.5.1
|
135
190
|
- !ruby/object:Gem::Dependency
|
136
191
|
name: mock_redis
|
137
|
-
requirement:
|
192
|
+
requirement: !ruby/object:Gem::Requirement
|
138
193
|
none: false
|
139
194
|
requirements:
|
140
195
|
- - ~>
|
@@ -142,10 +197,15 @@ dependencies:
|
|
142
197
|
version: 0.3.0
|
143
198
|
type: :development
|
144
199
|
prerelease: false
|
145
|
-
version_requirements:
|
200
|
+
version_requirements: !ruby/object:Gem::Requirement
|
201
|
+
none: false
|
202
|
+
requirements:
|
203
|
+
- - ~>
|
204
|
+
- !ruby/object:Gem::Version
|
205
|
+
version: 0.3.0
|
146
206
|
- !ruby/object:Gem::Dependency
|
147
207
|
name: guard
|
148
|
-
requirement:
|
208
|
+
requirement: !ruby/object:Gem::Requirement
|
149
209
|
none: false
|
150
210
|
requirements:
|
151
211
|
- - ~>
|
@@ -153,10 +213,15 @@ dependencies:
|
|
153
213
|
version: 0.8.8
|
154
214
|
type: :development
|
155
215
|
prerelease: false
|
156
|
-
version_requirements:
|
216
|
+
version_requirements: !ruby/object:Gem::Requirement
|
217
|
+
none: false
|
218
|
+
requirements:
|
219
|
+
- - ~>
|
220
|
+
- !ruby/object:Gem::Version
|
221
|
+
version: 0.8.8
|
157
222
|
- !ruby/object:Gem::Dependency
|
158
223
|
name: guard-rspec
|
159
|
-
requirement:
|
224
|
+
requirement: !ruby/object:Gem::Requirement
|
160
225
|
none: false
|
161
226
|
requirements:
|
162
227
|
- - ~>
|
@@ -164,10 +229,15 @@ dependencies:
|
|
164
229
|
version: 0.5.8
|
165
230
|
type: :development
|
166
231
|
prerelease: false
|
167
|
-
version_requirements:
|
232
|
+
version_requirements: !ruby/object:Gem::Requirement
|
233
|
+
none: false
|
234
|
+
requirements:
|
235
|
+
- - ~>
|
236
|
+
- !ruby/object:Gem::Version
|
237
|
+
version: 0.5.8
|
168
238
|
- !ruby/object:Gem::Dependency
|
169
239
|
name: guard-bundler
|
170
|
-
requirement:
|
240
|
+
requirement: !ruby/object:Gem::Requirement
|
171
241
|
none: false
|
172
242
|
requirements:
|
173
243
|
- - ~>
|
@@ -175,10 +245,15 @@ dependencies:
|
|
175
245
|
version: 0.1.3
|
176
246
|
type: :development
|
177
247
|
prerelease: false
|
178
|
-
version_requirements:
|
248
|
+
version_requirements: !ruby/object:Gem::Requirement
|
249
|
+
none: false
|
250
|
+
requirements:
|
251
|
+
- - ~>
|
252
|
+
- !ruby/object:Gem::Version
|
253
|
+
version: 0.1.3
|
179
254
|
- !ruby/object:Gem::Dependency
|
180
255
|
name: guard-cucumber
|
181
|
-
requirement:
|
256
|
+
requirement: !ruby/object:Gem::Requirement
|
182
257
|
none: false
|
183
258
|
requirements:
|
184
259
|
- - ~>
|
@@ -186,10 +261,15 @@ dependencies:
|
|
186
261
|
version: 0.7.4
|
187
262
|
type: :development
|
188
263
|
prerelease: false
|
189
|
-
version_requirements:
|
264
|
+
version_requirements: !ruby/object:Gem::Requirement
|
265
|
+
none: false
|
266
|
+
requirements:
|
267
|
+
- - ~>
|
268
|
+
- !ruby/object:Gem::Version
|
269
|
+
version: 0.7.4
|
190
270
|
- !ruby/object:Gem::Dependency
|
191
271
|
name: fakefs
|
192
|
-
requirement:
|
272
|
+
requirement: !ruby/object:Gem::Requirement
|
193
273
|
none: false
|
194
274
|
requirements:
|
195
275
|
- - ~>
|
@@ -197,7 +277,28 @@ dependencies:
|
|
197
277
|
version: 0.4.0
|
198
278
|
type: :development
|
199
279
|
prerelease: false
|
200
|
-
version_requirements:
|
280
|
+
version_requirements: !ruby/object:Gem::Requirement
|
281
|
+
none: false
|
282
|
+
requirements:
|
283
|
+
- - ~>
|
284
|
+
- !ruby/object:Gem::Version
|
285
|
+
version: 0.4.0
|
286
|
+
- !ruby/object:Gem::Dependency
|
287
|
+
name: appraisal
|
288
|
+
requirement: !ruby/object:Gem::Requirement
|
289
|
+
none: false
|
290
|
+
requirements:
|
291
|
+
- - ~>
|
292
|
+
- !ruby/object:Gem::Version
|
293
|
+
version: 0.4.1
|
294
|
+
type: :development
|
295
|
+
prerelease: false
|
296
|
+
version_requirements: !ruby/object:Gem::Requirement
|
297
|
+
none: false
|
298
|
+
requirements:
|
299
|
+
- - ~>
|
300
|
+
- !ruby/object:Gem::Version
|
301
|
+
version: 0.4.1
|
201
302
|
description: Manage delta indexes via Resque for Thinking Sphinx
|
202
303
|
email:
|
203
304
|
- aaron.gibralter@gmail.com
|
@@ -206,7 +307,10 @@ extensions: []
|
|
206
307
|
extra_rdoc_files: []
|
207
308
|
files:
|
208
309
|
- .gitignore
|
310
|
+
- .travis.yml
|
311
|
+
- Appraisals
|
209
312
|
- Gemfile
|
313
|
+
- Gemfile.lock
|
210
314
|
- Guardfile
|
211
315
|
- LICENSE
|
212
316
|
- README.markdown
|
@@ -222,6 +326,10 @@ files:
|
|
222
326
|
- features/thinking_sphinx/database.example.yml
|
223
327
|
- features/thinking_sphinx/db/migrations/create_delayed_betas.rb
|
224
328
|
- features/thinking_sphinx/models/delayed_beta.rb
|
329
|
+
- gemfiles/activerecord2.gemfile
|
330
|
+
- gemfiles/activerecord2.gemfile.lock
|
331
|
+
- gemfiles/activerecord3.gemfile
|
332
|
+
- gemfiles/activerecord3.gemfile.lock
|
225
333
|
- lib/flying_sphinx/resque_delta.rb
|
226
334
|
- lib/flying_sphinx/resque_delta/delta_job.rb
|
227
335
|
- lib/flying_sphinx/resque_delta/flag_as_deleted_job.rb
|
@@ -234,6 +342,8 @@ files:
|
|
234
342
|
- lib/thinking_sphinx/deltas/resque_delta/tasks.rb
|
235
343
|
- lib/thinking_sphinx/deltas/resque_delta/version.rb
|
236
344
|
- lib/ts-resque-delta.rb
|
345
|
+
- spec/bin/false.rb
|
346
|
+
- spec/bin/true.rb
|
237
347
|
- spec/flying_sphinx/resque_delta/delta_job_spec.rb
|
238
348
|
- spec/flying_sphinx/resque_delta/flag_as_deleted_job_spec.rb
|
239
349
|
- spec/flying_sphinx/resque_delta_spec.rb
|
@@ -265,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
265
375
|
version: '0'
|
266
376
|
requirements: []
|
267
377
|
rubyforge_project: ts-resque-delta
|
268
|
-
rubygems_version: 1.8.
|
378
|
+
rubygems_version: 1.8.24
|
269
379
|
signing_key:
|
270
380
|
specification_version: 3
|
271
381
|
summary: Thinking Sphinx - Resque Deltas
|
@@ -279,6 +389,8 @@ test_files:
|
|
279
389
|
- features/thinking_sphinx/database.example.yml
|
280
390
|
- features/thinking_sphinx/db/migrations/create_delayed_betas.rb
|
281
391
|
- features/thinking_sphinx/models/delayed_beta.rb
|
392
|
+
- spec/bin/false.rb
|
393
|
+
- spec/bin/true.rb
|
282
394
|
- spec/flying_sphinx/resque_delta/delta_job_spec.rb
|
283
395
|
- spec/flying_sphinx/resque_delta/flag_as_deleted_job_spec.rb
|
284
396
|
- spec/flying_sphinx/resque_delta_spec.rb
|