sawyer 0.0.1 → 0.0.2

data/lib/sawyer/agent.rb

@@ -42,7 +42,7 @@ module Sawyer
       end
 
       options ||= {}
-      url = URITemplate.new(url).expand(options[:uri] || {})
+      url = expand_url(url, options[:uri])
       res = @conn.send method, url do |req|
         req.body = encode_body(data) if data 
         if params = options[:query]
@@ -74,6 +74,12 @@ module Sawyer
       Yajl.load str, :symbolize_keys => true
     end
 
+    def expand_url(url, options = nil)
+      tpl = url.respond_to?(:expand) ? url : URITemplate.new(url.to_s)
+      expand = tpl.method(:expand)
+      options ? expand.call(options) : expand.call
+    end
+
     def inspect
       %(<#{self.class} #{@endpoint}>)
     end

data/lib/sawyer/relation.rb

@@ -46,7 +46,7 @@ module Sawyer
 
     attr_reader :agent,
       :name,
-      :href,
+      :href_template,
       :method,
       :available_methods
 
@@ -93,8 +93,8 @@ module Sawyer
     # method - The Symbol HTTP method.  Default: :get
     def initialize(agent, name, href, method = nil)
       @agent = agent
-      @name  = name.to_sym
-      @href  = href.to_s
+      @name = name.to_sym
+      @href_template = URITemplate.new(href.to_s)
 
       methods = nil
 
@@ -224,6 +224,11 @@ module Sawyer
       call data, opt
     end
 
+    def href(options = nil)
+      method = @href_template.method(:expand)
+      options ? method.call(options) : method.call
+    end
+
     # Public: Makes an API request with the curent Relation.
     #
     # data    - The Optional Hash or Resource body to be sent.  :get or :head
@@ -242,11 +247,11 @@ module Sawyer
         raise ArgumentError, "method #{m.inspect} is not available: #{@available_methods.to_a.inspect}"
       end
 
-      @agent.call m || @method, @href, data, options
+      @agent.call m || @method, @href_template, data, options
     end
 
     def inspect
-      %(#<#{self.class}: #{@name}: #{@method} #{@href}>)
+      %(#<#{self.class}: #{@name}: #{@method} #{@href_template}>)
     end
   end
 end

data/lib/sawyer.rb

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

data/sawyer.gemspec

@@ -13,7 +13,7 @@ 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.1'
+  s.version           = '0.0.2'
   s.date              = '2012-09-25'
   s.rubyforge_project = 'sawyer'
 

data/test/relation_test.rb

@@ -25,6 +25,7 @@ module Sawyer
       assert_equal '/comments',   rel.href
       assert_equal :get,          rel.method
       assert_equal [:get, :post], rel.available_methods.to_a
+      assert_kind_of URITemplate, rel.href_template
     end
 
     def test_builds_rels_from_hash_index
@@ -41,6 +42,7 @@ module Sawyer
       assert_equal '/users/1', rel.href
       assert_equal :get,       rel.method
       assert_equal [:get],     rel.available_methods.to_a
+      assert_kind_of URITemplate, rel.href_template
     end
 
     def test_builds_rels_from_nil
@@ -101,6 +103,9 @@ module Sawyer
 
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sawyer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: