sawyer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6486ef818a2c154d9689334ec7f58ac3c31d7e9
-  data.tar.gz: ed05b3d65f572314eab8caf2e18ff37d47942e6a
+  metadata.gz: dfd4d1232630a874ef6148436ec032cd58ccbcda
+  data.tar.gz: 1548f8adc99856f383bc8b3ebc1d6501c2b62d2f
 SHA512:
-  metadata.gz: 20e8d49cf6d7c293273694c50219398a9608afdf6ed1bd29d065224f7bdcf7915492ee3a4f97fe9ddfd3fe9938c3e63fad62887cd2247c7c17fee9083cd94764
-  data.tar.gz: 015da8b80b1851daad32fa3e0679ac9e7f9eb80fa5b96518ffa41714524d7459d20837abc63f4f0463746907d23511128e146683bf5080420db44958139d969b
+  metadata.gz: 9507fe98ea69328e2932fde6adce2432d8a2566ed30020f692f98933e7f7d54758fa69663ef322dc3931829cbda6b4f46a202174edf66fdb7bf2cdf99908ac37
+  data.tar.gz: 71f6df7b3be49de481986689e0fd210cf46f0b44ad3dd2b7955560b0d66e4e09ae31df0a2f0c2f9972855fc4131325328d4f7fa3b63027d52b9898e74f508792

data/lib/sawyer.rb

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

data/lib/sawyer/agent.rb

@@ -1,5 +1,5 @@
 require 'faraday'
-require 'uri_template'
+require 'addressable/template'
 
 module Sawyer
   class Agent
@@ -128,9 +128,8 @@ module Sawyer
     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
+      tpl = url.respond_to?(:expand) ? url : Addressable::Template.new(url.to_s)
+      tpl.expand(options || {}).to_s
     end
 
     def allow_undefined_methods?
@@ -148,4 +147,3 @@ module Sawyer
 
   end
 end
-

data/lib/sawyer/relation.rb

@@ -100,10 +100,7 @@ module Sawyer
       @agent = agent
       @name = name.to_sym
       @href = href
-      begin
-        @href_template = URITemplate.new(href.to_s)
-      rescue URITemplate::RFC6570::Invalid => e
-      end
+      @href_template = Addressable::Template.new(href.to_s)
 
       methods = nil
 
@@ -235,8 +232,7 @@ module Sawyer
 
     def href(options = nil)
       return @href if @href_template.nil?
-      method = @href_template.method(:expand)
-      options ? method.call(options) : method.call
+      @href_template.expand(options || {}).to_s
     end
 
     # Public: Makes an API request with the curent Relation.
@@ -265,4 +261,3 @@ module Sawyer
     end
   end
 end
-

data/sawyer.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.licenses = ['MIT']
 
   spec.add_dependency 'faraday',      ['~> 0.8', '< 0.10']
-  spec.add_dependency 'uri_template', ['~> 0.5.0']
+  spec.add_dependency 'addressable', ['~> 2.3.5']
 
   spec.files = %w(Gemfile LICENSE.md README.md Rakefile)
   spec.files << "#{lib}.gemspec"
@@ -30,4 +30,3 @@ Gem::Specification.new do |spec|
   git_files   = `git ls-files -z 2>#{dev_null}`
   spec.files &= git_files.split("\0") if $?.success?
 end
-

data/test/relation_test.rb

@@ -25,7 +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
+      assert_kind_of Addressable::Template, rel.href_template
     end
 
     def test_builds_rels_from_hash
@@ -42,7 +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
+      assert_kind_of Addressable::Template, rel.href_template
     end
 
     def test_builds_rels_from_hash_index
@@ -59,7 +59,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
+      assert_kind_of Addressable::Template, rel.href_template
     end
 
     def test_builds_rels_from_nil
@@ -163,4 +163,3 @@ module Sawyer
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sawyer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Rick Olson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -32,19 +32,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: uri_template
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 2.3.5
 description: 
 email: technoweenie@gmail.com
 executables: []