health_check 0.2.2 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.4

data/health_check.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{health_check}
-  s.version = "0.2.2"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian Heggie"]
-  s.date = %q{2011-11-15}
+  s.date = %q{2011-11-16}
   s.description = %q{Simple health check of Rails app for use with uptime monitoring sites}
   s.email = %q{ian@heggie.biz}
   s.extra_rdoc_files = [
@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
      "init.rb",
      "config/routes.rb",
      "lib/health_check.rb",
-     "lib/health_check/add_routes.rb",
+     "lib/health_check/add_23_routes.rb",
+     "lib/health_check/add_3x_routes.rb",
      "lib/health_check/health_check_class.rb",
      "lib/health_check/health_check_controller.rb",
      "test/helper.rb",
@@ -40,7 +41,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Simple health check of Rails app}
+  s.summary = %q{Simple health check of Rails app for use with uptime monitoring sites}
   s.test_files = [
     "test/helper.rb",
      "test/migrate/twelve/012_create_users.rb",

data/init.rb

@@ -1 +1,2 @@
-require 'health_check'
+require 'health_check'
+

data/lib/health_check/add_23_routes.rb

@@ -0,0 +1,17 @@
+# rails prior to 3.0
+module ActionController
+  module Routing #:nodoc:
+    class RouteSet #:nodoc:
+      alias_method :draw_without_health_check_routes, :draw
+      def draw
+	draw_without_health_check_routes do |map|
+	  map.connect 'health_check',
+	    :controller => 'health_check', :action => 'index'
+	  map.connect 'health_check/:checks',
+	    :controller => 'health_check', :action => 'check'
+	  yield map
+	end
+      end
+    end
+  end
+end

data/lib/health_check/add_3x_routes.rb

@@ -0,0 +1,13 @@
+if defined?(Rails) and Rails.respond_to?(:version) && Rails.version =~ /^3/
+  if defined? Rails31
+    Rails31::Application.routes.draw do
+      match 'health_check', :to => 'health_check#index'
+      match 'health_check/:checks', :to => 'health_check#check'
+    end
+  else
+    Rails.application.routes.draw do |map|
+      match 'health_check', :to => 'health_check#index'
+      match 'health_check/:checks', :to => 'health_check#check'
+    end
+  end
+end

data/lib/health_check.rb

@@ -1,3 +1,8 @@
 require 'health_check/health_check_class'
 require 'health_check/health_check_controller'
-require 'health_check/add_routes'
+if defined?(Rails) and Rails.respond_to?(:version) && Rails.version =~ /^3/
+  require 'health_check/add_3x_routes'
+else
+  require 'health_check/add_23_routes'
+end
+

data/test/helper.rb

@@ -11,25 +11,6 @@ if File.exists?(environment_file)
 else
   #tests as gem
   fail "TODO: Work out how to test as a gem (test as a plugin instead)"
-  # TODO: Work out how to do this!
-  #require 'rails/version'
-  #Rails.root = "test" unless defined?(Rails.root)
-  #module Rails
-  #  def backtrace_cleaner(args)
-  #    # do nothing
-  #  end
-  #end
-
-  #require 'active_support'
-  #require 'action_controller'
-  #require 'action_controller/base'
-  ##require 'action_controller/test_case'
-  #require 'action_view'
-  #require 'active_record'
-  ##require 'active_support/backtrace_cleaner'
-  ##require 'rails/backtrace_cleaner'
-
-  #require 'test_help'
 end
 
 
@@ -48,7 +29,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 # plugin init
 require File.join(File.dirname(__FILE__), '..', 'init')
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:", :database => 'health_test_test')
 
 EXAMPLE_SMTP_SETTINGS = {
   :address => "smtp.gmail.com",

data/test/test_routes.rb

@@ -3,8 +3,14 @@ require 'helper'
 class RoutingTest < Test::Unit::TestCase
 
   def setup
-    ActionController::Routing::Routes.draw do |map|
-       # do nothing - routes should be added automatically
+    if defined?(Rails) and defined?(Rails.application) and Rails.application.routes
+      Rails.application.routes.draw do |map|
+	 # do nothing - routes should be added automatically
+      end
+    else
+      ActionController::Routing::Routes.draw do |map|
+	 # do nothing - routes should be added automatically
+      end
     end
   end
 
@@ -23,10 +29,14 @@ class RoutingTest < Test::Unit::TestCase
   # tries to instantiate the controller) and because it uses an awkward
   # parameter order.
   def assert_recognition(method, path, options)
-    result = ActionController::Routing::Routes.recognize_path(path, :method => method)
+    if defined?(Rails) and defined?(Rails.application) and Rails.application.routes
+      result = Rails.application.routes.recognize_path(path, :method => method)
+    else
+      result = ActionController::Routing::Routes.recognize_path(path, :method => method)
+    end
     assert_equal options, result
   end
 
   # with Thanks to http://izumi.plan99.net/manuals/creating_plugins-8f53e4d6.html
 
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: health_check
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Ian Heggie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-15 00:00:00 Z
+date: 2011-11-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -81,7 +81,8 @@ files:
 - init.rb
 - config/routes.rb
 - lib/health_check.rb
-- lib/health_check/add_routes.rb
+- lib/health_check/add_23_routes.rb
+- lib/health_check/add_3x_routes.rb
 - lib/health_check/health_check_class.rb
 - lib/health_check/health_check_controller.rb
 - test/helper.rb
@@ -122,7 +123,7 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Simple health check of Rails app
+summary: Simple health check of Rails app for use with uptime monitoring sites
 test_files: 
 - test/helper.rb
 - test/migrate/twelve/012_create_users.rb

data/lib/health_check/add_routes.rb

@@ -1,20 +0,0 @@
-# rails 3.x routes defined in config/routes.rb
-unless defined?(Rails) and Rails.respond_to?(:version) && Rails.version =~ /^3/
-  # rails prior to 3.0
-  module ActionController
-    module Routing #:nodoc:
-      class RouteSet #:nodoc:
-	alias_method :draw_without_health_check_routes, :draw
-	def draw
-	  draw_without_health_check_routes do |map|
-	    map.connect 'health_check',
-	      :controller => 'health_check', :action => 'index'
-	    map.connect 'health_check/:checks',
-	      :controller => 'health_check', :action => 'check'
-	    yield map
-	  end
-	end
-      end
-    end
-  end
-end