restify 0.1.2.1.b40 → 0.1.2.1.b41

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGI1NWFhZGEzMzc5YjJlMmM5NDRjMGY5NzNhMjliZjcwZWI5MjBmZA==
+    OWUzY2Q1OGUzZDI1YTdhM2Q5YTExMTI1YmY2ZmFiMDkxNzAwZjU0YQ==
   data.tar.gz: !binary |-
-    YTMxY2I3Mjg2ZjdhNjZiM2E2YWM1ZTgyMjFkODc3YzczZGRhNTg5Ng==
+    ZDcyMTAxMzdlMjFjOGNiOGYzMGRjYzQ5ZmQyOTc2MTllMDg2ZGY3Ng==
 SHA512:
   metadata.gz: !binary |-
-    M2IzZGYwOGM5OWRiOTBlYWM0YjNlMDQxYzhkNzhiNGFhZTE2MDBmNDVhZDU2
-    ZmIyY2FjNGY4NGJlN2FmZmU0YmU5MmE0YTM5NjA4ZjMzYzFhODNhZjU2YzVi
-    YTA5MjE4ZGZkYTg1ODM4YWI3NjkwNTQ1ZDQzN2M5Y2E3ZmY4NWY=
+    ODI0MTdmYmMzYWVmZmI2MDAyY2ZhMTllZjllMGZkNGIxNzkyYWQ3ODllYTkw
+    ZWQ1MjZiMTg2NGJkYTFiZjJhZDQwODExNGFmOTZhMjFiMGJkOTM4ZjAzMWIy
+    MDNkMWM2MTk0YjAyYzdmMzc0YjFkZWI5MGU1YTdmNzU5ZTIyNmQ=
   data.tar.gz: !binary |-
-    MjI4ZmUyNjk5NmVmY2MzMWU4MTE5ZDdhNTY3ZDY0YWI2YjBmMTAzYTQwNjA2
-    YWE1YjkzYThjYjk5Nzk2MWI4ODA3MGMyNDgzY2RmMmU1Y2NkZmIzODVlMGY3
-    MjVlMTgzZjQ3MjNlMzUwNTk2ZDFmMGY3NWZiNTMzMjAyOTY0NzE=
+    NTYxMGJkYWRjZjMzOWQ5NGQ0N2U5ZDdmZDRmNTExMWIwYWJjNTY0ZjA0ZGIw
+    ODdlMzRhZTI1MDFjZWYyYTE4YmU1MjMzOTViMmIyNzRmNDk3NWU3NjMzMGZi
+    ODVjMzJmZjIyODdlMGYzNmZmYWJkYWVhNGViMGM4MWMwODU1MWU=

data/lib/restify/relation.rb

@@ -33,14 +33,23 @@ module Restify
         (other.is_a?(String) && @source == other)
     end
 
-    private
+    def expand(params)
+      @template.expand extracted params
+    end
 
-    attr_reader :client, :template
+    private
 
     def request(method, data, params)
-      uri = template.expand params
+      @context.request method, expand(params), data
+    end
 
-      @context.request method, uri, data
+    def extracted(params)
+      @template.variables.each_with_object({}) do |var, hash|
+        if (value = params.delete(var) { params.delete(var.to_sym) { nil }})
+          value = value.to_param if value.respond_to?(:to_param)
+          hash[var] = value
+        end
+      end
     end
 
     def to_template(pattern)

data/spec/restify/relation_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Restify::Relation do
   let(:context) { double 'context' }
   let(:source) { '/resource/{id}' }
-  let(:pattern) { "http://test.host/#{source}" }
+  let(:pattern) { "http://test.host#{source}" }
   let(:relation) { described_class.new context, source, pattern }
   subject { relation }
 
@@ -16,4 +16,24 @@ describe Restify::Relation do
       expect(subject).to eq pattern
     end
   end
+
+  describe '#expand' do
+    let(:params) { {id: 1337} }
+
+    subject { relation.expand params }
+
+    it { is_expected.to be_a Addressable::URI }
+
+    context 'with #to_param object' do
+      class ParamObject
+        def to_param
+          42
+        end
+      end
+
+      let(:params) { {id: ParamObject.new} }
+
+      it { expect(subject.to_s).to eq 'http://test.host/resource/42' }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 0.1.2.1.b40
+  version: 0.1.2.1.b41
 platform: ruby
 authors:
 - Jan Graichen