fishwife 1.2.0-java → 1.3.0-java

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 1.3.0 (2012-2-12)
+* Add OutputUtil JRuby java extension for write_body and
+  write_file. This increases single threaded output performance from
+  78Mb/s to 238Mb/s on my dev. host using curl against the included
+  example/giant.ru test app.
+* Upgrade to rack ~> 1.4.1
+
 === 1.2.0 (2012-1-29)
 * Upgrade, widen to rjack-jetty >= 7.5.4, < 7.7 (incl. 7.6.0.0 release)
 * Fixed, tests passing in 1.9 mode; at least with jruby pre-release

data/Manifest.txt

@@ -3,8 +3,10 @@ LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
+pom.xml
 bin/fishwife
 example/config.ru
+example/giant.ru
 lib/fishwife/base.rb
 lib/fishwife.rb
 lib/fishwife/http_server.rb
@@ -15,3 +17,4 @@ spec/spec_helper.rb
 spec/test_app.rb
 spec/data/hello.txt
 spec/data/reddit-icon.png
+lib/fishwife/fishwife-1.3.0.jar

data/example/config.ru

@@ -7,8 +7,6 @@
 require 'rjack-logback'
 RJack::Logback.config_console( :stderr => true, :thread => true )
 
-# FIXME: Currently Need Content-Length set to avoid double chunked
-# transfer-encoding with rack 1.3 (not a problem in rack 1.2)!
 use Rack::ContentLength
 
 run lambda { |env| [200, { "Content-Type" => "text/plain" }, ["Hello"]] }

data/example/giant.ru

@@ -0,0 +1,28 @@
+#\ -s Fishwife -p 9297 -E production
+# -*- ruby -*-
+
+require 'rjack-logback'
+RJack::Logback.config_console( :stderr => true, :thread => true )
+
+class GiantGenerator
+  FILLER = <<-END
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
+    eiusmod tempor incididunt ut labore et dolore magna aliqua.
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
+    eiusmod tempor incididunt ut labore et dolore magna aliqua.
+    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
+    eiusmod tempor incididunt ut labore et dolore magna aliqua.
+  END
+
+  def each
+    loop { yield FILLER[0..rand( FILLER.size)] }
+  end
+end
+
+class App
+  def call( env )
+    [ 200, { 'Content-Type' => 'text/plain' }, GiantGenerator.new ]
+  end
+end
+
+run App.new

data/lib/fishwife.rb

@@ -23,6 +23,12 @@ require 'rjack-slf4j'
 # Load Jetty JARs.
 require 'rjack-jetty'
 
+require 'fishwife/base'
+
+module Fishwife
+  require "#{LIB_DIR}/fishwife-#{VERSION}.jar"
+end
+
 require 'rack'
 require 'fishwife/rack_servlet'
 require 'fishwife/http_server'

data/lib/fishwife/base.rb

@@ -15,5 +15,6 @@
 #++
 
 module Fishwife
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
+  LIB_DIR = File.dirname( __FILE__ )
 end

data/lib/fishwife/rack_servlet.rb

@@ -15,6 +15,9 @@
 # permissions and limitations under the License.
 #++
 
+# Magic loader hook -> JRubyService
+require 'fishwife/JRuby'
+
 #
 # Wraps a Rack application in a Java servlet.
 #
@@ -214,29 +217,20 @@ module Fishwife
         end
       end
 
-      # How else would we write output?
       output = response.getOutputStream
 
-      # Turn the body into something nice and Java-y.
-      if(body.respond_to?(:to_path))
-        # We've been told to serve a file; use FileInputStream to
-        # stream the file directly to the servlet, because this is a
-        # lot faster than doing it with Ruby.
-        file = java.io.File.new(body.to_path)
-
-        # We set the content-length so we can use Keep-Alive, unless
-        # this is an async request.
-        response.setContentLength(file.length) unless content_length
-
-        # Stream the file directly.
-        buffer = Java::byte[4096].new
-        input_stream = FileInputStream.new(file)
-        while((count = input_stream.read(buffer)) != -1)
-          output.write(buffer, 0, count)
-        end
-        input_stream.close
+      if body.respond_to?( :to_path )
+
+        path = body.to_path
+
+        # Set Content-Length unless this is an async request.
+        response.setContentLength( File.size( path ) ) unless content_length
+
+        # FIXME: Support ranges?
+
+        OutputUtil.write_file( path, output )
       else
