service_api 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3011d5900d368b5667436e94dea95a0e5d185ab8
-  data.tar.gz: b5f2d3a2731f8b87233467105227aa52db36705e
+  metadata.gz: f227193b6f0739cab72692b0a226fad6d1f96e01
+  data.tar.gz: be73b894f91df18fab63a968d6f2abbb0c7276b1
 SHA512:
-  metadata.gz: 04e57921b787ac37766f34cb9c06e2cfb8731e265deaa5bbf6c31d31b264f26bb44e46e6c6032bb4b8e42f727f71350040ebcc4c0047c13a3cae3c41b48f0e8d
-  data.tar.gz: a4240168d0795b24c5cd40be56fdbb54ca4947307bd426d549fe3d9bb53156fcc5af1c609013c36bc359233f9f76637ab765b442ef7c9da37adffa05b557d722
+  metadata.gz: 59d9bb2a9ac24515f10e0bf6be68d133ff3f8cae3973d431b09d4c51f84663bf8de2ecb1fa45cb6a239108544f2de8d451d86e8798da8fa87cf86756dd169712
+  data.tar.gz: 5105f1d3dcb9bb51accd9679709a8434fb8d4ba0dac8b959c7ea4d9efbaeb807ba273093e8f11075905bd6e98cb9c7e6ca6eb0873ae9220f16aaa28d11c2b3ba

data/lib/service_api/base_faraday.rb

@@ -24,8 +24,6 @@ module ServiceApi
     def initialize(client)
       @client = client
       @params = {}
-      @mandatory_params = {}
-      @optional_params = {}
     end
 
     protected
@@ -88,7 +86,7 @@ module ServiceApi
 
     def uri_tokens(uri = nil)
       if uri
-        @uri_tokens = ServiceApi::UriTokens.new(uri)
+        @uri_tokens = ServiceApi::UriTokens.new(uri_kind, uri)
       else
         @uri_tokens
       end
@@ -102,6 +100,10 @@ module ServiceApi
       @params.reject{ |request_params| token?(request_params) }
     end
 
+    def uri_kind
+      :default
+    end
+
     def base_url
       raise NotImplementedError
     end

data/lib/service_api/version.rb

@@ -1,3 +1,3 @@
 module ServiceApi
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/functionals/base_faraday_spec.rb

@@ -24,7 +24,7 @@ end
 
 class SampleApi < MyApi
   def find
-    path('/test/request').params(sample: true, api_key: 'abcd').get
+    path('/test/{request}').params(sample: true, api_key: 'abcd', request: 'request').get
   end
 
   def find_url
@@ -32,15 +32,42 @@ class SampleApi < MyApi
   end
 end
 
+class Sample2Api < MyApi
+  def find
+    path('/test/:request').params(sample: true, api_key: 'abcd', request: 'request').get
+  end
+
+  def find_url
+    path('/test/request').params(sample: true, api_key: 'abcd').url
+  end
+
+  def uri_kind
+    :colon
+  end
+end
+
 describe ServiceApi::BaseFaraday do
   let(:client) { Client.new }
   let(:model) { SampleApi.new(client) }
+  let(:model2) { Sample2Api.new(client) }
+
+  describe 'model' do
+    it 'should return string' do
+      model.find.body.should == 'OK'
+    end
 
-  it 'should return string' do
-    model.find.body.should == 'OK'
+    it 'should return full url' do
+      model.find_url.should == 'http://example.com/test/request'
+    end
   end
 
-  it 'should return full url' do
-    model.find_url.should == 'http://example.com/test/request'
+  describe 'model2' do
+    it 'should return string' do
+      model2.find.body.should == 'OK'
+    end
+
+    it 'should return full url' do
+      model2.find_url.should == 'http://example.com/test/request'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: service_api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Krzysztof Wawer