leafy-rack 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32375b3191e4984cdda79aeaaae526f855cf073c
-  data.tar.gz: 884c3eec470ff217b30bf0aa8c1fec7fed4a153e
+  metadata.gz: d3257ef3584e75e8be25b0a9dc774b54f77a418c
+  data.tar.gz: b951a09f4d372c74e8e38adbf3f75d9d18cfefa7
 SHA512:
-  metadata.gz: 8a2b594c128067d6415ff542da326e467d2ea1acf8cf9bdfe2c82f78a487bbb335eb8c412eff89586ee3f345cee872ad435307957cf55eccfa559514dbaa5fe8
-  data.tar.gz: 80ecea5eada8befc856236ec8361c28714aa4597057c4a4a0ac090b39a0bbb923c8f2ab088163b2532fe0ae41d70444ac509aed0aee3c1ddd0781d38298e9e3b
+  metadata.gz: fb7352d17da646bfd9dfd42f06520eb55b34d83ce86a19a4f7219482d08d94fa217bd0a4f7b66229b2dd347d34ccd1b7ecfe393b26f02aee98ef4b7a5f4c19ed
+  data.tar.gz: df971cb52eae50c57854b9a8eba34ed58716ab411523fa6269bdde112fb6345ef7ebc619caf3c698ef9fa8c6562050cbd74d9fa6fa509c0cdb36d7a90a1bddc6

data/lib/leafy/rack/health.rb

@@ -1,20 +1,24 @@
 require 'leafy/rack'
 require 'leafy/json/health_writer'
+require 'json' unless defined? :JSON
 
 module Leafy
   module Rack
     class Health
 
-      WRITER = ::Leafy::Json::HealthWriter.new
-
       def self.response( health, env )
         data = health.run_health_checks
         is_healthy = data.values.all? { |r| r.healthy? }
+        json = if env[ 'QUERY_STRING' ] == 'pretty'
+                 JSON.pretty_generate( data.to_hash )
+               else
+                 data.to_hash.to_json
+               end
         [
-         is_healthy ? 200 : 500, 
+         is_healthy ? 200 : 503, 
          { 'Content-Type' => 'application/json',
            'Cache-Control' => 'must-revalidate,no-cache,no-store' }, 
-         [ WRITER.to_json( data, env[ 'QUERY_STRING' ] == 'pretty' ) ]
+         [ json ]
         ]
       end
 

data/lib/leafy/rack/version.rb

@@ -1,6 +1,6 @@
 module Leafy
   module Rack
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end
-    
+

data/lib/leafy-rack_jars.rb

@@ -2,9 +2,9 @@
 require 'jar_dependencies'
 
 require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.4.0' )
+require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.4.2' )
+require_jar( 'io.dropwizard.metrics', 'metrics-json', '3.1.0' )
 require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.4.2' )
+require_jar( 'io.dropwizard.metrics', 'metrics-core', '3.1.0' )
 require_jar( 'org.slf4j', 'slf4j-api', '1.7.7' )
 require_jar( 'io.dropwizard.metrics', 'metrics-jvm', '3.1.0' )
-require_jar( 'io.dropwizard.metrics', 'metrics-core', '3.1.0' )
-require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.4.2' )
-require_jar( 'io.dropwizard.metrics', 'metrics-json', '3.1.0' )

data/spec/health_rack_spec.rb

@@ -66,7 +66,7 @@ describe Leafy::Rack::Health do
 
     it 'has response' do
       status, headers, body = subject.response( health, {} )
-      expect( status ).to eq 500
+      expect( status ).to eq 503
       expect( headers.to_yaml).to eq expected_headers.to_yaml
       body = JSON.parse( body.join )
       expect( body.to_yaml ).to eq report.to_yaml
@@ -74,7 +74,7 @@ describe Leafy::Rack::Health do
 
     it 'has pretty response' do
       status, headers, body = subject.response( health, { 'QUERY_STRING' => 'pretty' } )
-      expect( status ).to eq 500
+      expect( status ).to eq 503
       expect( headers.to_yaml).to eq expected_headers.to_yaml
       expect( body.join.count( "\n" ) ).to eq 5
       body = JSON.parse( body.join )
@@ -103,7 +103,7 @@ describe Leafy::Rack::Health do
       status, headers, body = subject.call( env )
       expect( status ).to eq 200
       expect( headers.to_yaml).to eq expected_headers.to_yaml
-      expect( body.join ).to eq '{ }'
+      expect( body.join.gsub( /\s/m, '' ) ).to eq '{}'
     end
   end
 
@@ -130,7 +130,7 @@ describe Leafy::Rack::Health do
       status, headers, body = subject.call( env )
       expect( status ).to eq 200
       expect( headers.to_yaml).to eq expected_headers.to_yaml
-      expect( body.join ).to eq '{ }'
+      expect( body.join.gsub( /\s/m, '' ) ).to eq '{}'
     end
   end
 end

metadata

@@ -1,108 +1,107 @@
 --- !ruby/object:Gem::Specification
 name: leafy-rack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - christian meier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jar-dependencies
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.8
-  type: :runtime
+  name: jar-dependencies
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
-  name: leafy-metrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
-  type: :runtime
+  name: leafy-metrics
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: leafy-health
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
-  type: :runtime
+  name: leafy-health
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
-  type: :development
+  name: yard
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.2'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.2'
-description: rack middleware to expose leafy metrics/health data as well a ping rack
-  and a thread-dump rack
+description: rack middleware to expose leafy metrics/health data as well a ping rack and a thread-dump rack
 email:
 - christian.meier@lookout.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -138,26 +137,27 @@ homepage: https://github.com/lookout/leafy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - jar io.dropwizard.metrics:metrics-json, 3.1.0
 - jar io.dropwizard.metrics:metrics-jvm, 3.1.0
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.4.5
-signing_key: 
+signing_key:
 specification_version: 4
 summary: rack middleware to expose leafy metrics/health data and more
 test_files: []
+has_rdoc: