rb-net_http-client 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dc48f10a3e4bcef77bfd022105c8d2c8eac6ad051d5a2cb7df74ffe6f73301c
-  data.tar.gz: 29f716c9095d131543befdb9999febe5025168cef4ed6d543b1089302d6c3686
+  metadata.gz: 6d55326eb0acbf27e9b701970c6454d99ca776adb6cfd3b47bdc314fa9a487c2
+  data.tar.gz: 6da96962de6db3697ab09a34f0b9f5130a378a1ef5686b5ceb99952665b5b7bd
 SHA512:
-  metadata.gz: cb9851ae05fc3a6b2e5ebe40b8928fbea27d27ae6924004c041a805d145b5cb84f5b3c81844be6e1742ec530219dfcd929e323561536c52eb1715a6a91cc0823
-  data.tar.gz: ab449d0aa89b9e31633f4362258636a7e52b7b4cf8258c137bb73e8bc91b4185814be5ffed83fe1080f6b26b33594bd8f411c7ce5a6541fee1f6fb068b1ad7d1
+  metadata.gz: 598b5c8bbd716f0c57d901db69392593cb6ad2ec9469eb7d51748bb6db72ce425cd297367cca4bc1a0ad6004b38bad478cdf87c8e8d65aea6e7300866cccb566
+  data.tar.gz: 7fcf8f7272059c15be3a116e5dab90a4b64951696b44ef2df7e5e380f43d6afe11fee2340fbb036d828eb627ce3f3d34b3f4f763ed5a8575d02fe31194491310

data/lib/client/client.rb

@@ -32,7 +32,12 @@ module NetHTTP
 
     def initialize(opts = {})
       send('logger=', opts[:logger])
-      Core.schema_validation(opts, NetHTTP::Client::Schema, logger) unless opts[:enforce_schema_validation] == false
+      schema_results = Core.schema_validation(opts, NetHTTP::Client::Schema) unless opts[:enforce_schema_validation] == false
+      unless schema_results.nil?
+        logger.debug("NetHTTP::Client::SchemaError -> #{schema_results}")
+        raise NetHTTP::Client::SchemaError.new(schema_results.to_s)
+      end
+
       send('uri=', opts)
       send('client=', opts)
     end

data/lib/client/schema.rb

@@ -47,5 +47,11 @@ module NetHTTP
         uri.empty?.then(url.empty?.then(port.empty?.then(scheme.filled?)))
       end
     end
+
+    class SchemaError < StandardError
+      def initialize(msg)
+        super(msg)
+      end
+    end
   end
 end

data/lib/core/core.rb

@@ -15,23 +15,19 @@ module NetHTTP
       logger
     end
 
-    def self.schema_validation(opts, schema, logger)
-      begin
-        results = schema.call(opts)
-        return if results.success?
-        begin
-          schema_name = schema.name
-          logger.debug("NetHTTP::Core::SchemaValidationError - #{schema_name} input validation failed due to => #{results.messages}")
-          raise("NetHTTP::Core::SchemaValidationError - #{schema_name} input validation failed due to => #{results.messages}")
-        rescue RuntimeError => error
-          logger.debug("NetHTTP::Core::SchemaValidationError - Dry::Validation::Schema input validation failed due to => #{results.messages}")
-          raise("NetHTTP::Core::SchemaValidationError - Dry::Validation::Schema input validation failed due to => #{results.messages}")
-        end
-      rescue RuntimeError => error
-        logger.debug(error)
-        logger.debug("NetHTTP::Core::SchemaValidationError - Dry::Validation::Schema input validation failed.")
-        raise error
+    def self.schema_validation(opts, schema)
+      results = schema.call(opts)
+      if results.success?
+        return nil
+      else
+        return results.messages
       end
     end
   end
+
+  class SchemaError < StandardError
+    def initialize(msg)
+      super(msg)
+    end
+  end
 end

data/lib/core/utilities.rb

@@ -144,6 +144,23 @@ module NetHTTP
         opts[:object]
       end
 
