kapnismology 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4339000a844a6c3f722b1980f8e70a5acc78f5e5
-  data.tar.gz: fb8b3a15c6d841d73b5f9d1198188e8e4e1aa572
+  metadata.gz: 51c9bd5b25a2eff1be770baeb7ca2046f757e589
+  data.tar.gz: 8d7d741333c07ec96c7dee8b88ccede3ce5c10f5
 SHA512:
-  metadata.gz: 4de8ef415f02d7234ba102f235f1f9628822f531b130b7078ae19fc459f503b1a1de8ccfd9d67549be172af447e22a3c35b9b351fb1cf3ace851e52bfc09e954
-  data.tar.gz: 3ac836944d8c79fd3694b7f3f631c104d921d0df3e938e8c1aa898c921498e9f219b3d69af9fa97a9f3ce3577ffd739b8f9dac10ee91e618053ac39dea9c9ea6
+  metadata.gz: 6fa2922b7ec761a04001292743ce4695a8cba5d504c55936a4c28a026fe7ebddd12cbfe8b4fe3f15bb27c5cec8336058a0d9f54431b7afcf6669bb378d8d2a51
+  data.tar.gz: 5ee7a610033ee55a7a3d025331baeba88bb93fbb059d03ed01c0e59b44ff7853087ccb236a03a2f3abdbac23b7349087be0bccc66ff9fbbba036c268129e90db

data/app/controllers/kapnismology/smoke_tests_controller.rb

@@ -2,11 +2,10 @@ module Kapnismology
   # This is called when the user goes to the /smoke_test URL. This calls all the
   # smoke tests registered in the application and gather the results
   class SmokeTestsController < ApplicationController
-    PROFILE_URL = 'http://tbd.mdsol.com'.freeze
 
     def index
-      evaluations = SmokeTestCollection.evaluations(allowed_tags, blacklist)
-      render json: results(evaluations).to_json, status: status(evaluations)
+      response = SmokeTestResponse.new(SmokeTestCollection.evaluations(allowed_tags, blacklist))
+      render json: response.render(request.original_url), status: response.status
     end
 
     private
@@ -18,29 +17,6 @@ module Kapnismology
     def blacklist
       params[:skip].to_s.split(',')
     end
-
-    def status(evaluations)
-      if evaluations.passed?
-        :ok
-      else
-        :service_unavailable
-      end
-    end
-
-    def results(evaluations)
-      items = evaluations.as_json.select { |e| e.has_key?(:passed) }
-      {
-        _links: {
-          self: CGI.unescape(request.original_url),
-          profile: PROFILE_URL
-        },
-        passed: evaluations.passed?,
-        count: items.size,
-        trace_id: ApplicationInformation.new.trace_id,
-        codebase_revision: ApplicationInformation.new.codebase_revision,
-        items: items
-      }
-    end
   end
 
 end

data/lib/kapnismology.rb

@@ -7,4 +7,5 @@ require 'kapnismology/evaluation_collection'
 require 'kapnismology/rake_task'
 require 'kapnismology/smoke_test'
 require 'kapnismology/smoke_test_collection'
+require 'kapnismology/smoke_test_response'
 require 'kapnismology/spec_helper'

data/lib/kapnismology/evaluation.rb

@@ -14,7 +14,7 @@ module Kapnismology
       @result.passed?
     end
 
-    def as_json(_options = nil)
+    def to_hash(_options = nil)
       { name: @name.underscore }.merge(@result.to_hash)
     end
 

data/lib/kapnismology/evaluation_collection.rb

@@ -19,8 +19,8 @@ module Kapnismology
       evaluations.all?(&:passed?)
     end
 
-    def to_json
-      evaluations.map { |evaluation| evaluation.as_json }.to_json
+    def to_hash
+      evaluations.map(&:to_hash)
     end
 
     private

data/lib/kapnismology/smoke_test_response.rb

@@ -0,0 +1,31 @@
+module Kapnismology
+  # A summary of a run containing smoke test evaluations
+  class SmokeTestResponse
+
+    PROFILE_URL = 'http://tbd.mdsol.com'.freeze
+
+    def initialize(evaluations)
+      @evaluations = evaluations
+    end
+
+    def status
+      @evaluations.passed? ? 200 : 503
+    end
+
+    def render(request_url)
+      items = @evaluations.to_hash.select { |e| e.has_key?(:passed) }
+      {
+        _links: {
+          self: CGI.unescape(request_url),
+          profile: PROFILE_URL
+        },
+        passed: @evaluations.passed?,
+        count: items.size,
+        trace_id: ApplicationInformation.new.trace_id,
+        codebase_revision: ApplicationInformation.new.codebase_revision,
+        items: items
+      }.to_json
+    end
+
+  end
+end

data/lib/kapnismology/version.rb

@@ -1,3 +1,3 @@
 module Kapnismology
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapnismology
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Jordi Polo Carres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec-json_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +171,7 @@ files:
 - lib/kapnismology/smoke_test.rb
 - lib/kapnismology/smoke_test_collection.rb
 - lib/kapnismology/smoke_test_failed.rb
+- lib/kapnismology/smoke_test_response.rb
 - lib/kapnismology/spec_helper.rb
 - lib/kapnismology/terminal.rb
 - lib/kapnismology/version.rb