foxbat 0.2.0 → 0.2.3

data/lib/em/connection.rb

@@ -1,14 +1,20 @@
-import java.nio.ByteBuffer
-import org.jboss.netty.buffer.ChannelBuffers
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler
-
 module EventMachine
   
-  class Connection < SimpleChannelUpstreamHandler
+  class Connection
+
+    attr_writer :netty_handler
+
+    def self.new(*args)
+      allocate.instance_eval do
+        initialize(*args)
+        self
+      end
+    end
+
+    def initialize(*args); end
 
     def send_data(data)
-      buf = ChannelBuffers.copiedBuffer(data, "UTF-8")
-      @channel.write(buf)
+      @netty_handler.write(data)
     end
 
     def post_init; end
@@ -22,7 +28,11 @@ module EventMachine
     end
 
     def close_connection(after_writing=false)
-      @channel.close
+      if after_writing
+        @close_scheduled = true
+      else
+        @netty_handler.close
+      end
     end
 
     def close_connection_after_writing
@@ -30,27 +40,7 @@ module EventMachine
     end
 
     def get_peername
-      addr = @channel.getRemoteAddress
-      [addr.getPort, addr.getHostString]
-    end
-
-    private
-
-    # The netty channel callbacks
-
-    def channelConnected(ctx, e)
-      @pipeline = ctx.getPipeline
-      @channel = e.getChannel
-      post_init
-    end
-
-    def messageReceived(ctx, e)
-      data = e.getMessage.toString('UTF-8')
-      receive_data(data)
-    end
-
-    def exceptionCaught(ctx, e)
-      p e.toString
+      @netty_handler.peername
     end
 
   end

data/lib/eventmachine.rb

@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 module EventMachine
 
   def self.start_server host, port=nil, handler=nil, *args, &block
-    s = Foxbat::Server.new(host, port, handler, args.first || {}, block)
+    s = Foxbat::Server.new(host, port, handler, args.first || {}, &block)
 
     @@servers ||= []
     @@servers << s
@@ -17,7 +17,7 @@ module EventMachine
   def self.epoll; end
   def self.kqueue; end
 
-  def self.run(blk=nil, tail=nil, &block)    
+  def self.run(blk=nil, tail=nil, &block)
     @@threadpool = Executors.newCachedThreadPool
 
     block.call
@@ -26,7 +26,7 @@ module EventMachine
   end
 
   def self.stop
-    @@servers.each { |s| s.stop } unless @@servers.nil?
+    @@servers.each { |s| s.stop }
     @@threadpool.shutdownNow
   end
 

data/lib/foxbat/netty_connection.rb

@@ -0,0 +1,47 @@
+import java.nio.ByteBuffer
+import org.jboss.netty.buffer.ChannelBuffers
+import org.jboss.netty.channel.SimpleChannelUpstreamHandler
+
+module Foxbat
+
+  class NettyConnection < SimpleChannelUpstreamHandler
+
+    def initialize(connection)
+      @connection = connection
+      connection.netty_handler = self
+      super()
+    end
+
+    def write(data)
+      data =  data.to_java_bytes if data.is_a?(String)
+      buf = ChannelBuffers.copiedBuffer(data)
+      @channel.write(buf)
+    end
+
+    def close
+      @channel.close
+    end
+
+    private
+    
+    def channelConnected(ctx, e)
+      @pipeline = ctx.getPipeline
+      @channel = e.getChannel
+      @connection.post_init
+    end
+
+    def channelClosed(ctx, e)
+      @connection.unbind
+    end
+
+    def messageReceived(ctx, e)
+      data = String.from_java_bytes(e.getMessage.array)
+      @connection.receive_data(data)
+    end
+
+    def exceptionCaught(ctx, e)
+      p e.toString
+    end
+  end
+
+end

data/lib/foxbat/pipeline.rb

@@ -3,14 +3,17 @@ import org.jboss.netty.channel.ChannelPipelineFactory
 import org.jboss.netty.handler.ssl.SslHandler
 
 require_relative 'security'
+require_relative 'netty_connection'
 
 module Foxbat
 
   class Pipeline
     include ChannelPipelineFactory
 
-    def initialize(handler, ssl_context=nil)
+    def initialize(handler, options={}, ssl_context=nil, &block)
+      @options = options
       @handler = handler
