telemetry 1.1.12 → 1.1.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTA0YmZmMGQ2ODRiYTZkNTdlZTRmMTQyNDMwZGViZDEyNTM0YzZjMA==
+    NTQ1MDljMTg1YWUwNjc1MjRjNGMyODRkMmNmZTY1Zjg1YWQ3NjFhYQ==
   data.tar.gz: !binary |-
-    MTBmMGJiY2EzMDhlMGVlZWI4MDJmNzM0MmFhODZiNjY5NDZhOGVjMQ==
+    M2Q3MWU5Y2ZhODQ5YzliYTM3MDEzYTkyZTNiYmRiZjc2MGE5MzRhMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTE1NDY0OGYwNTVmZDAxYzM3NDhlMzBlYzNjOTkyYTFiZDAxMzcwMDgyNjk0
-    ODljYTg0ZTEzYmE5MWM0NjI2M2IxNmNlYTUzYTIwMmVhMWZhYjMzMGY3YjU2
-    M2Q3YTIzMjYxZDkwMjczM2IyMDJmODUwYjRjMmU5MTRhZDVkYzE=
+    NjU3ZDc3ZDY2YzZhZGRjNGVlZDhmNDVlM2RkNzQzZTkzZDIyYTJlYzM3NWI1
+    ZDI4NDc1MTVmNjhmMjJiMjc4NmYwNDUwMDkzYjFhNDk3Nzk2YWE0ZjdlZjg3
+    NzQ0MWUwY2ZhMmM0MTM4OGM5OTc3MzBjODJjYmFkYWMwOWZlN2I=
   data.tar.gz: !binary |-
-    ZmNlOGZlYTEwM2EwYjg2NWFjYzVkNDJhNTNjZDZmYTQzNWM4ZjliMmEwOGZj
-    OWE2YzZmYzBhM2FlZmJkYzRjODBlYTFlOTQzZGNmN2FlOTQwOWZhNTUyMzBm
-    NTE4ZWYwYzk1M2Y1MTI1ZGE0YjEzMDRkMmZmN2VkMDkwYmExMjg=
+    MjcxNWViNDgzZTUxMjJiNjViN2MyMmZhZjAyOWZiZjcxMDJjOGRkZGNhY2Q2
+    OGM0NDk2NDFjZGRjMTk1MzAwMGQ5ZGE4M2ZhNWVkZTAzZmY0NmE4YWRlZTdh
+    NzBkMGU4NmJjMWIyZDIyZWViNjlmOTc5YzExM2ViZThiMmExYzg=

data/README.md

@@ -10,7 +10,7 @@ Install on your system:
 
 ## Basic Usage
 
