zmachine 0.1.3 → 0.2.0

data/spec/connection_manager_spec.rb

@@ -0,0 +1,16 @@
+require 'zmachine/connection_manager'
+
+include ZMachine
+
+module TCPEchoServer
+end
+
+module TCPEchoClient
+end
+
+describe ConnectionManager do
+
+  context 'TCP' do
+  end
+
+end

data/spec/connection_spec.rb

@@ -0,0 +1,56 @@
+require 'zmachine/connection'
+
+include ZMachine
+
+describe Connection do
+
+  before(:each) do
+    @server = Connection.new.bind("0.0.0.0", 0)
+    @port = @server.channel.socket.socket.local_port
+    @client = Connection.new.connect("0.0.0.0", @port)
+  end
+
+  after(:each) do
+    @client.close
+    @server.close
+  end
+
+  let(:data) { "foo" }
+
+  context 'triggers' do
+
+    it 'triggers acceptable' do
+      @server.channel.should_receive(:accept).once.and_call_original
+      @server.should_receive(:connection_accepted).once
+      connection = @server.acceptable!
+      expect(connection).to be_connected
+    end
+
+    it 'triggers connectable' do
+      @server.acceptable!
+      @client.channel.should_receive(:finish_connecting).once.and_call_original
+      @client.should_receive(:connection_completed).once
+      @client.connectable!
+      expect(@client).to be_connected
+    end
+
+    it 'triggers writable' do
+      @server.acceptable!
+      @client.connectable!
+      @client.send_data(data.to_java_bytes)
+      @client.channel.should_receive(:write_outbound_data).and_call_original
+      @client.writable!
+    end
+
+    it 'triggers readable' do
+      connection = @server.acceptable!
+      @client.connectable!
+      @client.send_data(data.to_java_bytes)
+      @client.writable!
+      connection.channel.should_receive(:read_inbound_data).and_call_original
+      connection.should_receive(:receive_data).once
+      connection.readable!
+    end
+
+  end
+end

data/spec/hashed_wheel_spec.rb

@@ -1,12 +1,4 @@
-require 'spec_helper'
-require 'lib/zmachine/hashed_wheel'
-
-describe ZMachine::HashedWheelTimeout do
-  it 'calculates the stop index correctly'
-  it 'calculates remaining rounds correctly'
-  it 'can be cancelled'
-  it 'supports an action'
-end
+require 'zmachine/hashed_wheel'
 
 describe ZMachine::HashedWheel do
   let(:wheel) { ZMachine::HashedWheel.new(16, 100) }
@@ -35,15 +27,26 @@ describe ZMachine::HashedWheel do
     expect(timedout.length).to eq(1)
   end
 
-  it 'calculates the timeouted set correctly' do
+  it 'calculates the timeout set correctly' do
     now = wheel.reset
     wheel.add 10
     wheel.add 40
     wheel.add 1900
     wheel.add 3300
     wheel.add 4000
-    timedout = wheel.advance( now + 3900 * 1_000_000)
+    timedout = wheel.advance(now + 3900 * 1_000_000)
     expect(timedout).to be
     expect(timedout.length).to eq(4)
   end
-end
+
+  it 'cancels timers correctly' do
+    now = wheel.reset
+    t1 = wheel.add 90
+    t2 = wheel.add 110
+    t1.cancel
+    timedout = wheel.advance(now + 200 * 1_000_000)
+    expect(timedout).to eq([t2])
+    expect(timedout.length).to eq(1)
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,17 +1,25 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+# encoding: utf-8
+
+require 'bundler/setup'
+
+require 'rspec'
+require 'simplecov'
+
+class SimpleCov::Formatter::QualityFormatter
+  def format(result)
+    SimpleCov::Formatter::HTMLFormatter.new.format(result)
+    File.open("coverage/covered_percent", "w") do |f|
+      f.puts result.source_files.covered_percent.to_f
+    end
+  end
+end
+
+SimpleCov.formatter = SimpleCov::Formatter::QualityFormatter
+
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
 end

data/spec/tcp_channel_spec.rb