+      # Recursive function to remove nil and empty values (including [] and {} from Array or Hash nested objects.
+      def self.scrub_obj(obj)
+        case obj
+        when Array
+          return obj.map { |item| scrub_obj(item) }
+        when Hash
+          new_hash = {}
+          obj.compact.each do |key, value|
+            new_hash[key] = scrub_obj(value) unless value.empty?
+          end
+
+          return new_hash
+        end
+
+        obj
+      end
+
       # Convert JSON doc to a Ruby Hash.
       def self.json_2_hash(json_doc, type = 'symbol', logger = nil)
         msg = "Invalid 'type' => #{type}.  Use either 'string' or 'symbol' (default)."

data/lib/request/request.rb

@@ -135,7 +135,11 @@ module NetHTTP
     end
 
     def request_opts(opts)
-      Core.schema_validation(opts, NetHTTP::Request::Schema, logger) unless opts[:enforce_schema_validation] == false
+      schema_results = Core.schema_validation(opts, NetHTTP::Request::Schema) unless opts[:enforce_schema_validation] == false
+      unless schema_results.nil?
+        logger.debug("NetHTTP::Request::SchemaError -> #{schema_results}")
+        raise NetHTTP::Request::SchemaError.new(schema_results.to_s)
+      end
 
       request_method = opts[:method] ||= 'post'
       request_uri = Core::Utilities.parse_uri(opts[:uri] || opts[:url] || uri)

data/lib/request/schema.rb

@@ -20,5 +20,11 @@ module NetHTTP
         uri.empty?.then(url.empty?.then(path.filled?))
       end
     end
+
+    class SchemaError < StandardError
+      def initialize(msg)
+        super(msg)
+      end
+    end
   end
 end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NetHTTP
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

data/spec/unit/client/ext_spec.rb

@@ -19,7 +19,7 @@ describe 'NetHTTP::Client ext' do
         uri: 'https://jsonplaceholder.typicode.com/posts',
         proxy_uri: ''
       )
-    }.to raise_error(RuntimeError, /NetHTTP::Core::SchemaValidationError/)
+    }.to raise_error(NetHTTP::Client::SchemaError)
   end
 
   it 'returns a valid NetHTTP client instance with proxy_uri -> nil' do
@@ -28,7 +28,7 @@ describe 'NetHTTP::Client ext' do
         uri: 'https://jsonplaceholder.typicode.com/posts',
         proxy_uri: nil
       )
-    }.to raise_error(RuntimeError, /NetHTTP::Core::SchemaValidationError/)
+    }.to raise_error(NetHTTP::Client::SchemaError)
   end
 
   it 'returns a valid NetHTTP client instance with proxy_uri -> INVALID' do
@@ -37,7 +37,7 @@ describe 'NetHTTP::Client ext' do
         uri: 'https://jsonplaceholder.typicode.com/posts',
         proxy_uri: 12345
       )
-    }.to raise_error(RuntimeError, /NetHTTP::Core::SchemaValidationError/)
+    }.to raise_error(NetHTTP::Client::SchemaError)
   end
 
   it 'returns a valid NetHTTP client instance' do

data/spec/unit/core/core_spec.rb

@@ -10,26 +10,24 @@ describe 'NetHTTP::Core' do
       {
         uri: 'https://www.google.com'
       },
-      NetHTTP::Client::Schema,
-      logger
+      NetHTTP::Client::Schema
     )
 
     expect(results).to eq(nil)
   end
 
-  it 'failed schema_validation' do
-    logger = NetHTTP::Core.get_logger
+  # it 'failed schema_validation' do
+  #   logger = NetHTTP::Core.get_logger
 
-    expect {
-      NetHTTP::Core.schema_validation(
-        {
-          uri: nil
-        },
-        NetHTTP::Client::Schema,
-        logger
-      )
-    }.to raise_error(RuntimeError)
-  end
+  #   expect {
+  #     NetHTTP::Core.schema_validation(
+  #       {
+  #         uri: nil
+  #       },
+  #       NetHTTP::Client::Schema
+  #     )
+  #   }.to raise_error(NetHTTP::Client::SchemaError)
+  # end
 
   it 'failed schema_validation -> invalid schema' do
     logger = NetHTTP::Core.get_logger
@@ -39,8 +37,7 @@ describe 'NetHTTP::Core' do
         {
           uri: 'https://www.google.com'
         },
-        'Invalid::Schema',
-        logger
+        'Invalid::Schema'
       )
     }.to raise_error(NoMethodError, "undefined method `call' for \"Invalid::Schema\":String")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb-net_http-client
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Ryan Bostian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport