jubilee 0.2.1 → 0.2.2

data/CHANGELOG

@@ -0,0 +1,5 @@
+Release 0.2.1
+=============
+
+Supoort multiple values for a header.
+Add Rack::MethodOverride to support DELETE, PUT, HEAD, OPTION methods.

data/Gemfile

@@ -1,6 +1,7 @@
 source :rubygems
 
-gem 'rack', '~> 1.4.1'
+#gem 'rack', '~> 1.4.1'
+gem 'rack', path: "../../ruby/rack"
 gem 'spoon'
 
 group :development do

data/Gemfile.lock

@@ -1,3 +1,8 @@
+PATH
+  remote: ../../ruby/rack
+  specs:
+    rack (1.4.1)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -25,8 +30,7 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.3.1)
       spoon (~> 0.0)
-    rack (1.4.1)
-    rake (10.0.2)
+    rake (10.0.3)
     rcov (0.9.11-java)
     rdoc (3.12)
       json (~> 1.4)
@@ -43,6 +47,6 @@ DEPENDENCIES
   jeweler
   multipart-post
   pry
-  rack (~> 1.4.1)
+  rack!
   rcov
   spoon

data/Rakefile

@@ -26,7 +26,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/isaiah/jubilee"
   gem.license = "MIT"
   gem.summary = %Q{JRuby webserver based on Vertx}
-  gem.description = %Q{Web Server that rocks!}
+  gem.description = %Q{Jubilee is a experimental webserver built for speed, it's based on Vertx.}
   gem.email = "issaria@gmail.com"
   gem.authors = ["Isaiah Peng"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/java/src/org/jruby/jubilee/RackApplication.java

@@ -21,18 +21,17 @@ import java.util.concurrent.*;
 public class RackApplication {
   private IRubyObject app;
   private boolean ssl;
-  private Buffer bodyBuf;
 
   private ExecutorService exec;
 
   public RackApplication(IRubyObject app, boolean ssl) {
     this.app = app;
     this.ssl = ssl;
-    bodyBuf = new Buffer(0);
     exec = Executors.newCachedThreadPool();
   }
 
   public void call(final HttpServerRequest request) {
+    final Buffer bodyBuf = new Buffer(0);
     final Ruby runtime = app.getRuntime();
     final CountDownLatch bodyLatch = new CountDownLatch(1);
     request.dataHandler(new Handler<Buffer>() {

data/lib/rack/handler/jubilee.rb

@@ -25,7 +25,7 @@ module Rack
 
         puts "Jubilee #{::Jubilee::Const::JUBILEE_VERSION} starting..."
         puts "* Environment: #{ENV['RACK_ENV']}"
-        puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
+        puts "* Listening on http://#{options[:Host]}:#{options[:Port]}"
 
         yield @server if block_given?
 

data/test/jubilee/test_rack_server.rb

@@ -3,6 +3,7 @@ require 'rack/lint'
 require 'rack/commonlogger'
 
 class TestRackServer < MiniTest::Unit::TestCase
+  include Helpers
 
   class ErrorChecker
     def initialize(app)
@@ -43,6 +44,8 @@ class TestRackServer < MiniTest::Unit::TestCase
     
     @simple = lambda { |env| [200, { "X-Header" => "Works" }, ["Hello"]] }
     @checker = ErrorChecker.new ServerLint.new(@simple)
+    @host = "localhost"
+    @port = 3215
   end
 
   def teardown
@@ -87,6 +90,20 @@ class TestRackServer < MiniTest::Unit::TestCase
     assert_equal "/test/a/b/c", input['PATH_INFO']
   end
 
+  def test_request_method
+    input = nil
+    @server = Jubilee::Server.new (lambda { |env| input = env; @simple.call(env) })
+    @server.start
+
+    POST('/test/a/b/c', {"_method" => "delete", "user" => 1})
+    assert_equal "DELETE", input['REQUEST_METHOD']
+
+    # it should not memorize env
+    POST('/test/a/b/c', {"foo" => "bar"})
+    assert_equal "POST", input['REQUEST_METHOD']
+
+  end
+
   def test_query_string
     input = nil
     @server = Jubilee::Server.new (lambda { |env| input = env; @simple.call(env) })

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require 'minitest/unit'
 require 'jubilee'
 require 'net/http'
 require 'net/http/post/multipart'
+require 'yaml'
 def hit(uris)
   uris.map do |u|
     res = nil
@@ -19,3 +20,40 @@ def hit(uris)
     res
   end
 end
+
+module Helpers
+  attr_reader :status, :response
+
+  def GET(path, header={})
+    Net::HTTP.start(@host, @port) { |http|
+      user = header.delete(:user)
+      passwd = header.delete(:passwd)
+
+      get = Net::HTTP::Get.new(path, header)
+      get.basic_auth user, passwd  if user && passwd
+      http.request(get) { |response|
+        @status = response.code.to_i
+        begin
+          @response = YAML.load(response.body)
+        rescue TypeError, ArgumentError
+          @response = nil
+        end
+      }
+    }
+  end
+
+  def POST(path, formdata={}, header={})
+    Net::HTTP.start(@host, @port) { |http|
+      user = header.delete(:user)
+      passwd = header.delete(:passwd)
+
+      post = Net::HTTP::Post.new(path, header)
+      post.form_data = formdata
+      post.basic_auth user, passwd  if user && passwd
+      http.request(post) { |response|
+        @status = response.code.to_i
+        @response = YAML.load(response.body)
+      }
+    }
+  end
+end

metadata

@@ -2,28 +2,30 @@
 name: jubilee
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Isaiah Peng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :runtime
@@ -63,7 +65,7 @@ dependencies:
     none: false
   prerelease: false
   type: :development
-description: Web Server that rocks!
+description: Jubilee is a experimental webserver built for speed, it's based on Vertx.
 email: issaria@gmail.com
 executables:
 - jubilee
@@ -73,6 +75,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .rbenv-version
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -89,10 +92,6 @@ files:
 - jars/jackson-mapper-asl-1.9.4.jar
 - jars/netty-3.6.0.Beta1.jar
 - jars/vertx-core-1.3.0.final.jar
-- java/.idea/ant.xml
-- java/.idea/libraries/jruby.xml
-- java/.idea/libraries/netty_3_6_0_Beta1.xml
-- java/.idea/libraries/vertx_core_1_3_0_final.xml
 - java/src/jubilee/JubileeService.java
 - java/src/org/jruby/jubilee/Const.java
 - java/src/org/jruby/jubilee/RackApplication.java

data/java/.idea/ant.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AntConfiguration">
-    <defaultAnt bundledAnt="true" />
-  </component>
-</project>
-

data/java/.idea/libraries/jruby.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jruby">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.rbenv/versions/jruby-1.7.0/lib/jruby.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

data/java/.idea/libraries/netty_3_6_0_Beta1.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="netty-3.6.0.Beta1">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../jars/netty-3.6.0.Beta1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

data/java/.idea/libraries/vertx_core_1_3_0_final.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="vertx-core-1.3.0.final">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../jars/vertx-core-1.3.0.final.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>