openkvk 0.0.6 → 0.0.7

data/lib/openkvk/api.rb

@@ -9,26 +9,34 @@ module OpenKVK
   class API
     class << self
       def search(keywords)
-        JSON.parse(get(keywords, "sphinx")).first["RESULT"]
+        begin
+          JSON.parse(get(keywords, "sphinx")).first["RESULT"]
+        rescue Exception => e
+          raise_exception
+        end
       end
       
       def query(query)
-        result = JSON.parse(get(query)).first["RESULT"]
-        result["ROWS"].map { |row| Hashie::Mash.new(Hash[*result["HEADER"].zip(row).flatten]) }
+        begin
+          result = JSON.parse(get(query)).first["RESULT"]
+          result["ROWS"].map { |row| Hashie::Mash.new(Hash[*result["HEADER"].zip(row).flatten]) }
+        rescue Exception => e
+          raise_exception
+        end
       end
       
       private
       
       def get(query, service="api")
-        begin
-          response = Net::HTTP.get_response(URI.parse("http://#{service}.#{OpenKVK.host}/json/#{URI.escape(query)}"))
-          if response.kind_of?(Net::HTTPRedirection)
-            response = Net::HTTP.get_response(URI.parse("http://#{service}.#{OpenKVK.host}/#{URI.escape(response["Location"])}"))
-          end
-          response.body
-        rescue Exception => e
-          raise InvalidResponseException.new("Couldn't get the response: #{$!}")
+        response = Net::HTTP.get_response(URI.parse("http://#{service}.#{OpenKVK.host}/json/#{URI.escape(query)}"))
+        if response.kind_of?(Net::HTTPRedirection)
+          response = Net::HTTP.get_response(URI.parse("http://#{service}.#{OpenKVK.host}/#{URI.escape(response["Location"])}"))
         end
+        response.body
+      end
+
+      def raise_exception
+        raise InvalidResponseException.new("Couldn't get the response: #{$!}")
       end
 
     end

data/lib/openkvk/version.rb

@@ -1,3 +1,3 @@
 module OpenKVK
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/openkvk/api_spec.rb

@@ -28,6 +28,16 @@ describe OpenKVK do
       }.should raise_error OpenKVK::InvalidResponseException
     end
     
+    it "should raise an exception when an blank result is returned by the host" do
+      response = stub(:body => "")
+      response.stubs(:kind_of?).returns(false)
+      Net::HTTP.stubs(:get_response).returns(response)
+      
+      lambda {
+        OpenKVK::API.search("zilverline")
+      }.should raise_error OpenKVK::InvalidResponseException
+    end
+    
   end
   
 end

metadata

@@ -2,7 +2,7 @@
 name: openkvk
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Daniel van Hoesel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 +02:00
+date: 2012-05-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency