stretchr 1.2.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 345f38d76260c36717e9fdf93fbe3a0af6b75c49
-  data.tar.gz: 897c1b27963bc857527a7551f24159c872f27596
+  metadata.gz: 8e5b8e89dbf9d5bf8df7927c8f871b03af916b64
+  data.tar.gz: cf85a4a1530398710152a48e13b209b5bc6423bb
 SHA512:
-  metadata.gz: 08c0b14d97c11a8dbf60095a1c2fb32135bf47a33444b914ef33dbcde6b9c292ab5f6223c84e4a85454fafbfcf34ad7c794cb05eb0a513f5c8bbcba9ab266b8c
-  data.tar.gz: dc249cc25a034d36287655bfdfcc7db3efcf5260684ef0848caa0c0c2f9958c5b621b574c9759e925a6f575c2db0721ca4556640b3a985a59b071bed11a4066b
+  metadata.gz: e16c6f1fe0b43049f6c0b0bfb0bb7152fb63fc6bd5951c5ec004132f00151bb085b36b28450980835bf29f85dc0557a93cbc1163deb48d01b7b90bb41dfd383b
+  data.tar.gz: b497813de26adfe3fc462d6786f6ab72b50ac3e746fa1097adfd520d5ea61ce4309a3a249b104c0ea360946433795f889838d88c6cd76ed71177954d11640808

data/lib/stretchr/client.rb

@@ -1,6 +1,6 @@
 module Stretchr
 	class Client
-		attr_accessor :transporter, :api_version, :project, :key, :hostname
+		attr_accessor :transporter, :api_version, :project, :key, :hostname, :account
 		# Initializes a new stretchr client
 		# This is the main entrypoint into working with stretchr
 		#
@@ -15,6 +15,7 @@ module Stretchr
 			self.project = options[:project]
 			self.key = options[:key]
 			self.hostname = options[:hostname] || Stretchr.config["hostname"]
+			self.account = options[:account]
 		end
 
 		# Catches everything you can throw at client and passes it on to a new request object

data/lib/stretchr/request.rb

@@ -32,7 +32,7 @@ module Stretchr
 
 		# Builds a URI object
 		def to_uri
-			URI::HTTP.build(host: merge_host, path: merge_path, query: merge_query)
+			URI::HTTPS.build(host: merge_host, path: merge_path, query: merge_query)
 		end
 
 		# Set params for the url
@@ -171,11 +171,21 @@ module Stretchr
 			return self
 		end
 
+		# Set the path directly without having to go through it piece by piece
+		# 
+		# ==== Examples
+		# r= Stretchr::Request.new
+		# r.at("people/1/cars").path #=> "people/1/cars"
+		def at(path)
+			@path_elements += path.split("/")
+			return self
+		end
+
 		private
 
 		# Merges the path from the @path_elements
 		def merge_path
-			"/api/#{client.api_version}/#{@path_elements.join('/')}"
+			"/api/#{client.api_version}/#{client.project}/#{@path_elements.join('/')}"
 		end
 
 		# Merges query params and filter params
@@ -188,7 +198,7 @@ module Stretchr
 
 		# Generate the host from the hostname and project
 		def merge_host
-			"#{client.project}.#{client.hostname}"
+			"#{client.account}.#{client.hostname}"
 		end
 	end
 end

data/lib/stretchr/transporters/json_transporter.rb

@@ -1,5 +1,7 @@
 require "uri" if !defined? URI
 require "net/http" if !defined? Net
+require "json" if !defined? JSON
+
 module Stretchr
 	class JSONTransporter
 		# Perform the request against stretchr
@@ -8,7 +10,11 @@ module Stretchr
 		# Expects: {uri: URIOBJECT, body: "body", method: "PUT/PATCH/POST/DELETE/GET", client: stretchr client}
 		def make_request(request)
 			response = nil
-			Net::HTTP.start(request[:uri].host, request[:uri].port) do |http|
+
+			#convert to a json string unless the user already did it...
+			request[:body] = request[:body].to_json unless request[:body].is_a?(String)
+
+			Net::HTTP.start(request[:uri].host, request[:uri].port, {use_ssl: true}) do |http|
 				http_request = generate_request(request)
 				response = http.request http_request # Net::HTTPResponse object
 			end

data/test/test_client.rb

@@ -31,6 +31,11 @@ describe "Client" do
 		assert_equal stretchr, r.client, "Should have passed the client into the request"
 	end
 
+	it "Shoudl let me specify the account" do
+		stretchr = Stretchr::Client.new({account: "ryan"})
+		assert_equal "ryan", stretchr.account, "Should have let me set the account"
+	end
+
 	it "Should have a default api_version" do
 		stretchr = Stretchr::Client.new
 		assert stretchr.api_version, "Should have set a default api version"

data/test/test_request.rb

@@ -8,9 +8,9 @@ describe "Request Object" do
 	end
 
 	it "Should know how to build a complete url including path" do
-		c = Stretchr::Client.new({project: "project", api_version: "v1.1"})
+		c = Stretchr::Client.new({account: "account", project: "project", api_version: "v1.1"})
 		r = Stretchr::Request.new({client: c})
-		assert_equal "http://project.stretchr.com/api/v1.1/people/1/cars", r.people(1).cars.to_url, "Should have built the url properly"
+		assert_equal "https://account.stretchr.com/api/v1.1/project/people/1/cars", r.people(1).cars.to_url, "Should have built the url properly"
 	end
 
 	it "Should let you pass in params" do
@@ -108,11 +108,11 @@ describe "Request Object" do
 
 	it "should pass the correct uri to the transporter" do
 		t = Stretchr::TestTransporter.new
-		c = Stretchr::Client.new({project: "project", api_version: "v1.1", transporter: t})
+		c = Stretchr::Client.new({account: "account", project: "project", api_version: "v1.1", transporter: t})
 		r = Stretchr::Request.new({client: c})
 		r.people.get
-		assert_equal "http://project.stretchr.com/api/v1.1/people", r.to_url, "Should have saved the right url in the request"
-		assert_equal "http://project.stretchr.com/api/v1.1/people", t.requests.first[:uri].to_s, "Should have created the right URL and sent it to the transporter"
+		assert_equal "https://account.stretchr.com/api/v1.1/project/people", r.to_url, "Should have saved the right url in the request"
+		assert_equal "https://account.stretchr.com/api/v1.1/project/people", t.requests.first[:uri].to_s, "Should have created the right URL and sent it to the transporter"
 	end
 
 	it "Should know how to handle paging" do
@@ -181,4 +181,10 @@ describe "Request Object" do
 		r.people.delete
 		assert_equal :delete, t.requests[1][:method], "Should have performed a delete request"
 	end
+
+	it "Should let me set the path manually" do
+		c = Object.new
+		r = Stretchr::Request.new({client: c})
+		assert_equal "people/1/cars", r.at("people/1/cars").path, "Should have set the path completely"
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchr
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.1
 platform: ruby
 authors:
 - Ryan Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies: []
 description: A gem for interacting with your stretchr data
 email: ryan@mazondo.com