sawyer 0.8.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f6cbbe41c12f00d598889cbb8aed1d64097bd8dc
-  data.tar.gz: 938a4dd63ecc154994228964b2777ebd2c157563
+SHA256:
+  metadata.gz: 64487d4cb58ab69521a75070aedc4630968e138ca03add5e10f0a7933f007004
+  data.tar.gz: ecc9fb91e96931cc9e275ec976effbd88850a55a5f54c3ea521488b465d5b8bf
 SHA512:
-  metadata.gz: cfcca0af2c72b15c6a6a3d13d327e4ca1c60fb99ac292f19a81b695a5ef56d9d49cf5ce15a87434144566713e6a87343d52cde9f4e43a191552b8767a23d89cb
-  data.tar.gz: e8476f19b01abf5595ceb699e317fb5d5a68c590f91022778ff2e2b04b8350c98427cc5015c7132309b2856c881c90f578f2957932ef0d9297fc502467b16b43
+  metadata.gz: 7cdaadda1829426240d8f839c1065fa94b05014ebfede30367179c4e3d0add95484b1d6f3660e6bd810714beb7d6e1a3a814ce908539bd35b57e51a0b6a1e7ef
+  data.tar.gz: 3c4a5da79f2321361d0f6e9a36fa7d177eb0a087fb3514c66d1de3de0b932aa1b0fda2954e9df5815c5603367c8d1799031d16fd717299cccb73d1c80778ca27

data/Gemfile

@@ -1,8 +1,13 @@
 source "http://rubygems.org"
 
 gemspec
-gem 'rake'
+
+gem "rake"
 
 group :test do
   gem "minitest"
 end
+
+install_if -> { ENV["FARADAY_VERSION"] } do
+  gem "faraday", ENV["FARADAY_VERSION"]
+end

data/README.md

@@ -1,19 +1,62 @@
 # Sawyer
 
-Sawyer is an experimental secret user agent built on top of
-[Faraday][faraday].
+Sawyer is an experimental hypermedia agent for Ruby built on top of [Faraday][faraday].
 
 [faraday]: https://github.com/lostisland/faraday
 
