fishwife 1.1.1-java → 1.2.0-java

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 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
+  1.6.6.RC1, git: 333c503 (Don Werve)
+* Upgrade to tarpit ~> 2.0, bundler Gemfile, gemspec; rspec ~> 2.8.0 (build)
+
 === 1.1.1 (2011-11-5)
 * Set Content-Type via the setContentType method (#2, Adam Zell)
 * Split multiple header values on newline before adding (#2, Adam Zell)

data/README.rdoc

@@ -69,7 +69,7 @@ will need to load an output provider (see linked docs.)
 
 == License
 
-Copyright (c) 2011 David Kellum
+Copyright (c) 2011-2012 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/Rakefile

@@ -1,38 +1,7 @@
 # -*- ruby -*-
 
-$LOAD_PATH << './lib'
-
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.4'
+require 'bundler/setup'
 require 'rjack-tarpit'
 
-require 'fishwife/base'
-
-t = RJack::TarPit.new( 'fishwife', Fishwife::VERSION, :java_platform )
-
-t.specify do |h|
-  h.developer( 'David Kellum', 'dek-oss@gravitext.com' )
-  h.summary = "A hard working Jetty 7 based rack handler."
-
-  h.extra_deps     += [ [ 'rack',          '~> 1.3.2' ],
-                        [ 'rjack-jetty',   '~> 7.5.0' ],
-                        [ 'rjack-slf4j',   '~> 1.6.1' ] ]
-
-  h.extra_dev_deps += [ [ 'rjack-logback', '~> 1.2.0' ],
-                        [ 'rspec',         '~> 2.6.0' ] ]
-end
-
-# Version/date consistency checks:
-
-task :check_history_version do
-  t.test_line_match( 'History.rdoc', /^==/, / #{ t.version } / )
-end
-task :check_history_date do
-  t.test_line_match( 'History.rdoc', /^==/, /\([0-9\-]+\)$/ )
-end
-
-task :gem  => [ :check_history_version  ]
-task :tag  => [ :check_history_version, :check_history_date ]
-task :push => [ :check_history_version, :check_history_date ]
-
-t.define_tasks
+RJack::TarPit.new( 'fishwife' ).define_tasks

data/bin/fishwife

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 # -*- ruby -*-
 #--
-# Copyright (c) 2011 David Kellum
+# Copyright (c) 2011-2012 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/lib/fishwife.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 David Kellum
+# Copyright (c) 2011-2012 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you

data/lib/fishwife/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 David Kellum
+# Copyright (c) 2011-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -15,5 +15,5 @@
 #++
 
 module Fishwife
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/lib/fishwife/http_server.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 David Kellum
+# Copyright (c) 2011-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/lib/fishwife/rack_servlet.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 David Kellum
+# Copyright (c) 2011-2012 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -31,6 +31,8 @@ module Fishwife
     java_import 'java.io.FileInputStream'
     java_import 'org.eclipse.jetty.continuation.ContinuationSupport'
 
+    ASCII_8BIT = Encoding.find( "ASCII-8BIT" ) if defined?( Encoding )
+
     def initialize( app )
       super()
       @log = RJack::SLF4J[ self.class ]
@@ -158,7 +160,9 @@ module Fishwife
       end
 
       # The input stream is a wrapper around the Java InputStream.
-      env['rack.input'] = request.getInputStream.to_io
+      input = request.getInputStream.to_io.binmode
+      input.set_encoding( ASCII_8BIT ) if input.respond_to?( :set_encoding )
+      env['rack.input'] = input
 
       # The output stream defaults to stderr.
       env['rack.errors'] ||= $stderr

data/lib/rack/handler/fishwife.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 David Kellum
+# Copyright (c) 2011-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may

data/spec/fishwife_spec.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 David Kellum
+# Copyright (c) 2011-2012 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -20,6 +20,7 @@ require 'test_app'
 require 'thread'
 require 'digest/md5'
 require 'base64'
+require 'json'
 
 describe Fishwife do
   def get(path, headers = {})
@@ -69,7 +70,7 @@ describe Fishwife do
   it "sets Rack headers" do
     response = get("/echo")
     response.code.should == "200"
-    content = YAML.load(response.body)
+    content = JSON.parse(response.body)
     content["rack.version"].should == [ 1, 1 ]
     content["rack.multithread"].should be_true
     content["rack.multiprocess"].should be_false
@@ -79,7 +80,7 @@ describe Fishwife do
   it "passes form variables via GET" do
     response = get("/echo?answer=42")
     response.code.should == "200"
-    content = YAML.load(response.body)
+    content = JSON.parse(response.body)
     content['request.params']['answer'].should == '42'
   end
 
@@ -87,14 +88,14 @@ describe Fishwife do
     question = "What is the answer to life, the universe, and everything?"
     response = post("/echo", 'question' => question)
     response.code.should == "200"
-    content = YAML.load(response.body)
+    content = JSON.parse(response.body)
     content['request.params']['question'].should == question
   end
 
   it "passes custom headers" do
     response = get("/echo", "X-My-Header" => "Pancakes")
     response.code.should == "200"
-    content = YAML.load(response.body)
+    content = JSON.parse(response.body)
     content["HTTP_X_MY_HEADER"].should == "Pancakes"
   end
 
@@ -107,7 +108,7 @@ describe Fishwife do
   it "lets the Rack app know it's running as a servlet" do
     response = get("/echo", 'answer' => '42')
     response.code.should == "200"
-    content = YAML.load(response.body)
+    content = JSON.parse(response.body)
     content['rack.java.servlet'].should be_true
   end
 
@@ -118,14 +119,14 @@ describe Fishwife do
 
   it "sets the server port and hostname" do
     response = get("/echo")
-    content = YAML.load(response.body)
+    content = JSON.parse(response.body)
     content["SERVER_PORT"].should == "9201"
     content["SERVER_NAME"].should == "127.0.0.1"
   end
 
   it "passes the URI scheme" do
     response = get("/echo")
-    content = YAML.load(response.body)
+    content = JSON.parse(response.body)
     content['rack.url_scheme'].should == 'http'
   end
 

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 David Kellum
+# Copyright (c) 2011-2012 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -15,8 +15,8 @@
 # permissions and limitations under the License.
 #++
 
-# Load our local copy of Fishwife before anything else.
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
+require 'bundler/setup'
 
 # Setup logging
 require 'rjack-logback'

data/spec/test_app.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 David Kellum
+# Copyright (c) 2011-2012 David Kellum
 # Copyright (c) 2010-2011 Don Werve
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
@@ -15,6 +15,8 @@
 # permissions and limitations under the License.
 #++
 
+require 'json'
+
 # A tiny Rack application for testing the Fishwife webserver.  Each of
 # the following paths can be used to test webserver behavior:
 #
@@ -66,7 +68,7 @@ class TestApp
   def echo(request)
     response = Rack::Response.new
     env = request.env.merge('request.params' => request.params)
-    response.write(env.to_yaml)
+    response.write(env.to_json)
     response.finish
   end
 

metadata

@@ -2,7 +2,7 @@
 name: fishwife
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.2.0
 platform: java
 authors: 
   - David Kellum
@@ -10,88 +10,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rack
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.3.2
+            version: 1.3.6
+    requirement: *id001
+    prerelease: false
     type: :runtime
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: rjack-jetty
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 7.5.4
+        - - <
           - !ruby/object:Gem::Version 
-            version: 7.5.0
+            version: "7.7"
+    requirement: *id002
+    prerelease: false
     type: :runtime
-    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: rjack-slf4j
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.6.1
+    requirement: *id003
+    prerelease: false
     type: :runtime
-    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
-    name: rjack-logback
+    name: json
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.6.4
+    requirement: *id004
     prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: rjack-logback
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.2.0
+            version: "1.2"
+    requirement: *id005
+    prerelease: false
     type: :development
-    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: rspec
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
+    version_requirements: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 2.6.0
+            version: 2.8.0
+    requirement: *id006
+    prerelease: false
     type: :development
-    version_requirements: *id005
   - !ruby/object:Gem::Dependency 
     name: rjack-tarpit
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
+    version_requirements: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.4.0
+            version: "2.0"
+    requirement: *id007
+    prerelease: false
     type: :development
-    version_requirements: *id006
-description: |-
-  Researching fishing and salting process is supposed to increase the
-  fishing jetties output. That is, jetties rack holds 9 fish, with
-  Fishing (10%) and Salting Process (30%), their rack should hold 12
-  fish.
-  
-  They will go through the motion of placing more fish in the rack, but
-  the program doesn't count more than 9. So, Fishing and Salting Process
-  is a waste of research.
-  
-  Note: One fishing jetty with one fish monger can feed 33% more people
-  than one goat farm and one butcher.
-  
-  -- {tomnobles}[http://www.civcityforums.com/index.php?topic=1672.20;wap2], 2009-10-23
+description: Researching fishing and salting process is supposed to increase the fishing jetties output. That is, jetties rack holds 9 fish, with Fishing (10%) and Salting Process (30%), their rack should hold 12 fish.
 email: 
   - dek-oss@gravitext.com
 executables: 
@@ -99,7 +100,6 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-  - Manifest.txt
   - History.rdoc
   - README.rdoc
 files: 
@@ -120,7 +120,6 @@ files:
   - spec/test_app.rb
   - spec/data/hello.txt
   - spec/data/reddit-icon.png
-  - .gemtest
 homepage: http://github.com/dekellum/fishwife
 licenses: []
 
@@ -135,17 +134,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 requirements: []
 
-rubyforge_project: fishwife
-rubygems_version: 1.8.9
+rubyforge_project: 
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A hard working Jetty 7 based rack handler.