evt-event_source-event_store-http 0.1.1.0 → 0.2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b31dd13ca19696703c311b5d8ea529b84e3a83
-  data.tar.gz: 4fc28c6addd420dd2396eb61203c7d8256347f8f
+  metadata.gz: 6df13c6a49692d92c120afdb88275ad362527ef1
+  data.tar.gz: 409562ee8c2c8893f87e3bceeecd9966502e9bd7
 SHA512:
-  metadata.gz: f8c0b1adf4c141191168395507e2ca23009758182b620d818a8ecd211fe379aa2fcd4d153a6484be3c179217e48d621bfa3fcb63535d643b814cc9564e435ba1
-  data.tar.gz: 15ffe472c1372f7e3ca591c4e3d4e3641752a41bc38fdfde247205442962673118b33ae26e82551e3bb85f4eda40184e60b78f91e4dc4fd03c91a278bd39d540
+  metadata.gz: f83a2e956dbd796a73f69f368408496816d270b6d87b0d14e88af0f498c7eb5fb330f73a07c1e796d48815ba04e15bb8c439160982f17610c3d3e1b504a4871e
+  data.tar.gz: b82c62cf7c53332336722f1af0bed906ecd9efa2a3b0feec9e936da636a92bfbd0e580efe7747a3ba9e89b7fc8343b2dae214c06e0da1e6d2e41ae058a16a84e

data/lib/event_source/event_store/http.rb

@@ -1,17 +1,18 @@
-require 'net/http'
-
-require 'configure'; Configure.activate
 require 'event_source'
-require 'log'
-require 'settings'; Settings.activate
+require 'event_store/cluster/leader_status'
 
 require 'event_source/event_store/http/log'
-
 require 'event_source/event_store/http/media_types'
+require 'event_source/event_store/http/settings'
 
-require 'event_source/event_store/http/session/net_http'
-require 'event_source/event_store/http/session/telemetry'
+require 'event_source/event_store/http/session/build'
+require 'event_source/event_store/http/session/configure'
+require 'event_source/event_store/http/session/defaults'
+require 'event_source/event_store/http/session/log_text'
 require 'event_source/event_store/http/session/substitute'
+require 'event_source/event_store/http/session/telemetry'
 require 'event_source/event_store/http/session'
 
-require 'event_source/event_store/http/settings'
+require 'event_source/event_store/http/request'
+require 'event_source/event_store/http/request/get'
+require 'event_source/event_store/http/request/post'

data/lib/event_source/event_store/http/controls.rb

@@ -1,13 +1,33 @@
 require 'identifier/uuid/controls'
 require 'event_source/controls'
+require 'event_store/cluster/leader_status/controls'
+
+require 'event_source/event_store/http/controls/uuid'
+
+require 'event_source/event_store/http/controls/media_type'
+
+require 'event_source/event_store/http/controls/resolve_host'
+
+require 'event_source/event_store/http/controls/cluster_members'
+require 'event_source/event_store/http/controls/hostname'
+require 'event_source/event_store/http/controls/hostname/cluster'
+require 'event_source/event_store/http/controls/ip_address/cluster'
+require 'event_source/event_store/http/controls/port'
+
+require 'event_source/event_store/http/controls/settings'
+require 'event_source/event_store/http/controls/settings/cluster'
+
+require 'event_source/event_store/http/controls/session/request/require_leader'
+require 'event_source/event_store/http/controls/session/request/write_event'
 
-require 'event_source/event_store/http/controls/category'
 require 'event_source/event_store/http/controls/event_data'
 require 'event_source/event_store/http/controls/event_data/event_id'
 require 'event_source/event_store/http/controls/event_data/write'
-require 'event_source/event_store/http/controls/media_type'
+
 require 'event_source/event_store/http/controls/stream'
 require 'event_source/event_store/http/controls/stream_name'
 require 'event_source/event_store/http/controls/uri/path'
-require 'event_source/event_store/http/controls/uuid'
+
+require 'event_source/event_store/http/controls/expected_version'
+
 require 'event_source/event_store/http/controls/write'

data/lib/event_source/event_store/http/controls/cluster_members.rb

