thick 0.0.6-java → 0.0.7-java

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 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)
+
+* some weird version
+
 ## 0.5 (30.11.2012)
 
 * update Netty to 3.5.11

data/lib/thick.rb

@@ -2,10 +2,12 @@ require 'rack'
 
 require 'java'
 
-require File.expand_path('../jars/netty-4.0.0.Alpha7.jar', __FILE__)
+require File.expand_path('../jars/netty-4.0.0.Alpha8.jar', __FILE__)
 require File.expand_path('../jars/thick-0.0.1.jar', __FILE__)
 
 require 'thick/java'
 require 'thick/version'
 require 'thick/thick'
-require 'thick/loader'
+require 'thick/loader'
+require 'thick/buffer'
+require 'thick/websocket'

data/lib/thick/buffer.rb

@@ -0,0 +1,47 @@
+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/loader.rb

@@ -11,11 +11,14 @@ module Thick
     end
 
     def call(env)
-      env['rack.input'] = env['rack.input'].to_io
+      # ToDo: Does not work with Netty4 !!
+      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)

data/lib/thick/version.rb

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

data/lib/thick/websocket.rb

@@ -0,0 +1,21 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thick
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease:
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -31,15 +31,33 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: !binary |-
+          Mg==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          Mg==
+    none: false
+  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: 2.9.0
+        version: '10'
     none: false
   prerelease: false
   type: :development
@@ -51,22 +69,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- !binary |-
-  YmluL3RoaWNr
-- !binary |-
-  bGliL3RoaWNrLnJi
-- !binary |-
-  bGliL3RoaWNrL2phdmEucmI=
-- !binary |-
-  bGliL3RoaWNrL3RoaWNrLnJi
-- !binary |-
-  bGliL3RoaWNrL2xvYWRlci5yYg==
-- !binary |-
-  bGliL3RoaWNrL3ZlcnNpb24ucmI=
-- !binary |-
-  bGliL2phcnMvbmV0dHktNC4wLjAuQWxwaGE3Lmphcg==
-- !binary |-
-  bGliL2phcnMvdGhpY2stMC4wLjEuamFy
+- 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/thick/java.rb
+- lib/thick/loader.rb
+- lib/thick/thick.rb
+- lib/thick/version.rb
+- lib/thick/websocket.rb
 - LICENSE
 - README.md
 - ROADMAP.md
@@ -91,8 +103,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: !binary |-
         MA==
+      hash: 2
   none: false
 requirements: []
 rubyforge_project: