ts-resque-delta 1.2.1 → 1.2.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -7,29 +7,26 @@ class FlyingSphinx::ResqueDelta < ThinkingSphinx::Deltas::ResqueDelta
7
7
  FlyingSphinx::ResqueDelta::FlagAsDeletedJob
8
8
  ]
9
9
  end
10
-
10
+
11
11
  def self.job_prefix
12
12
  'fs-delta'
13
13
  end
14
-
14
+
15
15
  def index(model, instance = nil)
16
16
  return true if skip?(instance)
17
-
17
+
18
18
  model.delta_index_names.each do |delta|
19
19
  next if self.class.locked?(delta)
20
-
21
- Resque.enqueue(
22
- FlyingSphinx::ResqueDelta::DeltaJob,
23
- [delta]
24
- )
20
+
21
+ Resque.enqueue FlyingSphinx::ResqueDelta::DeltaJob, delta
25
22
  end
26
-
23
+
27
24
  Resque.enqueue(
28
25
  FlyingSphinx::ResqueDelta::FlagAsDeletedJob,
29
26
  model.core_index_names,
30
27
  instance.sphinx_document_id
31
28
  ) if instance
32
-
29
+
33
30
  true
34
31
  end
35
32
  end
@@ -1,6 +1,6 @@
1
1
  class FlyingSphinx::ResqueDelta::DeltaJob < ThinkingSphinx::Deltas::ResqueDelta::DeltaJob
2
2
  @queue = :fs_delta
3
-
3
+
4
4
  # Runs Sphinx's indexer tool to process the index. Currently assumes Sphinx
5
5
  # is running.
6
6
  #
@@ -9,6 +9,6 @@ class FlyingSphinx::ResqueDelta::DeltaJob < ThinkingSphinx::Deltas::ResqueDelta:
9
9
  def self.perform(indices)
10
10
  return if skip?(indices)
11
11
 
12
- FlyingSphinx::IndexRequest.new(indices).perform
12
+ FlyingSphinx::IndexRequest.new([indices]).perform
13
13
  end
14
14
  end
@@ -1,7 +1,7 @@
1
1
  module ThinkingSphinx
2
2
  module Deltas
3
3
  class ResqueDeltaInfo
4
- VERSION = '1.2.1'
4
+ VERSION = '1.2.2'
5
5
  end
6
6
  end
7
7
  end
@@ -7,26 +7,26 @@ describe FlyingSphinx::ResqueDelta::DeltaJob do
7
7
  should == :fs_delta
8
8
  end
9
9
  end
10
-
10
+
11
11
  describe '.perform' do
12
12
  it "doesn't create an index request when skipping" do
13
13
  FlyingSphinx::ResqueDelta::DeltaJob.stub!(:skip? => true)
14
-
14
+
15
15
  FlyingSphinx::IndexRequest.should_not_receive(:new)
16
-
17
- FlyingSphinx::ResqueDelta::DeltaJob.perform ['foo_delta']
16
+
17
+ FlyingSphinx::ResqueDelta::DeltaJob.perform 'foo_delta'
18
18
  end
19
-
19
+
20
20
  it "performs an index request when not skipping" do
21
21
  request = double('index request', :perform => true)
22
22
  FlyingSphinx::ResqueDelta::DeltaJob.stub!(:skip? => false)
23
-
23
+
24
24
  FlyingSphinx::IndexRequest.should_receive(:new).
25
25
  with(['foo_delta']).
26
26
  and_return(request)
27
27
  request.should_receive(:perform)
28
-
29
- FlyingSphinx::ResqueDelta::DeltaJob.perform ['foo_delta']
28
+
29
+ FlyingSphinx::ResqueDelta::DeltaJob.perform 'foo_delta'
30
30
  end
31
31
  end
32
32
  end
@@ -9,13 +9,13 @@ describe FlyingSphinx::ResqueDelta do
9
9
  ]
10
10
  end
11
11
  end
12
-
12
+
13
13
  describe '.job_prefix' do
14
14
  it "is fs-delta" do
15
15
  FlyingSphinx::ResqueDelta.job_prefix.should == 'fs-delta'
16
16
  end
17
17
  end
18
-
18
+
19
19
  describe '#index' do
20
20
  before :each do
21
21
  ThinkingSphinx.updates_enabled = true
@@ -90,8 +90,7 @@ describe FlyingSphinx::ResqueDelta do
90
90
 
91
91
  it "should enqueue a delta job" do
92
92
  Resque.should_receive(:enqueue).at_least(:once).with(
93
- FlyingSphinx::ResqueDelta::DeltaJob,
94
- ['foo_delta']
93
+ FlyingSphinx::ResqueDelta::DeltaJob, 'foo_delta'
95
94
  )
96
95
  @delayed_delta.index(@model)
