frenchy 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9f2034c5a6e3f43cbb2f187798d0213412c111
-  data.tar.gz: 0c4efe7e2493f909924b44e0ecb3ba52f82746ac
+  metadata.gz: 16af458377a1de408890760f4ac784abaad0a414
+  data.tar.gz: 84de7abdc7e201642c2521b3ec7add47869572a6
 SHA512:
-  metadata.gz: 09c1d18e40914e2b86c89aeea2075d5f901d049810e50a2b6bc89c5553841a0c3a4159825a7fc1e179243b4de4ea31c4ac748e4b3fec5c1e1612190be03fbf1b
-  data.tar.gz: 34d4992484cb896ee4c345cd5b5cf3ae15d16d8eaa1cd8900f43f67645a47e1f2a3086d9743cde0ea4a10e16a06bd15b7c9d91e030b8a6615c77f478ee095bb0
+  metadata.gz: f347685ae4c325a22ff0a7b76b6c11dd51742549c9ad51d1d38dc6bf5a188af842d5b8919a0cb61c42239ca41a2a987462b6838f08922cd932c65cff53e30895
+  data.tar.gz: 350dde3459350edb714c2f579cd912f1dd835b97865908249ceb99bca97d2b2ff151f590b5b66c1836f59c80dff11fe8b7ca1a31fec740df5dfcefeb17df81d3

data/lib/frenchy.rb

@@ -16,7 +16,7 @@ module Frenchy
   end
 
   def self.register_service(name, options={})
-    @services[name.to_s] = Frenchy::Client.new(options)
+    @services[name.to_s] = Frenchy::Client.new(name, options)
   end
 
   def self.find_service(name)

data/lib/frenchy/client.rb

@@ -3,16 +3,17 @@ require "json"
 
 module Frenchy
   class Client
-    attr_accessor :host, :timeout, :retries
+    attr_accessor :name, :host, :timeout, :retries
 
     # Create a new client instance
-    def initialize(options={})
+    def initialize(name, options={})
       options.stringify_keys!
 
-      @host = options.delete("host") || "http://127.0.0.1:8080"
-      @timeout = options.delete("timeout") || 30
-      @retries = options.delete("retries") || 0
-      @backoff_delay = options.delete("backoff_delay") || 1.0
+      @name           = name.to_s
+      @host           = options.fetch("host")           { "http://127.0.0.1:8080" }
+      @timeout        = options.fetch("timeout")        { 30 }
+      @retries        = options.fetch("retries")        { 0 }
+      @backoff_delay  = options.fetch("backoff_delay")  { 1.0 }
     end
 
     # Issue a get request with the given path and query parameters. Get
@@ -90,7 +91,7 @@ module Frenchy
 
       # Perform the request
       begin
-        resp = http.request(req)
+        resp = perform_request(http, req)
       rescue => ex
         raise Frenchy::ServerError.new(ex, reqinfo, nil)
       end
@@ -112,5 +113,9 @@ module Frenchy
         raise Frenchy::ServiceUnavailable.new(nil, reqinfo, resp)
       end
     end
+
+    def perform_request(http, req)
+      http.request(req)
+    end
   end
 end

data/lib/frenchy/version.rb

@@ -1,3 +1,3 @@
 module Frenchy
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/lib/frenchy/client_spec.rb

@@ -3,21 +3,21 @@ require "spec_helper"
 describe Frenchy::Client do
   describe "#initialize" do
     it "uses expected defaults" do
-      client = Frenchy::Client.new
+      client = Frenchy::Client.new("default")
       expect(client.host).to eql("http://127.0.0.1:8080")
       expect(client.timeout).to eql(30)
       expect(client.retries).to eql(0)
     end
 
     it "accepts an options hash" do
-      client = Frenchy::Client.new({"host" => "http://127.0.0.1:1234", "timeout" => 15, "retries" => 3})
+      client = Frenchy::Client.new("default", {"host" => "http://127.0.0.1:1234", "timeout" => 15, "retries" => 3})
       expect(client.host).to eql("http://127.0.0.1:1234")
       expect(client.timeout).to eql(15)
       expect(client.retries).to eql(3)
     end
 
     it "accepts an options hash (symbols)" do
-      client = Frenchy::Client.new(host: "http://127.0.0.1:1234", timeout: 15, retries: 3)
+      client = Frenchy::Client.new("default", host: "http://127.0.0.1:1234", timeout: 15, retries: 3)
       expect(client.host).to eql("http://127.0.0.1:1234")
       expect(client.timeout).to eql(15)
       expect(client.retries).to eql(3)
@@ -27,7 +27,7 @@ describe Frenchy::Client do
   ["patch", "post", "put", "delete"].each do |method|
     describe "##{method}" do
       it "returns a successful response containing the request json data" do
-        client = Frenchy::Client.new("host" => "http://httpbin.org")
+        client = Frenchy::Client.new("httpbin", "host" => "http://httpbin.org")
         data = {"data" => "abcd", "number" => 1, "nested" => {"more" => "data"}}
         expect = JSON.generate(data)
         result = client.send(method, "/#{method}", data)
@@ -39,24 +39,24 @@ describe Frenchy::Client do
 
   describe "#perform" do
     it "returns a hash for successful json response" do
-      client = Frenchy::Client.new("host" => "http://httpbin.org")
+      client = Frenchy::Client.new("httpbin", "host" => "http://httpbin.org")
       result = client.get("/ip", {})
       expect(result).to be_an_instance_of(Hash)
       expect(result.keys).to eql(["origin"])
     end
 
     it "raises an invalid response error for non-json response" do
-      client = Frenchy::Client.new("host" => "http://httpbin.org")
+      client = Frenchy::Client.new("httpbin", "host" => "http://httpbin.org")
       expect{client.get("/html", {})}.to raise_error(Frenchy::InvalidResponse)
     end
 
     it "raises a not found error for 404 responses" do
-      client = Frenchy::Client.new("host" => "http://httpbin.org")
+      client = Frenchy::Client.new("httpbin", "host" => "http://httpbin.org")
       expect{client.get("/status/404", {})}.to raise_error(Frenchy::NotFound)
     end
 
     it "raises a service unavailable error for 500+ responses" do
-      client = Frenchy::Client.new("host" => "http://httpbin.org")
+      client = Frenchy::Client.new("httpbin", "host" => "http://httpbin.org")
       expect{client.get("/status/500", {})}.to raise_error(Frenchy::ServiceUnavailable)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frenchy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jason Coene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json