webs 0.1.17 → 0.1.18

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('webs', '0.1.17') do |p|
+Echoe.new('webs', '0.1.18') do |p|
   p.description    = "Reusable webs stuff."
   p.url            = "https://colczak@github.com/websdev/websgem.git"
   p.author         = "Chuck Olczak"

data/lib/controller/alive_controller.rb

@@ -12,16 +12,13 @@ class Webs::AliveController < ActionController::Base
     # Only force down if calling from localhost
     render( :text=>'OK' ) and return unless Webs.cache
 
-    this_host = Socket.gethostname
-    key = "alive_#{this_host}"
-
-    server_down = Webs.cache.read(key)
+    server_down = fetch_server_down
     if request.local?
       if ['1', '-1'].include?( params['forceDown'] )
         server_down = '1'
-        Webs.cache.write(key, server_down)
+        set_server_down( server_down )
       elsif params['forceDown'] == '0'
-        Webs.cache.delete(key)
+        Webs.cache.delete(cache_key)
         server_down = nil
       end
     end
@@ -32,4 +29,26 @@ class Webs::AliveController < ActionController::Base
       render :text=>'OK'
     end
   end
+
+  private
+  def cache_key
+    this_host = Socket.gethostname
+    "alive_#{this_host}"
+  end
+  
+  def fetch_server_down
+    if Webs.cache.respond_to?( 'read' )
+      Webs.cache.read( cache_key )
+    else
+      Webs.cache[ cache_key ]
+    end
+  end
+  
+  def set_server_down server_down
+    if Webs.cache.respond_to?( 'write' )
+      Webs.cache.write(cache_key, server_down)
+    else
+      Webs.cache[ cache_key ] = server_down
+    end
+  end
 end

data/lib/webs.rb

@@ -7,7 +7,7 @@ require dir + 'helper/params'
 require dir + 'helper/tags'
 
 module Webs
-  VERSION = '0.1.17'.freeze
+  VERSION = '0.1.18'.freeze
 
 #  def self.load_constants
     # s = File.read("#{Pathname(__FILE__).dirname.expand_path}/config/webs_constants.yml")

data/webs.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webs}
-  s.version = "0.1.17"
+  s.version = "0.1.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 1
-    - 17
-  version: 0.1.17
+    - 18
+  version: 0.1.18
 platform: ruby
 authors: 
   - Chuck Olczak