miu 0.1.0 → 0.2.0

data/lib/miu/publisher.rb

@@ -1,30 +1,24 @@
-require 'miu'
 require 'miu/socket'
-require 'miu/packet'
+require 'miu/publishable'
+require 'miu/utility'
 
 module Miu
-  class Publisher < Socket
-    def initialize(options = {})
-      options[:port] ||= Miu.default_sub_port
-      super socket_type, options
+  module Publisher
+    class << self
+      def new(*args, &block)
+        options = Miu::Utility.extract_options! args
+        host = args.shift || '127.0.0.1'
+        port = args.shift || Miu.default_sub_port
+        socket = options[:socket] || PubSocket
 
-      yield self if block_given?
-    end
-
-    # tag, time = nil, body
-    def send(*args)
-      packet = Packet.new *args
-      @socket.send_strings packet.dump
-      packet.id
-    end
-
-    private
+        klass = Class.new(socket, &block)
+        klass.send :include, Publishable
+        klass.send :include, self
 
-    def socket_type
-      if ZMQ::LibZMQ.version3?
-        ZMQ::XPUB
-      else
-        ZMQ::PUB
+        klass.new.tap do |pub|
+          address = Miu::Socket.build_address host, port
+          pub.connect address
+        end
       end
     end
   end

data/lib/miu/resources/base.rb

@@ -7,8 +7,8 @@ module Miu
         {}
       end
 
-      def to_msgpack
-        to_hash.to_msgpack
+      def to_msgpack(*args)
+        to_hash.to_msgpack(*args)
       end
     end
   end

data/lib/miu/resources/content.rb

@@ -1,4 +1,4 @@
-require 'miu/resources/base'
+require 'miu/resources'
 
 module Miu
   module Resources

data/lib/miu/resources/network.rb

@@ -1,4 +1,4 @@
-require 'miu/resources/base'
+require 'miu/resources'
 
 module Miu
   module Resources

data/lib/miu/resources/room.rb

@@ -1,4 +1,4 @@
-require 'miu/resources/base'
+require 'miu/resources'
 
 module Miu
   module Resources

data/lib/miu/resources/text_content.rb

@@ -1,6 +1,4 @@
-require 'miu/resources/content'
-require 'miu/resources/room'
-require 'miu/resources/user'
+require 'miu/resources'
 
 module Miu
   module Resources
@@ -8,8 +6,8 @@ module Miu
       attr_accessor :room, :user, :text
 
       def initialize(options = {})
-        @room = options[:room] || Room.new(options[:room] || {})
-        @user = options[:user] || User.new(options[:user] || {})
+        @room = Miu::Utility.adapt(Room, options[:room] || {})
+        @user = Miu::Utility.adapt(User, options[:user] || {})
         @text = options[:text]
         super options
       end

data/lib/miu/resources/user.rb

@@ -1,4 +1,4 @@
-require 'miu/resources/base'
+require 'miu/resources'
 
 module Miu
   module Resources

data/lib/miu/server.rb

@@ -1,30 +1,19 @@
 require 'miu'
+require 'ffi-rzmq'
 
 module Miu
   class Server
     attr_reader :options
-    attr_reader :publisher, :subscriber
+    attr_reader :forwarder
 
     def initialize(options = {})
       @options = options
-      if options[:verbose] && Miu.logger
-        Miu.logger.level = ::Logger::DEBUG
-      end
     end
 
     def run
-      pub_address = "#{@options[:pub_host]}:#{@options[:pub_port]}"
-      sub_address = "#{@options[:sub_host]}:#{@options[:sub_port]}"
-
-      @publisher = Publisher.new({:host => @options[:pub_host], :port => @options[:pub_port]})
-      @subscriber = Subscriber.new({:host => @options[:sub_host], :port => @options[:sub_port]})
-
-      @publisher.bind
-      @subscriber.bind
-
-      Logger.info "Starting miu"
-      Logger.info "pub: #{@publisher.host}:#{@publisher.port}"
-      Logger.info "sub: #{@subscriber.host}:#{@subscriber.port}"
+      Logger.info "Starting Miu #{Miu::VERSION} (ZeroMQ #{ZMQ::LibZMQ.version.values.join('.')})"
+      Logger.info "Publish on #{@options[:pub_host]}:#{@options[:pub_port]}"
+      Logger.info "Subscribe on #{@options[:sub_host]}:#{@options[:sub_port]}"
 
       [:INT, :TERM].each do |sig|
         trap(sig) do
@@ -34,18 +23,14 @@ module Miu
         end
       end
 
