foucault_http 0.4.10 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c06c596cd34440fed2c6f58aaa90dcf1a857722e22e119bb5226dd9987fbc3
-  data.tar.gz: 42cdb95c159371d5ccb1f0674d0cce670f6596294dc6a2965987d1ac18234c97
+  metadata.gz: 4f3a575800d5379ebfccee8f9479c670dfa8bf6d663e6da89b8487b6d206f070
+  data.tar.gz: a5e00f7a22b10c63d5dfe787ee2cae1a0ba3ce368b77900571f21d404ba2aa2c
 SHA512:
-  metadata.gz: 949286ae86289d4d63bf642ed2de57eb707b65f5fad6a65759ef718f8aa481b731f436d012633639fe85dbb25ab660dde835486d29681865046a68c3f561c2f9
-  data.tar.gz: 700b65e88b60e8c7a02ba192af503e9ab9161c64a6c46e55505b60031835323cd7b89807931e1d17f42974cf190c62f5857fd8ff82517b89e6ec00662e48ee37
+  metadata.gz: ac29c9498e03e672654b0517f2e2758e9b7ece1e13e0e3a565a69bfab78fbdd28e8c76732d578d11efafc07582c712a4f243413fd90bbae578f1068dcc57e0c4
+  data.tar.gz: df22f9316f5997b21c3780f31bc8e084d3b69e270095d4e3b8ecf52698a8f3e3fed67c125e6aff13e8f49d68d71b7c44d3365d01a543961827b4237fcef943b3

data/README.md

@@ -31,7 +31,7 @@ You provide configuration through the object
 FoucaultHttp::Configuration.configure do |config|
   config.logger                = SomeLogger         # Any class that responds to the log level methods with a single param
                                                     # (a string or hash if you're using a structured log format)
