racknga 0.9.0 → 0.9.1

data/munin/plugins/passenger_status

@@ -0,0 +1,141 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#%# family=auto
+#%# capabilities=autoconf
+
+require 'rubygems'
+
+mode = ARGV[0]
+
+def passenger_status_path(gem_path)
+  File.join(gem_path, "bin", "passenger-status")
+end
+
+@label = ENV["label"]
+@pid_file = ENV["pid_file"]
+@ruby = ENV["ruby"] || Gem.ruby
+@gem_path = ((ENV["GEM_HOME"] || '').split(/:/) + Gem.path).find do |path|
+  File.exist?(passenger_status_path(path))
+end
+
+def passenger_status
+  if @pid_file
+    unless File.readable?(@pid_file)
+      return [false, "PID file isn't readable: #{@pid_file}"]
+    end
+    pid = File.read(@pid_file).strip
+  else
+    pid = nil
+  end
+  result = `#{@ruby} #{passenger_status_path(@gem_path)} #{pid}`
+  [$?.success?, result]
+end
+
+def parse_result(result)
+  sections = {}
+  section = nil
+  result.each_line do |line|
+    case section
+    when "General information"
+      case line.chomp
+      when /\A(\S+)\s*=\s*(\d+)\z/
+        key = $1
+        value = $2.to_i
+        sections[section] << {:key => key, :label => key, :value => value}
+      when /\A(Waiting on global queue):\s*(\d+)\z/
+        label = $1
+        value = $2.to_i
+        sections[section] << {:key => "global_queue",
+                              :label => label,
+                              :value => value}
+      end
+    else
+      if /-+\s+(.+)\s+-+/ =~ line
+        section = $1
+        sections[section] = []
+      end
+    end
+  end
+  sections
+end
+
+def config
+  success, result = passenger_status
+  unless success
+    puts result
+    exit(false)
+  end
+
+  if @label
+    title = "Passenger: #{@label}: status"
+  else
+    title = "Passenger: status"
+  end
+  sections = parse_result(result)
+  puts(<<-EOC)
+graph_title #{title}
+graph_category passenger
+graph_info Passenger status
+graph_vlabel number of processes
+
+EOC
+  have_stack_base = false
+  sections["General information"].each do |attributes|
+    key = attributes[:key]
+    next if key == "count"
+    puts("#{key}.label #{attributes[:label]}")
+    case key
+    when "max", "global_queue"
+      draw = "LINE2"
+    else
+      if have_stack_base
+        draw = "STACK"
+      else
+        draw = "AREA"
+        have_stack_base = true
+      end
+    end
+    puts("#{attributes[:key]}.draw #{draw}")
+  end
+end
+
+def report
+  success, result = passenger_status
+  exit(false) unless success
+
+  sections = parse_result(result)
+  sections["General information"].each do |attributes|
+    puts("#{attributes[:key]}.value #{attributes[:value]}")
+  end
+end
+
+case mode
+when "auto", "autoconf", "detect"
+  success, result = passenger_status
+  if success
+    puts "yes"
+    exit(true)
+  else
+    puts "no (#{result})"
+    exit(false)
+  end
+when "config"
+  config
+else
+  report
+end

data/test/racknga-test-utils.rb

@@ -0,0 +1,42 @@
+# Copyright (C) 2010  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
+
+require 'rubygems'
+
+require 'rack/test'
+require 'webrat'
+require 'json'
+
+require 'racknga'
+require 'racknga/middleware/cache'
+
+Webrat.configure do |config|
+  config.mode = :rack
+end
+
+module RackngaTestUtils
+  include Rack::Test::Methods
+  include Webrat::Methods
+  include Webrat::Matchers
+
+  def fixtures_dir
+    Pathname(__FILE__).dirname + "fixtures"
+  end
+
+  def response
+    webrat_session.response
+  end
+end

data/test/run-test.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2010  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
+
+$VERBOSE = true
+
+$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 'test/unit'
+
+# ARGV.unshift("--priority-mode")
+
+$LOAD_PATH.unshift(rroonga_ext_dir.to_s)
+$LOAD_PATH.unshift(rroonga_lib_dir.to_s)
+$LOAD_PATH.unshift(lib_dir.to_s)
+
+$LOAD_PATH.unshift(test_dir.to_s)
+require 'racknga-test-utils'
+
+Dir.glob("#{test_dir}/**/test{_,-}*.rb") do |file|
+  require file.sub(/\.rb$/, '')
+end
+
+exit Test::Unit::AutoRunner.run(false)

