sawyer 0.0.2 → 0.0.3

data/Gemfile

@@ -1,3 +1,4 @@
 source "http://rubygems.org"
 
 gemspec
+gem 'rake'

data/lib/sawyer.rb

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

data/lib/sawyer/agent.rb

@@ -9,12 +9,26 @@ module Sawyer
     # Sawyer::Response.
     #
     # endpoint - String URI of the API entry point.
-    def initialize(endpoint)
+    def initialize(endpoint, conn = nil)
       @endpoint = endpoint
-      @conn     = Faraday.new endpoint
+      @conn     = conn || Faraday.new(endpoint)
       yield @conn if block_given?
     end
 
+    # Public: Retains a reference to the root relations of the API.
+    #
+    # Returns a Sawyer::Relation::Map.
+    def rels
+      @rels ||= root.data.rels
+    end
+
+    # Public: Retains a reference to the root response of the API.
+    #
+    # Returns a Sawyer::Response.
+    def root
+      @root ||= start
+    end
+
     # Public: Hits the root of the API to get the initial actions.
     #
     # Returns a Sawyer::Response.
@@ -43,15 +57,19 @@ module Sawyer
 
       options ||= {}
       url = expand_url(url, options[:uri])
+      started = nil
       res = @conn.send method, url do |req|
-        req.body = encode_body(data) if data 
+        req.body = encode_body(data) if data
         if params = options[:query]
           req.params.update params
         end
         if headers = options[:headers]
           req.headers.update headers
         end
+        started = Time.now
       end
+      res.env[:sawyer_started] = started
+      res.env[:sawyer_ended] = Time.now
 
       Response.new self, res
     end

data/lib/sawyer/response.rb

@@ -16,6 +16,7 @@ module Sawyer
       @agent   = agent
       @status  = res.status
       @headers = res.headers
+      @env     = res.env
       @data    = process_data(@agent.decode_body(res.body))
     end
 
@@ -35,6 +36,14 @@ module Sawyer
       end
     end
 
+    def timing
+      @timing ||= @env[:sawyer_ended] - @env[:sawyer_started]
+    end
+
+    def time
+      @env[:sawyer_ended]
+    end
+
     def inspect
       %(#<#{self.class}: #{@status} @rels=#{@rels.inspect} @data=#{@data.inspect}>)
     end

data/sawyer.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'sawyer'
-  s.version           = '0.0.2'
-  s.date              = '2012-09-25'
+  s.version           = '0.0.3'
+  s.date              = '2012-09-26'
   s.rubyforge_project = 'sawyer'
 
   ## Make sure your summary is short. The description may be as long

data/test/agent_test.rb

@@ -10,6 +10,30 @@ module Sawyer
       end
     end
 
+    def test_accesses_root_relations
+      @stubs.get '/a/' do |env|
+        assert_equal 'foo.com', env[:url].host
+
+        [200, {}, Yajl.dump(
+          :_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_saves_root_endpoint
+      @stubs.get '/a/' do |env|
+        [200, {}, '{}']
+      end
+
+      assert_kind_of Sawyer::Response, @agent.root
+      assert_not_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

data/test/response_test.rb

@@ -3,6 +3,7 @@ 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)
@@ -17,7 +18,7 @@ module Sawyer
           end
         end
       end
-      
+
       @res = @agent.start
       assert_kind_of Sawyer::Response, @res
     end
@@ -40,6 +41,11 @@ module Sawyer
       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, {}, ""]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sawyer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday