racknga 0.9.1 → 0.9.2

data/munin/plugins/{passenger_domain_ → passenger_application_}

@@ -35,17 +35,17 @@ end
 end
 
 if @label
-  parameter_prefix = /\Apassenger_(?:#{@label}_)?domain_/
+  parameter_prefix = /\Apassenger_(?:#{@label}_)?application_/
 else
-  parameter_prefix = /\Apassenger_domain_/
+  parameter_prefix = /\Apassenger_application_/
 end
 parameter = File.basename($0).gsub(parameter_prefix, '')
 if /_(sessions|processed|uptime)\z/ =~ parameter
-  @domain = $PREMATCH
+  @application = $PREMATCH
   @type = $1
-  @domain = nil if @domain and @domain.empty?
+  @application = nil if @application and @application.empty?
 else
-  @domain = @type = nil
+  @application = @type = nil
 end
 
 def passenger_status
@@ -72,7 +72,7 @@ def parse_uptime(uptime)
   uptime_in_minutes
 end
 
-def extract_domain(path)
+def extract_application_name(path)
   components = path.split(/\//)
   ignore_components = ["current"]
   while ignore_components.include?(components.last)
@@ -84,24 +84,25 @@ end
 def parse_result(result)
   sections = {}
   section = nil
-  domain = nil
+  application_name = nil
   result.each_line do |line|
     case section
-    when "Domains"
+    when "Application groups"
       case line.chomp
       when /\A(.+):\s*\z/
         path = $1
-        domain = extract_domain(path)
-        sections[section] << [domain, []]
-      when /\A\s+PID:\s+(\d+)\s+
-                 Sessions:\s+(\d+)\s+
-                 Processed:\s+(\d+)\s+
-                 Uptime:\s+(.+)\z/x
+        application_name = extract_application_name(path)
+        sections[section] << [application_name, []]
+      when /\A\s+\*\s+
+              PID:\s+(\d+)\s+
+              Sessions:\s+(\d+)\s+
+              Processed:\s+(\d+)\s+
+              Uptime:\s+(.+)\z/x
         pid = $1.to_i
         sessions = $2.to_i
         processed = $3.to_i
         uptime = parse_uptime($4)
-        _domain, processes = sections[section].last
+        _application_name, processes = sections[section].last
         processes << {
           :pid => pid,
           :sessions => sessions,
@@ -119,6 +120,16 @@ def parse_result(result)
   sections
 end
 
+def extract_applications(result)
+  parse_result(result)["Application groups"] || []
+end
+
+def extract_application(result)
+  extract_applications(result).find do |name, processes|
+    name == @application
+  end
+end
+
 def vlabel
   case @type
   when "sessions"
@@ -139,26 +150,30 @@ def config
     exit(false)
   end
 
+  application = extract_application(result)
+  if application.nil?
+    puts("application doesn't exist: #{@application}: <\n#{result}\n>")
+    exit(false)
+  end
+
   if @label
-    title = "Passenger: #{@label}: #{@type}: #{@domain}"
+    title = "Passenger: #{@label}: #{@type}: #{@application}"
   else
-    title = "Passenger: #{@type}: #{@domain}"
+    title = "Passenger: #{@type}: #{@application}"
   end
-  sections = parse_result(result)
+
   puts(<<-EOC)
 graph_title #{title}
 graph_category passenger
-graph_info Passenger #{@domain} #{@type}
+graph_info Passenger #{@application} #{@type}
 graph_vlabel #{vlabel}
 
 EOC
-  sections["Domains"].each do |domain, processes|
-    next if domain != @domain
-    processes.sort_by do |attributes|
-      attributes[:pid]
-    end.each_with_index do |attributes, i|
-      puts("#{@type}#{i}.label #{i} (PID #{attributes[:pid]})")
-    end
+  name, processes = application
+  processes.sort_by do |attributes|
+    attributes[:pid]
+  end.each_with_index do |attributes, i|
+    puts("#{@type}#{i}.label #{i} (PID #{attributes[:pid]})")
   end
 end
 
@@ -168,15 +183,17 @@ def report
     puts result
     exit(false)
   end
+  application = extract_application(result)
+  if application.nil?
+    puts("application doesn't exist: #{@application}: <\n#{result}\n>")
+    exit(false)
+  end
 
-  sections = parse_result(result)
-  sections["Domains"].each do |domain, processes|
-    next if domain != @domain
-    processes.sort_by do |attributes|
-      attributes[:pid]
-    end.each_with_index do |attributes, i|
-      puts("#{@type}#{i}.value #{attributes[@type.to_sym]}")
-    end
+  name, processes = application
+  processes.sort_by do |attributes|
+    attributes[:pid]
+  end.each_with_index do |attributes, i|
+    puts("#{@type}#{i}.value #{attributes[@type.to_sym]}")
   end
 end
 
@@ -193,30 +210,29 @@ when "auto", "autoconf", "detect"
 when "suggest"
   success, result = passenger_status
   if success
-    sections = parse_result(result)
-    domains = sections["Domains"]
-    if domains
-      domains.each do |domain, processes|
-        puts "#{domain}_sessions"
-        puts "#{domain}_processed"
-        puts "#{domain}_uptime"
+    applications = extract_applications(result)
+    if applications.empty?
+      puts("no application: <\n#{result}\n>")
+      exit(false)
+    else
+      applications.each do |application, processes|
+        puts "#{application}_sessions"
+        puts "#{application}_processed"
+        puts "#{application}_uptime"
       end
       exit(true)
-    else
-      puts "no domain: #{result.inspect}"
-      exit(false)
     end
   else
     puts result
     exit(false)
   end
 else
-  if @domain.nil?
-    puts "no domain"
+  if @application.nil?
+    puts "no application"
     exit(false)
   end
   if @type.nil?
-    puts "no type: #{@domain}"
+    puts "no type: #{@application}"
     exit(false)
   end
   case mode

data/test/racknga-test-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2011  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,29 +14,26 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-require 'rubygems'
-
-require 'rack/test'
-require 'webrat'
+require "test/unit/capybara"
 require 'json'
 
 require 'racknga'
 require 'racknga/middleware/cache'
+require 'racknga/middleware/instance_name'
 
-Webrat.configure do |config|
-  config.mode = :rack
+Capybara.configure do |config|
+  config.default_driver = nil
+  config.current_driver = nil
 end
 
 module RackngaTestUtils
-  include Rack::Test::Methods
-  include Webrat::Methods
-  include Webrat::Matchers
+  include Capybara::DSL
 
   def fixtures_dir
     Pathname(__FILE__).dirname + "fixtures"
   end
 
-  def response
-    webrat_session.response
+  def get(*args)
+    page.driver.get(*args)
   end
 end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2011  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -23,24 +23,19 @@ $KCODE = "u" if RUBY_VERSION < "1.9"
 require 'pathname'
 
 base_dir = Pathname(__FILE__).dirname.parent.expand_path
-test_unit_dir = base_dir + "test-unit"
-test_unit_lib_dir = test_unit_dir + "lib"
 rroonga_dir = base_dir.parent + "rroonga"
 rroonga_ext_dir = rroonga_dir + "ext" + "groonga"
 rroonga_lib_dir = rroonga_dir + "lib"
 lib_dir = base_dir + "lib"
 test_dir = base_dir + "test"
 
-unless File.exist?(test_unit_dir)
-  test_unit_repository = "http://test-unit.rubyforge.org/svn/trunk/"
-  system("svn co #{test_unit_repository} #{test_unit_dir}") or exit(false)
-end
-
-$LOAD_PATH.unshift(test_unit_lib_dir.to_s)
+require "rubygems"
+require "bundler/setup"
 
 require 'test/unit'
+require 'test/unit/notify'
 
-# ARGV.unshift("--priority-mode")
+Test::Unit::Priority.enable
 
 $LOAD_PATH.unshift(rroonga_ext_dir.to_s)
 $LOAD_PATH.unshift(rroonga_lib_dir.to_s)

data/test/test-middleware-cache.rb

@@ -0,0 +1,77 @@
+# Copyright (C) 2011  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+class MiddlewareCacheTest < Test::Unit::TestCase
+  include RackngaTestUtils
+
+  def app
+    application = Proc.new do |environment|
+      @environment = environment
+      [200,
+       {"Content-Type" => "application/json"},
+       [@body]]
+    end
+    cache_options = {
+      :database_path => @database_path.to_s,
+    }
+    @cache = Racknga::Middleware::Cache.new(application, cache_options)
+    Proc.new do |environment|
+      environment = @update_environment.call(environment) if @update_environment
+      @cache.call(environment)
+    end
+  end
+
+  def setup
+    @cache_key_key = "racknga.cache.key"
+    @environment = nil
+    @body = "{}"
+    @update_environment = nil
+    setup_temporary_directory
+    @database_path = @temporary_directory + "cache/db"
+    Capybara.app = app
+  end
+
+  def setup_temporary_directory
+    @temporary_directory = Pathname.new(__FILE__).dirname + "tmp"
+    FileUtils.rm_rf(@temporary_directory)
+    FileUtils.mkdir_p(@temporary_directory)
+  end
+
+  def teardown
+    teardown_temporary_directory
+  end
+
+  def teardown_temporary_directory
+    FileUtils.rm_rf(@temporary_directory)
+  end
+
+  def test_4096_length_path
+    responses = @cache.database.responses
+    assert_equal([], responses.to_a.collect(&:key))
+    path = "/" + "x" * 4095
+    visit(path)
+    assert_equal([path], responses.to_a.collect(&:key))
+  end
+
+  def test_4096_length_over_path
+    responses = @cache.database.responses
+    assert_equal([], responses.to_a.collect(&:key))
+    path = "/" + "x" * 4096
+    visit(path)
+    assert_equal([Digest::SHA1.hexdigest(path)],
+                 responses.to_a.collect(&:key))
+  end
+end

data/test/test-middleware-instance-name.rb

@@ -0,0 +1,98 @@
+# Copyright (C) 2011  Ryo Onodera <onodera@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+class InstanceNameTest < Test::Unit::TestCase
+  include RackngaTestUtils
+
+  def test_no_option
+    server = default_instance_name.server
+    user = default_instance_name.user
+    revision = default_instance_name.revision
+
+    instance_name_options({}) do
+      request
+      assert_header("Proc (at #{revision}) on #{server} by #{user}")
+    end
+  end
+
+  def test_application_name
+    application_name = "HelloWorld"
+    server = default_instance_name.server
+    user = default_instance_name.user
+    revision = default_instance_name.revision
+
+    instance_name_options(:application_name => application_name) do
+      request
+      assert_header("#{application_name} (at #{revision}) on #{server} by #{user}")
+    end
+  end
+
+  def test_both_application_name_and_version
+    application_name = "HelloWorld"
+    version = 1
+    server = default_instance_name.server
+    user = default_instance_name.user
+    revision = default_instance_name.revision
+
+    instance_name_options(:application_name => application_name,
+                          :version => version) do
+      request
+      assert_header("#{application_name} v#{version} (at #{revision}) on #{server} by #{user}")
+    end
+  end
+
+  private
+  def prepare_rack_stack(options)
+    application = create_minimal_application
+    instance_name = create_instance_name(application, options)
+    outermost_wrapper_middleware(instance_name)
+  end
+
+  def outermost_wrapper_middleware(application)
+    Proc.new do |environment|
+      application.call(environment)
+    end
+  end
+
+  def create_instance_name(*arguments)
+    Racknga::Middleware::InstanceName.new(*arguments)
+  end
+
+  def default_instance_name
+    @default_instance_name ||= create_instance_name(create_minimal_application).freeze
+  end
+
+  def create_minimal_application
+    Proc.new do |environment|
+      [200,
+       {"Content-Type" => "text/plain"},
+       ["Hello world."]]
+    end
+  end
+
+  def request
+    get("/")
+  end
+
+  def instance_name_options(options)
+    Capybara.app = prepare_rack_stack(options)
+    yield
+  end
+
+  def assert_header(expected_header)
+    assert_equal(expected_header, page.response_headers["X-Responsed-By"])
+  end
+end

data/test/test-middleware-jsonp.rb

@@ -36,32 +36,32 @@ class MiddlewareJSONPTest < Test::Unit::TestCase
     @environment = nil
     @body = "{}"
     @update_environment = nil
+    Capybara.app = app
   end
 
   def test_no_jsonp
-    get "/"
-    assert_equal(@body, webrat_session.response.body)
+    visit("/")
+    assert_not_jsonp_response(@body)
   end
 
   def test_jsonp
-    get "/?callback=jsonp_callback"
-    assert_equal("jsonp_callback(#{@body});",
-                 webrat_session.response.body)
+    visit("/?callback=jsonp_callback")
+    assert_jsonp_response("jsonp_callback(#{@body});")
   end
 
   def test_no_jsonp_cache_key
-    get "/"
+    visit("/")
     assert_nil(@environment[@cache_key_key])
   end
 
   def test_jsonp_cache_key
-    get "/?callback=jsonp_callback"
+    visit("/?callback=jsonp_callback")
     assert_equal("/",
                  @environment[@cache_key_key])
   end
 
   def test_jsonp_cache_key_with_parameters
-    get "/?query=ruby&callback=jsonp_callback&_=1279288762"
+    visit("/?query=ruby&callback=jsonp_callback&_=1279288762")
     assert_equal("/?query=ruby",
                  @environment[@cache_key_key])
   end
@@ -71,8 +71,31 @@ class MiddlewareJSONPTest < Test::Unit::TestCase
       environment[@cache_key_key] = "pc"
       environment
     end
-    get "/?callback=jsonp_callback"
+    visit("/?callback=jsonp_callback")
     assert_equal("pc:/",
                  @environment[@cache_key_key])
   end
+
+  private
+  def assert_jsonp_response(body)
+    assert_equal({
+                   :content_type => "text/javascript",
+                   :body => body,
+                 },
+                 {
+                   :content_type => page.response_headers["Content-Type"],
+                   :body => page.source,
+                 })
+  end
+
+  def assert_not_jsonp_response(body)
+    assert_equal({
+                   :content_type => "application/json",
+                   :body => body,
+                 },
+                 {
+                   :content_type => page.response_headers["Content-Type"],
+                   :body => page.source,
+                 })
+  end
 end

data/test/test-middleware-range.rb

@@ -39,6 +39,7 @@ module MiddlewareRangeTests
     end
     stat = @ogv.stat
     @etag = "%x-%x-%x" % [stat.ino, stat.size, stat.mtime.to_i * 1_000_000]
+    Capybara.app = app
   end
 
   def test_both
@@ -135,10 +136,10 @@ module MiddlewareRangeTests
                    :body => body,
                  },
                  {
-                   :status => response.status,
-                   :content_length => response.headers["Content-Length"],
-                   :content_range => response.headers["Content-Range"],
-                   :body => response.body,
+                   :status => page.status_code,
+                   :content_length => page.response_headers["Content-Length"],
+                   :content_range => page.response_headers["Content-Range"],
+                   :body => page.source,
                  })
   end
 end