analytics-psw 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe0c7434249cf66e30bf8b4615b8fc059ef26f52
-  data.tar.gz: 9d491fa4a11171f9f977cb5ec073302bcf59f4a2
+  metadata.gz: 9877623eec796b47a783fd16cb90027c01a1b1ad
+  data.tar.gz: fab8e47fc2b66d0437267b4a17b823590519b36e
 SHA512:
-  metadata.gz: 886806b59dc92b9bf7332944bdde76917285771abb895b25a499384db405c1f46ce4db6a37bef456b2adad34adfe68dbe2d90a13dc723d164282cbca9dfaeb0d
-  data.tar.gz: ba1ff44fbab4d5c1e95eeb18e81cb1ebac8edfb5b3d7c5d564ffe23fe233074aa5542e236302f8d47d25c781525ce1d0853c5f6878797993381bfda3262301a1
+  metadata.gz: 12ae1f081ae762c56d562aaa1be836f68e313852ec8a4e28a21455d6bf0510bae474ab7bdc7ed84ea3303fc470dae6f9781481b86d1a504c9fc4d2a58604ec21
+  data.tar.gz: dcf354f78af91d7936613d21a6ce8d582dd2c264d8328e46cbcaf7f177ce5274dac7fbd11950db866e2983c3fb6a127cb645ee5fa98db851a812d7580559e9a1

data/lib/analytics-psw.rb

@@ -3,7 +3,7 @@ require 'json'
 
 class AnalyticsPSW
 
-	VERSION = "0.0.6"
+	VERSION = "0.0.7"
   API_VERSION = "v#{VERSION}"
   API_URL = "/api/#{API_VERSION}/services"
   JSON_CONTENT_TYPE = 'application/json'
@@ -14,6 +14,7 @@ class AnalyticsPSW
     @server_url = opts['server_url']
     service_name = opts['service']
     raise "Please ensure you have provided the appropriate server url and service name" unless @server_url && service_name
+    @server_url = @server_url.chomp("/")
     @proxy = opts['proxy']
     @proxy = "" if @server_url.start_with?("http://127.0.0.1") or @server_url.start_with?("http://localhost")
     @conn = faraday_connection
@@ -22,23 +23,26 @@ class AnalyticsPSW
 
   def record_event(event_type, metadata = {})
     metadata[:event_type] = event_type
-    post_json("#{@service_location}/events", "event", metadata)
+    resp = post_json("#{@service_location}/events", "event", metadata)
+    parse_json_response(resp)
   end
 
   def query_analytics(query_parameters)
     resp = get_with_hash("#{@service_location}/reports/query.json", query_parameters)
     raise "Problem with your query. Please check the required parameters and try again" if resp.status == 400
-    JSON.parse(resp.body)
+    parse_json_response(resp)
   end
 
   def create_event_type(name, description = "")
     metadata = create_metadata({:name => name, :description => description})
-    post_json("#{@service_location}/event_types", "event_type", metadata)
+    resp = post_json("#{@service_location}/event_types", "event_type", metadata)
+    parse_json_response(resp)
   end
 
   def create_dimension(name, data_type, units = "", description = "")
     metadata = create_metadata({:name => name, :description => description, :data_type => data_type, :units => units})
-    post_json("#{@service_location}/dimensions", "dimension", metadata)
+    resp = post_json("#{@service_location}/dimensions", "dimension", metadata)
+    parse_json_response(resp)
   end
 
   private
@@ -92,8 +96,15 @@ class AnalyticsPSW
     post_json(API_URL, "service", metadata)
   end
 
+  def parse_json_response(json_response)
+    parsed_response = {}
+    parsed_response['status'] = json_response.status if json_response.status
+    parsed_response['body'] = json_response.body if json_response.body
+    parsed_response
+  end
+
   def faraday_connection
-    return Faraday.new(@server_url) if @proxy == "" or @proxy == nil
+    return Faraday.new(@server_url) if @proxy == nil
     Faraday.new(@server_url, {:proxy => {:uri => @proxy}})
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: analytics-psw
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jordan Keyes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler