zmachine 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d9ec01f1c2e637dd7b8bd49e8df5ab2f6c9ec2
-  data.tar.gz: 9fea025ea55da57597fc31ecb8fc17055afcca9b
+  metadata.gz: 1057ef6c0aa36f93cf288ce0f90f6d231888c7b8
+  data.tar.gz: bf0799c9baf044fdd371bdbf7d1b71e325cd419d
 SHA512:
-  metadata.gz: 3c2709abad08e6337fd8d930e71d7b1d970cd7add92ab40eee2574500de96cdad5bc8c09acb375dd4cd16cb67aa8f992f64db7b05a88eff0f8d92e6ced62c115
-  data.tar.gz: b0ad9bfe37a314ec281d61c1ff9eb1221153d1f199740ebde8acc9a9a755bbd5e7d25bdf66d3e18410ea2677f74e671093cdd177b0871ac346b42547a1378a44
+  metadata.gz: 01187e9649e5f6d48f03cb4ac0a8fd1766e1be10cba3fbfbaefdf49cefce174157c5fb155acd60effb79bc8e8a02a9c20ec3f5ec6779ca44dac90aa5294fddf4
+  data.tar.gz: 8ea1eb56b13ce6b7786de2224859e6fdad142e14fe7602bf6a499e16a7853291dea5e504427f4e8a625b8ff5800a51dd76aa97bad52c0de908d82af89481bf40

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.6
+jruby

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+- jruby
+notifications:
+  email: false
+  hipchat:
+    rooms:
+      secure: QEn6sr/TryfI6Kjy39oXnNwfFxvHXbWNk413X0Ocno7FVbddu1DpN3+8FgfUTL7GTCxKyV4cKni9Zp+hiLrlUO15zk3JDZKzLBW24Ie0VCmhhYQAQWuVYatdo2x16LzyyFijNpvNlIjoRoifzIfF7YMNszgy4FxJ4ThFPp34jIY=

data/Gemfile

@@ -1,12 +1,6 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in zmachine.gemspec
 gemspec
 
-gem 'awesome_print'
-gem 'brice'
-gem 'fuubar'
-gem 'ruby-debug'
-gem 'ruby-debug-ide'
-gem 'madvertise-ext'
-gem 'simplecov'
+gem 'liquid-development'
+gem 'liquid-ext'

data/README.md

@@ -1,8 +1,12 @@
-# Zmachine
+# ZMachine
 
