jetty-rackup 7.0.0 → 7.1.0

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in jetty-rackup.gemspec
+gemspec

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,6 @@
-Copyright (c) 2010 Jason Rogers
+Copyright (c) 2013 Vladimir Dobriakov and the contributors
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -19,8 +19,9 @@ So here is the solution:
 * write your Rack based application as usual
 * create a rackup script `config.ru` as usual; there is more information in
   the official tutorial
-  <http://wiki.github.com/rack/rack/tutorial-rackup-howto>
-* install jetty-rackup (this project), e.g. 
+  <https://github.com/rack/rack/wiki/(tutorial)-rackup-howto>
+* install jetty-rackup (this project), e.g.
+  `gem install jetty-rackup` or
   `git clone git://github.com/geekq/jetty-rackup.git`
 * from your application folder run `jetty-rackup`. You can also provide
   a path to non-standard rackup-script and the desired port
@@ -35,7 +36,7 @@ Example
 
     #\ -p 8765
     require 'rubygems'
-    gem 'sinatra', '~> 0.9.4'
+    gem 'sinatra', '>= 1.0.0'
     require './my_app.rb'
     set :run, false # disable built-in sinatra web server
     set :environment, :development
@@ -61,14 +62,23 @@ FAQ
 
     jruby -J-Xmx2048m  /usr/local/lib/jetty-rackup/jetty-rackup config.ru
 
-TODO
+Tests
 ----
 
-Tests ;-)
+There are no automated tests for jetty-rackup. But there are some
+example applications with rackup configuration. Just cd to the
+particular example directory and run. E.g.
+
+    cd examples/just_ruby/
+    jetty-rackup
+    firefox http://localhost:9292/stranger
+
+jetty-rackup uses `config.ru` file from the current directory by
+default.
 
 See also
 --------
-For Rails deployment you may prefer jetty-rails 
+For Rails deployment you may prefer jetty-rails
 <http://jetty-rails.rubyforge.org/>
 
 
@@ -76,14 +86,16 @@ Copyright
 ---------
 (c) 2009 Vodafone Group Services GmbH
 
+(c) 2013 Vladimir Dobriakov
+
 
 Author
 ------
 Vladimir Dobriakov
 <http://blog.geekq.net>, <http://www.mobile-web-consulting.de>
 