@@ -0,0 +1,9 @@
+module EventSource
+  module EventStore
+    module HTTP
+      module Controls
+        ClusterMembers = ::EventStore::Cluster::LeaderStatus::Controls::CurrentMembers
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/controls/event_data/write.rb

@@ -31,3 +31,4 @@ module EventSource
     end
   end
 end
+

data/lib/event_source/event_store/http/controls/expected_version.rb

@@ -0,0 +1,31 @@
+module EventSource
+  module EventStore
+    module HTTP
+      module Controls
+        module ExpectedVersion
+          def self.example
+            11
+          end
+
+          module Header
+            def self.example
+              '11'
+            end
+          end
+
+          module NoStream
+            def self.example
+              :no_stream
+            end
+
+            module Header
+              def self.example
+                '-1'
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/controls/hostname.rb

@@ -0,0 +1,13 @@
+module EventSource
+  module EventStore
+    module HTTP
+      module Controls
+        module Hostname
+          def self.example
+            'localhost'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/controls/hostname/cluster.rb

@@ -0,0 +1,15 @@
+module EventSource
+  module EventStore
+    module HTTP
+      module Controls
+        module Hostname
+          module Cluster
+            def self.example
+              'localhost'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/controls/ip_address/cluster.rb

@@ -0,0 +1,25 @@
+module EventSource
+  module EventStore
+    module HTTP
+      module Controls
+        module IPAddress
+          def self.example
+            '127.0.0.1'
+          end
+
+          Cluster = ::EventStore::Cluster::LeaderStatus::Controls::IPAddress
+
+          module Cluster
+            module Leader
+              def self.get
+                leader_ip_address, * = ::EventStore::Cluster::LeaderStatus::Controls::CurrentMembers.get
+
+                leader_ip_address
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/controls/{category.rb → port.rb}

@@ -2,7 +2,7 @@ module EventSource
   module EventStore
     module HTTP
       module Controls
-        Category = EventSource::Controls::Category
+        Port = ::EventStore::HTTP::Connect::Controls::Port
       end
     end
   end

data/lib/event_source/event_store/http/controls/resolve_host.rb

@@ -0,0 +1,9 @@
+module EventSource
+  module EventStore
+    module HTTP
+      module Controls
+        ResolveHost = ::EventStore::HTTP::Connect::Controls::ResolveHost
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/controls/session/request/require_leader.rb

@@ -0,0 +1,41 @@
+module EventSource
+  module EventStore
+    module HTTP
+      module Controls
+        module Session
+          module Request
+            module WriteEvent
+              def self.example(data: nil, metadata: nil, type: nil, stream_name: nil, headers: nil)
+                stream_name ||= StreamName.example
+                headers ||= {}
+
+                event_data = EventData::Write.example(
+                  type: type,
+                  data: data,
+                  metadata: metadata
+                )
+
+                request_body = JSON.pretty_generate [
+                  {
+                    'eventId' => Identifier::UUID::Random.get,
+                    'eventType' => event_data.type,
+                    'data' => event_data.data,
+                    'metadata' => event_data.metadata
+                  }
+                ]
+
+                headers['Content-Type'] ||= MediaTypes.vnd_event_store_events_json
+
+                path = "/streams/#{stream_name}"
+
+                post = Net::HTTP::Post.new path, headers
+                post.body = request_body
+                post
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/controls/session/request/write_event.rb

@@ -0,0 +1,17 @@
+module EventSource
+  module EventStore
+    module HTTP
+      module Controls
+        module Session
+          module Request
+            module RequireLeader
+              def self.example
+                WriteEvent.example headers: { 'ES-RequireMaster' => 'true' }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/controls/settings.rb

@@ -0,0 +1,9 @@
+module EventSource
+  module EventStore
+    module HTTP
+      module Controls
+        Settings = ::EventStore::HTTP::Connect::Controls::Settings
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/controls/settings/cluster.rb

@@ -0,0 +1,19 @@
+module EventSource
+  module EventStore
+    module HTTP
+      module Controls
+        module Settings
+          module Cluster
+            def self.example
+              host = ::EventStore::Cluster::LeaderStatus::Controls::Hostname.example
+
+              HTTP::Settings.build({
+                :host => host
+              })
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/controls/write.rb

