lib/her/api.rb in her-0.1.6 vs lib/her/api.rb in her-0.1.7

@@ -5,11 +5,11 @@
   # @example
   #   $my_api = Her::API.new
   #   $my_api.setup :base_uri => "https://api.example.com"
   class API
     # @private
-    attr_reader :base_uri, :parse_with
+    attr_reader :base_uri, :middleware
 
     # Setup a default API connection
     def self.setup(attrs={}) # {{{
       @@default_api = new
       @@default_api.setup(attrs)
@@ -18,63 +18,58 @@
     # @private
     def self.default_api(attrs={}) # {{{
       defined?(@@default_api) ? @@default_api : nil
     end # }}}
 
+    # @private
+    def self.default_middleware # {{{
+      [Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttp]
+    end # }}}
+
     # Setup the API connection
+    #
+    # @example
+    #   module MyAPI
+    #     class ParseResponse
+    #       def on_complete(env)
+    #         json = JSON.parse(env[:body], :symbolize_names => true)
+    #         {
+    #           :data => json,
+    #           :errors => json[:errors] || [],
+    #           :metadata => json[:metadata] || {},
+    #         }
+    #       end
+    #     end
+    #   end
+    #   Her::API.setup :base_url => "https://api.example.com", :middleware => [MyAPI::ParseResponse, Faraday::Request::UrlEncoded, Faraday::Adapter::NetHttp]
     def setup(attrs={}) # {{{
       @base_uri = attrs[:base_uri]
-      @parse_with = lambda do |response|
-        json = JSON.parse(response.body, :symbolize_names => true)
-        {
-          :data => json[:data],
-          :errors => json[:errors],
-          :metadata => json[:metadata],
-        }
-      end
+      middleware = @middleware = attrs[:middleware] || [Her::Middleware::DefaultParseJSON] + Her::API.default_middleware
       @connection = Faraday.new(:url => @base_uri) do |builder|
-        builder.request :url_encoded
-        builder.adapter :net_http
+        middleware.each { |m| builder.use(m) }
       end
     end # }}}
 
     # Define a custom parsing procedure. The procedure is passed the response object and is
     # expected to return a hash with three keys: a main data Hash, an errors Array
     # and a metadata Hash.
     #
     # @example
-    #   $my_api.parse_with do |response|
-    #     json = JSON.parse(response.body)
-    #     { :resource => json[:data], :errors => json[:errors], :metadata => json[:metdata] }
-    #   end
-    def parse_with(&block) # {{{
-      @custom_parsing_block = true
-      @parse_with = block
-    end # }}}
 
-    # Return whether a custom parsing block has been defined
-    def custom_parsing_block? # {{{
-      @custom_parsing_block
-    end # }}}
-
     # Make an HTTP request to the API
     def request(attrs={}) # {{{
       method = attrs.delete(:_method)
       path = attrs.delete(:_path)
-      @connection.send method do |request|
+      response = @connection.send method do |request|
         if method == :get
           # For GET requests, treat additional parameters as querystring data
           request.url path, attrs
         else
           # For POST, PUT and DELETE requests, treat additional parameters as request body
           request.url path
           request.body = attrs
         end
       end
-    end # }}}
-
-    # Parse the HTTP response
-    def parse(response) # {{{
-      @parse_with.call(response)
+      response.env[:body]
     end # }}}
   end
 end