-To use this gem you must require it in your file and specify your API Token that you can find on the [Telemetry API Token page](https://admin.telemetryapp.com/account/api_token)
+To use this gem you must require it in your file and specify your API Token that you can find on the [Telemetry API Token page](https://www.telemetryapp.com/account/api_token)
 
 Set a hash of values for the flow to update.  Each hash must contain the tag of the flow that you want to update.  
 
@@ -24,7 +24,7 @@ Set a hash of values for the flow to update.  Each hash must contain the tag of
 	}
 	Telemetry::Value.new(properties).emit
 
-For documentation on flows and the properties they support please see the [flow documentation](https://admin.telemetryapp.com/documentation/flows) pages.
+For documentation on flows and the properties they support please see the [flow documentation](https://www.telemetryapp.com/documentation/flows) pages.
 
 ## Affiliates
 

data/lib/telemetry/api.rb

@@ -2,7 +2,7 @@
 
 require 'multi_json'
 require 'oj'
-require 'net/http'
+require 'net/http/persistent'
 require 'uri'
 require 'logger'
 
@@ -87,6 +87,7 @@ module Telemetry
 
 		def self.send(method, endpoint, data = nil)
 
+			http = Net::HTTP::Persistent.new 'telemetry_api'
 			uri = URI("#{Telemetry.api_host}#{endpoint}")
 
 			Telemetry::logger.debug "REQ #{uri} - #{MultiJson.dump(data)}"
@@ -108,67 +109,69 @@ module Telemetry
 			request['Accept-Version'] = '~ 1'
 			request['User-Agent'] = "Telemetry Ruby Gem (#{Telemetry::TELEMETRY_VERSION})"
 				
+			start_time = Time.now
+
 			begin
 				ssl = true if Telemetry.api_host.match(/^https/)
-				result = Net::HTTP.start(uri.host, uri.port, :use_ssl => ssl) do |http|
-					response = http.request(request)
-					code = response.code
-
-					Telemetry::logger.debug "RESP: #{response.code}:#{response.body}"
-
-					case response.code
-					when "200"
-						Telemetry::logger.debug response.body
-						return MultiJson.load(response.body)
-					when "400"
-						json = MultiJson.load(response.body)
-						error = "#{Time.now} (HTTP 400): #{json['code'] if json} #{json['message'] if json}"
-						Telemetry::logger.debug response.body
-						Telemetry::logger.error error
-						raise Telemetry::FormatError, error
-					when "401"
-						if Telemetry.token == nil
-							error = "#{Time.now} (HTTP 401): Authentication failed, please set Telemetry.token to your API Token. #{method.upcase} #{uri}"
-							Telemetry::logger.error error
-							raise Telemetry::AuthenticationFailed, error
-						else
-							error = "#{Time.now} (HTTP 401): Authentication failed, please verify your token. #{method.upcase} #{uri}"
-							Telemetry::logger.error error
-							raise Telemetry::AuthenticationFailed, error
-						end
-					when "403"
-						error = "#{Time.now} (HTTP 403): Authorization failed, please check your account access. #{method.upcase} #{uri}"
-						Telemetry::logger.error error
-						raise Telemetry::AuthorizationError, error
-					when "404"
-						error = "#{Time.now} (HTTP 404): Requested object not found. #{method.upcase} #{uri}"
-						Telemetry::logger.error error
-						raise Telemetry::FlowNotFound, error
-					when "405"
-						error = "#{Time.now} (HTTP 405): Method not allowed. #{method.upcase} #{uri}"
-						Telemetry::logger.error error
-						raise Telemetry::MethodNotAllowed, error
-					when "429"
-						error = "#{Time.now} (HTTP 429): Rate limited. Please reduce your update interval. #{method.upcase} #{uri}"
-						Telemetry::logger.error error
-						raise Telemetry::RateLimited, error
-					when "500"
-						error = "#{Time.now} (HTTP 500): Data API server error. #{method.upcase} #{uri}"
-						Telemetry::logger.error error
-						Telemetry::logger.error response.body
-						raise Telemetry::ServerException, error
-					when "502"
-						error = "#{Time.now} (HTTP 502): Data API server is down. #{method.upcase} #{uri}"
-						Telemetry::logger.error error
-						raise Telemetry::Unavailable, error
-					when "503"
-						error = "#{Time.now} (HTTP 503): Data API server is down. #{method.upcase} #{uri}"
+
+				response = http.request uri, request
+
+				code = response.code
+
+				Telemetry::logger.debug "RESP (#{((Time.now-start_time)*1000).to_i}ms): #{response.code}:#{response.body}"
+
+				case response.code
+				when "200"
+					Telemetry::logger.debug response.body
+					return MultiJson.load(response.body)
+				when "400"
+					json = MultiJson.load(response.body)
+					error = "#{Time.now} (HTTP 400): #{json['code'] if json} #{json['message'] if json}"
+					Telemetry::logger.debug response.body
+					Telemetry::logger.error error
+					raise Telemetry::FormatError, error
+				when "401"
+					if Telemetry.token == nil
+						error = "#{Time.now} (HTTP 401): Authentication failed, please set Telemetry.token to your API Token. #{method.upcase} #{uri}"
 						Telemetry::logger.error error
-						raise Telemetry::Unavailable, error
+						raise Telemetry::AuthenticationFailed, error
 					else
-						error = "#{Time.now} ERROR UNK: #{method.upcase} #{uri} #{response.body}."
-						raise Telemetry::UnknownError, error
+						error = "#{Time.now} (HTTP 401): Authentication failed, please verify your token. #{method.upcase} #{uri}"
+						Telemetry::logger.error error
+						raise Telemetry::AuthenticationFailed, error
 					end
+				when "403"
+					error = "#{Time.now} (HTTP 403): Authorization failed, please check your account access. #{method.upcase} #{uri}"
+					Telemetry::logger.error error
+					raise Telemetry::AuthorizationError, error
+				when "404"
+					error = "#{Time.now} (HTTP 404): Requested object not found. #{method.upcase} #{uri}"
+					Telemetry::logger.error error
+					raise Telemetry::FlowNotFound, error
+				when "405"
+					error = "#{Time.now} (HTTP 405): Method not allowed. #{method.upcase} #{uri}"
+					Telemetry::logger.error error
+					raise Telemetry::MethodNotAllowed, error
+				when "429"
+					error = "#{Time.now} (HTTP 429): Rate limited. Please reduce your update interval. #{method.upcase} #{uri}"
+					Telemetry::logger.error error
+					raise Telemetry::RateLimited, error
+				when "500"
+					error = "#{Time.now} (HTTP 500): Data API server error. #{method.upcase} #{uri}"
+					Telemetry::logger.error error
+					Telemetry::logger.error response.body
+					raise Telemetry::ServerException, error
+				when "502"
+					error = "#{Time.now} (HTTP 502): Data API server is down. #{method.upcase} #{uri}"
+					Telemetry::logger.error error
+					raise Telemetry::Unavailable, error
+				when "503"
+					error = "#{Time.now} (HTTP 503): Data API server is down. #{method.upcase} #{uri}"
+					Telemetry::logger.error error
+					raise Telemetry::Unavailable, error
+				else
+					error = "#{Time.now} ERROR UNK: #{method.upcase} #{uri} #{response.body}."
+					raise Telemetry::UnknownError, error
 				end
 
 			rescue Errno::ETIMEDOUT => e

data/lib/telemetry/version.rb

@@ -1,3 +1,3 @@
 module Telemetry
-  TELEMETRY_VERSION = "1.1.12"
+  TELEMETRY_VERSION = "1.1.13"
 end

data/telemetry.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "multi_json"
   gem.add_dependency "dante"
   gem.add_dependency "hashie"
+  gem.add_dependency "net-http-persistent"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telemetry
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.13
 platform: ruby
 authors:
 - W. Gersham Meharg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement