lib/restful_mapper.rb in restful_mapper-0.0.2 vs lib/restful_mapper.rb in restful_mapper-0.0.3

@@ -2,34 +2,45 @@
 require 'json'
 require "restful_mapper/version"
 require 'structure_mapper'
 require 'multi_json'
 require 'mustache'
+require 'faraday_middleware'
 
-
 class Object # http://whytheluckystiff.net/articles/seeingMetaclassesClearly.html
   def meta_def name, &blk
     (class << self; self; end).instance_eval { define_method name, &blk }
   end
 end
 
 
+class Exception
+  def self.from_content type, content_type, data
+
+  end
+end
+
 module RestfulMapper
 
   class EndpointDefinition
 
-    def initialize base_url, method, basic_authentication
+    def initialize base_url, method, basic_authentication, token
       @base_url=base_url
       @query_parameters=[]
       @method=method
       @basic_authentication=basic_authentication
+      @token=token
     end
 
     def path path, options={}
       @path=path
     end
 
+    def verbose
+      @verbose=true
+    end
+
     def responses response_mapping={}
       @response_mapping=response_mapping
     end
 
     def body_parameter body_parameter
@@ -47,63 +58,77 @@
         not (@query_parameters.include?(k.to_sym) || @query_parameters.include?(k.to_s))
       end
     end
 
     def call_service params
-      conn = Faraday.new(:url => @base_url) do |faraday|
-        # faraday.response :logger                  # log requests to STDOUT
+
+      puts "base url: %s" % @base_url
+
+      conn = Faraday.new(url: Mustache.render(@base_url, params)) do |faraday|
+        faraday.use FaradayMiddleware::FollowRedirects, limit: 5
+        if @verbose
+          faraday.response :logger
+        end
         faraday.adapter Faraday.default_adapter  # make requests with Net::HTTP
       end
 
       if has_basic_authentication?
         conn.basic_auth(*basic_authentication_data(params))
       end
 
-      response=conn.run_request(@method, Mustache.render(@path, params), nil, {'Content-Type' => 'application/json'}) { |request|
+      if has_token?
+        conn.authorization :Bearer, Mustache.render(@token, params)
+      end
+
+      path = Mustache.render(@path, params)
+
+      response=conn.run_request(@method, path, nil, {'Content-Type' => 'application/json'}) { |request|
         request.params.update(filter_parameters(params)) if filter_parameters(params)
         if @body_parameter
           request.body=MultiJson.dump(params[@body_parameter].to_structure)
         end
-
-
       }
 
-
       status=response.status
       status_class=@response_mapping[status]
       status_class||=@response_mapping[0]
       body=response.body
-      result=deserialize body, response.headers['Content-Type'], status_class
-      if Exception === result
-        raise result
-      end
-      result
+      deserialize body, response.headers['Content-Type'], status_class
     end
 
     def has_basic_authentication?
       @basic_authentication
     end
 
+    def has_token?
+      @token
+    end
+
     def basic_authentication_data params
       @basic_authentication.map{|name| Symbol === name ? params[name] : name}
     end
 
-
     def deserialize json, content_type, mapping
-      if content_type.start_with?('application/json')
+      if mapping.is_a?(Class) && Exception >= mapping
+        raise mapping, json
+      end
+      if content_type && content_type.start_with?('application/json')
         if json && !json.empty?
           mapping.from_structure(MultiJson.load(json))
         else
           if Hash == mapping || Array == mapping || mapping.is_a?(Class)
             mapping.new
           else
             mapping
           end
         end
-      else
+      elsif mapping.respond_to?(:from_content)
         mapping.from_content(content_type, json)
+      else
+        mapping
       end
+
     end
 
 
   end
 
@@ -141,13 +166,17 @@
 
     def self.basic_authentication username, password
       @basic_authentication=[username,password]
     end
 
+    def self.bearer_authentication token
+      @token=token
+    end
+
     private
 
     def self.service_method name, definition, method
-      endpoint_definition=EndpointDefinition.new @base_url, method, @basic_authentication
+      endpoint_definition=EndpointDefinition.new @base_url, method, @basic_authentication, @token
       endpoint_definition.instance_exec(&definition)
       self.meta_def(name.to_sym) do |params={}|
         copy=(@default_parameters || {}).merge(params)
         endpoint_definition.call_service copy
       end