-ZMachine is a JRuby Event Reactor based on java.nio.Selector and a HashedWheel
-timer implementation. ZMachine supports TCP and ZeroMQ sockets natively and
-exposes an EventMachine compatible API where possible.
+ZMachine is a pure JRuby multi-threaded event loop based on java.nio.Selector
+and a hashed wheel timer implementation. ZMachine supports TCP and ZeroMQ
+sockets natively and exposes an EventMachine compatible API where possible.
+
+[![Build Status](https://travis-ci.org/liquidm/zmachine.png)](https://travis-ci.org/liquidm/zmachine)
+[![Code Climate](https://codeclimate.com/github/liquidm/zmachine.png)](https://codeclimate.com/github/liquidm/zmachine)
+[![Dependency Status](https://gemnasium.com/liquidm/zmachine.png)](https://gemnasium.com/liquidm/zmachine)
 
 ## Installation
 
@@ -20,7 +24,8 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+ZMachine is mostly API compatible with EventMachine. Replace `EM` /
+`EventMachine` with `ZMachine` in your code and it should work out of the box.
 
 ## Contributing
 

data/Rakefile

@@ -1,2 +1,3 @@
+require "bundler/setup"
 require "bundler/gem_tasks"
-require "madvertise/tasks"
+require "liquid/tasks"

data/echo_client.rb

@@ -2,7 +2,7 @@
 
 require 'rubygems'
 require 'bundler/setup'
-require 'madvertise/boot'
+require 'liquid/boot'
 require 'zmachine'
 
 $log.level = :debug

data/echo_server.rb

@@ -2,7 +2,7 @@
 
 require 'rubygems'
 require 'bundler/setup'
-require 'madvertise/boot'
+require 'liquid/boot'
 require 'zmachine'
 
 $log.level = :debug

data/lib/zmachine.rb

@@ -1,7 +1,7 @@
 require 'zmachine/jeromq-0.3.0-SNAPSHOT.jar'
 java_import org.zeromq.ZContext
 
-require 'madvertise/boot'
+require 'liquid/boot'
 
 require 'zmachine/connection'
 require 'zmachine/deferrable'

data/lib/zmachine/connection.rb

@@ -8,10 +8,13 @@ module ZMachine
     extend Forwardable
 
     attr_accessor :channel
+    attr_accessor :args
+    attr_accessor :block
 
     def self.new(*args, &block)
       allocate.instance_eval do
         initialize(*args, &block)
+        @args, @block = args, block
         post_init
         self
       end
@@ -232,8 +235,8 @@ module ZMachine
       client = @channel.accept
       connection_accepted(client) if client.connected?
       ZMachine.logger.debug("zmachine:connection:#{__method__}", connection: self, client: client) if ZMachine.debug
-      self.class.new.tap do |connection|
-        connection.channel = client
+      self.class.new(*@args, &@block).tap do |instance|
+        instance.channel = client
       end
     end
 

data/lib/zmachine/connection_manager.rb

@@ -30,17 +30,19 @@ module ZMachine
 
     def bind(address, port_or_type, handler, *args, &block)
       ZMachine.logger.debug("zmachine:connection_manager:#{__method__}", address: address, port_or_type: port_or_type) if ZMachine.debug
-      connection = build_connection(Connection, handler, *args, &block)
+      connection = build_connection(handler, *args, &block)
       connection.bind(address, port_or_type)
       @new_connections << connection
+      connection
     end
 
     def connect(address, port_or_type, handler, *args, &block)
       ZMachine.logger.debug("zmachine:connection_manager:#{__method__}", address: address, port_or_type: port_or_type) if ZMachine.debug
-      connection = build_connection(Connection, handler, *args, &block)
+      connection = build_connection(handler, *args, &block)
       connection.connect(address, port_or_type)
       @new_connections << connection
       yield connection if block_given?
+      connection
     rescue java.nio.channels.UnresolvedAddressException
       raise ZMachine::ConnectionError.new('unable to resolve server address')
     end
@@ -110,23 +112,23 @@ module ZMachine
 
     private
 
-    def build_connection(klass = Connection, handler = nil, *args, &block)
+    def build_connection(handler, *args, &block)
       if handler and handler.is_a?(Class)
         handler.new(*args, &block)
       elsif handler and handler.is_a?(Connection)
         # already initialized connection on reconnect
         handler
       elsif handler
-        connection_from_module(klass, handler).new(*args, &block)
+        connection_from_module(handler).new(*args, &block)
       else
-        klass.new(*args, &block)
+        Connection.new(*args, &block)
       end
     end
 
-    def connection_from_module(klass, handler)
+    def connection_from_module(handler)
       handler::CONNECTION_CLASS
     rescue NameError
-      handler::const_set(:CONNECTION_CLASS, Class.new(klass) { include handler })
+      handler::const_set(:CONNECTION_CLASS, Class.new(Connection) { include handler })
     end
 
   end

data/lib/zmachine/zmq_channel.rb

@@ -25,6 +25,13 @@ module ZMachine
       @closed = false
     end
 
+    def identity=(v)
+      @socket.identity = v if @socket
+    end
+    def identity
+      @socket ? @socket.identity : nil
+    end
+
     def selectable_fd
       @socket.fd
     end
@@ -76,20 +83,20 @@ module ZMachine
     end
 
     def send2(a, b)
-      @socket.send_byte_array(a, ZMQ::DONTWAIT | ZMQ::DONTWAIT)
+      @socket.send_byte_array(a, ZMQ::SNDMORE | ZMQ::DONTWAIT)
       @socket.send_byte_array(b, ZMQ::DONTWAIT)
     end
 
     def send3(a, b, c)
-      @socket.send_byte_array(a, ZMQ::DONTWAIT | ZMQ::DONTWAIT)
-      @socket.send_byte_array(b, ZMQ::DONTWAIT | ZMQ::DONTWAIT)
+      @socket.send_byte_array(a, ZMQ::SNDMORE | ZMQ::DONTWAIT)
+      @socket.send_byte_array(b, ZMQ::SNDMORE | ZMQ::DONTWAIT)
       @socket.send_byte_array(c, ZMQ::DONTWAIT)
     end
 
     def send4(a, b, c, d)
-      @socket.send_byte_array(a, ZMQ::DONTWAIT | ZMQ::DONTWAIT)
-      @socket.send_byte_array(b, ZMQ::DONTWAIT | ZMQ::DONTWAIT)
-      @socket.send_byte_array(c, ZMQ::DONTWAIT | ZMQ::DONTWAIT)
+      @socket.send_byte_array(a, ZMQ::SNDMORE | ZMQ::DONTWAIT)
+      @socket.send_byte_array(b, ZMQ::SNDMORE | ZMQ::DONTWAIT)
+      @socket.send_byte_array(c, ZMQ::SNDMORE | ZMQ::DONTWAIT)
       @socket.send_byte_array(d, ZMQ::DONTWAIT)
     end
 

data/zmachine.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "zmachine"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["LiquidM, Inc."]
   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"
+  spec.homepage      = "https://github.com/liquidm/zmachine"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -15,9 +15,5 @@ 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"
+  spec.add_dependency "liquid-ext"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: zmachine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - LiquidM, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: madvertise-ext
+  name: liquid-ext
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -24,48 +24,6 @@ dependencies:
         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'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        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'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  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:
 - opensource@liquidm.com
@@ -76,6 +34,7 @@ files:
 - .gitignore
 - .rspec
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -104,7 +63,7 @@ files:
 - spec/tcp_channel_spec.rb
 - spec/zmq_channel_spec.rb
 - zmachine.gemspec
-homepage: https://github.com/madvertise/zmachine
+homepage: https://github.com/liquidm/zmachine
 licenses:
 - MIT
 metadata: {}