sawyer 0.0.7 → 0.0.8

data/README.md

@@ -3,6 +3,8 @@
 Sawyer is an experimental secret user agent built on top of
 [Faraday][faraday].
 
+[faraday]: https://github.com/lostisland/faraday
+
 ![](http://techno-weenie.net/sawyer/images/faraday.jpeg)
 
 Think of Faraday as the nerdy scientist behind an HTTP API.  Sure, he

data/lib/sawyer.rb

@@ -1,5 +1,5 @@
 module Sawyer
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 
   class Error < StandardError; end
 end
@@ -12,5 +12,6 @@ require 'set'
   response
   serializer
   agent
-  hal_rels_parser
+  link_parsers/hal
+  link_parsers/simple
 ).each { |f| require File.expand_path("../sawyer/#{f}", __FILE__) }

data/lib/sawyer/agent.rb

@@ -38,7 +38,7 @@ module Sawyer
       @endpoint = endpoint
       @conn = (options && options[:faraday]) || Faraday.new
       @serializer = (options && options[:serializer]) || self.class.serializer
-      @links_parser = (options && options[:links_parser]) || HalLinksParser.new
+      @links_parser = (options && options[:links_parser]) || Sawyer::LinkParsers::Hal.new
       @allow_undefined_methods = (options && options[:allow_undefined_methods])
       @conn.url_prefix = @endpoint
       yield @conn if block_given?

data/lib/sawyer/link_parsers/hal.rb

@@ -0,0 +1,15 @@
+module Sawyer
+  module LinkParsers
+
+    class Hal
+
+      def parse(data)
+        links = data.delete(:_links)
+
+        return data, links
+      end
+
+    end
+
+  end
+end

data/lib/sawyer/link_parsers/simple.rb

@@ -0,0 +1,29 @@
+module Sawyer
+  module LinkParsers
+
+    class Simple
+
+      LINK_REGEX = /_?url$/
+
+
+      # Public: Parses simple *_url style links on resources
+      #
+      # data   - Hash of resource data
+      #
+      # Returns a Hash of data with separate links Hash
+      def parse(data)
+
+        links = {}
+        inline_links = data.keys.select {|k| k.to_s[LINK_REGEX] }
+        inline_links.each do |key|
+          rel_name = key.to_s == 'url' ? 'self' : key.to_s.gsub(LINK_REGEX, '')
+          links[rel_name.to_sym] = data.delete(key)
+        end
+
+        return data, links
+      end
+
+    end
+
+  end
+end

data/lib/sawyer/response.rb

@@ -16,6 +16,7 @@ module Sawyer
       @headers = res.headers
       @env     = res.env
       @data    = process_data(@agent.decode_body(res.body))
+      @rels    = process_rels
     end
 
     # Turns parsed contents from an API response into a Resource or
@@ -33,6 +34,19 @@ module Sawyer
       end
     end
 
+    # Finds link relations from 'Link' response header
+    #
+    # Returns an array of Relations
+    def process_rels
+      links = ( @headers["Link"] || "" ).split(', ').map do |link|
+        href, name = link.match(/<(.*?)>; rel="(\w+)"/).captures
+
+        [name.to_sym, Relation.from_link(@agent, name, :href => href)]
+      end
+
+      Hash[*links.flatten]
+    end
+
     def timing
       @timing ||= @env[:sawyer_ended] - @env[:sawyer_started]
     end

data/test/resource_test.rb

@@ -118,5 +118,25 @@ module Sawyer
       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 !res.fields.include?(:url)
+      assert_equal 1, res.user.id
+      assert_equal '/users/1', res.user.rels[:self].href
+      assert !res.user.fields.include?(:url)
+      assert_equal '/users/1/followers', res.user.rels[:followers].href
+      assert !res.user.fields.include?(:followers_url)
+    end
   end
 end

data/test/response_test.rb

@@ -9,7 +9,10 @@ module Sawyer
         conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
         conn.adapter :test, @stubs do |stub|
           stub.get '/' do
-            [200, {'Content-Type' => 'application/json'}, Sawyer::Agent.encode(
+            [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'}
@@ -42,6 +45,10 @@ module Sawyer
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sawyer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -55,7 +55,8 @@ files:
 - Rakefile
 - sawyer.gemspec
 - lib/sawyer/agent.rb
-- lib/sawyer/hal_rels_parser.rb
+- lib/sawyer/link_parsers/hal.rb
+- lib/sawyer/link_parsers/simple.rb
 - lib/sawyer/relation.rb
 - lib/sawyer/resource.rb
 - lib/sawyer/response.rb

data/lib/sawyer/hal_rels_parser.rb

@@ -1,13 +0,0 @@
-module Sawyer
-
-  class HalLinksParser
-
-    def parse(data)
-      links = data.delete(:_links)
-
-      return data, links
-    end
-
-  end
-
-end