-With contributions by [Leandro Silva](http://leandrosilva.com.br/) and
-Jason Rogers.
+With contributions by [Leandro Silva](http://leandrosilva.com.br/),
+Jason Rogers and erdeszt.
 
 Further Credits
 ---------------

data/Rakefile

@@ -1,53 +1 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "jetty-rackup"
-    gem.summary = %Q{Rack + Jetty = Retty}
-    gem.description = %Q{Runs a rack conform application inside jetty web server}
-    gem.email = "vladimir@geekq.net"
-    gem.homepage = "http://github.com/geekq/jetty-rackup"
-    gem.authors = ["Vladimir Dobriakov", "Leandro Silva", "Jason Rogers"]
-    # gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "jetty-rackup #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"

data/examples/issue4_handle400/app.rb

@@ -0,0 +1,16 @@
+# See also the pull request https://github.com/geekq/jetty-rackup/pull/4
+
+# This example does not work with jruby-rack-1.1.2 but works with jruby-rack-1.1.12
+# Returns Error 354 in Chrome (net::ERR_CONTENT_LENGTH_MISMATCH)
+require 'sinatra/base'
+
+class TestIssue4 < Sinatra::Base
+  get '/' do
+    halt 400, 'test'
+  end
+
+  get '/works' do
+    'Always works'
+  end
+end
+

data/examples/issue4_handle400/config.ru

@@ -0,0 +1,6 @@
+require 'rubygems'
+require './app'
+
+TestIssue4.set :environment, :development
+
+run TestIssue4

data/jetty-rackup.gemspec

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'jetty-rackup/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "jetty-rackup"
+  gem.version       = Jetty::Rackup::VERSION
+  gem.authors       = ["Vladimir Dobriakov", "Leandro Silva", "Jason Rogers"]
+  gem.email         = ["vladimir@geekq.net"]
+  gem.description   = %q{Runs a rack conform application inside jetty web server}
+  gem.summary       = %q{Rack + Jetty = Retty}
+  gem.homepage      = %q{http://github.com/geekq/jetty-rackup}
+
+  # Order is important - put this line before all other file related directives
+  gem.files         = `git ls-files`.split($/)
+
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+
+  gem.require_paths = ["lib"]
+
+  gem.rubygems_version = %q{1.3.6}
+
+  gem.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.markdown"
+  ]
+
+  gem.add_dependency 'rack'
+
+  # bundler 1.2.3 seems to ignore the dependency defined by the following code line.
+  # So for development/testing just install sinatra with `gem install sinatra`.
+  # Or should I better put it under the :development group in the Gemfile like:
+  # gem 'sinatra', :group => :development
+  gem.add_development_dependency 'sinatra'
+
+end
+

data/lib/jetty-rackup.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env jruby
-# -*- ruby -*-
+require "jetty-rackup/version"
 
 require 'rubygems'
 require 'rack'

data/lib/jetty-rackup/server.rb

@@ -2,16 +2,16 @@ class Rack::Handler::Jetty
   def self.run(rackup_content, options={})
     Dir["#{File.dirname(__FILE__)}/../../jars/*.jar"].each { |jar| require jar }
 
-    include_class 'javax.servlet.http.HttpServlet'
-    include_class 'org.eclipse.jetty.server.Server'
-    include_class 'org.eclipse.jetty.servlet.ServletContextHandler'
-    include_class 'org.eclipse.jetty.servlet.ServletHolder'
-    include_class 'org.jruby.rack.servlet.ServletRackContext'
-    include_class 'org.eclipse.jetty.server.handler.ResourceHandler'
-    include_class 'org.eclipse.jetty.server.handler.DefaultHandler'
-    include_class 'org.eclipse.jetty.server.handler.HandlerList'
-    include_class 'org.eclipse.jetty.server.handler.ContextHandlerCollection'
-    include_class 'org.eclipse.jetty.servlet.DefaultServlet'
+    java_import 'javax.servlet.http.HttpServlet'
+    java_import 'org.eclipse.jetty.server.Server'
+    java_import 'org.eclipse.jetty.servlet.ServletContextHandler'
+    java_import 'org.eclipse.jetty.servlet.ServletHolder'
+    java_import 'org.jruby.rack.servlet.ServletRackContext'
+    java_import 'org.eclipse.jetty.server.handler.ResourceHandler'
+    java_import 'org.eclipse.jetty.server.handler.DefaultHandler'
+    java_import 'org.eclipse.jetty.server.handler.HandlerList'
+    java_import 'org.eclipse.jetty.server.handler.ContextHandlerCollection'
+    java_import 'org.eclipse.jetty.servlet.DefaultServlet'
 
     jetty = org.eclipse.jetty.server.Server.new options[:Port]
 

data/lib/jetty-rackup/version.rb

@@ -0,0 +1,5 @@
+module Jetty
+  module Rackup
+    VERSION = "7.1.0"
+  end
+end

metadata

@@ -1,40 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jetty-rackup
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 7
-  - 0
-  - 0
-  version: 7.0.0
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 7.1.0
 platform: ruby
-authors: 
+authors:
 - Vladimir Dobriakov
 - Leandro Silva
 - Jason Rogers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-01-02 00:00:00 +01:00
-default_executable: jetty-rackup
-dependencies: []
-
+date: 2012-12-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 description: Runs a rack conform application inside jetty web server
-email: vladimir@geekq.net
-executables: 
+email:
+- vladimir@geekq.net
+executables:
 - jetty-rackup
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
+extra_rdoc_files:
+- LICENSE.txt
 - README.markdown
-files: 
-- LICENSE
+files:
+- .gitignore
+- Gemfile
+- LICENSE.txt
 - README.markdown
 - Rakefile
-- VERSION
 - bin/jetty-rackup
+- examples/issue4_handle400/app.rb
+- examples/issue4_handle400/config.ru
 - examples/just_ruby/app.rb
 - examples/just_ruby/config.ru
 - examples/just_ruby/public/hello.html
@@ -52,44 +84,39 @@ files:
 - jars/jetty-server-7.2.2.v20101205.jar
 - jars/jetty-servlet-7.2.2.v20101205.jar
 - jars/jetty-util-7.2.2.v20101205.jar
-- jars/jruby-rack-1.1.2.jar
+- jars/jruby-rack-1.1.12.jar
 - jars/jsp-2.1.jar
 - jars/jsp-api-2.1.jar
 - jars/servlet-api-2.5-6.1.14.jar
+- jetty-rackup.gemspec
 - lib/jetty-rackup.rb
 - lib/jetty-rackup/bootstrap.rb
 - lib/jetty-rackup/server.rb
-- test/helper.rb
-- test/test_jetty-rackup.rb
-has_rdoc: true
+- lib/jetty-rackup/version.rb
 homepage: http://github.com/geekq/jetty-rackup
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
+  none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Rack + Jetty = Retty
 test_files: []
-

data/VERSION

@@ -1 +0,0 @@
-7.0.0

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'jetty-rackup'
-
-class Test::Unit::TestCase
-end

data/test/test_jetty-rackup.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestJettyRackup < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end