es-readmodel 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 461f2d34b19899740eb1194ff7490f732c39dfb8
-  data.tar.gz: b479dd0e94a125dc5b5044acd19beafdd7b28943
+  metadata.gz: 0d24d8d9b235b2e5841fd4731a948ce34311cee2
+  data.tar.gz: 6c9746f7171344d6580c0b017dfe0fd52dacbe74
 SHA512:
-  metadata.gz: d82ee96b08c208e66cfbe668605b26b7f9e1f5e821dc3ce11eca2f2de06ae6795490964ecaa1c8ce334fb3237f3b1229192dd5ca172f901b7af6553d6afdeda1
-  data.tar.gz: 0655b6785ac8f859fefe171e3847198164e86fe99bfef05bc68e217d7fd7a4f4d27de46710f8c26c2ce343cec770a0e92d24ed2f1d23d520ed9dceb279bf06cb
+  metadata.gz: bdd2fc1ef6fefd6196a2d3a13f60dded611dada7e43040aed3dfea0fe209e56ecf65e9ddd19c0a52759f8e8614e0f6c37f36a5e3de72e1118589a71754efd3cf
+  data.tar.gz: 995a7b227fa5610f1d575e7c6067df071c7dd120b6c6bd036ee2e86ea1e4876a13520a68d6b4831732c6746d10c86bc18eea1fe327948cff7d3a342c2d61c9a5

data/es-readmodel.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'es-readmodel'
-  spec.version       = '0.0.4'
+  spec.version       = '0.0.5'
   spec.licenses      = ['MIT']
   spec.authors       = ['Kevin Rutherford']
   spec.email         = ['kevin@rutherford-software.com']
@@ -14,13 +14,14 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'rspec', '3.5.0'
-
+  spec.add_runtime_dependency 'rack', '~> 2.0'
   spec.add_runtime_dependency 'faraday', '~> 0.13'
   spec.add_runtime_dependency 'faraday_middleware', '~> 0.12'
   spec.add_runtime_dependency 'hashie', '~> 3.5'
   spec.add_runtime_dependency 'json', '~> 2.1'
   spec.add_runtime_dependency 'mustermann', '~> 1.0'
 
+  spec.add_development_dependency 'rspec', '~> 3.7'
+
 end
 

data/lib/es_readmodel/api.rb

@@ -1,3 +1,4 @@
+require 'rack'
 require 'json'
 require 'mustermann'
 
@@ -13,19 +14,27 @@ module EsReadModel
       @request = Rack::Request.new(env)
       path = @request.path_info
       @routes.each do |route, handler|
-        pattern = Mustermann.new(route)
-        args = pattern.params(path)
-        if args
-          return json_response(503, {status: env['readmodel.status']}) unless env['readmodel.available'] == true
-          result = handler.call(@request.env['readmodel.state'], @request.params.merge(args))
-          return result ? json_response(200, result) : json_response(404, {error: 'not found'})
-        end
+        args = Mustermann.new(route).params(path)
+        return invoke_handler(handler, args, env) if args
       end
-      return json_response(404, {error: 'not found'})
+      return json_response(404, {error: 'path did not match any route'})
     end
 
     private
 
+    def invoke_handler(handler, args, env)
+      return json_response(503, {status: env['readmodel.status']}) unless env['readmodel.available'] == true
+      begin
+        result = handler.call(@request.env['readmodel.state'], @request.params.merge(args))
+        return result ? json_response(200, result) : json_response(404, {error: 'not found in read model'})
+      rescue Exception => ex
+        return json_response(500, {
+          error: "#{ex.class.name}: #{ex.message}",
+          backtrace: ex.backtrace
+        })
+      end
+    end
+
     def json_response(status_code, body)
       result = body.merge({
         _links: { self: @request.fullpath }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: es-readmodel
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kevin Rutherford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 description: An opinionated read model framework for use with EventStore
 email:
 - kevin@rutherford-software.com