-        body.each { |l| output.write(l.to_java_bytes) }
+        OutputUtil.write_body( body, output )
       end
 
       # Close the body if we're supposed to.

data/pom.xml

@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>fishwife</groupId>
+  <artifactId>fishwife</artifactId>
+  <packaging>jar</packaging>
+  <version>1.3.0</version>
+  <name>Fishwife Java Extension</name>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.jruby.extras</groupId>
+      <artifactId>bytelist</artifactId>
+      <version>1.0.10</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby-core</artifactId>
+      <version>1.6.6</version>
+      <optional>true</optional>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+          <optimize>true</optimize>
+          <debug>true</debug>
+          <encoding>UTF-8</encoding>
+          <showDeprecation>true</showDeprecation>
+          <showWarnings>true</showWarnings>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>

data/spec/fishwife_spec.rb

@@ -50,6 +50,7 @@ describe Fishwife do
 
   after(:all) do
     @server.stop
+    @server.join
   end
 
   it "returns 200 OK" do
@@ -134,8 +135,6 @@ describe Fishwife do
     response = get("/download")
     response.code.should == "200"
     response['Content-Type'].should == 'image/png'
-    response['Content-Disposition'].should ==
-      'attachment; filename=reddit-icon.png'
     checksum = Digest::MD5.hexdigest(response.body)
     checksum.should == '8da4b60a9bbe205d4d3699985470627e'
   end
@@ -161,6 +160,7 @@ describe Fishwife do
   end
 
   it "handles async requests" do
+    pending "Causes intermittent 30s pauses, TestApp.push/pull is sketchy"
     lock = Mutex.new
     buffer = Array.new
 

data/spec/spec_helper.rb

@@ -31,3 +31,20 @@ require 'rack/lint'
 require 'fishwife'
 
 Thread.abort_on_exception = true
+
+# Adjust Rack::Lint to not interfere with File body.to_path
+class Rack::Lint
+
+  def respond_to?( mth )
+    if mth == :to_path
+      @body.respond_to?( :to_path )
+    else
+      super
+    end
+  end
+
+  def to_path
+    @body.to_path
+  end
+
+end

data/spec/test_app.rb

@@ -104,12 +104,11 @@ class TestApp
   end
 
   def download(request)
-    file = File.new('spec/data/reddit-icon.png', 'r')
-    response = Rack::Response.new(file)
-    response['Content-Type'] = 'image/png'
-    response['Content-Disposition'] =
-      'attachment; filename=reddit-icon.png'
-    response.finish
+    file = File.new( File.dirname( __FILE__ ) + "/data/reddit-icon.png" )
+    def file.to_path
+      path
+    end
+    [ 200, { "Content-Type" => "image/png" }, file ]
   end
 
   def upload(request)

metadata

@@ -2,7 +2,7 @@
 name: fishwife
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.3.0
 platform: java
 authors: 
   - David Kellum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 Z
+date: 2012-02-12 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rack
@@ -19,7 +19,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.3.6
+            version: 1.4.1
     requirement: *id001
     prerelease: false
     type: :runtime
@@ -108,8 +108,10 @@ files:
   - Manifest.txt
   - README.rdoc
   - Rakefile
+  - pom.xml
   - bin/fishwife
   - example/config.ru
+  - example/giant.ru
   - lib/fishwife/base.rb
   - lib/fishwife.rb
   - lib/fishwife/http_server.rb
@@ -120,6 +122,7 @@ files:
   - spec/test_app.rb
   - spec/data/hello.txt
   - spec/data/reddit-icon.png
+  - lib/fishwife/fishwife-1.3.0.jar
 homepage: http://github.com/dekellum/fishwife
 licenses: []