thick 0.0.7-java → 0.0.8-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 68f8688da128a9ca14f1f2f60bf95a5122957462
+  data.tar.gz: 864c08c83fe2016b2c897a2e8f57e372fd38a9d5
+SHA512:
+  metadata.gz: 28d72f47efe4c073f6caf4fb7313606698c141a7d93d76791319cbdfbd9f3ac5bdc8ab3daa8479fc3aceb48e24216101dd0beb74ba8854114338aec7f39968f4
+  data.tar.gz: 16c7d25a1ec19054110de9c6f2cba2eac8f6b9b3015271157c79bff98c8dcf4d33facf91315ed64f8ec5df55ad78061cf270520b7623d7f1e1e224e4196cd938

data/CHANGELOG.md

@@ -1,34 +1,39 @@
-## 0.7 (20.12.2012)
+## 0.0.8 (XY.01.2013)
+
+* Rack handler
+* update versions in CHANGELOG
+
+## 0.0.7 (20.12.2012)
 
 * update Netty to 4th version
 * support for WebSockets
 * new buffer for uploaded data
 * simpler interface for async responses
 
-## 0.6 (01.12.2012)
+## 0.0.6 (01.12.2012)
 
 * some weird version
 
-## 0.5 (30.11.2012)
+## 0.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)
+## 0.0.4 (29.3.2012)
 
 * make gem Java specific
 * copy-less request body container
 * async responses
 
-## 0.3 (26.3.2012)
+## 0.0.3 (26.3.2012)
 
 Update Netty to 3.4.0.Alpha2
 
-## 0.2 (26.3.2012)
+## 0.0.2 (26.3.2012)
 
 First public version
 
-## 0.1 (26.3.2012)
+## 0.0.1 (26.3.2012)
 
 Claim the gem ;)

data/README.md

@@ -16,60 +16,122 @@ see PERFORMANCE.md
 
 Thick provides interfaces to control it's behaviour.
 
+### WebSockets
+
+Thick allows to handle WebSocket in a simple and (IMHO) not intrusive way.
+
+When a request to WebSocket is received, the server send a PUT request to
+
+```
+/thick/websockets
+```
+and provides two keys in the environment
+
+```ruby
+env['thick.websocket'].set_handler(Your::Handler)
+env['thick.websocket'].hand_shake("websocket URL")
+```
+
+Your::Handler should subclass *Thick::WebSocket* class. It is used to provide interface
+between your application and the connection. The interface for communication from the
+client to your application looks like
+
+```ruby
+class WebSocket < WebSocketHandler
+
+  def on_open
+    raise NotImplementedError.new("You should implement '#on_open' method.")
+  end
+
+  def on_data(data)
+    raise NotImplementedError.new("You should implement '#on_data(data)' method.")
+  end
+
+  def on_close
+    raise NotImplementedError.new("You should implement '#on_close' method.")
+  end
+
+end
+```
+
+Two more methods are available to control communicate back to the client
+
+```ruby
+send("data") # sends data back to client
+close # closes the connection
+```
+
+The *hand_shake("url")* method URL asks the server to finish the hand shake and upgrade
+the connection to WebSocket.
+
 ### Asynchronous responses
 
 Asynchronous responses provide functionality to stream response to the client by chunks.
 
 To enable streaming, run
 
-    env['thick.response'].chunked # For chunked encoded stream
-    env['thick.response'].streamed # For raw stream
+```ruby
+env['thick.response'].chunked # For chunked encoded stream
+env['thick.response'].streamed # For raw stream
+```
 
 and define "thick.async" callback in environment, so it reacts to "call" and takes one argument
 
-    env['thick.async'] = proc do |response|
-      # do something here
-    end
+```ruby
+env['thick.async'] = proc do |response|
+  # do something here
+end
+```
 
 now simply respond as usual. Once the headers and the basic content is sent, the callback will be invoked.
 
 To write content to the stream use
 
-    response.writeContent("some content")
+```ruby
+response.writeContent("some content")
+```
 
 and do not forget close the stream once done
 
-    response.close
+```ruby
+response.close
+```
 
 Example using Sinatra
 
-    require 'sinatra/base'
+```ruby
+require 'sinatra/base'
 
-    class App < Sinatra::Base
+class App < Sinatra::Base
 
-      get '/' do
-        env['thick.async'] = proc do |response|
-          (1..10).each do |i|
-            response.writeContent(i.to_s)
-            sleep(1)
-          end
-          response.close
-        end
-        env['thick.response'].chunked
-        "0"
+  get '/' do
+    env['thick.async'] = proc do |response|
+      (1..10).each do |i|
+        response.writeContent(i.to_s)
+        sleep(1)
       end
-
+      response.close
     end
+    env['thick.response'].chunked
+    "0"
+  end
+
+end
 
-    run App
+run App
+```
 
 ## Starting
 