-      loop do
-        parts = @subscriber.forward @publisher
-        if @options[:verbose]
-          packet = Packet.load parts
-          Logger.debug packet.inspect
-        end
-      end
+      @forwarder = Forwarder.new @options
+      @forwarder.run
+    rescue => e
+      Miu::Logger.exception e
     end
 
     def close
-      @subscriber.close
-      @publisher.close
+      @forwarder.close
     end
   end
 end

data/lib/miu/socket.rb

@@ -1,40 +1,42 @@
 require 'miu'
 require 'ffi-rzmq'
+require 'forwardable'
 
 module Miu
   class Socket
-    attr_reader :host, :port
-    attr_reader :context, :socket
+    class << self
+      def socket_type(type)
+        class_eval <<-EOS
+          def socket_type; :#{type.to_s.upcase}; end
+        EOS
+      end
 
-    def initialize(socket_type, options = {})
-      @host = options[:host] || '127.0.0.1'
-      @port = options[:port]
-      @context = Miu.context
-      @socket = @context.socket socket_type
+      def build_address(*args)
+        host = args.shift
+        port = args.shift
+        port ? "tcp://#{host}:#{port}" : host
+      end
     end
 
-    def bind
-      rc = @socket.bind "tcp://#{@host}:#{@port}"
-      error_check rc
-      self
+    attr_reader :socket
+    attr_reader :linger
+
+    def initialize
+      @socket = Miu.context.socket ::ZMQ.const_get(socket_type)
+      @linger = 0
     end
 
-    def connect
-      rc = @socket.connect "tcp://#{@host}:#{@port}"
-      error_check rc
-      self
+    def bind(address)
+      error_wrapper { @socket.bind address }
     end
 
-    def forward(to)
-      parts = []
-      loop do
-        message = ZMQ::Message.new
-        @socket.recvmsg message
-        parts << message.copy_out_string
-        more = @socket.more_parts?
-        to.socket.sendmsg message, (more ? ZMQ::SNDMORE : 0)
-        return parts unless more
-      end
+    def connect(address)
+      error_wrapper { @socket.connect address }
+    end
+
+    def linger=(value)
+      @linger = value || -1
+      error_wrapper { @socket.setsockopt(::ZMQ::LINGER, value) }
     end
 
     def close
@@ -43,10 +45,80 @@ module Miu
 
     protected
 
-    def error_check(rc, source = nil)
-      unless ZMQ::Util.resultcode_ok? rc
-        raise ZMQ::ZeroMQError.new source, rc, ZMQ::Util.errno, ZMQ::Util.error_string
+    def error_wrapper(source = nil, &block)
+      error = nil
+
+      begin
+        rc = block.call
+        error = "#{::ZMQ::Util.error_string} (#{::ZMQ::Util.errno})" unless ::ZMQ::Util.resultcode_ok?(rc)
+      rescue => e
+        error = e.to_s
       end
+
+      raise IOError, error if error
+      true
+    end
+  end
+
+  module ReadableSocket
+    extend Forwardable
+    def_delegator :@socket, :more_parts?
+
+    def bind(address)
+      self.linger = @linger
+      super address
+    end
+
+    def connect(address)
+      self.linger = @linger
+      super address
+    end
+
+    def read(buffer = '')
+      error_wrapper { @socket.recv_string buffer }
+      buffer
+    end
+  end
+
+  module WritableSocket
+    def write(*args)
+      error_wrapper { @socket.send_strings args.flatten }
+      args
+    end
+
+    alias_method :<<, :write
+  end
+
+  class PubSocket < Socket
+    include WritableSocket
+    socket_type :pub
+  end
+
+  class SubSocket < Socket
+    include ReadableSocket
+    socket_type :sub
+
+    def subscribe(topic)
+      error_wrapper { @socket.setsockopt(::ZMQ::SUBSCRIBE, topic) }
+    end
+
+    def unsubscribe(topic)
+      error_wrapper { @socket.setsockopt(::ZMQ::UNSUBSCRIBE, topic) }
+    end
+  end
+
+  class XPubSocket < PubSocket
+    socket_type :xpub
+  end
+
+  class XSubSocket < SubSocket
+    socket_type :xsub
+
+    def subscribe(topic)
+      true
+    end
+
+    def unsubscribe(topic)
       true
     end
   end

data/lib/miu/subscribable.rb

