rb-net_http-client 1.2.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ee59f656f96b2308e70a107218230eaa3ac7b3271144adb748ea999c1246f4d
-  data.tar.gz: 8614226dc0f42270a8862dba4c1fb6d32148bc5cf62c1c6ee06ee50478dcb2a2
+  metadata.gz: f4438fbea7afb62ae8feba9e90879dfdadfa98a06193d784d1e93787048a2843
+  data.tar.gz: 7d5b6582cafe859823266c6b1309f17acbb1bb11c5d6f620fbf72bc721f1989d
 SHA512:
-  metadata.gz: b143256438900426b4afaae95f331d57ca45ca34ab3f58dfa2671b3290e4e41e7b8a98847c73c314f0aaac04ba2071074b0da3e68649fe75088362672c076db4
-  data.tar.gz: 528ae4d8503c9156286ecc14f776557d2a003a3bf0dbc3d14b4b60b1d673493e7af94559a5800c932f6e3b471c22531e3f0032c72c29c6def38a092086e73c75
+  metadata.gz: 1d5c8e21cfc19583e1eb03bba0f87c643d70d59ca33a47496b151712a37e0f1ef3199457f9e5182e7caabea76f8d7ae980b6b7d84d53aee327fb0c3e2212d6a9
+  data.tar.gz: 35397ca1cc7295f412dbc5a4fab454f97d24e9bc96c61b6bcff6138696e161cc3b3ab44f57738f129b0b78b5e735df1748bd27622e4dadef073586bf8ca028dd

data/lib/client/client.rb

@@ -33,7 +33,7 @@ module NetHTTP
 
     def initialize(opts = {})
       send('logger=', opts[:logger])
-      schema_results = Core.schema_validation(opts, NetHTTP::Client::Schema) unless opts[:enforce_schema_validation] == false
+      schema_results = Core.schema_validation(opts, NetHTTP::Client::Schema.new) 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)

data/lib/client/schema.rb

@@ -4,47 +4,42 @@ require 'dry-validation'
 
 module NetHTTP
   class Client
-    Schema = Dry::Validation.Schema do
-      configure do
-        def name
-          'NetHTTP::Client::Schema'
-        end
-
-        def true_or_false
-          [true, false]
-        end
+    class Schema < Dry::Validation::Contract
+      schema do
+        optional(:ca_file).value(:string).filled
+        optional(:host).value(:string)
+        optional(:logger).filled
+        optional(:open_timeout).value(:integer).filled
+        optional(:path).value(:string)
+        optional(:port).value(:integer)
+        optional(:pkcs12_file).value(:string).filled
+        optional(:pkcs12_passphrase).value(:string).filled
+        optional(:proxy_uri_host).value(:string)
+        optional(:proxy_uri_path).value(:string)
+        optional(:proxy_uri_port).value(:integer)
+        optional(:proxy_uri_scheme).value(:string)
+        optional(:proxy_uri).value(:string).filled
+        optional(:proxy_url).value(:string).filled
+        optional(:query).value(:string).filled
+        optional(:read_timeout).value(:integer).filled
+        optional(:scheme).value(:string)
+        optional(:ssl_path).value(:string).filled
+        optional(:uri).value(:string)
+        optional(:url).value(:string)
+        optional(:use_ssl)
+        optional(:verify_mode).filled
       end
 
-      optional(:ca_file).filled(type?: String)
-      optional(:host).maybe(type?: String)
-      optional(:logger).filled
-      optional(:open_timeout).filled(type?: Integer)
-      optional(:path).maybe(type?: String)
-      optional(:port).maybe(type?: Integer)
-      optional(:pkcs12_file).filled(type?: String)
-      optional(:pkcs12_passphrase).filled(type?: String)
-      optional(:proxy_uri_host).maybe(type?: String)
-      optional(:proxy_uri_path).maybe(type?: String)
-      optional(:proxy_uri_port).maybe(type?: Integer)
-      optional(:proxy_uri_scheme).maybe(type?: String)
-      optional(:proxy_uri).filled(type?: String)
-      optional(:proxy_url).filled(type?: String)
-      optional(:query).filled(type?: String)
-      optional(:read_timeout).filled(type?: Integer)
-      optional(:scheme).maybe(type?: String)
-      optional(:ssl_path).filled(type?: String)
-      optional(:uri).maybe(type?: String)
-      optional(:url).maybe(type?: String)
-      optional(:use_ssl).filled(included_in?: true_or_false)
-      optional(:verify_mode).filled
+      rule(:uri, :url, :host) do
+        key.failure('uri, url, & host cannot all be nil') if (values[:uri].nil? && values[:url].nil? && values[:host].nil?)
+      end
 
-      rule(if_url_and_uri_are_nil_must_provide_host: [:uri, :url, :host]) do |uri, url, host|
-        uri.empty?.then(url.empty?.then(host.filled?))
+      rule(:uri, :url, :scheme, :port) do
+        key.failure('if uri and url are nil, scheme or port cannot be nil') if (values[:uri].nil? && values[:url].nil? && (values[:scheme].nil? || values[:port].nil?))
       end
 
-      rule(if_url_and_uri_are_nil_must_provide_scheme_or_port: [:uri, :url, :scheme, :port]) do |uri, url, scheme, port|
-        uri.empty?.then(url.empty?.then(scheme.empty?.then(port.filled?)))
-        uri.empty?.then(url.empty?.then(port.empty?.then(scheme.filled?)))
+      rule(:use_ssl) do
+        key.failure('use_ssl must be either true or false') if (!values[:use_ssl].nil? && values[:use_ssl].class != (FalseClass || TrueClass))
       end
     end
 

data/lib/core/core.rb

@@ -20,14 +20,8 @@ module NetHTTP
       if results.success?
         return nil
       else
-        return results.messages
+        return results.errors.to_h
       end
     end
   end
-
-  class SchemaError < StandardError
-    def initialize(msg)
-      super(msg)
-    end
-  end
 end

data/lib/request/request.rb

@@ -167,7 +167,7 @@ module NetHTTP
     end
 
     def request_opts(opts)
-      schema_results = Core.schema_validation(opts, NetHTTP::Request::Schema) unless opts[:enforce_schema_validation] == false
+      schema_results = Core.schema_validation(opts, NetHTTP::Request::Schema.new) 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)

data/lib/request/schema.rb

@@ -4,20 +4,19 @@ require 'dry-validation'
 
 module NetHTTP
   class Request
-    Schema = Dry::Validation.Schema do
-      configure do
-        def name
-          'NetHTTP::Request::Schema'
-        end
+    class Schema < Dry::Validation::Contract
+      schema do
+        required(:method).value(:string).filled
+        optional(:headers).value(:hash)
+        optional(:body)
+        optional(:query).filled
+        optional(:uri).value(:string).filled
+        optional(:url).value(:string).filled
+        optional(:path).value(:string).filled
       end
 
-      required(:method).filled(type?: String)
-      optional(:headers).maybe(type?: Hash)
-      optional(:body).maybe
-      optional(:query).filled
-
-      rule(if_url_and_uri_are_nil_must_provide_path: [:uri, :url, :path]) do |uri, url, path|
-        uri.empty?.then(url.empty?.then(path.filled?))
+      rule(:uri, :url, :path) do
+        key.failure('uri, url, & path cannot all be nil') if (values[:uri].nil? && values[:url].nil? && values[:path].nil?)
       end
     end
 

data/lib/version.rb

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

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rb-net_http-client
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Ryan Bostian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Simple Ruby HTTP Client