RubyGems - rails-pulse - Versions diffs - 0.4.7 → 0.5.0 - Mend

rails-pulse 0.4.7 → 0.5.0

Files changed (5) hide show

data/README.textile CHANGED Viewed

@@ -6,11 +6,12 @@ h3. Authors
 * "Paul Gross":http://www.prgs.net
 * "Jesse Newland":http://jnewland.com
+* "Josh Nichols":http://technicalpickles.com
 h2. Requirements
 * Rails
-* MySQL, Postgres, or Oracle. sqlite not supported, sorry.
+* MySQL, Postgres, or sqlite
 h2. Installation
@@ -28,7 +29,9 @@ In your @config/routes.rb@:
 <pre>
   <code>
-    pulse '/my/pulse/url'
+    pulse
+    # or customize the URL
+    pulse '/admin/pulse'
   </code>
 </pre>
@@ -56,7 +59,9 @@ Finally, add a route to config/routes.rb:
 <pre>
   <code>
-    map.pulse 'pulse'
+    map.pulse
+    # or customize the URL
+    map.pulse '/admin/pulse'
   </code>
 </pre>
@@ -124,4 +129,4 @@ For a complete god configuration example, check out my "god_examples project":ht
 h2. License
-Released under "Ruby's license":http://www.ruby-lang.org/en/LICENSE.txt
+Released under "Ruby's license":http://www.ruby-lang.org/en/LICENSE.txt

data/lib/pulse/controller.rb CHANGED Viewed

@@ -1,25 +1,78 @@
 class PulseController < ActionController::Base
   session :off unless Rails::VERSION::STRING >= "2.3"
-  # we don't need pulse cluttering up our new relic stats
-  newrelic_ignore if respond_to?(:newrelic_ignore)
-  #The pulse action. Runs <tt>select 1</tt> on the DB. If a sane result is
-  #returned, 'OK' is displayed and a 200 response code is returned. If not,
-  #'ERROR' is returned along with a 500 response code.
+  # The pulse action. Runs <tt>select 1</tt> on the DB. If a sane result is
+  # returned, 'OK' is displayed and a 200 response code is returned. If not,
+  # 'ERROR' is returned along with a 500 response code.
   def pulse
-    if (ActiveRecord::Base::connection_pool.spec.adapter_method =~ /mysql2/) &&
-      ((ActiveRecord::Base.connection.execute("select 1 from dual").count rescue 0) == 1)
-      render :text => "<html><body>OK  #{Time.now.utc.to_s(:db)}</body></html>"
-    elsif (ActiveRecord::Base.connection.execute("select 1 from dual").num_rows rescue 0) == 1
-      render :text => "<html><body>OK  #{Time.now.utc.to_s(:db)}</body></html>"
+    adapter = ActiveRecord::Base::connection_pool.spec.config[:adapter]
+    health_method = "#{adapter}_healthy?"
+    activerecord_okay = if respond_to?(health_method)
+                          send(health_method)
+                        else
+                          raise "Don't know how to check #{adapter}... please to fix?"
+                        end
+    if activerecord_okay
+      render :text => okay_response
     else
-      render :text => '<html><body>ERROR</body></html>', :status => :internal_server_error
+      render :text => error_response, :status => :internal_server_error
     end
   end
-  #cancel out loggin for the PulseController by defining logger as <tt>nil</tt>
+  protected
+  # cancel out loggin for the PulseController by defining logger as <tt>nil</tt>
   def logger
     nil
   end
+  def sqlite3_healthy?
+    select_one_count == 1
+  end
+  def mysql_healthy?
+    select_one_from_dual_num_rows == 1
+  end
+  def mysql2_healthy?
+    select_one_from_dual_count == 1
+  end
+  def postgresql_healthy?
+    select_one_count == 1
+  end
+  def select_one_count
+    count = begin
+              ActiveRecord::Base.connection.execute("select 1").count
+            rescue
+              0
+            end
+  end
+  def select_one_from_dual_count
+    begin
+      ActiveRecord::Base.connection.execute("select 1 from dual").count
+    rescue
+      0
+    end
+  end
+  def select_one_from_dual_num_rows
+    begin
+      ActiveRecord::Base.connection.execute("select 1 from dual").num_rows
+    rescue
+      0
+    end
+  end
+  def okay_response
+    "<html><body>OK  #{Time.now.utc.to_s(:db)}</body></html>"
+  end
+  def error_response
+    '<html><body>ERROR</body></html>'
+  end
 end

data/lib/pulse/helper.rb CHANGED Viewed

@@ -1,2 +1,4 @@
+# some versions of Rails expect there to be a helper for each controller
+# soooo... fake it out
 module PulseHelper
 end

data/lib/pulse/routes.rb CHANGED Viewed

@@ -1,16 +1,17 @@
 module Pulse
   module Routes
-    def pulse(path)
+    def pulse(path = nil)
+      path ||= "/pulse"
       if Rails::VERSION::MAJOR == 2
         connect path, :controller => 'pulse', :action => 'pulse'
       else
-        match path => "pulse#pulse"
+        get path => 'pulse#pulse'
       end
     end
   end
 end
-if Rails::VERSION::MAJOR == 3
+if Rails::VERSION::MAJOR > 2
   ActionDispatch::Routing::Mapper.send :include, Pulse::Routes
 else # fallback to 2.x stuff
   ActionController::Routing::RouteSet::Mapper.send :include, Pulse::Routes

metadata CHANGED Viewed

@@ -1,51 +1,45 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: rails-pulse
-version: !ruby/object:Gem::Version
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease:
-  segments:
-  - 0
-  - 4
-  - 7
-  version: 0.4.7
 platform: ruby
-authors:
+authors:
 - Paul Gross
 - Jesse Newland
 - Josh Goebel
 - Will Farrington
+- Josh Nichols
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00 -05:00
-default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2013-04-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: |-
-  Adds a pulse URL that pings the DB to a Rails app.
-  This is the maintained version of the `pulse` gem.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'Adds a pulse URL that pings the DB to a Rails app.
+  This is the maintained version of the `pulse` gem.'
 email: jnewland@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files:
 - README.textile
-files:
+files:
 - README.textile
 - lib/pulse/controller.rb
 - lib/pulse/helper.rb
@@ -54,41 +48,32 @@ files:
 - spec/pulse_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: false
 homepage: http://github.com/jnewland/pulse
 licenses: []
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key:
 specification_version: 3
 summary: Adds a pulse URL that pings the DB to a Rails app.
-test_files:
+test_files:
 - spec/pulse_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: false