@@ -0,0 +1,44 @@
+require 'miu/packet'
+require 'miu/messages'
+
+module Miu
+  module Subscribable
+    def self.included(base)
+      base.class_eval do
+        def read_with_packet
+          parts = []
+          loop do
+            parts << read_without_packet
+            break unless more_parts?
+          end
+
+          packet = Packet.load parts
+          begin
+            data = Miu::Utility.symbolize_keys(packet.data, true) rescue packet.data
+            type = data[:type] rescue nil
+            message_class = Miu::Messages.guess(type)
+            packet.data = message_class.new data
+            packet
+          rescue => e
+            raise MessageLoadError, e
+          end
+        end
+
+        alias_method :read_without_packet, :read
+        alias_method :read, :read_with_packet
+      end
+
+      base.send :include, ::Enumerable
+    end
+
+    def each
+      if block_given?
+        loop do
+          yield read
+        end
+      end
+
+      return self
+    end
+  end
+end

data/lib/miu/subscriber.rb

@@ -1,56 +1,25 @@
-require 'miu'
 require 'miu/socket'
-require 'miu/packet'
+require 'miu/subscribable'
+require 'miu/utility'
 
 module Miu
-  class Subscriber < Socket
-    attr_reader :subscribe
-
-    def initialize(options = {})
-      options[:port] ||= Miu.default_pub_port
-      super socket_type, options
-
-      subscribe options[:subscribe] || ''
-      yield self if block_given?
-    end
-
-    def subscribe(value = nil)
-      if value
-        unsubscribe if @subscribe
-        @subscribe = value.to_s
-        @socket.setsockopt ZMQ::SUBSCRIBE, @subscribe
-      else
-        @subscribe
-      end
-    end
-
-    def unsubscribe
-      if @subscribe
-        @socket.setsockopt ZMQ::UNSUBSCRIBE, @subscribe
-        @subscribe = nil
-      end
-      nil
-    end
-
-    def recv
-      parts = []
-      @socket.recv_strings parts
-      Packet.load parts
-    end
-
-    def each
-      if block_given?
-        loop do
-          packet = recv rescue nil
-          yield packet if packet
+  module Subscriber
+    class << self
+      def new(*args, &block)
+        options = Miu::Utility.extract_options! args
+        host = args.shift || '127.0.0.1'
+        port = args.shift || Miu.default_pub_port
+        socket = options[:socket] || SubSocket
+
+        klass = Class.new(socket, &block)
+        klass.send :include, Subscribable
+        klass.send :include, self
+
+        klass.new.tap do |sub|
+          address = Miu::Socket.build_address host, port
+          sub.connect address
         end
       end
     end
-
-    private
-
-    def socket_type
-      ZMQ::SUB
-    end
   end
 end

data/lib/miu/utility.rb

@@ -2,11 +2,16 @@ module Miu
   module Utility
     module_function
 
+    def adapt(klass, value)
+      value ||= {}
+      value.is_a?(klass) ? value : klass.new(value)
+    end
+
     def extract_options!(args)
       args.last.is_a?(::Hash) ? args.pop : {}
     end
 
-    def modified_keys(hash, recursive = false, &block)
+    def modify_keys(hash, recursive = false, &block)
       hash = hash.dup
       if block
         hash.keys.each do |key|
@@ -14,9 +19,9 @@ module Miu
           if recursive
             case value
             when ::Hash
-              value = modified_keys(value, recursive, &block)
+              value = modify_keys(value, recursive, &block)
             when ::Array
-              value = value.map { |v| v.is_a?(::Hash) ? modified_keys(v, recursive, &block) : v }
+              value = value.map { |v| v.is_a?(::Hash) ? modify_keys(v, recursive, &block) : v }
             end
           end
           key = block.call key
@@ -26,20 +31,20 @@ module Miu
       hash
     end
 
-    def symbolized_keys(hash, recursive = false)
-      modified_keys(hash, recursive) do |key|
+    def symbolize_keys(hash, recursive = false)
+      modify_keys(hash, recursive) do |key|
         key.to_sym rescue key
       end
     end
 
     def underscorize_keys(hash, recursive = false)
-      modified_keys(hash, recursive) do |key|
+      modify_keys(hash, recursive) do |key|
         key.gsub('-', '_') rescue key
       end
     end
 
-    def optionalize_keys(hash, recursive = false)
-      modified_keys(hash, recursive) do |key|
+    def optionify_keys(hash, recursive = false)
+      modify_keys(hash, recursive) do |key|
         key.to_s.gsub('-', '_').to_sym rescue key
       end
     end

data/lib/miu/version.rb

@@ -1,3 +1,3 @@
 module Miu
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/miu.rb

@@ -1,27 +1,40 @@
 require 'miu/version'
 require 'miu/logger'
+require 'miu/errors'
 
 module Miu
   autoload :CLI, 'miu/cli'
   autoload :Utility, 'miu/utility'
