decathlon-https 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed30bcfe395a329f0f2217675bd09513bbd0bb378efe99f6f1582ac0a44f0ca8
-  data.tar.gz: a3e8870b643bc8dad06159eaa0f5384a87d6597e5fdae671b30398db51e0f70a
+  metadata.gz: 75ced51ca25387dd63aab7ead0962a4a5e76021e6eedc86600c77fdb324cd35d
+  data.tar.gz: 1d634bc7f46c7c3451e4a8a6044f0c3aeb59845c43db66aed68f83ab5df96594
 SHA512:
-  metadata.gz: 9e73cfaf5d4a95d4615b31a47dcdbc00ba358eea039c61f26a68863efc1b4eebaf77786c1f10907290603bbd6a9cb5b9ca59961198471a3e17c692c182e85a04
-  data.tar.gz: 478b2e15b2783c79e402636cb5bf8d50f4d5154332d052b490adb050921222f2ab4b91fdf83ac8877edb42a2111d431b98fca3d538273dcedd27fa5d71806680
+  metadata.gz: de58b4bddd8439180b7020385379d7187e9873a931f09f5d5ff9eff21ab0973847cf0ab0b0cb0df43cea68a18698740da737bf9e7d3a6adba7ce8a8bb98576c7
+  data.tar.gz: a278eed529f22f7c95f30a373f0ca692158cb31e5dbfe4d5af60af42d63d8187dcf841c3f35b66cbd4005758543cbd77d845009c4b98b163aefceb729611732a

data/lib/decathlon/https.rb

@@ -9,17 +9,26 @@ module Decathlon
   #
   module HTTPS
 
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
 
     def self.json_api_request(base_url: '', params: {}, verb: :get, headers: {}, return_http_status_code: false)
 
-      # Parse URI and build a new HTTPS client
+      # Parse URI and build a new HTTP(S) client
       #
       uri = URI.parse(base_url)
-      raise 'InsecureRequestURL' unless uri.scheme == 'https'
       http = ::Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+      # Sometimes, there might be reasons to call a non-https API
+      #
+      if uri.scheme == 'https'
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+      # Prevent calls to non HTTP based schemes
+      #
+      elsif uri.scheme != 'http'
+        raise 'InsecureRequestURL'
+      end
 
       # Don't include empty params
       #
@@ -61,13 +70,20 @@ module Decathlon
       #
       response = http.request(request)
       code = response.code.to_i
-      body = response.body.to_s
+
+      # Parse the response body based on response content header
+      #
+      if response['content-type'].match(/application\/json/)
+        JSON.parse(response.body.to_s, symbolize_names: true)
+      else
+        body = response.body.to_s
+      end
 
       # Return parsed body content, and status code if requested
       #
-      return { body: JSON.parse(body, symbolize_names: true), code: code } if return_http_status_code == true
+      return { body: body, code: code } if return_http_status_code == true
       return {} if code == 204 || (body.empty? && code < 400)
-      return JSON.parse(body, symbolize_names: true)
+      return body
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decathlon-https
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jack Hayter
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Simple abstraction library for making HTTPS JSON calls