From 8a3151cf586251d2d6c01bc0caa09a9bc7e8aa57 Mon Sep 17 00:00:00 2001
From: dinedine <didier.lafforgue@gmail.com>
Date: Tue, 4 Jan 2011 12:49:14 +0100
Subject: [PATCH] change version + bug fix with the webservice module

---
 lib/locomotive/httparty/webservice.rb           | 6 +++---
 lib/locomotive/version.rb                       | 2 +-
 spec/lib/locomotive/httparty/webservice_spec.rb | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/locomotive/httparty/webservice.rb b/lib/locomotive/httparty/webservice.rb
index bf5705aa..02881b71 100644
--- a/lib/locomotive/httparty/webservice.rb
+++ b/lib/locomotive/httparty/webservice.rb
@@ -20,10 +20,10 @@ module Locomotive
         response = self.get(path, options)
 
         if response.code == 200
-          if response.respond_to?(:each)
-            response.collect(&:underscore_keys)
+          if response.respond_to?(:underscore_keys)
+            response.underscore_keys
           else
-            response.try(:underscore_keys)
+            response.collect(&:underscore_keys)
           end
         else
           nil
diff --git a/lib/locomotive/version.rb b/lib/locomotive/version.rb
index 0a49314d..3e81c606 100644
--- a/lib/locomotive/version.rb
+++ b/lib/locomotive/version.rb
@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = "1.0.0.0beta"
+  VERSION = "1.0.0.beta"
 end
diff --git a/spec/lib/locomotive/httparty/webservice_spec.rb b/spec/lib/locomotive/httparty/webservice_spec.rb
index 87503271..3f5f23ea 100644
--- a/spec/lib/locomotive/httparty/webservice_spec.rb
+++ b/spec/lib/locomotive/httparty/webservice_spec.rb
@@ -5,7 +5,7 @@ describe Locomotive::Httparty::Webservice do
   context '#consuming' do
 
     before(:each) do
-      @response = mock('response', :code => 200, :underscore_keys => [])
+      @response = mock('response', :code => 200, :underscore_keys => {})
     end
 
     it 'sets the base uri from a simple url' do