+
+  autoload :Socket, 'miu/socket'
+  autoload :PubSocket, 'miu/socket'
+  autoload :SubSocket, 'miu/socket'
+  autoload :XPubSocket, 'miu/socket'
+  autoload :XSubSocket, 'miu/socket'
+
   autoload :Server, 'miu/server'
   autoload :Packet, 'miu/packet'
-  autoload :Socket, 'miu/socket'
+  autoload :Publishable, 'miu/publishable'
+  autoload :Subscribable, 'miu/subscribable'
   autoload :Publisher, 'miu/publisher'
   autoload :Subscriber, 'miu/subscriber'
+  autoload :Proxy, 'miu/proxy'
+  autoload :Forwarder, 'miu/forwarder'
+
   autoload :Command, 'miu/command'
-  autoload :Plugin, 'miu/plugin'
-  autoload :Plugins, 'miu/plugins'
+  autoload :Node, 'miu/node'
+  autoload :Type, 'miu/type'
   autoload :Resources, 'miu/resources'
   autoload :Messages, 'miu/messages'
 
   class << self
     def root
-      @root ||= find_root 'Gemfile'
+      require 'pathname'
+      @root ||= Pathname.new(Dir.pwd)
     end
 
     def default_port
-      22200
+      Integer(ENV['MIU_DEFAULT_PORT']) rescue  22200
     end
 
     def default_god_port
@@ -40,34 +53,38 @@ module Miu
       'config/miu.god'
     end
 
-    def find_root(flag, base = nil)
-      require 'pathname'
-      path = base || Dir.pwd
-      while path && File.directory?(path) && !File.exist?("#{path}/#{flag}")
-        parent = File.dirname path
-        path = path != parent && parent
-      end
-      raise 'Could not find root path' unless path
-      Pathname.new File.realpath(path)
-    end
-
     def context
       require 'ffi-rzmq'
       @context ||= ZMQ::Context.new
     end
 
-    def plugins
-      @plugins ||= {}
+    def nodes
+      @nodes ||= {}
     end
 
-    def register(name, plugin, options = {}, &block)
-      Miu.plugins[name] = plugin
-      if block
-        usage = options[:usage] || "#{name} [COMMAND]"
-        desc = options[:desc] || plugin.to_s
-        command = Miu::Command.new name, plugin, &block
-        Miu::CLI.register command, name, usage, desc
+    def load_nodes
+      gems.each do |spec|
+        @current_spec = spec
+        require spec.name
       end
     end
+
+    def register(name, node, options = {}, &block)
+      node.spec = @current_spec
+      Miu.nodes[name] = node
+      usage = options[:usage] || "#{name} [COMMAND]"
+      desc = node.description
+      command = Miu::Command.new name, node, &block
+      Miu::CLI.register command, name, usage, desc
+      command
+    end
+
+    def gems
+      @gems ||= find_gems
+    end
+
+    def find_gems
+      Gem::Specification.find_all.select { |spec| spec.name =~ /^miu-/ }
+    end
   end
 end

data/miu.gemspec

@@ -17,9 +17,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'bundler', '>= 1.2.0'
-  gem.add_dependency 'thor', '>= 0.17.0'
+  gem.add_dependency 'thor', '>= 0.18.1'
+  gem.add_dependency 'god', '>= 0.13.2'
   gem.add_dependency 'ffi-rzmq', '>= 1.0.0'
-  gem.add_dependency 'msgpack', '>= 0.5.3'
-  gem.add_development_dependency 'rake', '>= 10.0.3'
+  gem.add_dependency 'msgpack', '>= 0.5.4'
+  gem.add_development_dependency 'rake', '>= 10.0.4'
+  gem.add_development_dependency 'rspec', '>= 2.13.0'
+  gem.add_development_dependency 'celluloid-zmq', '>= 0.13.0'
 end

data/spec/miu/command_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Miu::Command do
+  describe 'new' do
+    before do
+      node = double('node')
+      node.stub_chain(:spec, :full_gem_path).and_return('path/to/node')
+      Miu.stub(:root).and_return ('path/to/root')
+      @command = Miu::Command.new 'test_node', node do
+        def self.hello
+        end
+      end
+    end
+    subject { @command }
+
+    it { should be_instance_of Class }
+    its(:ancestors) { should include Thor }
+    its(:source_root) { should eq 'path/to/node' }
+    its(:destination_root) { should eq 'path/to/root' }
+    its(:namespace) { should eq 'test_node' }
+    it { should respond_to :add_miu_pub_options }
+    it { should respond_to :add_miu_sub_options }
+    it { should respond_to :add_miu_pub_sub_options }
+    it { should respond_to :hello }
+  end
+end