footrest 0.3.1 → 0.4.1

data/footrest.gemspec

@@ -23,8 +23,12 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler", ">= 1.0.0"
   gem.add_development_dependency "rspec", "~> 2.6"
   gem.add_development_dependency "webmock"
-  gem.add_development_dependency "debugger"
   gem.add_development_dependency "pry"
+  if RUBY_VERSION < '2.0'
+    gem.add_development_dependency "debugger"
+  else
+    gem.add_development_dependency "byebug"
+  end
 
   gem.add_dependency "faraday", "~> 0.9.0"
   gem.add_dependency "activesupport", ">= 3.0.0"

data/lib/footrest.rb

@@ -3,4 +3,19 @@ require 'footrest/client'
 require 'footrest/version'
 
 module Footrest
-end
+end
+
+module Faraday
+  class Response::Logger < Response::Middleware
+    private
+
+    SENSITIVE_HEADERS = %w{Authorization}
+    def dump_headers(headers)
+      return "empty headers" unless headers
+      headers.map { |k, v|
+        message = "#{k}: "
+        message << (SENSITIVE_HEADERS.include?(k) ? "[filtered]" : v.inspect)
+      }.join("\n")
+    end
+  end
+end

data/lib/footrest/connection.rb

@@ -10,10 +10,15 @@ module Footrest
     attr_reader :connection
 
     def set_connection(config)
+      config[:logger] = config[:logging] if config[:logging]
       @connection = Faraday.new(url: config[:prefix]) do |faraday|
         faraday.request                     :multipart
         faraday.request                     :url_encoded
-        faraday.response                    :logger if config[:logging]
+        if config[:logger] == true
+          faraday.response :logger
+        elsif config[:logger]
+          faraday.use Faraday::Response::Logger, config[:logger]
+        end
         faraday.adapter                     Faraday.default_adapter
         faraday.use                         Footrest::FollowRedirects
         faraday.use                         Footrest::ParseJson, :content_type => /\bjson$/

data/lib/footrest/http_error.rb

@@ -13,7 +13,28 @@ module Footrest
         @body = @response[:body]
         @method = @response[:method]
 
-        super("HTTP ERROR: #{@status} #{errors}")
+        super("HTTP ERROR: #{@status} #{method} #{url}\n#{errors}\n#{headers}")
+      end
+
+      def method
+        @method.to_s.upcase
+      rescue => e
+        "[Unable to show HTTP method: #{e}]"
+      end
+
+      def url
+        @response.url.to_s
+      rescue => e
+        "[Unable to show URL: #{e}]"
+      end
+
+      def headers
+        JSON::pretty_generate(
+          request: @response.request_headers,
+          response: @response.response_headers
+        )
+      rescue => e
+        "[Unable to show headers: #{e}]"
       end
 
       def errors

data/lib/footrest/pagination.rb

@@ -5,8 +5,9 @@ module Footrest
     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")
+          %w(prev next first last current).each do |page|
+            response["#{page}_page".to_sym] = find_link(link, page)
+          end
         end
       end
     end

data/lib/footrest/response_middleware.rb

@@ -55,9 +55,14 @@ module Footrest
     end
 
     def response_type(env)
-      type = env[:response_headers][CONTENT_TYPE].to_s
-      type = type.split(';', 2).first if type.index(';')
-      type
+      if env[:response_headers]
+        type = env[:response_headers][CONTENT_TYPE].to_s
+        type = type.split(';', 2).first if type.index(';')
+        type
+      else
+        warn("response_headers are nil. Did you use http when you meant https?")
+        nil
+      end
     end
 
     def process_response_type?(type)

data/lib/footrest/version.rb

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

data/spec/footrest/client_spec.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../spec_helper'
 
 describe Footrest::Client do
   it "sets the domain" do

data/spec/footrest/http_error_spec.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../spec_helper'
 
 describe Footrest::HttpError do
   before do

data/spec/footrest/pagination_spec.rb

@@ -0,0 +1,20 @@
+require_relative '../spec_helper'
+
+describe Footrest::Pagination do
+
+  context "on_complete" do
+    it 'captures prev, next, first, last, and current page links as response headers' do
+      response = {
+        response_headers: {
+          link: "<current_link>; rel=\"current\",<next_link>; rel=\"next\",<prev_link>; rel=\"prev\",<first_link>; rel=\"first\",<last_link>; rel=\"last\""
+        }
+      }
+
+      Footrest::Pagination.new.on_complete(response)
+
+      %w(prev next first last current).each do |page|
+        expect(response["#{page}_page".to_sym]).to eq("#{page}_link")
+      end
+    end
+  end
+end

data/spec/footrest/request_spec.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../spec_helper'
 
 class RequestHarness; include Footrest::Request; end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: footrest
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -77,7 +77,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -93,7 +93,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -178,8 +178,9 @@ files:
 - lib/footrest.rb
 - spec/footrest/client_spec.rb
 - spec/footrest/http_error_spec.rb
+- spec/footrest/pagination_spec.rb
 - spec/footrest/request_spec.rb
-- spec/helper.rb
+- spec/spec_helper.rb
 homepage: https://github.com/instructure/footrest
 licenses:
 - MIT
@@ -208,6 +209,7 @@ summary: REST APIs
 test_files:
 - spec/footrest/client_spec.rb
 - spec/footrest/http_error_spec.rb
+- spec/footrest/pagination_spec.rb
 - spec/footrest/request_spec.rb
-- spec/helper.rb
+- spec/spec_helper.rb
 has_rdoc: