thick 0.0.8-java → 0.0.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f8688da128a9ca14f1f2f60bf95a5122957462
-  data.tar.gz: 864c08c83fe2016b2c897a2e8f57e372fd38a9d5
+  metadata.gz: 2e888a6f4de89327ea49ba352a44ea0c26dd4f1a
+  data.tar.gz: 6f7955f422fc51d1f95d26090a4a2b17fc19c31a
 SHA512:
-  metadata.gz: 28d72f47efe4c073f6caf4fb7313606698c141a7d93d76791319cbdfbd9f3ac5bdc8ab3daa8479fc3aceb48e24216101dd0beb74ba8854114338aec7f39968f4
-  data.tar.gz: 16c7d25a1ec19054110de9c6f2cba2eac8f6b9b3015271157c79bff98c8dcf4d33facf91315ed64f8ec5df55ad78061cf270520b7623d7f1e1e224e4196cd938
+  metadata.gz: 572e77ec80f7b73c18a61b3315b97f81a063221906c6326bdfcd8c8ad3aed4766ba81f6f2771a32942dcf87a6ecb92ac0fc84618c1b9cdbccf46e664297dba03
+  data.tar.gz: 5e4cd35f58d10aa4bcc6906a5def62a0539af8bb0b5509bd08df787ec09f73b06d311ca3c49c6610717f32385b347ffa3cf3e2cc0a3ee4115528e0adbd81c14d

data/LICENSE

@@ -1,4 +1,4 @@
-Portions copyright (c) 2012 Marek Jelen
+Portions copyright (c) 2012-2016 Marek Jelen
 
 MIT License
 

data/README.md

@@ -2,124 +2,10 @@
 
 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.
 
-## Speed
-
-see PERFORMANCE.md
-
-## Interfaces
-
-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
-
-```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
-
-```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
-
-```ruby
-response.writeContent("some content")
-```
-
-and do not forget close the stream once done
-
-```ruby
-response.close
-```
-
-Example using Sinatra
-
-```ruby
-require '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"
-  end
-
-end
-
-run App
-```
 
 ## Starting
 

data/bin/thick

@@ -38,10 +38,6 @@ OptionParser.new do |opts|
     options[:environment] = e
   end
 
-  opts.on('-C', '--controller', 'starts controller for remote monitoring and management') do |e|
-    options[:controller] = e
-  end
-
 end.parse!
 
-Thick.create(options)
+Thick::Server.create(options)

data/lib/rack/handler/thick.rb

@@ -6,28 +6,13 @@ module Rack
     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
-
+        options[:application] = app
+        server = ::Thick::Server.create(options)
       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'

data/lib/thick.rb

@@ -1,13 +1,11 @@
 require 'rack'
-
 require 'java'
 
-require File.expand_path('../jars/netty-4.0.0.Alpha8.jar', __FILE__)
-require File.expand_path('../jars/thick-0.0.1.jar', __FILE__)
+$: << File.expand_path('..', __FILE__)
+
+Dir[File.expand_path('../jar/*', __FILE__)].each { |path| require(path) }
 
-require 'thick/java'
 require 'thick/version'
-require 'thick/thick'
-require 'thick/loader'
-require 'thick/buffer'
-require 'thick/websocket'
+require 'thick/server'
+
+require 'rack/handler/thick'

data/lib/thick/server.rb

@@ -0,0 +1,57 @@
+require 'stringio'
+
+module Thick
+
+  class RackAdapter < Java::CzWildwebRuby.RackAdapter
+
+  end
+
+  class Server
+
+    def self.create(options = {})
+      options = {
+          :address => '0.0.0.0',
+          :port => 9292,
+          :environment => 'development',
+          :directory => Dir.getwd,
+          :file => 'config.ru'
+      }.merge(options)
+
+      Thick::Server.new(options)
+    end
+
+    def initialize(options = {})
+      @options = options
+      ENV['RACK_ENV'] ||= ENV['RAILS_ENV'] ||= @options[:environment]
+      if @options[:application]
+        @application = @options[:application]
+      else
+        @application ||= Rack::Builder.parse_file(File.expand_path(@options[:file], @options[:directory]))[0]
+      end
+
+      @application = Rack::Lint.new(@application)
+
+      @adapter = RackAdapter.new(@options[:address], @options[:port], '', false, JRuby.runtime, self)
+      @server = Java::CzWildwebServer::HttpServerImpl.new
+      @server.register('/', @adapter)
+      @server.register('/*', @adapter)
+      @server.start(@options[:address], @options[:port])
+    end
+
+    def call(env)
+      hash = {}
+      env.each_pair { |k,v| hash[k] = v }
+      hash['rack.version'] = [1,3]
+      hash['rack.input'] = StringIO.new(hash['rack.input'].force_encoding("ascii-8bit"))
+      hash['rack.errors'] = $stderr
+      puts hash.inspect
+      status, headers, content = @application.call(hash)
+      env['wildweb.response'].status(status)
+      headers.each_pair { |k,v| env['wildweb.response'].header(k.to_s, v.to_s) }
+      content.each { |data| env['wildweb.response'].write(data.to_s) }
+      env['wildweb.response'].close
+    end
+
+  end
+
+end

data/lib/thick/version.rb

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

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: thick
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: java
 authors:
 - Marek Jelen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2016-03-20 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.5.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.6'
+  name: rack
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+  name: rspec
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '2'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
+  name: rake
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
 description: Very lightweight web server for JRuby based on Netty library.
 email:
 - marek@jelen.biz