@@ -7,34 +7,15 @@ module EventSource
             event_count ||= 1
             stream_name ||= StreamName.example
 
-            host = Settings.get :host
-            port = Settings.get :port
+            ::EventStore::HTTP::Connect.() do |http|
+              post = Session::Request::WriteEvent.example(
+                type: type,
+                data: data,
+                metadata: metadata,
+                stream_name: stream_name
+              )
 
-            event_data = EventData::Write.example(
-              type: type,
-              data: data,
-              metadata: metadata
-            )
-
-            Net::HTTP.start host, port do |http|
-              event_datum = (0...event_count).map do
-                event_id = Identifier::UUID::Random.get
-
-                {
-                  'eventId' => event_id,
-                  'eventType' => event_data.type,
-                  'data' => event_data.data,
-                  'metadata' => event_data.metadata
-                }
-              end
-
-              headers = { 'Content-Type' => MediaTypes.vnd_event_store_events_json }
-
-              path = "/streams/#{stream_name}"
-
-              request_body = JSON.pretty_generate event_datum
-
-              response = http.request_post path, request_body, headers
+              response = http.request post
 
               unless response.code.to_i == 201
                 fail "Write failed (StatusCode: #{response.code}, ReasonPhrase: #{response.message})"
@@ -48,3 +29,4 @@ module EventSource
     end
   end
 end
+

data/lib/event_source/event_store/http/log.rb

@@ -4,7 +4,6 @@ module EventSource
       class Log < ::Log
         def tag!(tags)
           tags << :event_source_event_store_http
-          tags << :library
           tags << :verbose
         end
       end

data/lib/event_source/event_store/http/request.rb

@@ -0,0 +1,27 @@
+module EventSource
+  module EventStore
+    module HTTP
+      class Request
+        include Log::Dependency
+
+        configure :request
+
+        dependency :session, Session
+
+        def self.build(session: nil)
+          instance = new
+          Session.configure instance, session: session
+          instance
+        end
+
+        abstract :call
+
+        abstract :media_type
+
+        def headers
+          @headers ||= {}
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/request/get.rb

@@ -0,0 +1,64 @@
+module EventSource
+  module EventStore
+    module HTTP
+      class Request
+        class Get < Request
+          include Log::Dependency
+
+          def call(path, &probe)
+            log_attributes = "Path: #{path}, MediaType: #{media_type}, Headers: #{headers.inspect}"
+
+            logger.trace { "Performing GET request (#{log_attributes}" }
+
+            request = Net::HTTP::Get.new path, headers
+            request['Accept'] = media_type
+
+            response = session.(request, &probe)
+
+            log_attributes << ", StatusCode: #{response.code}, ReasonPhrose: #{response.message}"
+
+            status_code = response.code.to_i
+
+            if (200..399).include? status_code
+              response_body = response.body
+            elsif status_code == 404
+              logger.warn "Get query failed, resource not found (#{log_attributes})"
+            else
+              error_message = "Get command failed (#{log_attributes})"
+              logger.error error_message
+              raise Error, error_message
+            end
+
+            logger.debug { "GET request done (#{log_attributes}, StatusCode: #{status_code})" }
+
+            return response_body, status_code
+          end
+
+          def enable_long_poll
+            headers['ES-LongPoll'] = Defaults.long_poll_duration.to_s
+          end
+
+          def long_poll_enabled?
+            headers.key? 'ES-LongPoll'
+          end
+
+          def media_type
+            MediaTypes.vnd_event_store_atom_json
+          end
+
+          Error = Class.new StandardError
+
+          module Defaults
+            def self.long_poll_duration
+              duration = ENV['LONG_POLL_DURATION']
+
+              return duration.to_i if duration
+
+              15
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/request/post.rb