97
96
  end
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
31
31
  s.add_development_dependency "rake", ">= 0.8.7"
32
32
  s.add_development_dependency "activerecord", "~> 2.3.11"
33
33
  s.add_development_dependency "flying-sphinx", ">= 0.5.1"
34
- s.add_development_dependency "ryansch-mock_redis", "~> 0.3.0"
34
+ s.add_development_dependency "mock_redis", "~> 0.3.0"
35
35
  s.add_development_dependency "guard", "~> 0.8.8"
36
36
  s.add_development_dependency "guard-rspec", "~> 0.5.8"
37
37
  s.add_development_dependency "guard-bundler", "~> 0.1.3"
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.1
4
+ version: 1.2.2
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: 2011-12-21 00:00:00.000000000 Z
12
+ date: 2012-05-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: thinking-sphinx
16
- requirement: &70353934169780 !ruby/object:Gem::Requirement
16
+ requirement: &70228176788680 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.4.1
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70353934169780
24
+ version_requirements: *70228176788680
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: riddle
27
- requirement: &70353934169060 !ruby/object:Gem::Requirement
27
+ requirement: &70228176715300 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '1.5'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70353934169060
35
+ version_requirements: *70228176715300
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: resque
38
- requirement: &70353934168300 !ruby/object:Gem::Requirement
38
+ requirement: &70228176710500 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '1.10'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70353934168300
46
+ version_requirements: *70228176710500
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: resque-lock-timeout
49
- requirement: &70353934167540 !ruby/object:Gem::Requirement
49
+ requirement: &70228176564800 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 0.3.1
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70353934167540
57
+ version_requirements: *70228176564800
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &70353934165840 !ruby/object:Gem::Requirement
60
+ requirement: &70228176561680 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 2.7.0
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70353934165840
68
+ version_requirements: *70228176561680
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: cucumber
71
- requirement: &70353934165080 !ruby/object:Gem::Requirement
71
+ requirement: &70228176559760 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70353934165080
79
+ version_requirements: *70228176559760
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: database_cleaner
82
- requirement: &70353934164440 !ruby/object:Gem::Requirement
82
+ requirement: &70228176558680 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 0.5.2
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70353934164440
90
+ version_requirements: *70228176558680
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: mysql2
93
- requirement: &70353934163720 !ruby/object:Gem::Requirement
93
+ requirement: &70228176557720 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 0.2.7
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70353934163720
101
+ version_requirements: *70228176557720
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rake
104
- requirement: &70353934162820 !ruby/object:Gem::Requirement
104
+ requirement: &70228176556760 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 0.8.7
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70353934162820
112
+ version_requirements: *70228176556760
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: activerecord
115
- requirement: &70353934161620 !ruby/object:Gem::Requirement
115
+ requirement: &70228176555900 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 2.3.11
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70353934161620
123
+ version_requirements: *70228176555900
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: flying-sphinx
126
- requirement: &70353934161100 !ruby/object:Gem::Requirement
126
+ requirement: &70228176555220 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 0.5.1
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70353934161100
134
+ version_requirements: *70228176555220
135
135
  - !ruby/object:Gem::Dependency
136
- name: ryansch-mock_redis
137
- requirement: &70353934160360 !ruby/object:Gem::Requirement
136
+ name: mock_redis
137
+ requirement: &70228176554600 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: 0.3.0
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *70353934160360
145
+ version_requirements: *70228176554600
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: guard
148
- requirement: &70353934159100 !ruby/object:Gem::Requirement
148
+ requirement: &70228176553900 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: 0.8.8
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *70353934159100
156
+ version_requirements: *70228176553900
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: guard-rspec
159
- requirement: &70353934157480 !ruby/object:Gem::Requirement
159
+ requirement: &70228176553160 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: 0.5.8
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *70353934157480
167
+ version_requirements: *70228176553160
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: guard-bundler
170
- requirement: &70353934156780 !ruby/object:Gem::Requirement
170
+ requirement: &70228176552380 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ~>
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: 0.1.3
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *70353934156780
178
+ version_requirements: *70228176552380
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: guard-cucumber
181
- requirement: &70353934156000 !ruby/object:Gem::Requirement
181
+ requirement: &70228176551380 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ~>
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: 0.7.4
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *70353934156000
189
+ version_requirements: *70228176551380
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: fakefs
192
- requirement: &70353934155120 !ruby/object:Gem::Requirement
192
+ requirement: &70228176549160 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ~>
@@ -197,7 +197,7 @@ dependencies:
197
197
  version: 0.4.0
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *70353934155120
200
+ version_requirements: *70228176549160
201
201
  description: Manage delta indexes via Resque for Thinking Sphinx
202
202
  email:
203
203
  - aaron.gibralter@gmail.com