rest_dsl 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a37783f662f90bf063aa89a5d2ec129c6b165348f9f5809f3718479310d5e1d
-  data.tar.gz: a5c427a4fde05951a1d5f899b9c9b3e2c105c66b493a4d7048e3d3993bdf42e0
+  metadata.gz: a391433ed18e7b84cd3d4f47065e9ed861d9d7d7d0fc5d0a58d2352753631d16
+  data.tar.gz: 0a96ac8af22c162c815487eaa57cf79b8f84a44355e67e1b072a84d3393c1b62
 SHA512:
-  metadata.gz: abb0aedc0b963db58a13dab20569fcccd03da08d8f1a7d93deddfa2eff3b446360f21741e4d17248d1b82d72da29b573684d20aed02dbaa4c6d599ed781979ea
-  data.tar.gz: fe19a5b06ab8a2986d8a2225dfab90d18cabef6e37e2691764026532105e6f692cedbdd6d35a85984550cf8c342b173e658edeb61d7f568a9075810177852578
+  metadata.gz: 2afa1d1237863054781187e56dbead899b2a6ed5e635340c309042317de0a42b22a91a14d573583628340d3b721f78296e684dd8f5341ae1116b2a56d170133b
+  data.tar.gz: 2f97e19928e5e049f03fd7db323c1c1d1390de9c6b23869dad7a85fb1074826224ca4f6a444de2bb002d24b68a6771e1695bcea60a6307e0834e8fa6976abad3

data/lib/rest_dsl/service_base.rb

@@ -41,19 +41,23 @@ module RestDSL
       # Can by wrapped manually to create more complicated logic than what's supported by the default generators
       def execute_request(method, rest_method_call, *args, headers: nil, payload: nil, params: nil, url_args: nil, **hash_args, &block)
         headers ||= self.headers
-        params ||= {}
         url_args ||= {}
-        params = "?#{params.map{|key,value| "#{key}=#{value}"}.join('&')}"
         service_name = "#{@service_name}/" unless @service_name&.empty?
         hash_args.merge!(auth)
         hash_args.merge!(payload: payload) if payload
         sub_url_args!(url_args, rest_method_call)
-        arg_list = [method, "#{service_name}#{rest_method_call}#{params}", headers]
+        arg_list = [method, "#{service_name}#{rest_method_call}#{build_params(params)}", headers]
         response = @client.execute(*arg_list, *args, **hash_args, &block)
         @last_response = response[:response]
         response[:parsed]
       end
 
+      def build_params(params)
+        params ||= {}
+        return "" if params.empty?
+        "?#{params.map{|key,value| "#{key}=#{value}"}.join('&')}" unless params.empty?
+      end
+
       def sub_url_args!(arg_list, rest_method_call)
         # Given the protocol is handled by the client and not service_base, this should be a safe enough pattern in most cases
         arg_list.each{ |arg_name, value| rest_method_call.gsub!(":#{arg_name}", value) }
@@ -71,6 +75,7 @@ module RestDSL
       def reload_config
         @config = Psych.load_file(@config_file)[@environment] if File.exist?(@config_file)
         @config = {} unless File.exist?(@config_file)
+        @config
       end
 
       def auth

data/lib/rest_dsl/version.rb

@@ -1,3 +1,3 @@
 module RestDSL
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Luke Ridge
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler