service_api 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f227193b6f0739cab72692b0a226fad6d1f96e01
-  data.tar.gz: be73b894f91df18fab63a968d6f2abbb0c7276b1
+  metadata.gz: 17d0157549889eafc0a06c5a154157f06e386daf
+  data.tar.gz: ffea55d1004c3be0a232495b0bffa9ce27c81dae
 SHA512:
-  metadata.gz: 59d9bb2a9ac24515f10e0bf6be68d133ff3f8cae3973d431b09d4c51f84663bf8de2ecb1fa45cb6a239108544f2de8d451d86e8798da8fa87cf86756dd169712
-  data.tar.gz: 5105f1d3dcb9bb51accd9679709a8434fb8d4ba0dac8b959c7ea4d9efbaeb807ba273093e8f11075905bd6e98cb9c7e6ca6eb0873ae9220f16aaa28d11c2b3ba
+  metadata.gz: a7962f428ede59c30b397374042389a03302decdce4418d02bc70b641a6abe9f82af097e0bc40e3d1d504c8bf0b84b44d528673ce3160cab827d1f39c2260237
+  data.tar.gz: e0ced0bd45724356fdfdf74f51c4a7eb74cd9778ef4b30487ea08ffbc92fe3423969fe8b1f1924fa05da02bff363ab55794084df5adc3ce9d6e7732c2dba5134

data/lib/service_api/base_faraday.rb

@@ -1,6 +1,7 @@
 require 'faraday'
 require 'faraday_middleware'
 require 'uri_template'
+require 'queryparams'
 
 module ServiceApi
   # BaseFaraday is module for Faraday api which should be included in own base Api class.
@@ -62,7 +63,7 @@ module ServiceApi
     #  path('/test/request').params(sample: true, api_key: 'abcd').url
     #
     def url
-      "#{base_url}#{uri}"
+      "#{base_url}#{uri}#{query_params_formatted}"
     end
 
     private
@@ -100,6 +101,11 @@ module ServiceApi
       @params.reject{ |request_params| token?(request_params) }
     end
 
+    def query_params_formatted
+      params = query_params
+      params.empty? ? '' : "?#{QueryParams.encode(params)}"
+    end
+
     def uri_kind
       :default
     end

data/lib/service_api/version.rb

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

data/service_api.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'faraday', '~> 0.9.0'
   spec.add_runtime_dependency 'uri_template', '~> 0.7.0'
+  spec.add_runtime_dependency 'queryparams', '~> 0.0.3'
   spec.add_runtime_dependency 'faraday_middleware', '~> 0.9.1'
   spec.add_runtime_dependency 'multi_xml', '~> 0.5.5'
 

data/spec/functionals/base_faraday_spec.rb

@@ -24,21 +24,21 @@ end
 
 class SampleApi < MyApi
   def find
-    path('/test/{request}').params(sample: true, api_key: 'abcd', request: 'request').get
+    path('/test/{request}').params(api_key: 'abcd', sample: true, request: 'request').get
   end
 
   def find_url
-    path('/test/request').params(sample: true, api_key: 'abcd').url
+    path('/test/request').params(api_key: 'abcd', sample: true).url
   end
 end
 
 class Sample2Api < MyApi
   def find
-    path('/test/:request').params(sample: true, api_key: 'abcd', request: 'request').get
+    path('/test/:request').params(api_key: 'abcd', sample: true, request: 'request').get
   end
 
   def find_url
-    path('/test/request').params(sample: true, api_key: 'abcd').url
+    path('/test/request').params(api_key: 'abcd', sample: true).url
   end
 
   def uri_kind
@@ -57,7 +57,7 @@ describe ServiceApi::BaseFaraday do
     end
 
     it 'should return full url' do
-      model.find_url.should == 'http://example.com/test/request'
+      model.find_url.should == 'http://example.com/test/request?api_key=abcd&sample=true'
     end
   end
 
@@ -67,7 +67,7 @@ describe ServiceApi::BaseFaraday do
     end
 
     it 'should return full url' do
-      model2.find_url.should == 'http://example.com/test/request'
+      model2.find_url.should == 'http://example.com/test/request?api_key=abcd&sample=true'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: service_api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Krzysztof Wawer
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: queryparams
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement