heroscale 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,3 @@
 source :rubygems
 
-gem "rake"
 gemspec

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    heroscale (0.0.1)
-      rack (~> 1.0)
+    heroscale (0.0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    rack (1.2.1)
+    json (1.4.6)
     rake (0.8.7)
     rspec (2.1.0)
       rspec-core (~> 2.1.0)
@@ -24,6 +23,6 @@ PLATFORMS
 
 DEPENDENCIES
   heroscale!
-  rack (~> 1.0)
-  rake
+  json
+  rake (~> 0.8.7)
   rspec (~> 2.0)

data/Rakefile

@@ -39,5 +39,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-
 task :default => :spec

data/heroscale.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = "heroscale"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.authors = ["Jacques Crocker"]
   s.summary = "Autoscale your heroku app"
-  s.description = "This rack middleware that allows easy external querying of your heroku's app queue depth"
+  s.description = "Rack middleware that allows easy external querying of your heroku's app queue depth"
 
   s.email = "railsjedi@gmail.com"
   s.homepage = "http://github.com/railsjedi/heroscale"
@@ -27,8 +27,9 @@ Gem::Specification.new do |s|
     "README.md"
   ]
 
-  s.add_runtime_dependency 'rack', '~> 1.0'
+  s.add_development_dependency "json"
   s.add_development_dependency "rspec", "~> 2.0"
+  s.add_development_dependency 'rake',      '~> 0.8.7'
 end
 
 

data/lib/heroscale/middleware.rb

@@ -0,0 +1,29 @@
+module Heroscale
+
+  # simple Rack Middleware that adds a hook to return the heroku env info
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      if env["PATH_INFO"] == "/heroscale/status"
+        queue_wait_time = env['HTTP_X_HEROKU_QUEUE_WAIT_TIME']
+        queue_depth = env['HTTP_X_HEROKU_QUEUE_DEPTH']
+        dynos_in_use = env['HTTP_X_HEROKU_DYNOS_IN_USE']
+
+        if queue_wait_time and queue_depth and dynos_in_use
+          # format the response on heroku
+          res = %|{"heroku": true, "queue_wait_time": #{queue_wait_time.to_i}, "queue_depth": #{queue_depth.to_i}, "dynos_in_use": #{dynos_in_use.to_i}}|
+        else
+          res = %|{"heroku": false}|
+        end
+
+        [ 200, {'Content-Type' => 'application/json'}, res]
+      else
+        @app.call(env)
+      end
+    end
+
+  end
+end

data/lib/heroscale.rb

@@ -0,0 +1,2 @@
+require 'heroscale/middleware'
+require 'heroscale/railtie' if defined?(Rails::Railtie)

data/spec/heroscale/middleware_spec.rb

@@ -0,0 +1,74 @@
+require "spec_helper"
+require "heroscale"
+
+require "json"
+
+describe Heroscale::Middleware do
+
+  # this is our original app (that the middleware is wrapping around)
+  let(:orig_app) do
+    lambda do |env|
+      [ 200, {'Content-Type' => 'application/json'}, "HELLO!"]
+    end
+  end
+
+  # this is our app with the middleware attached
+  let(:app) do
+    Heroscale::Middleware.new orig_app
+  end
+
+  def heroku_request(opts = {})
+    app.call({
+      'PATH_INFO' => '/heroscale/status',
+      'HTTP_X_HEROKU_QUEUE_WAIT_TIME' => (opts[:wait] || 100),
+      'HTTP_X_HEROKU_QUEUE_DEPTH' => (opts[:depth] || 0),
+      'HTTP_X_HEROKU_DYNOS_IN_USE' => (opts[:dynos] || 1)
+    })
+  end
+
+  context "when querying on a heroku instance" do
+    before(:each) do
+      @rack_response = heroku_request(:wait => 100, :depth => 5, :dynos => 12)
+      @json = JSON.parse(@rack_response.last)
+    end
+
+    it "should return the 'heroku' field that tells that we're on heroku" do
+      @json["heroku"].should == true
+    end
+
+    it "should return the 'queue_wait_time' field that tells us the queue wait time" do
+      @json["queue_wait_time"].should == 100
+    end
+
+    it "should return the 'queue_depth' field that tells us the current queue depth" do
+      @json["queue_depth"].should == 5
+    end
+
+    it "should return the 'dynos_in_use' field that tells us the current heroku dynos in use" do
+      @json["dynos_in_use"].should == 12
+    end
+
+  end
+
+  context "when not quering the status link" do
+    it "should return the original app's response" do
+      app.call({}).last.should == "HELLO!"
+      app.call({"PATH_INFO" => "/"}).last.should == "HELLO!"
+      app.call({"PATH_INFO" => "/heroscale/"}).last.should == "HELLO!"
+      app.call({"PATH_INFO" => "/heroscale/status2"}).last.should == "HELLO!"
+    end
+
+  end
+
+  context "when query while not on a heroku instance" do
+    before(:each) do
+      @rack_response = app.call({"PATH_INFO" => "/heroscale/status"})
+      @json = JSON.parse(@rack_response.last)
+    end
+
+    it "should return the 'heroku' field telling use we're not on heroku" do
+      @json["heroku"].should == false
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'bundler/setup'
+require "rspec"
+
+$:.unshift "lib"
+
+Rspec.configure do |config|
+  config.color_enabled = true
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -14,21 +14,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-13 00:00:00 -08:00
+date: 2010-11-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: json
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 0
-        version: "1.0"
-  type: :runtime
+        version: "0"
+  type: :development
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,7 +44,22 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id002
-description: This rack middleware that allows easy external querying of your heroku's app queue depth
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+description: Rack middleware that allows easy external querying of your heroku's app queue depth
 email: railsjedi@gmail.com
 executables: []
 
@@ -55,6 +69,11 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- lib/heroscale/middleware.rb
+- lib/heroscale/railtie.rb
+- lib/heroscale.rb
+- spec/heroscale/middleware_spec.rb
+- spec/spec_helper.rb
 - heroscale.gemspec
 - Gemfile
 - Gemfile.lock
@@ -75,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 176599757990332131
+      hash: -2259297854901398522
       segments: 
       - 0
       version: "0"
@@ -84,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 176599757990332131
+      hash: -2259297854901398522
       segments: 
       - 0
       version: "0"
@@ -95,5 +114,6 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Autoscale your heroku app
-test_files: []
-
+test_files: 
+- spec/heroscale/middleware_spec.rb
+- spec/spec_helper.rb