tupalo-gattica 0.3.4 → 0.3.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 3
+:patch: 5

data/lib/gattica.rb

@@ -11,7 +11,6 @@ require 'hpricot'
 require 'yaml'
 
 # internal
-require 'gattica/core_extensions'
 require 'gattica/convertible'
 require 'gattica/exceptions'
 require 'gattica/user'
@@ -26,7 +25,7 @@ require 'gattica/data_point'
 
 module Gattica
   
-  VERSION = '0.3.4.for_tupalo'
+  VERSION = '0.3.5.for_tupalo'
   
   # Creates a new instance of Gattica::Engine and gets us going. Please see the README for usage docs.
   #

data/lib/gattica/auth.rb

@@ -19,7 +19,7 @@ module Gattica
     def initialize(http, user)
       options = OPTIONS.merge(user.to_h)
       
-      response, data = http.post(SCRIPT_NAME, options.to_query, HEADERS)
+      response, data = http.post(SCRIPT_NAME, hash_to_query(options), HEADERS)
       if response.code != '200'
         case response.code
         when '403'
@@ -47,6 +47,14 @@ module Gattica
       end
       return tokens
     end
+
+    def hash_to_query(hash)
+      require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
+      hash.collect do |key, value|
+        "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
+      end.sort * '&'
+    end
+    
   
   end
 end

data/lib/gattica/convertible.rb

@@ -21,7 +21,14 @@ module Gattica
     alias inspect to_s
     
     def to_query
-      to_h.to_query
+      hash_to_query(to_h)
+    end
+    
+    def hash_to_query(hash)
+      require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
+      hash.collect do |key, value|
+        "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
+      end.sort * '&'
     end
     
     # Return the raw XML (if the object has a @xml instance variable, otherwise convert the object itself to xml)

data/lib/gattica/data_point.rb

@@ -37,10 +37,18 @@ module Gattica
       end
       
       # output all dimensions
-      @dimensions.map {|d| d.value}.each { |c| columns << c }
+      @dimensions.map {|d| 
+        (
+          d.values.first if d.length == 1
+        )
+      }.each { |c| columns << c }
       
       # output all metrics
-      @metrics.map {|m| m.value}.each { |c| columns << c }
+      @metrics.map {|m|
+        (
+          m.values.first if d.length == 1
+        )
+      }.each { |c| columns << c }
 
       output = CSV.generate_line(columns)      
       return output

data/lib/gattica/data_set.rb

@@ -34,8 +34,16 @@ module Gattica
       end
       
       unless @points.empty?   # if there was at least one result
-        @points.first.dimensions.map {|d| d.key}.each { |c| columns << c }
-        @points.first.metrics.map {|m| m.key}.each { |c| columns << c }
+        @points.first.dimensions.map { |d|
+          (
+            d.keys.first if d.length == 1
+          )
+        }.each { |c| columns << c }
+        @points.first.metrics.map { |m|
+          (
+            m.keys.first if m.length == 1
+          )
+        }.each { |c| columns << c }
       end
       
       output = CSV.generate_line(columns) + "\n"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Rob Cameron
@@ -39,7 +39,6 @@ files:
 - lib/gattica/account.rb
 - lib/gattica/auth.rb
 - lib/gattica/convertible.rb
-- lib/gattica/core_extensions.rb
 - lib/gattica/data_point.rb
 - lib/gattica/data_set.rb
 - lib/gattica/exceptions.rb

data/lib/gattica/core_extensions.rb

@@ -1,25 +0,0 @@
-class Hash
-  
-  def to_query
-    require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
-    self.collect do |key, value|
-      "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}"
-    end.sort * '&'
-  end
-  
-  def key
-    self.keys.first if self.length == 1
-  end
-
-  def value
-    self.values.first if self.length == 1
-  end
-  
-  # def stringify_keys
-  #   inject({}) do |options, (key, value)|
-  #     options[key.to_s] = value
-  #     options
-  #   end
-  # end
-
-end