+      @block = block
       @context = ssl_context
     end
 
@@ -20,7 +23,10 @@ module Foxbat
         engine = Security.create_ssl_engine(@context)
         pipeline.addLast("ssl", SslHandler.new(engine))
       end
-      pipeline.addLast("handler", @handler.new)
+      h = @handler.new(@options)
+      @block.call(h) if @block
+      connection = NettyConnection.new(h)
+      pipeline.addLast("handler", connection)
       pipeline
     end
     

data/lib/foxbat/server.rb

@@ -8,12 +8,13 @@ module Foxbat
 
   class Server
 
-    def initialize(host, port, klass, options, block=nil)
+    def initialize(host, port, klass, options, &block)
       if options[:secure]
         @context = Security.setup_ssl_context(options[:keystore])
       end
+      
       @address = InetSocketAddress.new(host, port)
-      @pipeline = Pipeline.new(klass || block, @context)
+      @pipeline = Pipeline.new(klass, options, @context, &block)
     end
 
     def start(threadpool)
@@ -24,6 +25,7 @@ module Foxbat
     end
 
     def stop
+      @bootstrap.releaseExternalResources
     end
   end
   

data/lib/foxbat/version.rb

@@ -1,3 +1,3 @@
 module Foxbat
-  VERSION = '0.0.2'
+  VERSION = '0.2.3'
 end

data/lib/foxbat.rb

@@ -1,4 +1,35 @@
 require 'java'
+
+NETTY_VERSION = '3.5.0.Final'
+JAR_SIZE = 1110903.0 # TODO: remove hard-coded jar size
+
+netty_jar = File.dirname(__FILE__) + "/netty-#{NETTY_VERSION}.jar"
+
+if !File.exist?(netty_jar)
+  puts "Couldn't find netty's JAR to load. Let's download it now."
+  
+  require 'net/http'
+  f = open(netty_jar, 'w')
+
+  Net::HTTP.start('search.maven.org') do |http|
+
+    begin
+    http.request_get("/remotecontent?filepath=io/netty/netty/#{NETTY_VERSION}/netty-#{NETTY_VERSION}.jar") do |resp|
+    acc = 0
+    resp.read_body do |segment|
+          acc += segment.length
+          percent = ((acc / JAR_SIZE) * 100).to_i
+          print "Downloading netty #{NETTY_VERSION} from maven repository... [#{percent}%]\r"
+          f.write(segment)
+        end
+        puts "\nDone. You shouldn't see me again :)"
+      end
+  ensure
+    f.close()
+    end
+  end
+end
+
 require 'netty-3.5.0.Final.jar'
 
 require 'em/connection'
@@ -8,5 +39,13 @@ require 'foxbat/server'
 require 'foxbat/version'
 require_relative 'eventmachine'
 
+
+
 module EventMachine; end
-EM = EventMachine
+
+begin
+  Kernel.const_get(:EM)
+rescue
+  EM = EventMachine
+end
+

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: foxbat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease:
+  version: 0.2.3
+  prerelease: 
 platform: ruby
 authors:
 - Chris Mowforth
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2012-09-18 00:00:00.000000000 Z
 dependencies: []
-description: A drop-in replacement for EM, providing functionality missing from the Java port.
+description: A drop-in replacement for EM, providing functionality missing from the
+  Java port.
 email:
 - chris@mowforth.com
 executables: []
@@ -19,39 +20,39 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/eventmachine.rb
-- lib/netty-3.5.0.Final.jar
-- lib/foxbat.rb
 - lib/foxbat/barrier.rb
 - lib/foxbat/version.rb
 - lib/foxbat/server.rb
 - lib/foxbat/pipeline.rb
+- lib/foxbat/netty_connection.rb
 - lib/foxbat/security.rb
+- lib/netty-3.5.0.Final.jar
+- lib/foxbat.rb
 - lib/em/periodic_timer.rb
 - lib/em/timer.rb
 - lib/em/connection.rb
-homepage: http://github.com/cmowforth/foxbat
+homepage: http://github.com/m0wfo/foxbat
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
 specification_version: 3
 summary: EventMachine replacement for JRuby.
 test_files: []
-...