frenchy 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaf4ee2e3ddd7a66d40b81fc8f792e6f06dad047
-  data.tar.gz: 25804251db9bf9cd05427f6f152e035bf3d43b08
+  metadata.gz: b997d6d2702753a71cb04388c829b32cc68b53b1
+  data.tar.gz: 238f61662629cc797ffed1845a47598384539247
 SHA512:
-  metadata.gz: c7b03b5adda247d60140a9e8bcf44216fed3dbceb7f4e7a9f27e210f05fb2aad3c026b1b6cfea46af8248cc890d616115db4b1d5e6bf8bda605d43a0ef4e1419
-  data.tar.gz: 7c7710e2b0eab498159b850e76d3856152dd8f129e39d132ae5fb0823c0d380053d3378e4ec0df39583ca1529bb578253d909ffe7ccce25cd6103db9baea7326
+  metadata.gz: b9e395f9728e47492a1873a9b3813b7f673c05d0dbb4ec6df929808e557fd14bcd7947159c1159001ea7b8f52f162b297e72ee7d139025ee748ec7af30422524
+  data.tar.gz: cb5c37306cb4b97b1bc51fdf0e35a72762c6864768f3747e8734d118e5eabd82eb28faa49d2fa0b75200cd73a766586b8dc7afb9b744dd6b74e09e9fa21d06d0

data/lib/frenchy.rb

@@ -14,6 +14,8 @@ require "frenchy/version"
 module Frenchy
   class_eval do
     @services = {}
+    @content_types = {}
+    @content_type_accept = ""
   end
 
   def self.register_service(name, options={})
@@ -23,4 +25,19 @@ module Frenchy
   def self.find_service(name)
     @services[name.to_s] || raise(Frenchy::Error, "No service '#{name}' registered")
   end
+
+  def self.register_content_type(name, &block)
+    @content_types[name] = block
+    @content_type_accept = @content_types.keys.join(", ")
+  end
+
+  def self.find_content_type_handler(name)
+    @content_types[name] || raise(Frenchy::Error, "No content type '#{name}' registered")
+  end
+
+  def self.accept_header
+    @content_type_accept
+  end
 end
+
+Frenchy.register_content_type("application/json") {|x| JSON.parse(x) }

data/lib/frenchy/client.rb

@@ -51,7 +51,7 @@ module Frenchy
       body = nil
       headers = {
         "User-Agent" => "Frenchy/#{Frenchy::VERSION}",
-        "Accept"     => "application/json",
+        "Accept"     => Frenchy.accept_header,
       }.merge(@headers)
 
       # Set the URI path
@@ -103,7 +103,7 @@ module Frenchy
       when 200...399
         # Positive responses are expected to return JSON
         begin
-          JSON.parse(resp.body)
+          decode_response(resp)
         rescue => ex
           raise Frenchy::InvalidResponse.new(ex, reqinfo, resp)
         end
@@ -125,5 +125,9 @@ module Frenchy
     def perform_request(http, req)
       http.request(req)
     end
+
+    def decode_response(resp)
+      Frenchy.find_content_type_handler(resp["Content-Type"]).call(resp.body)
+    end
   end
 end

data/lib/frenchy/version.rb

@@ -1,3 +1,3 @@
 module Frenchy
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/spec/lib/frenchy_spec.rb

@@ -15,4 +15,16 @@ describe Frenchy do
       expect{Frenchy.find_service("nonexistent")}.to raise_error(Frenchy::Error)
     end
   end
-end
+
+  describe ".register_content_type" do
+    it "adds the content type to the accept header" do
+      expect(Frenchy.accept_header).to eql("application/json")
+      Frenchy.register_content_type("application/other") do |x|
+        5
+      end
+      expect(Frenchy.accept_header).to eql("application/json, application/other")
+      expect(Frenchy.find_content_type_handler("application/other").call(nil)).to eql(5)
+      expect{Frenchy.find_content_type_handler("nonexistent")}.to raise_error(Frenchy::Error)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frenchy
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Jason Coene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json