@@ -0,0 +1,79 @@
+module EventSource
+  module EventStore
+    module HTTP
+      class Request
+        class Post < Request
+          include Log::Dependency
+
+          def call(path, request_body, expected_version: nil, &probe)
+            expected_version = -1 if expected_version == Post.no_stream_version
+
+            log_attributes = "Path: #{path}, ContentLength: #{request_body.bytesize}, MediaType: #{media_type}, Headers: #{headers.inspect}"
+            logger.trace { "Performing GET request (#{log_attributes}" }
+
+            request = Net::HTTP::Post.new path, headers
+            request['Content-Type'] = media_type
+            request['ES-ExpectedVersion'] = expected_version.to_s if expected_version
+            request.body = request_body
+
+            response = session.(request, &probe)
+
+            status_code = response.code.to_i
+
+            log_attributes << ", StatusCode: #{status_code}, ReasonPhrase: #{response.message}"
+
+            unless (200..299).include? status_code
+              if expected_version_error? response
+                error_message = "Wrong expected version number (#{log_attributes})"
+                error_type = ExpectedVersionError
+              end
+
+              if write_timeout_error? response
+                error_message = "Write timeout (#{log_attributes})"
+                error_type = WriteTimeoutError
+              end
+
+              error_message ||= "Post command failed (#{log_attributes})"
+              error_type ||= Error
+
+              logger.error error_message
+              raise error_type, error_message
+            end
+
+            logger.debug { "GET request done (#{log_attributes}, StatusCode: #{status_code})" }
+
+            return status_code
+          end
+
+          def require_leader
+            headers['ES-RequireMaster'] = 'True'
+          end
+
+          def leader_required?
+            headers.key? 'ES-RequireMaster'
+          end
+
+          def media_type
+            MediaTypes.vnd_event_store_events_json
+          end
+
+          def expected_version_error?(response)
+            response.code == '400' && response.message == 'Wrong expected EventNumber'
+          end
+
+          def write_timeout_error?(response)
+            response.code == '500' && response.message == 'Write timeout'
+          end
+
+          Error = Class.new StandardError
+          ExpectedVersionError = Class.new Error
+          WriteTimeoutError = Class.new Error
+
+          def self.no_stream_version
+            :no_stream
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/session.rb

@@ -4,157 +4,107 @@ module EventSource
       class Session
         include Log::Dependency
 
-        dependency :net_http, NetHTTP
-        dependency :telemetry, ::Telemetry
-
-        def self.build(settings=nil, namespace: nil)
-          instance = new
+        extend Build
+        extend Configure
+        extend Telemetry::RegisterSink
 
-          ::Telemetry.configure instance
-          NetHTTP.configure instance, settings: settings, namespace: namespace
+        attr_writer :connection
+        attr_writer :disable_leader_detection
 
-          instance.connect
+        def disable_leader_detection
+          if @disable_leader_detection.nil?
+            @disable_leader_detection = Defaults.disable_leader_detection
+          end
 
-          instance
+          @disable_leader_detection
         end
 
-        def self.configure(receiver, settings=nil, namespace: nil, session: nil, attr_name: nil)
-          attr_name ||= :session
+        dependency :connect, ::EventStore::HTTP::Connect
+        dependency :get_leader_status, ::EventStore::Cluster::LeaderStatus::Get
+        dependency :telemetry, ::Telemetry
+
+        attr_accessor :host
+        attr_accessor :port
 
-          if session.nil?
-            instance = build settings, namespace: namespace
-          else
-            instance = session
-          end
+        def call(request, redirect: nil, &probe)
+          redirect ||= false
 
-          receiver.public_send "#{attr_name}=", instance
+          logger.trace(tags: :http) { "Issuing #{request.method} request (#{LogText.request_attributes request})" }
+          logger.trace(tag: :data) { LogText.request_body request } if request.request_body_permitted?
 
-          instance
-        end
+          response = connection.request request
 
-        def self.register_telemetry_sink(instance)
-          sink = Telemetry::Sink.new
+          if Net::HTTPRedirection === response && !redirect
+            logger.debug(tags: :http) { "#{request.method} request received redirect response (#{LogText.request_attributes request}, #{LogText.response_attributes response}, Location: #{response['Location'] || '(none)'})" }
 
-          instance.telemetry.register sink
+            location = URI.parse response['Location']
+            leader_ip_address = location.host
 
-          sink
-        end
+            telemetry.record :redirected, Telemetry::Redirected.new(request.path, connection.address, location)
 
-        def connect
-          logger.trace(tag: [:http, :db_connection]) {
-            "Connecting to EventStore (Host: #{host.inspect}, Port: #{port.inspect})"
-          }
+            establish_connection leader_ip_address
 
