webspicy 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce670706ba555bb3edf4ba23d469bde15dcd33ee
-  data.tar.gz: 12711a20555b10b0e20503da6a815c95d85bab6c
+  metadata.gz: d4beb76e573d7d42f8a85e65608ad59c83038a63
+  data.tar.gz: d1c2cb823fa50d41573b3a9116bc5125ef5fc98c
 SHA512:
-  metadata.gz: f7685c29ebfb2f25736bc110823550cfa3de86ebb903f107e45bd8a89cbe6687e15b2e88284cd7f857ed3735c072d0faae4515d0625a4b95a5bd5b9dcb150d2c
-  data.tar.gz: ee5981c3bf710146258d5d457bc108779fa00f86ba65c19f67f95090b9b7988213b5219122e88f26fd4ecb5be3274ee23d75eea742fe2d9620008343f0656a40
+  metadata.gz: 73bf0132edf5214d7c0209202987f87e837765f68ff1916fc60e2924e2e4e620825100bf4347b5393d6b348b1bf475905f23e38ccd0fb9a3f79894adf08ed8f2
+  data.tar.gz: cd4f8964ccae0a8979a6610dac9aa972f00243f8f421017f536aba75fdba037947d3fca97b8f653a4543554bd8859eae0f2dbef88dbf92ad6ecf6e7d16893f05

data/lib/webspicy/resource.rb

@@ -19,19 +19,14 @@ module Webspicy
     end
 
     def url_placeholders
-      url.scan(/\{([a-zA-Z]+)\}/).map{|x| x.first.to_sym }
+      url.scan(/\{([a-zA-Z]+(\.[a-zA-Z]+)*)\}/).map{|x| x.first }
     end
 
     def instantiate_url(params)
       url, rest = self.url, params.dup
       url_placeholders.each do |placeholder|
-        key = [placeholder, placeholder.to_s].find{|x| params.has_key?(x) }
-        if key
-          url = url.gsub("{#{placeholder}}", params[key].to_s)
-          rest.delete(placeholder)
-        else
-          raise "Missing URL parameter `#{placeholder}`\n\t(#{params.inspect})"
-        end
+        value, rest = extract_placeholder_value(params, placeholder)
+        url = url.gsub("{#{placeholder}}", value.to_s)
       end
       [ url, rest ]
     end
@@ -42,6 +37,20 @@ module Webspicy
 
   private
 
+    def extract_placeholder_value(params, placeholder, split = nil)
+      return extract_placeholder_value(params, placeholder, placeholder.split(".")) unless split
+
+      key = [ split.first, split.first.to_sym ].find{|k| params.has_key?(k) }
+      raise "Missing URL parameter `#{placeholder}`" unless key
+
+      if split.size == 1
+        [ params[key], params.dup.delete_if{|k| k == key } ]
+      else
+        value, rest = extract_placeholder_value(params[key], placeholder, split[1..-1])
+        [ value, params.merge(key => rest) ]
+      end
+    end
+
     def bind_services
       (@raw[:services] ||= []).each do |s|
         s.resource = self

data/lib/webspicy/version.rb

@@ -2,7 +2,7 @@ module Webspicy
   module Version
     MAJOR = 0
     MINOR = 8
-    TINY  = 3
+    TINY  = 4
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/spec/unit/resource/test_instantiate_url.rb

@@ -16,5 +16,12 @@ module Webspicy
       expect(params).to eq(baz: "coz")
     end
 
+    it 'supports placeholders corresponding to subentities' do
+      r = Resource.new(url: "/test/{foo.id}/url")
+      url, params = r.instantiate_url(foo: {id: "bar"}, baz: "coz")
+      expect(url).to eq("/test/bar/url")
+      expect(params).to eq(foo: {}, baz: "coz")
+    end
+
   end
 end

data/spec/unit/resource/test_url_placeholders.rb

@@ -9,7 +9,12 @@ module Webspicy
 
     it 'returns all placeholders' do
       r = Resource.new(url: "/test/{foo}/url/{bar}")
-      expect(r.url_placeholders).to eq([:foo, :bar])
+      expect(r.url_placeholders).to eq(["foo", "bar"])
+    end
+
+    it 'returns all placeholders expr' do
+      r = Resource.new(url: "/test/{foo.id}/url/{bar}")
+      expect(r.url_placeholders).to eq(["foo.id", "bar"])
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Webspicy helps testing web services as software operation black boxes!