thick 0.0.4-java → 0.0.5-java

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 0.4 (xy.xz.2012)
+## 0.5 (30.11.2012)
+
+* update Netty to 3.5.11
+* get rid of Loader experiment
+* update Rake gem (development)
+
+## 0.4 (29.3.2012)
 
 * make gem Java specific
 * copy-less request body container

data/README.md

@@ -2,6 +2,8 @@
 
 Thick is very lightweight web server for JRuby based on excellent Netty library.
 
+[![Build Status](https://secure.travis-ci.org/marekjelen/thick.png?branch=master)](http://travis-ci.org/marekjelen/thick)
+
 ## Status
 
 Works on several Sinatra and Rails applications. No real testing, yet.

data/ROADMAP.md

@@ -3,8 +3,7 @@
 * SSL support
 * Tests
 * Code refactorings
-* Optimalizations
-* Replace StringIO
+* Optimizations
 
 ## Nice to have
 

data/bin/thick

@@ -2,7 +2,6 @@
 require 'optparse'
 
 require 'rubygems'
-require 'rack'
 
 $: << File.expand_path('../../lib', __FILE__)
 require 'thick'
@@ -27,20 +26,22 @@ OptionParser.new do |opts|
     options[:port] = Integer(port)
   end
 
-  opts.on('-E', '--env ENVIRONMENT', 'use ENVIRONMENT for defaults (default: development)') do |e|
-    options[:environment] = e
+  opts.on('-f', '--file FILE', 'use FILE to load the application (default: config.ru)') do |file|
+    options[:file] = file
   end
 
-end.parse!
+  opts.on('-d', '--directory DIR', 'use DIR as default directory (default: cwd)') do |directory|
+    options[:directory] = directory
+  end
 
-options[:address] ||= '0.0.0.0'
-options[:port] ||= 9292
-options[:environment] ||= 'development'
+  opts.on('-E', '--env ENVIRONMENT', 'use ENVIRONMENT for defaults (default: development)') do |e|
+    options[:environment] = e
+  end
 
-ENV['RACK_ENV'] ||= ENV['RAILS_ENV'] ||= options[:environment]
+  opts.on('-C', '--controller', 'starts controller for remote monitoring and management') do |e|
+    options[:controller] = e
+  end
 
-puts "Loading app #{options.inspect}"
-app = Rack::Builder.parse_file('config.ru')
+end.parse!
 
-puts "Starting server"
-Thick.start(app[0], options)
+Thick.start(options)

data/lib/thick/async_response.rb

@@ -8,15 +8,26 @@ module Thick
       @custom = false
       @async = false
       @block = nil
+      @chunked = false
+      @content_length = nil
+      @closed = false
       @params = []
     end
 
     def call(chunk)
-      @context.channel.write(Thick::Java::ChannelBuffers.copiedBuffer(chunk.to_s, Thick::Java::CharsetUtil::UTF_8))
+      chunk = Thick::Java::ChannelBuffers.copiedBuffer(chunk.to_s, Thick::Java::CharsetUtil::UTF_8)
+      chunk = Thick::Java::DefaultHttpChunk.new(chunk) if @chunked
+      @context.channel.write(chunk) unless closed?
     end
 
     def close
-      @context.channel.write(Thick::Java::ChannelBuffers::EMPTY_BUFFER).addListener(Thick::Java::ChannelFutureListener::CLOSE)
+      if @chunked
+        chunk = Thick::Java::ChannelBuffers.copiedBuffer("0\r\n\r\n", Thick::Java::CharsetUtil::UTF_8)
+      else
+        chunk = Thick::Java::ChannelBuffers::EMPTY_BUFFER
+      end
+      @context.channel.write(chunk).addListener(Thick::Java::ChannelFutureListener::CLOSE) unless closed?
+      closed!
     end
 
     def ready!
@@ -48,6 +59,30 @@ module Thick
       @async
     end
 
+    def chunked!
+      @chunked = true
+    end
+
+    def chunked?
+      @chunked
+    end
+
+    def content_length!(length)
+      @content_length = length
+    end
+
+    def content_length
+      @content_length
+    end
+
+    def closed!
+      @closed = true
+    end
+
+    def closed?
+      @closed
+    end
+
   end
 
 end

data/lib/thick/controller.rb

@@ -0,0 +1,88 @@
+module Thick
+  class Controller
+
+    def initialize(options, server)
+      @options = options
+      @server = server
+      @factory = Thick::Java::NioServerSocketChannelFactory.new(Thick::Java::Executors.new_cached_thread_pool, Thick::Java::Executors.new_cached_thread_pool)
+      @bootstrap = Thick::Java::ServerBootstrap.new(@factory)
+      @bootstrap.pipeline_factory = Controller::PipelineFactory.new(@options)
+    end
+
+    def start
+      @channel = @bootstrap.bind(Thick::Java::InetSocketAddress.new('127.0.0.1', 9393))
+      puts "* Controller started on 127.0.0.1:9393"
+      self
+    end
+
+    def stop
+      @channel.close
+      self
+    end
+
+    class PipelineFactory
+
+      include Thick::Java::ChannelPipelineFactory
+
+      def initialize(options)
+        @options = options
+      end
+
+      def getPipeline
+        pipeline = Thick::Java::Channels.pipeline
+        pipeline.add_last('decoder', Thick::Java::HttpRequestDecoder.new)
+        pipeline.add_last('aggregator', Thick::Java::HttpChunkAggregator.new(65536))
+        pipeline.add_last('encoder', Thick::Java::HttpResponseEncoder.new)
+        pipeline.add_last('handler', Controller::Handler.new(@options))
+        pipeline
+      end
+
+    end
+
+    class Handler < Thick::Java::SimpleChannelUpstreamHandler
+
+      def messageReceived(context, event)
+        message = event.message
+        case message
+          when Thick::Java::HttpRequest
+            handle_request(context, message)
+          when Thick::Java::WebSocketFrame
+            handle_websocket_frame(context, message)
+        end
+      end
+
+      def handle_request(context, request)
+        url = "ws://" + request.get_header(Thick::Java::HttpHeaders::Names::HOST) + '/controller'
+        factory = Thick::Java::WebSocketServerHandshakerFactory.new(url, nil, false)
+        @handshaker = factory.new_handshaker(request)
+        if @handshaker
+          @handshaker.handshake(context, request)
+        else
+          factory.send_unsupported_webSocket_version_response(context)
+        end
+      end
+
+      def handle_websocket_frame(context, frame)
+        case frame
+          when Thick::Java::CloseWebSocketFrame
+            @handshaker.close(context, frame)
+          when Thick::Java::PingWebSocketFrame
+            context.channel.write(Thick::Java::PongWebSocketFrame.new(frame.binary_data))
+          when Thick::Java::TextWebSocketFrame
+            handle_websocket_message(context, frame.text)
+        end
+      end
+
+      def websocket_send(context, message)
+        context.channel.write(Thick::Java::TextWebSocketFrame.new(message.to_s))
+      end
+
+      def handle_websocket_message(context, message)
+
+      end
+
+    end
+
+  end
+
+end

data/lib/thick/java.rb

@@ -8,16 +8,24 @@ module Thick
     java_import 'org.jboss.netty.buffer.ChannelBuffer'
     java_import 'org.jboss.netty.buffer.ChannelBufferInputStream'
     java_import 'org.jboss.netty.buffer.ChannelBuffers'
+    java_import 'org.jboss.netty.handler.codec.http.DefaultHttpChunk'
     java_import 'org.jboss.netty.handler.codec.http.DefaultHttpResponse'
     java_import 'org.jboss.netty.handler.codec.http.HttpContentDecompressor'
     java_import 'org.jboss.netty.handler.codec.http.HttpHeaders'
     java_import 'org.jboss.netty.handler.codec.http.HttpChunk'
+    java_import 'org.jboss.netty.handler.codec.http.HttpChunkAggregator'
     java_import 'org.jboss.netty.handler.codec.http.HttpRequest'
     java_import 'org.jboss.netty.handler.codec.http.HttpRequestDecoder'
     java_import 'org.jboss.netty.handler.codec.http.HttpResponseEncoder'
     java_import 'org.jboss.netty.handler.codec.http.HttpResponseStatus'
     java_import 'org.jboss.netty.handler.codec.http.HttpVersion'
     java_import 'org.jboss.netty.handler.codec.http.QueryStringDecoder'
+    java_import 'org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame'
+    java_import 'org.jboss.netty.handler.codec.http.websocketx.PingWebSocketFrame'
+    java_import 'org.jboss.netty.handler.codec.http.websocketx.PongWebSocketFrame'
+    java_import 'org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame'
+    java_import 'org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame'
+    java_import 'org.jboss.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory'
     java_import 'org.jboss.netty.handler.codec.spdy.SpdyFrameDecoder'
     java_import 'org.jboss.netty.handler.codec.spdy.SpdyFrameEncoder'
     java_import 'org.jboss.netty.handler.codec.spdy.SpdySessionHandler'
@@ -36,6 +44,10 @@ module Thick
     java_import 'org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory'
     java_import 'org.jboss.netty.logging.InternalLogLevel'
     java_import 'org.jboss.netty.util.CharsetUtil'
+    java_import 'org.jruby.CompatVersion'
+    java_import 'org.jruby.embed.AttributeName'
+    java_import 'org.jruby.embed.LocalContextScope'
+    java_import 'org.jruby.embed.ScriptingContainer'
 
   end
 end

data/lib/thick/loader.rb

@@ -0,0 +1,20 @@
+module Thick
+
+  class Loader
+
+    def initialize(options)
+      @options = options
+      ENV['RACK_ENV'] ||= ENV['RAILS_ENV'] ||= @options[:environment]
+      @application = Rack::Builder.parse_file(@options[:file])[0]
+    end
+
+    def call(env)
+      @application.call(env)
+    rescue => e
+      puts e.message
+      puts e.backtrace
+    end
+
+  end
+
+end

data/lib/thick/pipeline_factory.rb

@@ -1,57 +1,16 @@
 module Thick
 
-  class TimeProbe
-
-    include Thick::Java::ChannelUpstreamHandler
-    include Thick::Java::ChannelDownstreamHandler
-
-    def self.setup
-      @total = 0
-      @count = 0
-    end
-
-    def initialize
-      @time = Time.now.to_f
-    end
-
-    TimeProbe.setup
-
-    def self.time(time)
-      @total += time
-      @count += 1
-      if @count % 100 == 0
-        puts "AVG: #{@total / @count}"
-        setup
-      end
-    end
-
-    def handleUpstream(context, event)
-      context.send_upstream(event)
-    end
-
-    def handleDownstream(context, event)
-      if event.respond_to?(:getState)
-        stop = Time.now.to_f - @time
-        self.class.time(stop)
-      end
-      context.send_downstream(event)
-    end
-
-  end
-
   class PipelineFactory
 
     include Thick::Java::ChannelPipelineFactory
 
-    def initialize(application)
-      @application = application
+    def initialize(options)
+      @options = options
       @executor = Thick::Java::ExecutionHandler.new(Thick::Java::OrderedMemoryAwareThreadPoolExecutor.new(20, 0, 0))
     end
 
     def getPipeline
       pipeline = Thick::Java::Channels.pipeline
-      
-      pipeline.add_last('time_probe', TimeProbe.new)
 
       pipeline.add_last('http_decoder', Thick::Java::HttpRequestDecoder.new)
       pipeline.add_last('http_encoder', Thick::Java::HttpResponseEncoder.new)
@@ -60,7 +19,7 @@ module Thick
 
       pipeline.add_last('executor', @executor)
 
-      pipeline.add_last('handler', ServerHandler.new(@application))
+      pipeline.add_last('handler', ServerHandler.new(@options))
 
       pipeline
     end

data/lib/thick/server.rb

@@ -1,29 +1,23 @@
 module Thick
 
-  def self.start(application, options)
-    @server = Server.new(application)
-    @server.start(:address => options[:address], :port => options[:port])
-  end
-
   class Server
 
-    def initialize(application)
+    def initialize(options)
+      @options = options
       @factory = Thick::Java::NioServerSocketChannelFactory.new(Thick::Java::Executors.new_cached_thread_pool, Thick::Java::Executors.new_cached_thread_pool)
       @bootstrap = Thick::Java::ServerBootstrap.new(@factory)
-      @bootstrap.pipeline_factory = PipelineFactory.new(application)
+      @bootstrap.pipeline_factory = PipelineFactory.new(@options)
     end
 
-    def start(options = {})
-      @channel = @bootstrap.bind(Thick::Java::InetSocketAddress.new(options[:address], options[:port]))
-      puts 'Server started'
-      loop do
-        # ToDo: Is this hack needed?
-        sleep(100)
-      end
+    def start
+      @channel = @bootstrap.bind(Thick::Java::InetSocketAddress.new(@options[:address], @options[:port]))
+      puts "* Server started on #{@options[:address]}:#{@options[:port]}"
+      self
     end
 
     def stop
       @channel.close
+      self
     end
 
   end

data/lib/thick/server_handler.rb

@@ -1,12 +1,10 @@
-require 'stringio'
-
 module Thick
 
   class ServerHandler < Thick::Java::SimpleChannelUpstreamHandler
 
-    def initialize(application)
+    def initialize(options)
       super()
-      @application = application
+      @options = options
     end
 
     def channelConnected(context, event)
@@ -32,7 +30,7 @@ module Thick
     def on_request(context, request)
 
       # Serve file if exists in public directory
-      file = File.join('public', request.uri)
+      file = File.join(@options[:directory], 'public', request.uri)
       return serve_file(context, file).addListener(Thick::Java::ChannelFutureListener::CLOSE) if !request.uri.index('..') && File.exists?(file) && !File.directory?(file)
 
       query_string = request.uri.split('?', 2)
@@ -53,7 +51,8 @@ module Thick
           'SERVER_NAME' => 'localhost', # ToDo: Be more precise!
           'SERVER_PORT' => '8080', # ToDo: Be more precise!
           # Thick specific
-          'thick.async' => AsyncResponse.new(context)
+          'thick.async' => AsyncResponse.new(context),
+          'thick.options' => @options
       }
 
       # Get content length if available
@@ -83,7 +82,7 @@ module Thick
     end
 
     def handle_request(context)
-      response = @application.call(@env)
+      response = @options[:application].call(@env)
 
       # Let the application make the response as it wants
       if @env['thick.async'].custom?
@@ -102,6 +101,15 @@ module Thick
         Thick::Java::HttpHeaders.set_header(@response, name, value)
       end
 
+      if @env['thick.async'].async?
+        if length = @env['thick.async'].content_length
+          Thick::Java::HttpHeaders.set_content_length(@response, length)
+        else
+          @response.remove_header('Content-Length')
+        end
+        @response.chunked = true if @env['thick.async'].chunked?
+      end
+
       context.channel.write(@response)
 
       # Set content as requested by application
@@ -126,6 +134,7 @@ module Thick
     end
 
     def channelClosed(context, event)
+      @env['thick.async'].closed!
     end
 
     def exceptionCaught(context, e)

data/lib/thick/thick.rb

@@ -0,0 +1,29 @@
+module Thick
+
+  def self.start(options)
+    @options = {
+        :address => '0.0.0.0',
+        :port => 9292,
+        :environment => 'development',
+        :reloader => false,
+        :controller => false,
+        :directory => Dir.getwd,
+        :file => 'config.ru'
+    }.merge(options)
+
+    puts "* Starting Thick: #{@options.inspect}"
+
+    @options[:application] = Loader.new(@options)
+    @server = Server.new(@options).start
+
+    if @options[:controller]
+      @controller = Controller.new(@options, @server)
+      @controller.start
+    end
+
+    loop do
+      sleep(100) # ToDo: Is this hack needed?
+    end
+  end
+
+end

data/lib/thick/version.rb

@@ -1,3 +1,3 @@
 module Thick
-  VERSION = '0.0.4' unless const_defined?(:VERSION)
+  VERSION = '0.0.5' unless const_defined?(:VERSION)
 end

data/lib/thick.rb

@@ -2,12 +2,16 @@ require 'rack'
 
 require 'java'
 
-require File.expand_path('../jars/netty-3.4.0.Alpha2.jar', __FILE__)
+require File.expand_path('../jars/netty-3.5.11.Final.jar', __FILE__)
 
 require 'thick/java'
+require 'thick/thick'
 require 'thick/version'
 require 'thick/buffer'
 require 'thick/async_response'
+require 'thick/loader'
 require 'thick/server_handler'
 require 'thick/pipeline_factory'
-require 'thick/server'
+require 'thick/controller'
+require 'thick/server'
+

metadata

@@ -1,78 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: thick
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.0.5
+  prerelease:
 platform: java
-authors: 
-  - Marek Jelen
-autorequire: 
+authors:
+- Marek Jelen
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-03-29 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rack
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.4.1
-    type: :runtime
-    version_requirements: *id001
+date: 2012-11-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: 1.4.1
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+    none: false
+  prerelease: false
+  type: :development
 description: Very lightweight web server for JRuby based on Netty library.
-email: 
-  - marek@jelen.biz
-executables: 
-  - thick
+email:
+- marek@jelen.biz
+executables:
+- thick
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - bin/thick
-  - lib/thick.rb
-  - lib/jars/netty-3.4.0.Alpha2.jar
-  - lib/thick/async_response.rb
-  - lib/thick/buffer.rb
-  - lib/thick/java.rb
-  - lib/thick/pipeline_factory.rb
-  - lib/thick/server.rb
-  - lib/thick/server_handler.rb
-  - lib/thick/version.rb
-  - LICENSE
-  - README.md
-  - ROADMAP.md
-  - CHANGELOG.md
+files:
+- !binary |-
+  YmluL3RoaWNr
+- !binary |-
+  bGliL3RoaWNrLnJi
+- !binary |-
+  bGliL3RoaWNrL3BpcGVsaW5lX2ZhY3RvcnkucmI=
+- !binary |-
+  bGliL3RoaWNrL2phdmEucmI=
+- !binary |-
+  bGliL3RoaWNrL3RoaWNrLnJi
+- !binary |-
+  bGliL3RoaWNrL2xvYWRlci5yYg==
+- !binary |-
+  bGliL3RoaWNrL3ZlcnNpb24ucmI=
+- !binary |-
+  bGliL3RoaWNrL3NlcnZlcl9oYW5kbGVyLnJi
+- !binary |-
+  bGliL3RoaWNrL2FzeW5jX3Jlc3BvbnNlLnJi
+- !binary |-
+  bGliL3RoaWNrL2J1ZmZlci5yYg==
+- !binary |-
+  bGliL3RoaWNrL2NvbnRyb2xsZXIucmI=
+- !binary |-
+  bGliL3RoaWNrL3NlcnZlci5yYg==
+- !binary |-
+  bGliL2phcnMvbmV0dHktMy41LjExLkZpbmFsLmphcg==
+- LICENSE
+- README.md
+- ROADMAP.md
+- CHANGELOG.md
 homepage: http://github.com/marekjelen/thick
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      version: !binary |-
+        MA==
+      hash: 2
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.15
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Very lightweight web server for JRuby
 test_files: []
-