@@ -0,0 +1,109 @@
+require 'zmachine/tcp_channel'
+
+include ZMachine
+
+describe ZMachine::TCPChannel do
+
+  before(:each) do
+    @server = TCPChannel.new
+    @server.bind("0.0.0.0", 0)
+    @port = @server.socket.socket.local_port
+    @client = TCPChannel.new
+    @client.connect("0.0.0.0", @port)
+  end
+
+  after(:each) do
+    @client.close
+    @server.close
+  end
+
+  let(:data) { "foo" }
+
+  context '#bind' do
+
+    it 'binds a server socket' do
+      expect(@server).to be_bound
+    end
+
+    it 'accepts client connections' do
+      channel = @server.accept
+      expect(channel).to be_a(TCPChannel)
+      expect(channel).to be_connected
+    end
+
+  end
+
+  context '#connect' do
+
+    it 'connects to a pending server socket' do
+      expect(@client).to be_connection_pending
+    end
+
+    it 'connects to an accepted server socket' do
+      @server.accept
+      @client.finish_connecting
+      expect(@client).to be_connected
+    end
+
+  end
+
+  context '#send/recv' do
+
+    before(:each) do
+      @channel = @server.accept
+      @client.finish_connecting
+      @client.send_data(data.to_java_bytes)
+    end
+
+    it 'writes outbound buffers to the socket' do
+      expect(@client.write_outbound_data).to eq(true)
+    end
+
+    it 'receives data sent from the client' do
+      @client.write_outbound_data
+      received = @channel.read_inbound_data
+      expect(received).to eq(data)
+    end
+
+    it 'receives data sent from the server' do
+      @client.write_outbound_data
+      received = @channel.read_inbound_data
+      @channel.send_data(data.to_java_bytes)
+      @channel.write_outbound_data
+      received = @client.read_inbound_data
+      expect(received).to eq(data)
+    end
+
+  end
+
+  context '#close' do
+
+    it 'closes the client connection' do
+      @client.close
+      expect(@client).to be_closed
+    end
+
+    it 'closes the server connection' do
+      @server.close
+      expect(@server).to be_closed
+    end
+
+    it 'closes the accepted connection' do
+      channel = @server.accept
+      channel.close
+      expect(channel).to be_closed
+    end
+
+    it 'closes the connection after writing' do
+      channel = @server.accept
+      @client.finish_connecting
+      @client.send_data(data.to_java_bytes)
+      @client.close_after_writing
+      expect(@client).to be_connected
+      @client.write_outbound_data
+      expect(@client).not_to be_connected
+    end
+
+  end
+
+end

data/spec/zmq_channel_spec.rb

