flying-sphinx 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/flying_sphinx/index_request.rb

@@ -69,14 +69,15 @@ class FlyingSphinx::IndexRequest
   end
   
   def request_complete?
-    case response = api.get("/app/indices/#{index_id}")
+    response = api.get("/app/indices/#{index_id}")
+    case response.body
     when 'FINISHED', 'FAILED'
-      puts "Indexing request failed." if response == 'FAILED'
+      puts "Indexing request failed." if response.body == 'FAILED'
       true
     when 'PENDING'
       false
     else
-      raise "Unknown index response: #{response}"
+      raise "Unknown index response: '#{response.body}'"
     end
   end
   

data/spec/flying_sphinx/index_request_spec.rb

@@ -49,7 +49,8 @@ describe FlyingSphinx::IndexRequest do
       api.should_receive(:put).with('/app', conf_params).and_return('ok')
       api.should_receive(:post).
         with('/app/indices', index_params).and_return(42)
-      api.should_receive(:get).with('/app/indices/42').and_return('PENDING')
+      api.should_receive(:get).with('/app/indices/42').
+        and_return(stub(:response, :body => 'PENDING'))
       
       begin
         Timeout::timeout(0.2) {
@@ -63,7 +64,8 @@ describe FlyingSphinx::IndexRequest do
       api.should_receive(:put).with('/app', conf_params).and_return('ok')
       api.should_receive(:post).
         with('/app/indices', index_params).and_return(42)
-      api.should_receive(:get).with('/app/indices/42').and_return('FINISHED')
+      api.should_receive(:get).with('/app/indices/42').
+        and_return(stub(:response, :body => 'FINISHED'))
       
       index_request.update_and_index
     end
@@ -87,7 +89,8 @@ describe FlyingSphinx::IndexRequest do
     it "makes a new request" do
       api.should_receive(:post).
         with('/app/indices', index_params).and_return(42)
-      api.should_receive(:get).with('/app/indices/42').and_return('PENDING')
+      api.should_receive(:get).with('/app/indices/42').
+        and_return(stub(:response, :body => 'PENDING'))
       
       begin
         Timeout::timeout(0.2) {
@@ -100,7 +103,8 @@ describe FlyingSphinx::IndexRequest do
     it "should finish when the index request has been completed" do
       api.should_receive(:post).
         with('/app/indices', index_params).and_return(42)
-      api.should_receive(:get).with('/app/indices/42').and_return('FINISHED')
+      api.should_receive(:get).with('/app/indices/42').
+        and_return(stub(:response, :body => 'FINISHED'))
       
       index_request.perform
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 +11:00
+date: 2011-01-24 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency