http_api_builder 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 523e286569e92c9ac943a7d3fc0c985d27cd37bf
-  data.tar.gz: 4aa788219c64c7c59c9ca3905b1de37fce5bbec4
+  metadata.gz: 16f4c4049c99b8b57a337a7bca40772764900cb4
+  data.tar.gz: 8374854880f0ad10a5ae4d771acd67f2aa296056
 SHA512:
-  metadata.gz: f62f4f82d40d7fdb6cd2663524e47327318ca3a91f428cbb80e8b443eec9926000d124359ae6dc8169ad4823ab8829aaedd3539dfe10c058c97268110b4d90a6
-  data.tar.gz: d565433c4d53f9802c3d110aa48cd6921c5aabd8ddefdb94f9468ec0ef0f272d530bcdec313dcb26587ba8be8210e3133ab88b18c97dee3ec1a708204d6f7cf4
+  metadata.gz: b3e8c5eb8d044ae54ae7560df211dad9047508232dad4a5ff0f77467f4ea2822f5220cd7c4f632c63aa26883391b36adb25b2dc11c203cb6cc822712338e39c4
+  data.tar.gz: 355de4a286c278978c3e908818e75b9a74fe3f864264bc2b2eae8a4bceb045cdf4db1315cc4ab2f80778cd5b91781741ef5481d8e1744d68dc973923e22ff8b8

data/lib/http_api_builder.rb

@@ -12,7 +12,8 @@ module HttpApiBuilder
 
     # Perform the request, post processors, and return the result
     def perform(method, path, form: nil, query: nil, body: nil, json: nil, &_block) # rubocop:disable Metrics/ParameterLists
-      response = request(method, path, form: form, query: query, body: body, json: json)
+      url = build_url(path)
+      response = request(method, url, form: form, query: query, body: body, json: json)
       status = response.status
       resource = response.body
       block_given? ? yield(resource, status, response) : resource
@@ -22,7 +23,7 @@ module HttpApiBuilder
     # Accepts these params, for you to do whatever you like with. See the HTTPrb_client implementation
     #
     # @param [Symbol] method The HTTP VERB to use
-    # @param [String, URI] path The path, excluding base_url, which should be prepended inside your implementation
+    # @param [Addressable::URI] uri The url to make the request to 
     # @param [Hash] form: nil Form data, for encoding into HTTP form encoding
     # @param [Hash] query: nil Query key/value pairs
     # @param [String] body: nil A raw body

data/lib/http_api_builder/client/http_rb.rb

@@ -1,4 +1,5 @@
 require 'http'
+require 'addressable/template'
 
 module HttpApiBuilder
   module Client
@@ -6,8 +7,7 @@ module HttpApiBuilder
     # This is functional and pretty much production ready, but you can
     # easily rewrite it to use curb or typhoeus or anything else really
     module HttpRb
-      def request(verb, path, form:, query:, body:, json:) # rubocop:disable Metrics/ParameterLists
-        url = URI.join(self.class.base_url || '', path)
+      def request(verb, url, form:, query:, body:, json:) # rubocop:disable Metrics/ParameterLists
         HTTP.send(verb, url, form: form, params: query, body: body, json: json)
       end
     end

data/lib/http_api_builder/helpers.rb

@@ -71,5 +71,22 @@ module HttpApiBuilder
 
       raise ArgumentError, "unrecognized arguments: #{unrecognized.join(', ')}"
     end
+
+    # Handle's building paths
+    def build_url(path)
+      parsed_base = Addressable::URI.parse(self.class.base_url)
+      parsed_basepath = parsed_base.path.split('/').reject(&:empty?)
+
+      addressable_path = Addressable::URI.parse(path)
+
+      return addressable_path unless addressable_path.relative?
+      parsed_path = addressable_path.path.split('/').reject(&:empty?)
+
+      parsed_basepath += parsed_path
+
+      parsed_base.path = parsed_basepath.join('/')
+
+      parsed_base
+    end
   end
 end

data/lib/http_api_builder/version.rb

@@ -1,3 +1,3 @@
 module HttpApiBuilder
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_api_builder
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jeff Sandberg