-          net_http.start
+            request['Host'] = nil
+            response = self.(request, redirect: true)
 
-          data = Telemetry::Connected.new host, port
+            return response
+          end
+
+          logger.trace(tags: :http) { "#{request.method} request issued (#{LogText.request_attributes request}, #{LogText.response_attributes response})" }
+          logger.trace(tag: :data) { LogText.response_body response }
 
-          telemetry.record :connected, data
+          telemetry.record :http_request, Telemetry::HTTPRequest.build(request, response)
+
+          probe.(response) if probe
 
-          logger.debug(tag: [:http, :db_connection]) {
-            "Connected to EventStore (Host: #{host.inspect}, Port: #{port.inspect})"
-          }
+          response
+        end
 
-          net_http
+        def connection
+          @connection ||= establish_connection
         end
 
         def connected?
-          net_http.started?
+          !@connection.nil?
         end
 
         def close
-          logger.trace(tag: [:http, :db_connection]) { "Closing connection to EventStore" }
-
-          net_http.finish
+          connection.finish
 
-          logger.debug(tag: [:http, :db_connection]) { "Connection to EventStore closed" }
-
-          net_http
+          self.connection = nil
         end
 
-        def get(path, media_type, headers=nil, &probe)
-          headers ||= {}
-
-          logger.trace(tag: :http) {
-            "Issuing GET request (Path: #{path}, MediaType: #{media_type})"
-          }
+        def establish_connection(leader_ip_address=nil)
+          logger.trace { "Establishing connection to EventStore (#{LogText.establishing_connection self, leader_ip_address})" }
 
-          headers['Accept'] = media_type
+          close if connected?
 
-          response = net_http.request_get path, headers
+          unless leader_ip_address || disable_leader_detection
+            leader_status_queried_telemetry = Telemetry::LeaderStatusQueried.new
 
-          status_code = response.code.to_i
-          response_body = response.body if (200..399).include? status_code
+            begin
+              leader_status = get_leader_status.()
+              leader_ip_address = leader_status.http_ip_address
 
-          logger.debug(tag: :http) {
-            "GET request issued (Path: #{path}, MediaType: #{media_type}, StatusCode: #{status_code}, ReasonPhrase: #{response.message}, ContentLength: #{response_body&.bytesize.inspect})"
-          }
+              leader_status_queried_telemetry.leader_status = leader_status
 
-          if response.body.empty?
-            logger.debug(tags: [:data]) { "Response: (none)" }
-          else
-            logger.debug(tags: [:data]) { "Response:\n\n#{response.body}" }
-          end
-
-          probe.(response) if probe
-
-          data = Telemetry::Get.new(
-            path,
-            status_code,
-            response.message,
-            response.body,
-            media_type
-          )
-
-          telemetry.record :get, data
-
-          return status_code, response_body
-        end
-
-        def post(path, request_body, media_type, headers=nil, &probe)
-          headers ||= {}
-          headers['Content-Type'] = media_type
+            rescue ::EventStore::Cluster::LeaderStatus::GossipEndpoint::Get::NonClusterError => error
+              leader_status_queried_telemetry.error = error
+              logger.warn { "Could not determine cluster leader (#{LogText.establishing_connection self, leader_ip_address}, Error: #{error.class})" }
+            end
 
-          logger.trace(tag: :http) {
-            "Issuing POST request (Path: #{path}, MediaType: #{media_type}, ContentLength: #{request_body.bytesize})"
-          }
-          logger.trace(tags: [:data]) { "Request:\n\n#{request_body}" }
-
-          response = net_http.request_post path, request_body, headers
-
-          status_code = response.code.to_i
-
-          logger.debug(tag: :http) {
-            "POST request issued (Path: #{path}, MediaType: #{media_type}, ContentLength: #{request_body.bytesize}, StatusCode: #{status_code}, ReasonPhrase: #{response.message})"
-          }
-
-          if response.body.empty?
-            logger.debug(tags: [:data]) { "Response: (none)" }
-          else
-            logger.debug(tags: [:data]) { "Response:\n\n#{response.body}" }
+            telemetry.record :leader_status_queried, leader_status_queried_telemetry
           end
 