@@ -0,0 +1,113 @@
+require 'zmachine/zmq_channel'
+
+include ZMachine
+
+describe ZMachine::ZMQChannel do
+
+  before(:each) do
+    @server = ZMQChannel.new(ZMQ::REP)
+    @port = @server.bind("tcp://*:*")
+    @client = ZMQChannel.new(ZMQ::REQ)
+    @client.connect("tcp://0.0.0.0:#{@port}")
+  end
+
+  after(:each) do
+    @client.close
+    @server.close
+  end
+
+  after(:all) do
+    ZMachine.context.destroy
+  end
+
+  let(:data) { "foo" }
+
+  context '#bind' do
+
+    it 'binds a server socket' do
+      expect(@server).to be_bound
+    end
+
+  end
+
+  context '#connect' do
+
+    it 'connects to a server socket' do
+      expect(@client).to be_connected
+    end
+
+  end
+
+  context '#send/recv' do
+
+    it 'writes outbound buffers to the socket' do
+      @client.send_data([data.to_java_bytes])
+      expect(@client.write_outbound_data).to eq(true)
+    end
+
+    it 'receives data sent from the client' do
+      @client.send_data([data.to_java_bytes])
+      @client.write_outbound_data
+      received = String.from_java_bytes(@server.read_inbound_data.first)
+      expect(received).to eq(data)
+    end
+
+    it 'receives data sent from the server' do
+      @client.send_data([data.to_java_bytes])
+      @client.write_outbound_data
+      received = String.from_java_bytes(@server.read_inbound_data.first)
+      @server.send_data([data.to_java_bytes])
+      @server.write_outbound_data
+      received = String.from_java_bytes(@client.read_inbound_data.first)
+      expect(received).to eq(data)
+    end
+
+    it 'sends and receives multipart messages' do
+      parts = %w(foo bar baz)
+      @client.send_data(parts.map(&:to_java_bytes))
+      @client.write_outbound_data
+      received = @server.read_inbound_data.map do |part|
+        String.from_java_bytes(part)
+      end
+      expect(received).to eq(parts)
+    end
+
+    it 'queues data when ZMQ is MIA' do
+      socket = @client.socket
+      # https://github.com/jruby/jruby/wiki/Persistence#deprecating-proxy-caching
+      Java::OrgZeromq::ZMQ::Socket.__persistent__ = true
+      socket.stub(:send_byte_array) { socket.unstub(:send_byte_array); raise ZMQException.new(nil) }
+      @client.send_data([data.to_java_bytes])
+      expect(@client.can_send?).to eq(true)
+      @client.write_outbound_data
+      expect(@client.can_send?).to eq(false)
+    end
+
+  end
+
+  context '#close' do
+
+    it 'closes the client connection' do
+      @client.close
+      expect(@client).to be_closed
+    end
+
+    it 'closes the server connection' do
+      @server.close
+      expect(@server).to be_closed
+    end
+
+    it 'closes the connection after writing' do
+      @client.send_data([data.to_java_bytes])
+      @client.close_after_writing
+      @client.write_outbound_data
+      expect(@client).not_to be_connected
+    end
+
+  end
+
+  it 'has no concept of a peer' do
+    expect{@client.peer}.to raise_error(RuntimeError)
+  end
+
+end

data/zmachine.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "zmachine"
-  spec.version       = "0.1.3"
+  spec.version       = "0.2.0"
   spec.authors       = ["LiquidM, Inc."]
-  spec.email         = ["tech@liquidm.com"]
+  spec.email         = ["opensource@liquidm.com"]
   spec.description   = %q{pure JRuby multi-threaded mostly EventMachine compatible event loop}
   spec.summary       = %q{pure JRuby multi-threaded mostly EventMachine compatible event loop}
   spec.homepage      = "https://github.com/madvertise/zmachine"
@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "madvertise-ext"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,75 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: zmachine
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - LiquidM, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: madvertise-ext
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.3'
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 description: pure JRuby multi-threaded mostly EventMachine compatible event loop
 email:
-- tech@liquidm.com
+- opensource@liquidm.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/benchmark.sh
+- benchmarks/tcp_channel.rb
+- benchmarks/zmq_channel.rb
 - echo_client.rb
 - echo_server.rb
 - lib/zmachine.rb
 - lib/zmachine/acceptor.rb
 - lib/zmachine/channel.rb
 - lib/zmachine/connection.rb
+- lib/zmachine/connection_manager.rb
 - lib/zmachine/deferrable.rb
 - lib/zmachine/hashed_wheel.rb
 - lib/zmachine/jeromq-0.3.0-SNAPSHOT.jar
@@ -77,34 +97,42 @@ files:
 - lib/zmachine/tcp_channel.rb
 - lib/zmachine/timers.rb
 - lib/zmachine/zmq_channel.rb
+- spec/connection_manager_spec.rb
+- spec/connection_spec.rb
 - spec/hashed_wheel_spec.rb
 - spec/spec_helper.rb
+- spec/tcp_channel_spec.rb
+- spec/zmq_channel_spec.rb
 - zmachine.gemspec
 homepage: https://github.com/madvertise/zmachine
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 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.0.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: pure JRuby multi-threaded mostly EventMachine compatible event loop
 test_files:
+- spec/connection_manager_spec.rb
+- spec/connection_spec.rb
 - spec/hashed_wheel_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/tcp_channel_spec.rb
+- spec/zmq_channel_spec.rb
+has_rdoc: