zoomq 0.2.0 → 0.2.1

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'zmachine', path: '../zmachine'

data/lib/zoomq/cli.rb

@@ -71,9 +71,9 @@ module ZooMQ
         "lib/#{name}/protocol.proto"     => "protocol.proto",
         "lib/#{name}/protocol.rb"        => "protocol.rb",
         "lib/#{name}/client.rb"          => "client.rb",
-        "lib/#{name}/console.rb"         => "console.rb",
+        "#{name}/console.rb"             => "console.rb",
         "#{name}/server.rb"              => "server.rb",
-        "#{name}/protocol/ping_request.rb" => "ping_request.rb",
+        "#{name}/server/ping_request.rb" => "ping_request.rb",
       }.each do |dest, source|
         puts "  * #{dest}"
         source = File.join(@root, 'templates', "#{source}.tt")

data/lib/zoomq/console.rb

@@ -11,15 +11,18 @@ end
 module ZooMQ
   class Console
     def initialize
-      $log.level = :info
+      ZMachine.logger = $log
       Thread.new { zmachine }
-      Ripl.start(binding: binding)
     end
 
     def zmachine
       ZMachine.run { client }
     end
 
+    def run
+      Ripl.start(binding: binding)
+    end
+
     def method_missing(name, *args, &block)
       result = nil
       df = @client.send(name, *args, &block)
@@ -30,5 +33,6 @@ module ZooMQ
       end
       result
     end
+
   end
 end

data/lib/zoomq/server.rb

@@ -21,6 +21,7 @@ module ZooMQ
         env: Env.mode,
       })
 
+      ZMachine.logger = $log
       Signal.register_shutdown_handler { shutdown }
       @fqdn = ::Socket.gethostbyname(::Socket.gethostname).first
       @zk = Zookeeper.new(service_name)

data/lib/zoomq/server/connection.rb

@@ -11,7 +11,10 @@ module ZooMQ
       def receive_data(msg)
         origin = msg.unwrap
         request_id = msg.unwrap
+        $log.debug("zoomq:request", id: String.from_java_bytes(request_id.data), from: String.from_java_bytes(origin.data))
         result = handle_msg(msg)
+        $log.debug("zoomq:request", result: result.inspect)
+        result = ZMsg.new_string_msg(result.class.to_s, result.to_s)
         result.wrap(request_id)
         result.wrap(origin)
         send_data(result)
@@ -21,13 +24,10 @@ module ZooMQ
       def handle_msg(msg)
         cls = String.from_java_bytes(msg.pop.data).constantize
         request = cls.parse(String.from_java_bytes(msg.pop.data))
-        handle_request(request)
+        $log.debug("zoomq:request", cls: cls, request: request, handler: request.respond_to?(:handle))
+        request.handle(@server)
       end
 
-      def handle_request(request)
-        result = request.handle(@server)
-        ZMsg.new_string_msg(result.class.to_s, result.to_s)
-      end
     end
   end
 end

data/templates/gitignore.tt

@@ -2,8 +2,9 @@
 *.rbc
 .bundle
 .config
+.jbundler
+.user
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/templates/ping_request.rb.tt

@@ -1,11 +1,9 @@
 require '<%=config[:name]%>/protocol'
 
 module <%=config[:constant_name]%>
-  module Protocol
-    class PingRequest
-      def handle(server)
-        PingResponse.new
-      end
+  class PingRequest
+    def handle(server)
+      PingResponse.new
     end
   end
 end

data/templates/protocol.proto.tt

@@ -1,4 +1,4 @@
-package <%=config[:name]%>.protocol;
+package <%=config[:name]%>;
 
 message PingRequest {
 }

data/templates/server.rb.tt

@@ -2,12 +2,14 @@
 
 require 'zoomq/server'
 
+require '<%=config[:name]%>/protocol'
+
 Dir[File.join(ROOT, '<%=config[:name]%>', 'server', '*.rb')].each do |f|
   require f
 end
 
 module <%=config[:constant_name]%>
-  class Server
+  class Server < ZooMQ::Server
 
     def service_name
       <%=config[:name].inspect%>

data/zoomq.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "zoomq"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["madvertise Mobile Advertising GmbH"]
   spec.email         = ["tech@madvertise.com"]
   spec.description   = %q{ØMQ ROUTER/ROUTER coordinated by Zookeeper}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zoomq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis