circular dependency removed

Gemfile.lock

@@ -1,20 +1,32 @@
 PATH
   remote: .
   specs:
+<<<<<<< HEAD
+    gattica (0.5.1)
+=======
     gattica (0.6.0)
       gattica
+>>>>>>> upstream/master
       hpricot
       test-unit
 
 GEM
   remote: http://rubygems.org/
   specs:
     hpricot (0.8.6)
+<<<<<<< HEAD
+    rake (0.9.2.2)
+=======
+>>>>>>> upstream/master
     test-unit (2.4.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+<<<<<<< HEAD
+  rake
+=======
   gattica!
+>>>>>>> upstream/master
   test-unit

Gemfile.lock.orig

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+<<<<<<< HEAD
+    gattica (0.5.1)
+=======
+    gattica (0.6.0)
+      gattica
+>>>>>>> upstream/master
+      hpricot
+      test-unit
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    hpricot (0.8.6)
+<<<<<<< HEAD
+    rake (0.9.2.2)
+=======
+>>>>>>> upstream/master
+    test-unit (2.4.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+<<<<<<< HEAD
+  rake
+=======
+  gattica!
+>>>>>>> upstream/master
+  test-unit

lib/gattica/data_point.rb

@@ -55,6 +55,18 @@ def to_yaml
         'dimensions' => @dimensions,
         'metrics' => @metrics }.to_yaml
     end
+
+    def to_hash
+
+      res_hash = {}
+
+      @dimensions.each{|d| res_hash.merge!(d) }
+      # output all metrics
+      @metrics.each{|m| res_hash.merge!(m) }
+      res_hash
+
+    end
+
 
   end
 

lib/gattica/data_set.rb

@@ -48,6 +48,10 @@ def to_yaml
         'points' => @points }.to_yaml
     end
 
+    def to_hash
+      @points.map(&:to_hash)
+    end
+
   end
 
 end

lib/gattica/engine.rb

@@ -170,7 +170,7 @@ def do_http_get(query_string)
         end
       end
 
-      return data
+      return response.body
     end