-          probe.(response) if probe
-
-          data = Telemetry::Post.new(
-            path,
-            status_code,
-            response.message,
-            request_body,
-            media_type
-          )
+          connection = connect.(leader_ip_address)
 
-          telemetry.record :post, data
+          telemetry.record :connection_established, Telemetry::ConnectionEstablished.new(leader_ip_address || host, port, connection)
 
-          status_code
-        end
+          logger.debug { "Connection to EventStore established (#{LogText.connection_established self, leader_ip_address})" }
 
-        def host
-          net_http.address
-        end
+          self.connection = connection
 
-        def port
-          net_http.port
+          connection
         end
       end
     end

data/lib/event_source/event_store/http/session/build.rb

@@ -0,0 +1,28 @@
+module EventSource
+  module EventStore
+    module HTTP
+      class Session
+        module Build
+          def build(settings=nil, namespace: nil)
+            instance = new
+
+            connect = ::EventStore::HTTP::Connect.configure(
+              instance,
+              settings,
+              namespace: namespace
+            )
+
+            instance.host = connect.host
+            instance.port = connect.port
+
+            ::EventStore::Cluster::LeaderStatus::Get.configure instance, connect
+
+            ::Telemetry.configure instance
+
+            instance
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/session/configure.rb

@@ -0,0 +1,22 @@
+module EventSource
+  module EventStore
+    module HTTP
+      class Session
+        module Configure
+          def configure(receiver, settings=nil, namespace: nil, session: nil, attr_name: nil)
+            attr_name ||= :session
+
+            if session.nil?
+              instance = build settings, namespace: namespace
+            else
+              instance = session
+            end
+
+            receiver.public_send "#{attr_name}=", instance
+            instance
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/session/defaults.rb

@@ -0,0 +1,19 @@
+module EventSource
+  module EventStore
+    module HTTP
+      class Session
+        module Defaults
+          def self.disable_leader_detection
+            disabled = ENV['DISABLE_EVENT_STORE_LEADER_DETECTION']
+
+            if /\A(?:on|yes|y|true|1)\z/i.match disabled
+              true
+            else
+              false
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/session/log_text.rb

@@ -0,0 +1,41 @@
+module EventSource
+  module EventStore
+    module HTTP
+      class Session
+        module LogText
+          def self.establishing_connection(session, leader_ip_address)
+            "HostSetting: #{session.host}, PortSetting: #{session.port}, LeaderIPAddress: #{leader_ip_address || '(unknown)'}"
+          end
+
+          def self.connection_established(session, leader_ip_address)
+            "HostSetting: #{session.host}, PortSetting: #{session.port}, LeaderIPAddress: #{leader_ip_address || '(unused)'}"
+          end
+
+          def self.request_attributes(request)
+            "Path: #{request.path}, Host: #{request['Host'] || '(not yet set)'}, MediaType: #{request['Content-Type'] || '(none)'}, ContentLength: #{request.body&.bytesize.to_i}, Accept: #{request['Accept'] || '(none)'}"
+          end
+
+          def self.request_body(request)
+            if request.body.nil? || request.body.empty?
+              "Request: (none)'"
+            else
+              "Request:\n\n#{request.body}"
+            end
+          end
+
+          def self.response_attributes(response)
+            "StatusCode: #{response.code}, ReasonPhrase: #{response.message}"
+          end
+
+          def self.response_body(response)
+            if response.body.empty?
+              "Response: (none)"
+            else
+              "Response:\n\n#{response.body}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/event_source/event_store/http/session/substitute.rb

@@ -4,46 +4,36 @@ module EventSource
       class Session
         module Substitute
           def self.build
-            Session.build
+            Session.new
           end
 
-          class Session < Session
-            attr_accessor :telemetry_sink
+          Response = Struct.new :code, :message, :body
 
-            def self.build
-              instance = new
+          class Session
+            attr_writer :status_code
+            attr_writer :reason_phrase
+            attr_accessor :response_body
 