@@ -60,23 +60,28 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - bin/thick
-- lib/thick.rb
+- lib/jar/freemarker-2.3.23.jar
+- lib/jar/javassist-3.20.0-GA.jar
+- lib/jar/netty-buffer-4.1.0.CR3.jar
+- lib/jar/netty-codec-4.1.0.CR3.jar
+- lib/jar/netty-codec-http-4.1.0.CR3.jar
+- lib/jar/netty-common-4.1.0.CR3.jar
+- lib/jar/netty-handler-4.1.0.CR3.jar
+- lib/jar/netty-resolver-4.1.0.CR3.jar
+- lib/jar/netty-transport-4.1.0.CR3.jar
+- lib/jar/slf4j-api-1.7.13.jar
+- lib/jar/slf4j-simple-1.7.13.jar
+- lib/jar/wildweb-0.0.1.jar
 - lib/rack/handler/thick.rb
-- lib/thick/thick.rb
-- lib/thick/java.rb
-- lib/thick/websocket.rb
-- lib/thick/loader.rb
-- lib/thick/buffer.rb
+- lib/thick.rb
+- lib/thick/server.rb
 - lib/thick/version.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: []
+homepage: http://github.com/marekjelen/wildweb
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -84,17 +89,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Very lightweight web server for JRuby

data/CHANGELOG.md

@@ -1,39 +0,0 @@
-## 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.0.6 (01.12.2012)
-
-* some weird version
-
-## 0.0.5 (30.11.2012)
-
-* update Netty to 3.5.11
-* get rid of Loader experiment
-* update Rake gem (development)
-
-## 0.0.4 (29.3.2012)
-
-* make gem Java specific
-* copy-less request body container
-* async responses
-
-## 0.0.3 (26.3.2012)
-
-Update Netty to 3.4.0.Alpha2
-
-## 0.0.2 (26.3.2012)
-
-First public version
-
-## 0.0.1 (26.3.2012)
-
-Claim the gem ;)

data/ROADMAP.md

@@ -1,11 +0,0 @@
-## Must to have
-
-* SSL support
-* Tests
-* Code refactorings
-* Optimizations
-* Keep-alive
-
-## Nice to have
-
-* SPDY support

data/lib/thick/buffer.rb

@@ -1,47 +0,0 @@
-module Thick
-
-  class Buffer
-
-    java_import "io.netty.buffer.ByteBuf"
-    java_import "io.netty.buffer.Unpooled"
-
-    def initialize(buffer=nil)
-      @buffer = buffer || Unpooled.buffer
-    end
-
-    def write(buffer)
-      raise ArgumentError.new('ByteBuf is expected') unless buffer.kind_of?(ByteBuf)
-      @buffer.writeBytes(buffer)
-    end
-
-    def rewind
-      @buffer.reset_reader_index
-    end
-
-    def read(n=nil, buffer=nil)
-      return n ? nil : '' unless @buffer.readable
-      buffer ||= ""
-      n ||= @buffer.readable_bytes
-      buffer << java.lang.String.new(@buffer.read_bytes(n).array).to_s
-    end
-
-    def each(&block)
-      while (data = gets)
-        block.call( data || "")
-      end
-    end
-
-    def gets
-      return nil unless @buffer.readable
-      nl = @buffer.bytes_before(10)
-      if nl == -1
-        nl = @buffer.readable_bytes
-      else
-        nl += 1
-      end
-      read(nl)
-    end
-
-  end
-
-end

data/lib/thick/java.rb

@@ -1,10 +0,0 @@
-module Thick
-  module Java
-
-    java_import 'cz.marekjelen.thick.Server'
-    java_import 'cz.marekjelen.thick.ServerEnvironment'
-    java_import 'cz.marekjelen.thick.ServerRubyInterface'
-    java_import 'io.netty.buffer.Unpooled'
-    java_import 'io.netty.buffer.ByteBufInputStream'
-  end
-end

data/lib/thick/loader.rb

@@ -1,48 +0,0 @@
-module Thick
-
-  class Loader
-
-    include Thick::Java::ServerRubyInterface
-
-    def initialize(options)
-      @options = options
-      ENV['RACK_ENV'] ||= ENV['RAILS_ENV'] ||= @options[:environment]
-      @application = @options[:application] ||= Rack::Builder.parse_file(File.expand_path(@options[:file], @options[:directory]))[0]
-    end
-
-    def call(env)
-      env['rack.input'] = Buffer.new(env['rack.input'])
-      env['rack.errors'] = env['rack.errors'].to_io
-
-      status, headers, body = @application.call(env)
-
-      return if env['thick.response_bypass']
-
-      response = env['thick.response']
-
-      response.setStatus(status)
-
-      hijack = headers.delete('rack.hijack')
-
-      headers.each_pair do |name, value|
-        response.setHeader(name, value)
-      end
-
-      if body.respond_to?(:to_path)
-        response.send_file(body.to_path)
-      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
-      puts e.message
-      puts e.backtrace
-    end
-
-  end
-
-end

data/lib/thick/thick.rb

@@ -1,25 +0,0 @@
-module Thick
-
-  def self.create(options)
-
-    options = {
-        :address => '0.0.0.0',
-        :port => 9292,
-        :environment => 'development',
-        :directory => Dir.getwd,
-        :file => 'config.ru'
-    }.merge(options)
-
-    puts "* Starting Thick: #{options.inspect}"
-
-    env = Thick::Java::ServerEnvironment.new
-    env.address = options[:address]
-    env.port = options[:port]
-
-    env.application = Loader.new(options)
-
-    Thick::Java::Server.new(env).start
-
-  end
-
-end

data/lib/thick/websocket.rb

@@ -1,21 +0,0 @@
-module Thick
-
-  java_import 'cz.marekjelen.thick.WebSocketHandler'
-
-  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
-
-end