-    thick [-o <interface>] [-p <port>] [-E <environment>]
+```
+thick [-o <interface>] [-p <port>] [-E <environment>]
+```
 
 ## Installation
 
-    gem install thick
+```
+gem install thick
+```
 
 ## License
 

data/ROADMAP.md

@@ -4,8 +4,8 @@
 * Tests
 * Code refactorings
 * Optimizations
+* Keep-alive
 
 ## Nice to have
 
-* SPDY support
-* WebSockets support
+* SPDY support

data/lib/rack/handler/thick.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../../../thick', __FILE__)
+
+module Rack
+  module Handler
+
+    class Thick
+
+      def self.run(app, options={})
+
+        env = ::Thick::Java::ServerEnvironment.new
+        env.address = options[:Host]
+        env.port = options[:Port]
+
+        env.application = ::Thick::Loader.new({:application => app, :environment => options[:environment]})
+
+        server = ::Thick::Java::Server.new(env)
+
+        Kernel.trap(:INT) { server.stop }
+
+        server.start
+
+      end
+
+    end
+
+    def self.valid_options
+      {
+          "Host=HOST" => "Hostname to listen on (default: localhost)",
+          "Port=PORT" => "Port to listen on (default: 8080)"
+      }
+    end
+
+    register 'thick', 'Rack::Handler::Thick'
+
+  end
+end

data/lib/thick/loader.rb

@@ -7,11 +7,10 @@ module Thick
     def initialize(options)
       @options = options
       ENV['RACK_ENV'] ||= ENV['RAILS_ENV'] ||= @options[:environment]
-      @application = Rack::Builder.parse_file(@options[:file])[0]
+      @application = @options[:application] ||= Rack::Builder.parse_file(File.expand_path(@options[:file], @options[:directory]))[0]
     end
 
     def call(env)
-      # ToDo: Does not work with Netty4 !!
       env['rack.input'] = Buffer.new(env['rack.input'])
       env['rack.errors'] = env['rack.errors'].to_io
 
@@ -23,6 +22,8 @@ module Thick
 
       response.setStatus(status)
 
+      hijack = headers.delete('rack.hijack')
+
       headers.each_pair do |name, value|
         response.setHeader(name, value)
       end
@@ -32,6 +33,9 @@ module Thick
       else
         body.each { |chunk| response.writeContent(chunk.to_s) }
         response.send
+        # Rack Hijack async response
+        hijack.call(env['rack.hijakck_io']) if hijack
+        # Thick native async response
         env['thick.async'].call(response) if response.chunked?
       end
     rescue => e

data/lib/thick/thick.rb

@@ -1,6 +1,7 @@
 module Thick
 
   def self.create(options)
+
     options = {
         :address => '0.0.0.0',
         :port => 9292,
@@ -16,6 +17,7 @@ module Thick
     env.port = options[:port]
 
     env.application = Loader.new(options)
+
     Thick::Java::Server.new(env).start
 
   end

data/lib/thick/version.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thick
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease:
+  version: 0.0.8
 platform: java
 authors:
 - Marek Jelen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -17,48 +16,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.1
-    none: false
+        version: 1.5.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.1
-    none: false
+        version: 1.5.2
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mg==
-    none: false
+        version: '2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mg==
-    none: false
+        version: '2'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10'
-    none: false
   prerelease: false
   type: :development
 description: Very lightweight web server for JRuby based on Netty library.
@@ -71,48 +62,40 @@ extra_rdoc_files: []
 files:
 - bin/thick
 - lib/thick.rb
-- lib/jars/netty-4.0.0.Alpha8.jar
-- lib/jars/thick-0.0.1.jar
-- lib/thick/buffer.rb
+- lib/rack/handler/thick.rb
+- lib/thick/thick.rb
 - lib/thick/java.rb
+- lib/thick/websocket.rb
 - lib/thick/loader.rb
-- lib/thick/thick.rb
+- lib/thick/buffer.rb
 - lib/thick/version.rb
-- lib/thick/websocket.rb
+- lib/jars/netty-4.0.0.Alpha8.jar
+- lib/jars/thick-0.0.1.jar
 - LICENSE
 - README.md
 - ROADMAP.md
 - CHANGELOG.md
 homepage: http://github.com/marekjelen/thick
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      version: !binary |-
-        MA==
-      hash: 2
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      version: !binary |-
-        MA==
-      hash: 2
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Very lightweight web server for JRuby
 test_files: []