data/test/test-middleware-jsonp.rb

@@ -0,0 +1,78 @@
+# Copyright (C) 2010  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 MiddlewareJSONPTest < Test::Unit::TestCase
+  include RackngaTestUtils
+
+  def app
+    application = Proc.new do |environment|
+      @environment = environment
+      [200,
+       {"Content-Type" => "application/json"},
+       [@body]]
+    end
+    jsonp = Racknga::Middleware::JSONP.new(application)
+    Proc.new do |environment|
+      environment = @update_environment.call(environment) if @update_environment
+      jsonp.call(environment)
+    end
+  end
+
+  def setup
+    @cache_key_key = "racknga.cache.key"
+    @environment = nil
+    @body = "{}"
+    @update_environment = nil
+  end
+
+  def test_no_jsonp
+    get "/"
+    assert_equal(@body, webrat_session.response.body)
+  end
+
+  def test_jsonp
+    get "/?callback=jsonp_callback"
+    assert_equal("jsonp_callback(#{@body});",
+                 webrat_session.response.body)
+  end
+
+  def test_no_jsonp_cache_key
+    get "/"
+    assert_nil(@environment[@cache_key_key])
+  end
+
+  def test_jsonp_cache_key
+    get "/?callback=jsonp_callback"
+    assert_equal("/",
+                 @environment[@cache_key_key])
+  end
+
+  def test_jsonp_cache_key_with_parameters
+    get "/?query=ruby&callback=jsonp_callback&_=1279288762"
+    assert_equal("/?query=ruby",
+                 @environment[@cache_key_key])
+  end
+
+  def test_jsonp_cache_key_exist
+    @update_environment = Proc.new do |environment|
+      environment[@cache_key_key] = "pc"
+      environment
+    end
+    get "/?callback=jsonp_callback"
+    assert_equal("pc:/",
+                 @environment[@cache_key_key])
+  end
+end

data/test/test-middleware-range.rb

