es-readmodel 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ed03ded9ef3fbcf44ebd93b4c36cb59c757032
-  data.tar.gz: a70370261a0d7d14650d2efa3731dd2b38efe118
+  metadata.gz: c07024ef0f57f993a1a7473791442ee8f1e98f97
+  data.tar.gz: f31b63a404a62e6a2abbef01bd99a943e554232d
 SHA512:
-  metadata.gz: 2fdf091962a187dec7d5e2dbb47daccd45047dcfc25e2305d76224b311c7a3bf0a2a90f196eb8a630c22f4e209f1a3aa18c4e1d6074c58828a86df118ad3141e
-  data.tar.gz: f56c0bd38141d11381cee702a24a2b9e4af70e90681d6edf0ed767a911101fe32984888c9811f2454e523d53a36550c8ef2eb115e8dd6d43250cba30eb0c7871
+  metadata.gz: 8cdfb4cd8853e515c6311476a9181a6e07900201dcca1f60b96d8d8bd240015ebd41f605bcadb3ef01ac05870cd4a200b96ad9de6707991810976f6e4960c71a
+  data.tar.gz: abe9a2419936c0b428c4b99274b1d96caaf24969038f8bbe6c2ae0e597e73de0f218b47e7d65931391b5ab21e1f789b317888f3b6b611f75185cdd712d123109

data/README.md

@@ -4,7 +4,7 @@ An opinionated read model framework for EventStore.
 
 Your reducer can be anything that responds to #call.
 It will receive two arguments -- the current state and the event.
-The current state will be nil if no events have bee processed yet.
+The current state will be nil if no events have been processed yet.
 The reducer function must return the new state.
 
 ## Routes
@@ -31,9 +31,8 @@ use Rack::Cors do
   end
 end
 
-use EsReadModel::Subscriber,
-  es_host:     ENV['ES_HOST'],
-  es_port:     ENV['ES_PORT'],
+use EsReadModel::RackSubscriber,
+  es_url:      'http://localhost:2113',
   es_username: ENV['ES_USERNAME'],
   es_password: ENV['ES_PASSWORD'],
   reducer:     ActiveUsers.new,

data/es-readmodel.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'es-readmodel'
-  spec.version       = '0.1.0'
+  spec.version       = '1.0.0'
   spec.licenses      = ['MIT']
   spec.authors       = ['Kevin Rutherford']
   spec.email         = ['kevin@rutherford-software.com']

data/lib/es_readmodel/rack_subscriber.rb

@@ -0,0 +1,54 @@
+require 'rack'
+require 'json'
+
+module EsReadModel
+
+  class RackSubscriber
+
+    attr_reader :status
+
+    def initialize(app, options)
+      @app = app
+      @listener = options[:listener]
+      @subscriber = Subscriber.new(options)
+      Thread.new { @subscriber.subscribe }
+    end
+
+    def call(env)
+      @request = Rack::Request.new(env)
+      if env['PATH_INFO'] == '/status'
+        status, headers, body = json_response(200, @subscriber.status)
+      else
+        env['readmodel.state'] = @subscriber.state
+        env['readmodel.available'] = @subscriber.status[:available]
+        env['readmodel.status'] = 'OK'
+        status, headers, body = @app.call(env)
+      end
+      @listener.call({
+        level:  'info',
+        tag:    'http.request',
+        msg:    "#{env['REQUEST_METHOD']} #{@request.fullpath}",
+        status: status
+      })
+      [status, headers, body]
+    end
+
+    private
+
+    def json_response(status_code, body)
+      result = body.merge({
+        _links: { self: @request.fullpath }
+      })
+      [
+        status_code,
+        {
+          'Content-Type' => 'application/json'
+        },
+        [result.to_json]
+      ]
+    end
+
+  end
+
+end
+

data/lib/es_readmodel/subscriber.rb

@@ -1,5 +1,3 @@
-require 'rack'
-require 'json'
 require_relative './connection'
 require_relative './stream'
 
@@ -7,13 +5,12 @@ module EsReadModel
 
   class Subscriber
 
-    attr_reader :status
+    attr_reader :status, :state
 
-    def initialize(app, options)
-      @app = app
+    def initialize(options)
       @listener = options[:listener]
       @initial_state = options[:initial]
-      url = "http://#{options[:es_host]}:#{options[:es_port]}"
+      url = options[:es_url]
       @status = {
         available: false,
         startedAt: Time.now,
@@ -26,30 +23,8 @@ module EsReadModel
       }
       @connection = Connection.new(url, options[:es_username], options[:es_password])
       @reducer = options[:reducer]
-      Thread.new { subscribe }
     end
 
-    def call(env)
-      @request = Rack::Request.new(env)
-      if env['PATH_INFO'] == '/status'
-        status, headers, body = json_response(200, @status)
-      else
-        env['readmodel.state'] = @state
-        env['readmodel.available'] = @status[:available]
-        env['readmodel.status'] = 'OK'
-        status, headers, body = @app.call(env)
-      end
-      @listener.call({
-        level:  'info',
-        tag:    'http.request',
-        msg:    "#{env['REQUEST_METHOD']} #{@request.fullpath}",
-        status: status
-      })
-      [status, headers, body]
-    end
-
-    private
-
     def subscribe
       loop do
         begin
@@ -72,6 +47,8 @@ module EsReadModel
       end
     end
 
+    private
+
     def subscribe_to_all_events
       loop do
         @status[:available] = true
@@ -100,19 +77,6 @@ module EsReadModel
       end
     end
 
-    def json_response(status_code, body)
-      result = body.merge({
-        _links: { self: @request.fullpath }
-      })
-      [
-        status_code,
-        {
-          'Content-Type' => 'application/json'
-        },
-        [result.to_json]
-      ]
-    end
-
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-readmodel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Kevin Rutherford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -126,6 +126,7 @@ files:
 - lib/es_readmodel/event.rb
 - lib/es_readmodel/logger.rb
 - lib/es_readmodel/page.rb
+- lib/es_readmodel/rack_subscriber.rb
 - lib/es_readmodel/stream.rb
 - lib/es_readmodel/subscriber.rb
 homepage: https://github.com/kevinrutherford/es-readmodel