patchboard 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46fe7f3a6e42bd2248df577e00d2bf4ebff0de19
-  data.tar.gz: e5cbc55c390be6754d739326283058c2d120f71c
+  metadata.gz: 916ee5e5133154c488707325cb9e4125f7b472da
+  data.tar.gz: c78813b303ce9464fe02cf914d72324722ca166e
 SHA512:
-  metadata.gz: 8d5bd558a0d07e437dab031f50f291eb82ae334492f8c4bf2284b859b66077f7938224bfa661ea82c926b94880fc3ca060c9fad9ee5bf1e58f2131dd72c821af
-  data.tar.gz: 5096c602c6aee31da7d65dffb3efe1fec7d1539efdd47854dd16c833118c3e23ff3f57b1dc442bb4d46f1df7cf8071cbc3b81ce01ef2236f4b92cc986e7666b7
+  metadata.gz: c2ef016046c0629f3d77a8591ba4d5ab89ddc707f5fb3ab962c47a4a6a8ba87458df7e5cfb4062fb2e7bc00d4a290e31c5710420c6ceb9368b6710d24869f1d8
+  data.tar.gz: c0d10a0e3577e0e2f14b0aa3e80ee17f59b25ec37b41ae116786fcab1d47aeb3a077b66a5507559ab5bdc479cb24f47d4363444e3d710f102b772a2c67b6fb7e

data/lib/patchboard/action.rb

@@ -14,13 +14,14 @@ class Patchboard
       @method = definition[:method]
 
 
-      @headers = {
-      }
+      @headers = {}
 
       request, response = definition[:request], definition[:response]
 
       if request
-        @auth_scheme = request[:authorization]
+        if schemes = request[:authorization]
+          @auth_schemes = schemes.is_a?(String) ? [schemes] : schemes
+        end
         if request[:type]
           @headers["Content-Type"] = request[:type]
           @request_schema = @schema_manager.find :media_type => request[:type]
@@ -43,7 +44,8 @@ class Patchboard
       raw = self.http.request @method, url, options.merge(:response => :object)
       response = Response.new(raw)
       if response.status != @status
-        raise ResponseError.new(response.status, response.body), "Unexpected response status: #{response.status} - #{response.body}"
+        raise ResponseError.new(response),
+          "Unexpected response status: #{response.status} - #{response.body}"
       end
       out = @api.decorate(resource.context, @response_schema, response.data)
       out.response = response
@@ -57,9 +59,10 @@ class Patchboard
         :url => url, :method => @method, :headers => headers
       }
 
-      if @auth_scheme && context.respond_to?(:authorizer)
-        credential = context.authorizer(@auth_scheme, resource, @name)
-        headers["Authorization"] = "#{@auth_scheme} #{credential}"
+      if @auth_schemes && context.respond_to?(:authorizer)
+        scheme, credential = context.authorizer(@auth_schemes, resource, @name)
+
+        headers["Authorization"] = "#{scheme} #{credential}"
       end
 
       input_options = self.process_args(args)
@@ -100,13 +103,16 @@ class Patchboard
 
 
     class ResponseError < StandardError
-      attr_reader :status
-      attr_reader :body
 
-      def initialize(status, body)
-        @status = status
-        @body = body
+      attr_reader :response, :status, :body, :headers
+
+      def initialize(response)
+        @response = response
+        @status = @response.status
+        @body = @response.body
+        @headers = @response.headers
       end
+
     end
 
   end

data/lib/patchboard/response.rb

@@ -1,8 +1,49 @@
 class Patchboard
   class Response
 
+    module Headers
+      module_function
+
+      ## This example Authorization value has two schemes:  Custom and Basic
+      ## The Custom scheme has two params, key and smurf
+      ## The Basic scheme has one param, realm
+      # %q[Custom key="otp.fBvQqSSlsNzJbqZcHKsylg", smurf="blue", Basic realm="foo"]
+
+      WWWAuthRegex = /
+        # keys are not quoted
+        ([^\s,]+)
+        =
+
+        # value might be quoted
+        "?
+          # the value currently may not contain whitespace
+          ([^\s,"]+)
+        "?
+      /x # the x flag means whitespace within the Regex definition is ignored
+
+      def parse_www_auth(string)
+        parsed = {}
+        # FIXME:  This assumes that no quoted strings have spaces within.
+        tokens = string.split(" ")
+        name = tokens.shift
+        parsed[name] = {}
+        while token = tokens.shift
+          # Now I have two problems
+          if md = WWWAuthRegex.match(token)
+            full, key, value = md.to_a
+            parsed[name][key] = value
+          else
+            name = token
+            parsed[name] = {}
+          end
+        end
+        parsed
+      end
+
+    end
+
     attr_accessor :resource
-    attr_reader :raw, :data
+    attr_reader :raw, :data, :parsed_headers
     def initialize(raw)
       @raw = raw
       if @raw.headers["Content-Type"]
@@ -10,6 +51,17 @@ class Patchboard
           @data = JSON.parse @raw.body, :symbolize_names => true
         end
       end
+      @parsed_headers = {}
+      parse_headers
+    end
+
+    def parse_headers
+      @raw.headers.each do |name, string|
+        case name
+        when /www-authenticate/i
+          @parsed_headers["WWW-Authenticate"] = Headers.parse_www_auth(string)
+        end
+      end
     end
 
     def method_missing(name, *args, &block)

data/lib/patchboard.rb

@@ -94,17 +94,22 @@ class Patchboard
 
   def spawn(context=nil)
     context ||= @context_creator.call
-    self.class::Client.new(context, @api, @endpoint_classes)
+    self.class::Client.new(self, context, @api, @endpoint_classes)
   end
 
   class Client
 
     attr_reader :resources, :context
-    def initialize(context, api, klasses)
+    def initialize(main, context, api, klasses)
+      @main = main
       @context = context
       @resources = Endpoints.new @context, api, klasses
     end
 
+    def spawn(context=nil)
+      @main.spawn(context)
+    end
+
   end
 
   def create_classes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patchboard
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Matthew King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json