@@ -0,0 +1,160 @@
+# Copyright (C) 2010  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
+
+module MiddlewareRangeTests
+  include RackngaTestUtils
+
+  def app
+    application = Proc.new do |environment|
+      @environment = environment
+      [200,
+       {
+         "Content-Type" => "video/ogv",
+         "Content-Length" => @body.bytesize.to_s,
+         "Last-Modified" => @ogv.mtime.httpdate,
+         "ETag" => @etag,
+       },
+       application_body]
+    end
+    Racknga::Middleware::Range.new(application)
+  end
+
+  def setup
+    @ogv = fixtures_dir + "rabbit-theme-change.ogv"
+    @ogv.open("rb") do |file|
+      @body = file.read.force_encoding("ASCII-8BIT")
+    end
+    stat = @ogv.stat
+    @etag = "%x-%x-%x" % [stat.ino, stat.size, stat.mtime.to_i * 1_000_000]
+  end
+
+  def test_both
+    get("/", {}, {"HTTP_RANGE" => "bytes=200-499"})
+
+    assert_response(206,
+                    "300",
+                    "bytes 200-499/#{@body.bytesize}",
+                    @body[200, 300])
+  end
+
+  def test_first_byte_only
+    get("/", {}, {"HTTP_RANGE" => "bytes=200-"})
+
+    data_length = @body.bytesize
+    expected_bytes = data_length - 200
+    assert_response(206,
+                    "#{expected_bytes}",
+                    "bytes 200-#{data_length - 1}/#{data_length}",
+                    @body[200, expected_bytes])
+  end
+
+  def test_last_byte_only
+    get("/", {}, {"HTTP_RANGE" => "bytes=-200"})
+
+    data_length = @body.bytesize
+    first_byte = data_length - 200
+    assert_response(206,
+                    "200",
+                    "bytes #{first_byte}-#{data_length - 1}/#{data_length}",
+                    @body[data_length - 200, 200])
+  end
+
+  def test_no_position
+    get("/", {}, {"HTTP_RANGE" => "bytes=-"})
+
+    assert_response(416, "0", nil, "")
+  end
+
+  def test_if_range_date
+    get("/",
+        {},
+        {
+          "HTTP_RANGE" => "bytes=200-499",
+          "HTTP_IF_RANGE" => @ogv.mtime.httpdate,
+        })
+
+    data_length = @body.bytesize
+    assert_response(206, "300", "bytes 200-499/#{data_length}", @body[200, 300])
+  end
+
+  def test_if_range_date_expired
+    get("/",
+        {},
+        {
+          "HTTP_RANGE" => "bytes=200-499",
+          "HTTP_IF_RANGE" => Time.now.httpdate,
+        })
+
+    assert_response(200, "#{@body.bytesize}", nil, @body)
+  end
+
+  def test_if_range_etag
+    get("/",
+        {},
+        {
+          "HTTP_RANGE" => "bytes=200-499",
+          "HTTP_IF_RANGE" => @etag,
+        })
+
+    assert_response(206,
+                    "300",
+                    "bytes 200-499/#{@body.bytesize}",
+                    @body[200, 300])
+  end
+
+  def test_if_range_etag_expired
+    get("/",
+        {},
+        {
+          "HTTP_RANGE" => "bytes=200-499",
+          "HTTP_IF_RANGE" => "not-match-etag",
+        })
+
+    assert_response(200, "#{@body.bytesize}", nil, @body)
+  end
+
+  private
+  def assert_response(status, content_length, content_range, body)
+    assert_equal({
+                   :status => status,
+                   :content_length => content_length,
+                   :content_range => content_range,
+                   :body => body,
+                 },
+                 {
+                   :status => response.status,
+                   :content_length => response.headers["Content-Length"],
+                   :content_range => response.headers["Content-Range"],
+                   :body => response.body,
+                 })
+  end
+end
+
+class MiddlewareRangeDataTest < Test::Unit::TestCase
+  include MiddlewareRangeTests
+
+  def application_body
+    [@body]
+  end
+end
+
+class MiddlewareRangeFileTest < Test::Unit::TestCase
+  include MiddlewareRangeTests
+
+  def application_body
+    @ogv.open("rb")
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: racknga
 version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 +09:00
+date: 2010-11-11 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rroonga
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: rubyforge
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -59,14 +66,16 @@ dependencies:
   name: hoe
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 6
-        - 1
-        version: 2.6.1
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id004
 description: |
@@ -82,9 +91,9 @@ extensions: []
 
 extra_rdoc_files: 
 - NEWS.rdoc
-- README.rdoc
-- README.ja.rdoc
 - NEWS.ja.rdoc
+- README.ja.rdoc
+- README.rdoc
 files: 
 - AUTHORS
 - NEWS.ja.rdoc
@@ -97,17 +106,28 @@ files:
 - html/header.html.erb
 - lib/racknga/cache_database.rb
 - lib/racknga/exception_mail_notifier.rb
+- lib/racknga/log_database.rb
 - lib/racknga/middleware/cache.rb
 - lib/racknga/middleware/deflater.rb
 - lib/racknga/middleware/exception_notifier.rb
+- lib/racknga/middleware/jsonp.rb
+- lib/racknga/middleware/log.rb
+- lib/racknga/middleware/range.rb
 - lib/racknga/utils.rb
 - lib/racknga/version.rb
+- lib/racknga/will_paginate.rb
 - lib/racknga.rb
-- license/LGPL
+- munin/plugins/passenger_domain_
+- munin/plugins/passenger_status
+- test/fixtures/rabbit-theme-change.ogv
+- test/racknga-test-utils.rb
+- test/run-test.rb
+- test/test-middleware-jsonp.rb
+- test/test-middleware-range.rb
 has_rdoc: true
 homepage: http://groonga.rubyforge.org/
 licenses: 
-- LGPL 2.1
+- LGPL 2.1 or later
 post_install_message: 
 rdoc_options: 
 - --main
@@ -115,25 +135,29 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: groonga
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rack middlewares that uses rroonga features.
-test_files: []
-
+test_files: 
+- test/run-test.rb