-              ::Telemetry.configure instance
-
-              instance.telemetry_sink = register_telemetry_sink instance
-
-              instance
+            def call(request)
+              response = Response.new
+              response.code = status_code.to_s
+              response.message = reason_phrase
+              response.body = response_body.to_s
+              response
             end
 
             def set_response(status_code, response_body=nil, reason_phrase: nil)
-              net_http.set_response(
-                status_code,
-                response_body,
-                reason_phrase: reason_phrase
-              )
+              self.status_code = status_code
+              self.reason_phrase = reason_phrase
+              self.response_body = response_body if response_body
             end
 
-            module Assertions
-              def get_request?(&block)
-                block ||= proc { true }
-
-                telemetry_sink.recorded_get? do |record|
-                  block.(record.data)
-                end
-              end
-
-              def post_request?(&block)
-                block ||= proc { true }
+            def status_code
+              @status_code ||= 404
+            end
 
-                telemetry_sink.recorded_post? do |record|
-                  block.(record.data)
-                end
-              end
+            def reason_phrase
+              @reason_phrase ||= 'Not found'
             end
           end
         end

data/lib/event_source/event_store/http/session/telemetry.rb

@@ -6,28 +6,77 @@ module EventSource
           class Sink
             include ::Telemetry::Sink
 
-            record :connected
-            record :get
-            record :post
+            record :connection_established
+
+            record :leader_status_queried
+
+            record :http_request
+
+            record :redirected
+
+            def leader_status_query_successful?
+              recorded_leader_status_queried? do |record|
+                record.data.leader_status && record.data.error.nil?
+              end
+            end
+
+            def leader_status_query_failed?
+              recorded_leader_status_queried? do |record|
+                record.data.leader_status.nil? && record.data.error
+              end
+            end
           end
 
-          Connected = Struct.new :host, :port
+          module RegisterSink
+            def register_telemetry_sink(instance)
+              sink = Telemetry::Sink.new
 
-          Get = Struct.new(
-            :path,
-            :status_code,
-            :reason_phrase,
-            :response_body,
-            :acceptable_media_type
-          )
+              instance.telemetry.register sink
 