-![](http://techno-weenie.net/sawyer/images/faraday.jpeg)
+## Installation
 
-Think of Faraday as the nerdy scientist behind an HTTP API.  Sure, he
-knows the technical details of how to communicate with an application.
-But he also gets overly obsessive about alternate timelines to be of
-much use.
+Add this line to your application's Gemfile:
 
-![](http://techno-weenie.net/sawyer/images/sawyer.jpeg)
+```ruby
+gem 'sawyer'
+```
 
-Sawyer knows what needs to be done.  He gets in there, assesses the
-situation, and figures out the next action.
+And then execute:
 
+```sh
+bundle
+```
+
+Or install it yourself as:
+
+```sh
+gem install sawyer
+```
+
+## Usage
+
+```ruby
+require "sawyer"
+
+# Create a Sawyer agent
+agent = Sawyer::Agent.new("https://api.github.com",
+  links_parser: Sawyer::LinkParsers::Simple.new)
+
+# Fetch the root of the API
+root = agent.root.data
+
+# Access a resource directly
+contributors = agent.call(:get, "repos/lostisland/sawyer/contributors").data
+
+# Load a hypermedia relation
+top_contributor = contributors.first
+followers = top_contributor.rels[:followers].get.data
+```
+
+For more information, check out the [documentation](http://www.rubydoc.info/gems/sawyer/).
+
+## Development
+
+After checking out the repo, run `script/test` to bootstrap the project and run the tests.
+You can also run `script/console` for an interactive prompt that will allow you to experiment.
+
+To package the gem, run `script/package`. To release a new version, update the version number in [`lib/sawyer.rb`](lib/sawyer.rb), and then run `script/release`, which will create a git tag for the version, push git commits and tags, and push the .gem file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Check out the [contributing guide](CONTRIBUTING.md) for more information on contributing.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/sawyer/agent.rb

@@ -48,6 +48,11 @@ module Sawyer
       yield @conn if block_given?
     end
 
+    # Public: Close the underlying connection.
+    def close
+      @conn.close if @conn.respond_to?(:close)
+    end
+
     # Public: Retains a reference to the root relations of the API.
     #
     # Returns a Sawyer::Relation::Map.

data/lib/sawyer/relation.rb

@@ -38,6 +38,7 @@ module Sawyer
       def keys
         @map.keys
       end
+
       def to_hash
         pairs = @map.map do |k, v|
           [(k.to_s + "_url").to_sym, v.href]

data/lib/sawyer/response.rb

@@ -3,7 +3,8 @@ module Sawyer
     attr_reader :agent,
       :status,
       :headers,
-      :data,
+      :env,
+      :body,
       :rels
 
     # Builds a Response after a completed request.
@@ -15,12 +16,19 @@ module Sawyer
       @status  = res.status
       @headers = res.headers
       @env     = res.env
-      @data    = @headers[:content_type] =~ /json|msgpack/ ? process_data(@agent.decode_body(res.body)) : res.body
+      @body    = res.body
       @rels    = process_rels
       @started = options[:sawyer_started]
       @ended   = options[:sawyer_ended]
     end
 
+    def data
+      @data ||= begin
+        return(body) unless (headers[:content_type] =~ /json|msgpack/) 
+        process_data(agent.decode_body(body))
+      end
+    end
+
     # Turns parsed contents from an API response into a Resource or
     # collection of Resources.
     #
@@ -58,7 +66,7 @@ module Sawyer
     end
 
     def inspect
-      %(#<#{self.class}: #{@status} @rels=#{@rels.inspect} @data=#{@data.inspect}>)
+      %(#<#{self.class}: #{@status} @rels=#{@rels.inspect} @data=#{data.inspect}>)
     end
   end
 end

data/lib/sawyer/serializer.rb

@@ -4,7 +4,9 @@ require 'time'
 module Sawyer
   class Serializer
     def self.any_json
-      yajl || multi_json || json
+      yajl || multi_json || json || begin
+        raise RuntimeError, "Sawyer requires a JSON gem: yajl, multi_json, or json"
+      end
     end
 
     def self.yajl

data/lib/sawyer.rb

@@ -1,5 +1,5 @@
 module Sawyer
-  VERSION = "0.8.1"
+  VERSION = "0.9.1"
 
   class Error < StandardError; end
 end

data/sawyer.gemspec

@@ -17,13 +17,12 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/lostisland/sawyer'
   spec.licenses = ['MIT']
 
-  spec.add_dependency 'faraday',      ['~> 0.8', '< 1.0']
-  spec.add_dependency 'addressable', ['>= 2.3.5', '< 2.6']
+  spec.add_dependency 'faraday', '>= 0.17.3', '< 3'
+  spec.add_dependency 'addressable', ['>= 2.3.5']
 
   spec.files = %w(Gemfile LICENSE.md README.md Rakefile)
   spec.files << "#{lib}.gemspec"
   spec.files += Dir.glob("lib/**/*.rb")
-  spec.files += Dir.glob("test/**/*.rb")
   spec.files += Dir.glob("script/*")
 
   dev_null    = File.exist?('/dev/null') ? '/dev/null' : 'NUL'

metadata

@@ -1,36 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: sawyer
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.1
 platform: ruby
 authors:
 - Rick Olson
 - Wynn Netherland
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.17.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.17.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -38,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,10 +45,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-description: 
+description:
 email: technoweenie@gmail.com
 executables: []
 extensions: []
@@ -75,16 +69,11 @@ files:
 - script/package
 - script/release
 - script/test
-- test/agent_test.rb
-- test/helper.rb
-- test/relation_test.rb
-- test/resource_test.rb
-- test/response_test.rb
 homepage: https://github.com/lostisland/sawyer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,10 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 2
 summary: Secret User Agent of HTTP
 test_files: []
-has_rdoc: 

data/test/agent_test.rb

@@ -1,195 +0,0 @@
-require File.expand_path("../helper", __FILE__)
-
-require 'faraday/adapter/test'
-
-module Sawyer
-  class AgentTest < TestCase
-
-    class InlineRelsParser
-      def parse(data)
-        links = {}
-        data.keys.select {|k| k[/_url$/] }.each {|k| links[k.to_s.gsub(/_url$/, '')] = data.delete(k) }
-
-        return data, links
-      end
-    end
-
-    def setup
-      @stubs = Faraday::Adapter::Test::Stubs.new
-      @agent = Sawyer::Agent.new "http://foo.com/a/" do |conn|
-        conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
-        conn.adapter :test, @stubs
-      end
-    end
-
-    def test_accesses_root_relations
-      @stubs.get '/a/' do |env|
-        assert_equal 'foo.com', env[:url].host
-
-        [200, {'Content-Type' => 'application/json'}, Sawyer::Agent.encode(
-          :_links => {
-            :users => {:href => '/users'}})]
-      end
-
-      assert_equal 200, @agent.root.status
-
-      assert_equal '/users', @agent.rels[:users].href
-      assert_equal :get,     @agent.rels[:users].method
-    end
-
-    def test_allows_custom_rel_parsing
-      @stubs.get '/a/' do |env|
-        assert_equal 'foo.com', env[:url].host
-
-        [200, {'Content-Type' => 'application/json'}, Sawyer::Agent.encode(
-          :url => '/',
-          :users_url => '/users',
-          :repos_url => '/repos')]
-      end
-
-      agent = Sawyer::Agent.new "http://foo.com/a/" do |conn|
-        conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
-        conn.adapter :test, @stubs
-      end
-      agent.links_parser = InlineRelsParser.new
-
-      assert_equal 200, agent.root.status
-
-      assert_equal '/users', agent.rels[:users].href
-      assert_equal :get,     agent.rels[:users].method
-      assert_equal '/repos', agent.rels[:repos].href
-      assert_equal :get,     agent.rels[:repos].method
-
-    end
-
-    def test_saves_root_endpoint
-      @stubs.get '/a/' do |env|
-        [200, {}, '{}']
-      end
-
-      assert_kind_of Sawyer::Response, @agent.root
-      refute_equal @agent.root.time, @agent.start.time
-    end
-
-    def test_starts_a_session
-      @stubs.get '/a/' do |env|
-        assert_equal 'foo.com', env[:url].host
-
-        [200, {'Content-Type' => 'application/json'}, Sawyer::Agent.encode(
-          :_links => {
-            :users => {:href => '/users'}})]
-      end
-
-      res = @agent.start
-
-      assert_equal 200, res.status
-      assert_kind_of Sawyer::Resource, resource = res.data
-
-      assert_equal '/users', resource.rels[:users].href
-      assert_equal :get,     resource.rels[:users].method
-    end
-
-    def test_requests_with_body_and_options
-      @stubs.post '/a/b/c' do |env|
-        assert_equal '{"a":1}', env[:body]
-        assert_equal 'abc',     env[:request_headers]['x-test']
-        assert_equal 'foo=bar', env[:url].query
-        [200, {}, "{}"]
-      end
-
-      res = @agent.call :post, 'b/c' , {:a => 1},
-        :headers => {"X-Test" => "abc"},
-        :query   => {:foo => 'bar'}
-      assert_equal 200, res.status
-    end
-
-    def test_requests_with_body_and_options_to_get
-      @stubs.get '/a/b/c' do |env|
-        assert_nil env[:body]
-        assert_equal 'abc',     env[:request_headers]['x-test']
-        assert_equal 'foo=bar', env[:url].query
-        [200, {}, "{}"]
-      end
-
-      res = @agent.call :get, 'b/c' , {:a => 1},
-        :headers => {"X-Test" => "abc"},
-        :query   => {:foo => 'bar'}
-      assert_equal 200, res.status
-    end
-
-    def test_encodes_and_decodes_times
-      time = Time.at(Time.now.to_i)
-      data = {
-        :a => 1,
-        :b => true,
-        :c => 'c',
-        :created_at => time,
-        :published_at => nil,
-        :updated_at => "An invalid date",
-        :pub_date => time,
-        :subscribed_at => time.to_i,
-        :lost_at => time.to_f,
-        :first_date => false,
-        :validate => true
-      }
-      data = [data.merge(:foo => [data])]
-      encoded = Sawyer::Agent.encode(data)
-      decoded = Sawyer::Agent.decode(encoded)
-
-      2.times do
-        assert_equal 1, decoded.size
-        decoded = decoded.shift
-
-        assert_equal 1, decoded[:a]
-        assert_equal true, decoded[:b]
-        assert_equal 'c', decoded[:c]
-        assert_equal time, decoded[:created_at], "Did not parse created_at as Time"
-        assert_nil decoded[:published_at]
-        assert_equal "An invalid date", decoded[:updated_at]
-        assert_equal time, decoded[:pub_date], "Did not parse pub_date as Time"
-        assert_equal true, decoded[:validate]
-        assert_equal time, decoded[:subscribed_at], "Did not parse subscribed_at as Time"
-        assert_equal time, decoded[:lost_at], "Did not parse lost_at as Time"
-        assert_equal false, decoded[:first_date], "Parsed first_date"
-        decoded = decoded[:foo]
-      end
-    end
-
-    def test_does_not_encode_non_json_content_types
-      @stubs.get '/a/' do |env|
-        assert_equal 'foo.com', env[:url].host
-
-        [200, {'Content-Type' => 'text/plain'}, "This is plain text"]
-      end
-      res = @agent.call :get, '/a/',
-        :headers => {"Accept" => "text/plain"}
-      assert_equal 200, res.status
-
-      assert_equal "This is plain text", res.data
-    end
-
-    def test_handle_yaml_dump_and_load
-      require 'yaml'
-      res = Agent.new 'http://example.com', :a => 1
-      YAML.load(YAML.dump(res))
-    end
-
-    def test_handle_marshal_dump_and_load
-      res = Agent.new 'http://example.com', :a => 1
-      Marshal.load(Marshal.dump(res))
-    end
-
-    def test_blank_response_doesnt_raise
-      @stubs.get "/a/" do |env|
-        assert_equal "foo.com", env[:url].host
-        [200, { "Content-Type" => "application/json" }, " "]
-      end
-
-      agent = Sawyer::Agent.new "http://foo.com/a/" do |conn|
-        conn.adapter :test, @stubs
-      end
-
-      assert_equal 200, agent.root.status
-    end
-  end
-end

data/test/helper.rb

@@ -1,7 +0,0 @@
-require "minitest/autorun"
-require File.expand_path('../../lib/sawyer', __FILE__)
-
-class Sawyer::TestCase < Minitest::Test
-  def default_test
-  end
-end

data/test/relation_test.rb

@@ -1,174 +0,0 @@
-require File.expand_path("../helper", __FILE__)
-
-module Sawyer
-  class RelationTest < TestCase
-    def test_builds_relation_from_hash
-      hash = {:href => '/users/1', :method => 'post'}
-      rel  = Sawyer::Relation.from_link(nil, :self, hash)
-
-      assert_equal :self,      rel.name
-      assert_equal '/users/1', rel.href
-      assert_equal :post,      rel.method
-      assert_equal [:post],    rel.available_methods.to_a
-    end
-
-    def test_builds_multiple_rels_from_multiple_methods
-      index = {
-        'comments' => {:href => '/comments', :method => 'get,post'}
-      }
-
-      rels = Sawyer::Relation.from_links(nil, index)
-      assert_equal 1, rels.size
-      assert_equal [:comments], rels.keys
-
-      assert rel = rels[:comments]
-      assert_equal '/comments',   rel.href
-      assert_equal :get,          rel.method
-      assert_equal [:get, :post], rel.available_methods.to_a
-      assert_kind_of Addressable::Template, rel.href_template
-    end
-
-    def test_builds_rels_from_hash
-      index = {
-        'self' => '/users/1'
-      }
-
-      rels = Sawyer::Relation.from_links(nil, index)
-
-      assert_equal 1, rels.size
-      assert_equal [:self], rels.keys
-      assert rel = rels[:self]
-      assert_equal :self,      rel.name
-      assert_equal '/users/1', rel.href
-      assert_equal :get,       rel.method
-      assert_equal [:get],     rel.available_methods.to_a
-      assert_kind_of Addressable::Template, rel.href_template
-    end
-
-    def test_builds_rels_from_hash_index
-      index = {
-        'self' => {:href => '/users/1'}
-      }
-
-      rels = Sawyer::Relation.from_links(nil, index)
-
-      assert_equal 1, rels.size
-      assert_equal [:self], rels.keys
-      assert rel = rels[:self]
-      assert_equal :self,      rel.name
-      assert_equal '/users/1', rel.href
-      assert_equal :get,       rel.method
-      assert_equal [:get],     rel.available_methods.to_a
-      assert_kind_of Addressable::Template, rel.href_template
-    end
-
-    def test_builds_rels_from_nil
-      rels = Sawyer::Relation.from_links nil, nil
-      assert_equal 0,  rels.size
-      assert_equal [], rels.keys
-    end
-
-    def test_relation_api_calls
-      agent = Sawyer::Agent.new "http://foo.com/a/" do |conn|
-        conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
-        conn.adapter :test do |stubs|
-          stubs.get '/a/1' do
-            [200, {}, '{}']
-          end
-          stubs.delete '/a/1' do
-            [204, {}, '{}']
-          end
-        end
-      end
-
-      rel = Sawyer::Relation.new agent, :self, "/a/1", "get,put,delete"
-      assert_equal :get, rel.method
-      [:get, :put, :delete].each do |m|
-        assert rel.available_methods.include?(m), "#{m.inspect} is not available: #{rel.available_methods.inspect}"
-      end
-
-      assert_equal 200, rel.call.status
-      assert_equal 200, rel.call(:method => :head).status
-      assert_equal 204, rel.call(nil, :method => :delete).status
-      assert_raises ArgumentError do
-        rel.call nil, :method => :post
-      end
-
-      assert_equal 200, rel.head.status
-      assert_equal 200, rel.get.status
-      assert_equal 204, rel.delete.status
-
-      assert_raises ArgumentError do
-        rel.post
-      end
-    end
-
-    def test_relation_api_calls_with_uri_tempate
-      agent = Sawyer::Agent.new "http://foo.com/a" do |conn|
-        conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
-        conn.adapter :test do |stubs|
-          stubs.get '/octocat/hello' do |env|
-            assert_equal "a=1&b=2", env[:url].query
-            [200, {}, '{}']
-          end
-
-          stubs.get '/a' do
-            [404, {}, '{}']
-          end
-        end
-      end
-
-      rel = Sawyer::Relation.new agent, :repo, "{/user,repo}{?a,b}"
-
-      assert_equal '', rel.href
-      assert_equal '/octocat', rel.href(:user => :octocat)
-
-      assert_equal 404, rel.get.status
-      assert_equal 200, rel.get(:uri => {'user' => 'octocat', 'repo' => 'hello', 'a' => 1, 'b' => 2}).status
-    end
-
-    def test_handles_invalid_uri
-      hash = {:href => '/this has spaces', :method => 'post'}
-      rel  = Sawyer::Relation.from_link(nil, :self, hash)
-
-      assert_equal :self,      rel.name
-      assert_equal '/this has spaces', rel.href
-    end
-
-    def test_allows_all_methods_when_not_in_strict_mode
-
-      agent = Sawyer::Agent.new "http://foo.com/a/", :allow_undefined_methods => true do |conn|
-        conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
-        conn.adapter :test do |stubs|
-          stubs.get '/a/1' do
-            [200, {}, '{}']
-          end
-          stubs.delete '/a/1' do
-            [204, {}, '{}']
-          end
-          stubs.post '/a/1' do
-            [200, {}, '{}']
-          end
-          stubs.put '/a/1' do
-            [204, {}, '{}']
-          end
-        end
-      end
-
-      rel = Sawyer::Relation.new agent, :self, "/a/1"
-      assert_equal 200, rel.get.status
-      assert_equal 200, rel.post.status
-      assert_equal 204, rel.put.status
-      assert_equal 204, rel.delete.status
-    end
-
-    def test_map_inspect
-      map = Sawyer::Relation::Map.new
-      hash = {:href => '/users/1', :method => 'post'}
-      rel  = Sawyer::Relation.from_link(nil, :self, hash)
-      map << rel
-
-      assert_equal "{:self_url=>\"/users/1\"}", map.inspect
-    end
-  end
-end

data/test/resource_test.rb

@@ -1,199 +0,0 @@
-require File.expand_path("../helper", __FILE__)
-
-module Sawyer
-  class ResourceTest < TestCase
-
-    def setup
-      @stubs = Faraday::Adapter::Test::Stubs.new
-      @agent = Sawyer::Agent.new "http://foo.com/a/" do |conn|
-        conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
-        conn.adapter :test, @stubs
-      end
-    end
-
-    def test_accessible_keys
-      res = Resource.new @agent, :a => 1,
-        :_links => {:self => {:href => '/'}}
-
-      assert_equal 1, res.a
-      assert res.rels[:self]
-      assert_equal @agent, res.agent
-      assert_equal 1, res.fields.size
-      assert res.fields.include?(:a)
-    end
-
-    def test_clashing_keys
-      res = Resource.new @agent, :agent => 1, :rels => 2, :fields => 3,
-        :_links => {:self => {:href => '/'}}
-
-      assert_equal 1, res.agent
-      assert_equal 2, res.rels
-      assert_equal 3, res.fields
-
-      assert res._rels[:self]
-      assert_equal @agent, res._agent
-      assert_equal 3, res._fields.size
-      [:agent, :rels, :fields].each do |f|
-        assert res._fields.include?(f)
-      end
-    end
-
-    def test_nested_object
-      res = Resource.new @agent,
-        :user   => {:id => 1, :_links => {:self => {:href => '/users/1'}}},
-        :_links => {:self => {:href => '/'}}
-
-      assert_equal '/', res.rels[:self].href
-      assert_kind_of Resource, res.user
-      assert_equal 1, res.user.id
-      assert_equal '/users/1', res.user.rels[:self].href
-    end
-
-    def test_nested_collection
-      res = Resource.new @agent,
-        :users  => [{:id => 1, :_links => {:self => {:href => '/users/1'}}}],
-        :_links => {:self => {:href => '/'}}
-
-      assert_equal '/', res.rels[:self].href
-      assert_kind_of Array, res.users
-
-      assert user = res.users.first
-      assert_kind_of Resource, user
-      assert_equal 1, user.id
-      assert_equal '/users/1', user.rels[:self].href
-    end
-
-    def test_attribute_predicates
-      res = Resource.new @agent, :a => 1, :b => true, :c => nil, :d => false
-
-      assert  res.a?
-      assert  res.b?
-      assert !res.c?
-      assert !res.d?
-    end
-
-    def test_attribute_setter
-      res = Resource.new @agent, :a => 1
-      assert_equal 1, res.a
-      assert !res.key?(:b)
-
-      res.b = 2
-      assert_equal 2, res.b
-      assert res.key?(:b)
-    end
-
-    def test_dynamic_attribute_methods_from_getter
-      res = Resource.new @agent, :a => 1
-      assert res.key?(:a)
-      assert res.respond_to?(:a)
-      assert res.respond_to?(:a=)
-
-      assert_equal 1, res.a
-      assert res.respond_to?(:a)
-      assert res.respond_to?(:a=)
-    end
-
-    def test_nillable_attribute_getters
-      res = Resource.new @agent, :a => 1
-      assert !res.key?(:b)
-      assert !res.respond_to?(:b)
-      assert !res.respond_to?(:b=)
-      assert_nil res.b
-      res.b
-    end
-
-    def test_dynamic_attribute_methods_from_setter
-      res = Resource.new @agent, :a => 1
-      assert !res.key?(:b)
-      assert !res.respond_to?(:b)
-      assert !res.respond_to?(:b=)
-
-      res.b = 1
-      assert res.key?(:b)
-      assert res.respond_to?(:b)
-      assert res.respond_to?(:b=)
-    end
-
-    def test_attrs
-      res = Resource.new @agent, :a => 1
-      hash = {:a => 1 }
-      assert_equal hash, res.attrs
-    end
-
-    def test_to_h
-      res = Resource.new @agent, :a => 1
-      hash = {:a => 1 }
-      assert_equal hash, res.to_h
-    end
-
-    def test_to_h_with_nesting
-      res = Resource.new @agent, :a => {:b => 1}
-      hash = {:a => {:b => 1}}
-      assert_equal hash, res.to_h
-    end
-
-    def test_to_attrs_for_sawyer_resource_arrays
-      res = Resource.new @agent, :a => 1, :b => [Resource.new(@agent, :a => 2)]
-      hash = {:a => 1, :b => [{:a => 2}]}
-      assert_equal hash, res.to_attrs
-    end
-
-    def test_handle_hash_notation_with_string_key
-      res = Resource.new @agent, :a => 1
-      assert_equal 1, res['a']
-
-      res[:b] = 2
-      assert_equal 2, res.b
-    end
-
-    def test_simple_rel_parsing
-      @agent.links_parser = Sawyer::LinkParsers::Simple.new
-      res = Resource.new @agent,
-        :url => '/',
-        :user   => {
-          :id => 1,
-          :url => '/users/1',
-          :followers_url => '/users/1/followers'
-        }
-
-      assert_equal '/', res.rels[:self].href
-      assert_kind_of Resource, res.user
-      assert_equal '/', res.url
-      assert_equal 1, res.user.id
-      assert_equal '/users/1', res.user.rels[:self].href
-      assert_equal '/users/1', res.user.url
-      assert_equal '/users/1/followers', res.user.rels[:followers].href
-      assert_equal '/users/1/followers', res.user.followers_url
-    end
-
-    def test_handle_yaml_dump
-      require 'yaml'
-      res = Resource.new @agent, :a => 1
-      YAML.dump(res)
-    end
-
-    def test_handle_marshal_dump
-      dump = Marshal.dump(Resource.new(@agent, :a => 1))
-      resource = Marshal.load(dump)
-      assert_equal 1, resource.a
-    end
-
-    def test_inspect
-      resource = Resource.new @agent, :a => 1
-      assert_equal "{:a=>1}", resource.inspect
-    end
-
-    def test_each
-      resource = Resource.new @agent, { :a => 1, :b => 2 }
-      output = []
-      resource.each { |k,v| output << [k,v] }
-      assert_equal [[:a, 1], [:b, 2]], output
-    end
-
-    def test_enumerable
-      resource = Resource.new @agent, { :a => 1, :b => 2 }
-      enum = resource.map
-      assert_equal Enumerator, enum.class
-    end
-  end
-end

data/test/response_test.rb

@@ -1,77 +0,0 @@
-require File.expand_path("../helper", __FILE__)
-
-module Sawyer
-  class ResponseTest < TestCase
-    def setup
-      @now = Time.now
-      @stubs = Faraday::Adapter::Test::Stubs.new
-      @agent = Sawyer::Agent.new "http://foo.com" do |conn|
-        conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
-        conn.adapter :test, @stubs do |stub|
-          stub.get '/' do
-            [200, {
-              'Content-Type' => 'application/json',
-              'Link' =>  '</starred?page=2>; rel="next", </starred?page=19>; rel="last"'
-              }, Sawyer::Agent.encode(
-              :a => 1,
-              :_links => {
-                :self => {:href => '/a', :method => 'POST'}
-              }
-            )]
-          end
-
-          stub.get '/emails' do
-            emails = %w(rick@example.com technoweenie@example.com)
-            [200, {'Content-Type' => 'application/json'}, Sawyer::Agent.encode(emails)]
-          end
-        end
-      end
-
-      @res = @agent.start
-      assert_kind_of Sawyer::Response, @res
-    end
-
-    def test_gets_status
-      assert_equal 200, @res.status
-    end
-
-    def test_gets_headers
-      assert_equal 'application/json', @res.headers['content-type']
-    end
-
-    def test_gets_body
-      assert_equal 1, @res.data.a
-      assert_equal [:a], @res.data.fields.to_a
-    end
-
-    def test_gets_rels
-      assert_equal '/starred?page=2', @res.rels[:next].href
-      assert_equal :get, @res.rels[:next].method
-      assert_equal '/starred?page=19', @res.rels[:last].href
-      assert_equal :get, @res.rels[:next].method
-      assert_equal '/a',  @res.data.rels[:self].href
-      assert_equal :post, @res.data.rels[:self].method
-    end
-
-    def test_gets_response_timing
-      assert @res.timing > 0
-      assert @res.time >= @now
-    end
-
-    def test_makes_request_from_relation
-      @stubs.post '/a' do
-        [201, {'Content-Type' => 'application/json'}, ""]
-      end
-
-      res = @res.data.rels[:self].call
-      assert_equal 201, res.status
-      assert_nil res.data
-    end
-
-    def test_handles_arrays_of_strings
-      res = @agent.call(:get, '/emails')
-      assert_equal 'rick@example.com', res.data.first
-    end
-  end
-end
-