rack-ecg 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f59a0b33808baa8d2e2e9fce089e2cfdf03668c
-  data.tar.gz: 3cc238f62ea9afc55dccea25814b24aecc9975aa
+  metadata.gz: 6e69b8b06f6e9447931c2dd5f6a709153fc05054
+  data.tar.gz: 7fd824b68af2e6db167af65b7518004c1c7aabce
 SHA512:
-  metadata.gz: f122cef317b2d199fe20075495826a9581af55042addceb61e7ce3f9a32ffb92f3a566590e4b2afa33ee78ca00da9b624265ae9fa1d06363066edb452da64944
-  data.tar.gz: 2cf179f722e4024aaf52c3a5c10d676e083a88c4a1b5b5fdc3b6cd63ed5ec9b7c5cf85f384bc35504a95aed0e085e73335638514c1d9b2aae3848728c36622d4
+  metadata.gz: 80b858e5dbf7874a6db6d70361c7f8c5726b515113e3bece707c9c857ed70d0d14448ee640899433f7bc4206458cb418b23b03b66d72e32b18c2b5a347c2bcc8
+  data.tar.gz: 6fa5476c8cba27af405f0c648be87843d79c89f166328ca0b8b15368f3d8cb1b8c3fda15ddc0c850e8d5b66711635c1ca02193001e5cd514fe43074599f8582d

data/.travis.yml

@@ -1,15 +1,28 @@
 language: ruby
+sudo: false
+cache: bundler
+
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.1
+  - 2.0
+  - 2.1
+  - 2.2.5
+  - 2.3.1
   - ruby-head
   - jruby
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/b627d6a74f88be59d0b9
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false - rbx-2
+
+gemfile:
+  - Gemfile
+  - gemfiles/rack_v1.gemfile
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby
+  exclude:
+    - rvm: 1.9.3
+      gemfile: Gemfile
+    - rvm: 2.0
+      gemfile: Gemfile
+    - rvm: 2.1
+      gemfile: Gemfile

data/README.md

@@ -145,7 +145,13 @@ migrations stored in `schema_versions` table
 
 ## Maintainers
 
+- [Tao Guo](https://github.com/taoza)
+- [Warren Seen](https://github.com/warrenseen)
+
+## Authors
+
 - [Julian Doherty](https://github.com/madlep)
+- [Warren Seen](https://github.com/warrenseen)
 
 ## License
 
@@ -168,4 +174,17 @@ For bug fixes, documentation changes, and small features:
 4. Push to the branch (git push origin my-new-feature)
 5. Create a new Pull Request
 
-For larger new features: Do everything as above, but first also make contact with the project maintainers to be sure your change fits with the project direction and you won't be wasting effort going in the wrong direction
+For larger new features: Do everything as above, but first also make contact with the project maintainers to be sure your change fits with the project direction and you won't be wasting effort going in the wrong direction.
+
+## About
+
+This project is maintained by the [Envato engineering team][webuild] and funded by [Envato][envato]. 
+
+[<img src="http://opensource.envato.com/images/envato-oss-readme-logo.png" alt="Envato logo">][envato]
+
+Encouraging the use and creation of open source software is one of the ways we serve our community. See [our other projects][oss] or [come work with us][careers] where you'll find an incredibly diverse, intelligent and capable group of people who help make our company succeed and make our workplace fun, friendly and happy.
+
+  [webuild]: http://webuild.envato.com?utm_source=github
+  [envato]: https://envato.com?utm_source=github
+  [oss]: http://opensource.envato.com//?utm_source=github
+  [careers]: http://careers.envato.com/?utm_source=github

data/gemfiles/rack_v1.gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rack', '< 2'
+gemspec path: '../'

data/lib/rack/ecg.rb

@@ -15,6 +15,8 @@ module Rack
       @check_classes = build_check_classes(check_names)
 
       @at = options.delete(:at) || DEFAULT_MOUNT_AT
+
+      @hook = options.delete(:hook)
     end
 
     def call(env)
@@ -25,7 +27,11 @@ module Rack
           results.merge(check.result.to_json)
         }
 
-        response_status = check_results.any?{|check| check[1][:status] == "error" } ? 500 : 200
+        success = check_results.none? { |check| check[1][:status] == "error" } 
+
+        response_status = success ? 200 : 500
+
+        @hook.call(success, check_results) if @hook
 
         response_headers = {
           "X-Rack-ECG-Version"  => Rack::ECG::VERSION,

data/lib/rack/ecg/check/migration_version.rb

@@ -8,9 +8,7 @@ module Rack
           begin
             if defined?(ActiveRecord)
               connection = ActiveRecord::Base.connection
-              result_set = connection.execute("select max(version) as version from schema_migrations")
-              version = result_set.first
-              value = version["version"]
+              value = connection.select_value("select max(version) from schema_migrations")
             else
               status = "error"
               value = "ActiveRecord not found"

data/lib/rack/ecg/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class ECG
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/rack_middleware_spec.rb

@@ -70,6 +70,22 @@ RSpec.describe "when used as middleware" do
       end
     end
 
+    context "when hook config option is set" do
+      let(:hook_proc) { instance_double(Proc) }
+      let(:options) {
+        { hook: hook_proc, checks: :error }
+      }
+
+      it "executes the hook proc with success status and check results as params" do
+        expect(hook_proc).to receive(:call) do |success, check_results|
+          expect(success).to be_falsey
+          expect(check_results).to have_key(:error)
+        end
+        get "_ecg"
+        expect(last_response.status).to eq(500)
+      end
+    end
+
     context "git revision" do
       let(:options) {
         { checks: [:git_revision] }
@@ -124,9 +140,9 @@ RSpec.describe "when used as middleware" do
           version = "123456"
           connection = double("connection")
           expect(ActiveRecord::Base).to receive(:connection).and_return(connection)
-          expect(connection).to receive(:execute).
-            with("select max(version) as version from schema_migrations").
-            and_return([{"version" => version}])
+          expect(connection).to receive(:select_value).
+            with("select max(version) from schema_migrations").
+            and_return(version)
           get "/_ecg"
           expect(json_body["migration_version"]["status"]).to eq("ok")
           expect(json_body["migration_version"]["value"]).to eq(version)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-ecg
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Envato
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -116,6 +116,7 @@ files:
 - examples/checks.ru
 - examples/mounted_path.ru
 - examples/stand_alone.ru
+- gemfiles/rack_v1.gemfile
 - lib/rack-ecg.rb
 - lib/rack/ecg.rb
 - lib/rack/ecg/check.rb
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Rack middleware serving a health check page