-  config.network_log_formatter = SomeLogFormatter   # A class which inherits from Faraday::Logging::Formatter
+  config.log_formatter         = SomeLogFormatter   # A class which inherits from Faraday::Logging::Formatter
   config.logging_level         = :info
 end
 ```
@@ -114,6 +114,12 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+To update the gem on RubyGems:
+
++ Update the version
++ `gem build foucault_http.gemspec`
++ `gem push foucault_http-v.v.v.gem`
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/wildfauve/foucault_http. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/Rakefile

@@ -4,3 +4,17 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+task :build do |t, args|
+  puts "packaging gem"
+  system "gem build foucault_http.gemspec"
+end
+
+task :push, [:version] do |t, args|
+  if args[:version]
+    puts "pushing gem"
+    system "gem push foucault_http-#{args[:version]}.gem"
+  else
+    puts "Please provide version"
+  end
+end

data/foucault_http.gemspec

@@ -30,13 +30,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'stoplight'
+  spec.add_dependency 'stoplight', "~> 2.2"
   spec.add_dependency 'dry-monads', "~> 1.0"
-  spec.add_dependency 'dry-configurable'
-  spec.add_dependency 'funcify'
+  spec.add_dependency 'dry-configurable', "~> 0.11"
+  spec.add_dependency 'funcify', "~> 0.4"
   spec.add_dependency 'faraday', '~> 1.0'
-  spec.add_dependency "dry-types"
-  spec.add_dependency "dry-struct"
+  spec.add_dependency "dry-types", "~> 1.4"
+  spec.add_dependency "dry-struct", "~> 1.3"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/foucault_http/configuration.rb

@@ -7,9 +7,8 @@ module FoucaultHttp
     setting :type_parsers, {}
     setting :logger
     setting :log_formatter
-    setting :network_log_formatter
     setting :logging_level
 
   end  # class Configuration
 
-end  # module ScoreCard
+end  # module FoucaultHttp

data/lib/foucault_http/http_connection.rb

@@ -10,8 +10,8 @@ module FoucaultHttp
 
     HTTP_CONNECTION_FAILURE = :http_connection_failure
 
-    def connection(address, encoding, cache_store = nil, instrumenter = nil)
-      @http_connection = Try { http_connection(address, encoding, cache_store, instrumenter) }
+    def connection(address, opts, encoding, cache_store = nil, instrumenter = nil)
+      @http_connection = Try { http_connection(address, opts, encoding, cache_store, instrumenter) }
       self
     end
 
@@ -27,9 +27,10 @@ module FoucaultHttp
 
     def post(hdrs, body)
       return @http_connection.to_result if @http_connection.failure?
+      return body.to_result if body.failure?
       Try {
         @http_connection.value_or.post do |r|
-          r.body = body
+          r.body = body.value_or
           r.headers = hdrs
         end
       }.to_result
@@ -46,12 +47,12 @@ module FoucaultHttp
 
     private
 
-    def http_connection(address, encoding, cache_store, instrumenter)
-      faraday_connection = Faraday.new(:url => address) do |faraday|
+    def http_connection(address, opts={}, encoding, cache_store, instrumenter)
+      faraday_connection = Faraday.new(opts.merge(url: address)) do |faraday|
         # faraday.use :http_cache, caching if caching
         faraday.request  encoding if encoding
         if Configuration.config.logger && Configuration.config.log_formatter
-          faraday.response :logger, Configuration.config.logger, formatter: Configuration.config.network_log_formatter
+          faraday.response :logger, Configuration.config.logger, formatter: Configuration.config.log_formatter
         elsif Configuration.config.logger
           faraday.response :logger, Configuration.config.logger
         else

data/lib/foucault_http/http_port.rb

@@ -18,39 +18,39 @@ module FoucaultHttp
     class << self
 
       def post
-        -> correlation, service, resource, hdrs, body_fn, enc, body {
+        -> correlation, service, resource, opts, hdrs, body_fn, enc, body {
           ( Fn.either.(net_ok).(Monad.success).(Monad.failure) <<
             log_response.(correlation, service, resource, __method__) <<
             response_value <<
             run_post.(hdrs, body_fn, body) <<
-            addressed.(service, resource)).(connection.(enc))
+            addressed.(service, resource)).(connection.(opts, enc))
         }
       end
 
       def get
-        -> correlation, service, resource, hdrs, enc, query {
+        -> correlation, service, resource, opts, hdrs, enc, query {
           ( Fn.either.(net_ok).(Monad.success).(Monad.failure) <<
             log_response.(correlation, service, resource, __method__) <<
             response_value <<
             run_get.(hdrs, query) <<
-            addressed.(service, resource)).(connection.(enc))
+            addressed.(service, resource)).(connection.(opts, enc))
         }
       end
 
       def delete
-        -> correlation, service, resource, hdrs {
+        -> correlation, service, resource, opts, hdrs {
           ( Fn.either.(net_ok).(Monad.success).(Monad.failure) <<
             log_response.([], service, resource, __method__) <<
             response_value <<
             run_delete.(hdrs) <<
-            addressed.(service, resource)).(connection.(nil))
+            addressed.(service, resource)).(connection.(opts, nil))
         }
       end
 
 
       def run_post
         -> hdrs, body_fn, body, connection {
-          connection.post(hdrs, body_fn.(body))
+          connection.post(hdrs, Try { body_fn.(body) })
         }.curry
       end
 
@@ -73,7 +73,7 @@ module FoucaultHttp
       end
 
       def connection
-        -> encoding, address { HttpConnection.new.connection(address, encoding) }.curry
+        -> opts, encoding, address { HttpConnection.new.connection(address, opts, encoding) }.curry
       end
 
       def address
@@ -132,7 +132,7 @@ module FoucaultHttp
         -> type {
           case type
           when "text/html"
-            nil_parser
+            xml_parser
           when "text/plain"
             text_parser
           when "text/csv"
@@ -140,7 +140,7 @@ module FoucaultHttp
           when "application/json"
             json_parser
           when "application/xml", "application/soap+xml", "text/xml"
-            nil_parser
+            xml_parser
           else
             nil_parser
           end
@@ -148,7 +148,7 @@ module FoucaultHttp
       end
 
       def returned_response(response)
-        raise(NoContentTypeError.new("Content Type in response is nil")) unless response.value_or.headers["content-type"]
+        raise(NoContentTypeError.new("Content Type in response is nil; body: #{response.value_or.body}")) unless response.value_or.headers["content-type"]
         OpenStruct.new(
           status: evalulate_status.(response.value_or.status),
           code: response.value_or.status,
@@ -177,6 +177,10 @@ module FoucaultHttp
         -> response { JSON.parse(response.body) }
       end
 
+      def xml_parser
+        -> response { Nokogiri::XML(response.body) }
+      end
+
       def text_parser
         -> response { response.body }
       end
@@ -196,18 +200,18 @@ module FoucaultHttp
       def structured_log(service, resource, api, response, correlation={})
         {
           msg: "Common::Network::Net",
-          context: context_for_log(service, resource, response, correlation),
+          context: context_for_log(service, resource, response),
           step: api,
           status: response.status
-        }
+        }.merge(correlation || {})
       end
 
-      def context_for_log(service, resource, response, correlation={})
+      def context_for_log(service, resource, response)
         {
           http_code: response.code,
           resource: address.(service, resource),
           fail_response: log_of_failure(response)
-        }.merge(correlation || {})
+        }
       end
 
       def log_of_failure(response)

data/lib/foucault_http/net.rb

@@ -9,9 +9,10 @@ module FoucaultHttp
     class << self
 
       # Client interface
+
       def post
-        -> correlation, service, resource, hdrs, enc, body_fn, body {
-          HttpPort.post.(correlation, service, resource, hdrs, body_fn, enc, body)
+        -> correlation, service, resource, opts, hdrs, enc, body_fn, body {
+          HttpPort.post.(correlation, service, resource, opts, hdrs, body_fn, enc, body)
         }.curry
       end
 
@@ -30,8 +31,8 @@ module FoucaultHttp
       # Example
       # > get.(@env[:host], "/userinfo", {authorization: "Bearer <token> }, :url_encoded, {} )
       def get
-        -> correlation, service, resource, hdrs, enc, query {
-            HttpPort.get.(correlation, service, resource, hdrs, enc, query)
+        -> correlation, service, resource, opts, hdrs, enc, query {
+            HttpPort.get.(correlation, service, resource, opts, hdrs, enc, query)
         }.curry
       end
 
@@ -82,7 +83,7 @@ module FoucaultHttp
       end
 
       def json_body_fn
-        -> body { body.to_json }
+        -> body { JSON.generate(body) }
       end
 
 

data/lib/foucault_http/version.rb

@@ -1,3 +1,3 @@
 module FoucaultHttp
-  VERSION = "0.4.10"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foucault_http
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.2
 platform: ruby
 authors:
 - Col Perks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2021-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stoplight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -42,30 +42,30 @@ dependencies:
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: funcify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +84,30 @@ dependencies:
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement