Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

circular dependency removed #7

Merged
merged 13 commits into from
Commits on Jan 30, 2012
  1. @vgololobov
  2. @vgololobov

    circular dependency removed

    vgololobov authored
Commits on Feb 1, 2012
  1. @vgololobov
Commits on Mar 20, 2012
  1. @vgololobov

    debug

    vgololobov authored
  2. @vgololobov

    Revert "debug"

    vgololobov authored
    This reverts commit f2bb599.
  3. @vgololobov

    merget chrisle gattica

    vgololobov authored
  4. @vgololobov

    cleanup

    vgololobov authored
Commits on Mar 28, 2012
  1. @vgololobov
  2. @vgololobov
  3. @vgololobov
  4. @vgololobov

    To hash for set

    vgololobov authored
  5. @vgololobov

    To hash for point

    vgololobov authored
  6. @vgololobov

    To hash for set

    vgololobov authored
This page is out of date. Refresh to see the latest.
View
12 Gemfile.lock
@@ -1,8 +1,12 @@
PATH
remote: .
specs:
+<<<<<<< HEAD
+ gattica (0.5.1)
+=======
gattica (0.6.0)
gattica
+>>>>>>> upstream/master
hpricot
test-unit
@@ -10,11 +14,19 @@ 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
View
32 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
View
12 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
View
4 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
View
2  lib/gattica/engine.rb
@@ -170,7 +170,7 @@ def do_http_get(query_string)
end
end
- return data
+ return response.body
end
Something went wrong with that request. Please try again.