-          Post = Struct.new(
+              sink
+            end
+          end
+
+          ConnectionEstablished = Struct.new :host, :port, :connection
+
+          LeaderStatusQueried = Struct.new :leader_status, :error
+
+          HTTPRequest = Struct.new(
+            :request,
+            :response,
+            :action,
             :path,
             :status_code,
             :reason_phrase,
+            :response_body,
+            :acceptable_media_type,
             :request_body,
             :content_type
           )
+
+          class HTTPRequest
+            def self.build(request, response)
+              instance = new(
+                request,
+                response,
+                request.method,
+                request.path,
+                response.code.to_i,
+                response.message,
+                response.body,
+                request['Accept']
+              )
+
+              if request.request_body_permitted?
+                instance.request_body = request.body
+                instance.content_type = request['Content-Type']
+              end
+
+              instance
+            end
+          end
+
+          Redirected = Struct.new :requested_path, :origin_host, :redirect_uri
         end
       end
     end

data/lib/event_source/event_store/http/settings.rb

@@ -1,27 +1,7 @@
 module EventSource
   module EventStore
     module HTTP
-      class Settings < ::Settings
-        def self.data_source
-          'settings/event_source_event_store_http.json'
-        end
-
-        def self.instance
-          @instance ||= build
-        end
-
-        def self.names
-          %i(host port read_timeout)
-        end
-
-        def self.set(receiver)
-          instance.set receiver
-        end
-
-        def self.get(name)
-          instance.get name
-        end
-      end
+      Settings = ::EventStore::HTTP::Connect::Settings
     end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: evt-event_source-event_store-http
 version: !ruby/object:Gem::Version
-  version: 0.1.1.0
+  version: 0.2.0.0.pre1
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: evt-configure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: evt-event_source
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: evt-settings
+  name: evt-event_store-cluster-leader_status
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -74,11 +60,21 @@ extra_rdoc_files: []
 files:
 - lib/event_source/event_store/http.rb
 - lib/event_source/event_store/http/controls.rb
-- lib/event_source/event_store/http/controls/category.rb
+- lib/event_source/event_store/http/controls/cluster_members.rb
 - lib/event_source/event_store/http/controls/event_data.rb
 - lib/event_source/event_store/http/controls/event_data/event_id.rb
 - lib/event_source/event_store/http/controls/event_data/write.rb
+- lib/event_source/event_store/http/controls/expected_version.rb
+- lib/event_source/event_store/http/controls/hostname.rb
+- lib/event_source/event_store/http/controls/hostname/cluster.rb
+- lib/event_source/event_store/http/controls/ip_address/cluster.rb
 - lib/event_source/event_store/http/controls/media_type.rb
+- lib/event_source/event_store/http/controls/port.rb
+- lib/event_source/event_store/http/controls/resolve_host.rb
+- lib/event_source/event_store/http/controls/session/request/require_leader.rb
+- lib/event_source/event_store/http/controls/session/request/write_event.rb
+- lib/event_source/event_store/http/controls/settings.rb
+- lib/event_source/event_store/http/controls/settings/cluster.rb
 - lib/event_source/event_store/http/controls/stream.rb
 - lib/event_source/event_store/http/controls/stream_name.rb
 - lib/event_source/event_store/http/controls/uri/path.rb
@@ -86,8 +82,14 @@ files:
 - lib/event_source/event_store/http/controls/write.rb
 - lib/event_source/event_store/http/log.rb
 - lib/event_source/event_store/http/media_types.rb
+- lib/event_source/event_store/http/request.rb
+- lib/event_source/event_store/http/request/get.rb
+- lib/event_source/event_store/http/request/post.rb
 - lib/event_source/event_store/http/session.rb
-- lib/event_source/event_store/http/session/net_http.rb
+- lib/event_source/event_store/http/session/build.rb
+- lib/event_source/event_store/http/session/configure.rb
+- lib/event_source/event_store/http/session/defaults.rb
+- lib/event_source/event_store/http/session/log_text.rb
 - lib/event_source/event_store/http/session/substitute.rb
 - lib/event_source/event_store/http/session/telemetry.rb
 - lib/event_source/event_store/http/settings.rb
@@ -106,9 +108,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8

data/lib/event_source/event_store/http/session/net_http.rb

@@ -1,100 +0,0 @@
-module EventSource
-  module EventStore
-    module HTTP
-      class Session
-        module NetHTTP
-          def self.configure(receiver, settings: nil, namespace: nil, attr_name: nil)
-            attr_name ||= :net_http
-            settings ||= Settings.instance
-            namespace = Array(namespace)
-
-            host = settings.get *namespace, :host
-            port = settings.get *namespace, :port
-            read_timeout = settings.get *namespace, :read_timeout
-
-            net_http = Net::HTTP.new host, port
-
-            net_http.read_timeout = read_timeout if read_timeout
-
-            receiver.public_send "#{attr_name}=", net_http
-
-            net_http
-          end
-
-          class Substitute
-            attr_accessor :address
-            attr_accessor :reason_phrase
-            attr_writer :response_body
-            attr_accessor :port
-            attr_accessor :status_code
-            attr_accessor :started
-
-            def self.build
-              new
-            end
-
-            def request_get(path, initheader=nil)
-              status_code = get_request_status_code
-
-              OpenStruct.new(
-                :code => status_code,
-                :body => response_body,
-                :message => reason_phrase
-              )
-            end
-
-            def request_post(path, request_body, initheader=nil)
-              status_code = post_request_status_code
-
-              OpenStruct.new(
-                :code => status_code,
-                :body => response_body,
-                :message => reason_phrase
-              )
-            end
-
-            def start
-              self.started = true
-            end
-
-            def started?
-              started ? true : false
-            end
-
-            def response_body
-              @response_body ||= Defaults.response_body
-            end
-
-            def get_request_status_code
-              status_code || Defaults.get_request_status_code
-            end
-
-            def post_request_status_code
-              status_code || Defaults.post_request_status_code
-            end
-
-            def set_response(status_code, response_body=nil, reason_phrase: nil)
-              self.status_code = status_code
-              self.response_body = response_body if response_body
-              self.reason_phrase = reason_phrase if reason_phrase
-            end
-
-            module Defaults
-              def self.get_request_status_code
-                404
-              end
-
-              def self.post_request_status_code
-                201
-              end
-
-              def self.response_body
-                ''
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end