footrest 0.2.0 → 0.2.2

data/footrest.gemspec

@@ -29,4 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "faraday", "~> 0.8.8"
   gem.add_dependency "faraday_middleware", "~> 0.9.0"
   gem.add_dependency "activesupport", ">= 3.0.0"
+
+  # Parses Link headers formatted according to RFC 5988 draft spec
+  gem.add_dependency "link_header", ">= 0.0.7"
 end

data/lib/footrest/client.rb

@@ -25,6 +25,7 @@ module Footrest
     end
 
     def fullpath(path)
+      return path if path =~ /^https?:/i
       prefix ? join(prefix, path) : path
     end
 

data/lib/footrest/connection.rb

@@ -1,6 +1,7 @@
 require 'faraday'
 require 'faraday_middleware'
-require 'faraday/response/raise_footrest_http_error'
+require 'footrest/http_error'
+require 'footrest/pagination'
 
 module Footrest
   module Connection
@@ -15,7 +16,8 @@ module Footrest
         faraday.adapter                     Faraday.default_adapter
         faraday.use                         FaradayMiddleware::FollowRedirects
         faraday.use                         FaradayMiddleware::ParseJson, :content_type => /\bjson$/
-        faraday.use                         Faraday::Response::RaiseFootrestHttpError
+        faraday.use                         Footrest::RaiseFootrestErrors
+        faraday.use                         Footrest::Pagination
         faraday.headers[:accept]          = "application/json"
         faraday.headers[:authorization]   = "Bearer #{config[:token]}" if config[:token]
         faraday.headers[:user_agent]      = "Footrest"

data/lib/footrest/http_error.rb

@@ -1,3 +1,6 @@
+require 'faraday'
+require 'json'
+
 module Footrest
   module HttpError
     class ErrorBase < StandardError
@@ -10,7 +13,13 @@ module Footrest
         @body = @response[:body]
         @method = @response[:method]
 
-        super("HTTP ERROR: #{@status}")
+        super("HTTP ERROR: #{@status} #{errors}")
+      end
+
+      def errors
+        JSON::pretty_generate(JSON::parse(@body)["errors"])
+      rescue
+        @body
       end
     end
 
@@ -21,6 +30,25 @@ module Footrest
     ).each do |error|
       const_set error.to_sym, Class.new(ErrorBase)
     end
+  end
 
+  class RaiseFootrestErrors < Faraday::Response::Middleware
+    ERROR_MAP = {
+      400 => Footrest::HttpError::BadRequest,
+      401 => Footrest::HttpError::Unauthorized,
+      403 => Footrest::HttpError::Forbidden,
+      404 => Footrest::HttpError::NotFound,
+      405 => Footrest::HttpError::MethodNotAllowed,
+      500 => Footrest::HttpError::InternalServerError,
+      501 => Footrest::HttpError::NotImplemented,
+      502 => Footrest::HttpError::BadGateway,
+      503 => Footrest::HttpError::ServiceUnavailable
+    }
+
+    def on_complete(response)
+      key = response[:status].to_i
+      raise ERROR_MAP[key].new(response) if ERROR_MAP.has_key? key
+    end
   end
+
 end

data/lib/footrest/pagination.rb

@@ -0,0 +1,20 @@
+require 'link_header'
+
+module Footrest
+  class Pagination < Faraday::Response::Middleware
+    def on_complete(response)
+      if response[:response_headers]
+        if link = response[:response_headers][:link]
+          response[:next_page] = find_link(link, "next")
+          response[:first_page] = find_link(link, "first")
+        end
+      end
+    end
+
+    def find_link(header, rel)
+      link = ::LinkHeader.parse(header).links.find{ |link| link['rel'] == rel }
+      link.to_a.first if link
+    end
+  end
+end
+

data/lib/footrest/version.rb

@@ -1,3 +1,3 @@
 module Footrest
-  VERSION = '0.2.0' unless defined?(Footrest::VERSION)
+  VERSION = '0.2.2' unless defined?(Footrest::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: footrest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,6 +156,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: link_header
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.7
 description: Ruby interface for restful APIs
 email:
 - duane@instructure.com
@@ -166,10 +182,10 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - footrest.gemspec
-- lib/faraday/response/raise_footrest_http_error.rb
 - lib/footrest/client.rb
 - lib/footrest/connection.rb
 - lib/footrest/http_error.rb
+- lib/footrest/pagination.rb
 - lib/footrest/request.rb
 - lib/footrest/version.rb
 - lib/footrest.rb

data/lib/faraday/response/raise_footrest_http_error.rb

@@ -1,23 +0,0 @@
-require 'faraday'
-require 'footrest/http_error'
-
-module Faraday
-  class Response::RaiseFootrestHttpError < Response::Middleware
-    ERROR_MAP = {
-      400 => Footrest::HttpError::BadRequest,
-      401 => Footrest::HttpError::Unauthorized,
-      403 => Footrest::HttpError::Forbidden,
-      404 => Footrest::HttpError::NotFound,
-      405 => Footrest::HttpError::MethodNotAllowed,
-      500 => Footrest::HttpError::InternalServerError,
-      501 => Footrest::HttpError::NotImplemented,
-      502 => Footrest::HttpError::BadGateway,
-      503 => Footrest::HttpError::ServiceUnavailable
-    }
-
-    def on_complete(response)
-      key = response[:status].to_i
-      raise ERROR_MAP[key].new(response) if ERROR_MAP.has_key? key
-    end
-  end
-end