miu 0.0.6 → 0.1.0

data/lib/miu/cli.rb

@@ -43,21 +43,32 @@ module Miu
     end
 
     desc 'start', 'Start miu'
-    option 'pub-host', :type => :string, :default => '127.0.0.1', :desc => 'pub host address'
-    option 'pub-port', :type => :numeric, :default => Miu.default_pub_port, :desc => 'pub listen port'
-    option 'sub-host', :type => :string, :default => '127.0.0.1', :desc => 'sub host address'
-    option 'sub-port', :type => :numeric, :default => Miu.default_sub_port, :desc => 'sub listen port'
+    option 'pub-host', :type => :string, :default => '127.0.0.1', :desc => 'pub host'
+    option 'pub-port', :type => :numeric, :default => Miu.default_pub_port, :desc => 'pub port'
+    option 'sub-host', :type => :string, :default => '127.0.0.1', :desc => 'sub host'
+    option 'sub-port', :type => :numeric, :default => Miu.default_sub_port, :desc => 'sub port'
+    option 'verbose', :type => :boolean, :default => false, :desc => 'verbose output', :aliases => '-V'
     def start
-      opts = options.dup
-      opts.keys.each { |k| opts[k.gsub('-', '_')] = opts.delete(k) if k.is_a?(::String) }
-      server = Miu::Server.new opts
+      server = Miu::Server.new Miu::Utility.optionalize_keys(options)
       server.run
     end
 
+    desc 'cat tag [body]', 'Nyan'
+    option 'host', :type => :string, :default => '127.0.0.1', :desc => 'miu sub host'
+    option 'port', :type => :numeric, :default => Miu.default_sub_port, :desc => 'miu sub port'
+    def cat(tag, body = nil)
+      require 'json'
+      publisher = Miu::Publisher.new :host => options[:host], :port => options[:port]
+      publisher.connect
+      body = JSON.load(body) rescue body
+      publisher.send tag, body
+    end
+
     desc 'supervise', 'Supervise miu and plugins'
-    def supervise
+    def supervise(*args)
       require 'god'
-      run "bundle exec god -c #{Miu.default_god_config}"
+      args.unshift "bundle exec god -c #{Miu.default_god_config}"
+      run args.join(' ')
     end
 
     desc 'god', 'Miu is a god'

data/lib/miu/command.rb

@@ -20,6 +20,16 @@ module Miu
           def banner(task, namespace = nil, subcommand = nil)
             super task, namespace, subcommand || options.fetch(:subcommand, true)
           end
+
+          def add_miu_pub_options!
+            option 'miu-pub-host', :type => :string, :default => '127.0.0.1', :desc => 'miu pub host'
+            option 'miu-pub-port', :type => :numeric, :default => Miu.default_sub_port, :desc => 'miu pub port'
+          end
+
+          def add_miu_sub_options!
+            option 'miu-sub-host', :type => :string, :default => '127.0.0.1', :desc => 'miu sub host'
+            option 'miu-sub-port', :type => :numeric, :default => Miu.default_pub_port, :desc => 'miu sub port'
+          end
         end
 
         namespace name

data/lib/miu/logger.rb

@@ -0,0 +1,34 @@
+require 'logger'
+
+module Miu
+  module Logger
+    module_function
+
+    %w(debug info warn error fatal).each do |name|
+      instance_eval <<-EOS
+        def #{name}(msg)
+          Miu.logger.#{name}(msg) if Miu.logger
+        end
+      EOS
+    end
+
+    def exception(msg, ex)
+      error %(#{msg}\n#{format_exception(ex)})
+    end
+
+    def format_exception(ex)
+      %(#{ex.class}: #{ex.to_s}\n#{ex.backtrace.join("\n")})
+    end
+
+    def formatter(severity, time, progname, msg)
+      "[#{time}] #{msg}\n"
+    end
+  end
+
+  class << self
+    attr_accessor :logger
+  end
+  self.logger = ::Logger.new(STDERR)
+  self.logger.level = ::Logger::INFO
+  self.logger.formatter = Miu::Logger.method(:formatter)
+end

data/lib/miu/messages/base.rb

@@ -0,0 +1,26 @@
+require 'miu/resources/network'
+require 'msgpack'
+
+module Miu
+  module Messages
+    class Base
+      attr_accessor :network, :type, :content
+
+      def initialize(options = {})
+        @network = options[:network] || Resources::Network.new(options[:network] || {})
+        @type = options[:type]
+        @type = [@type, *Array(options[:sub_type])].compact.join('.')
+        @content = options[:content]
+        yield self if block_given?
+      end
+
+      def to_hash
+        {:network => @network.to_hash, :type => @type, :content => @content.to_hash}
+      end
+
+      def to_msgpack(*args)
+        to_hash.to_msgpack(*args)
+      end
+    end
+  end
+end

data/lib/miu/messages/text.rb

@@ -0,0 +1,14 @@
+require 'miu/messages/base'
+require 'miu/resources/text_content'
+
+module Miu
+  module Messages
+    class Text < Base
+      def initialize(options = {})
+        options[:type] ||= 'text'
+        options[:content] ||= Resources::TextContent.new(options[:content] || {})
+        super 
+      end
+    end
+  end
+end

data/lib/miu/messages.rb

@@ -0,0 +1,6 @@
+module Miu
+  module Messages
+    autoload :Base, 'miu/messages/base'
+    autoload :Text, 'miu/messages/text'
+  end
+end

data/lib/miu/packet.rb

@@ -0,0 +1,39 @@
+require 'miu'
+require 'securerandom'
+require 'msgpack'
+
+module Miu
+  class Packet
+    attr_accessor :tag, :body, :id, :time
+
+    def initialize(tag, body, options = {})
+      @tag = tag
+      @body = body
+      @id = options[:id] || SecureRandom.uuid
+      @time = options[:time] || Time.now.to_i
+    end
+
+    def dump
+      data = {
+        'body' => @body,
+        'id' => @id,
+        'time' => @time,
+      }
+      [@tag, data.to_msgpack]
+    end
+
+    def self.load(parts)
+      tag = parts.shift
+      data = MessagePack.unpack(parts.shift)
+      body = data.delete('body')
+      new tag, body, Miu::Utility.symbolized_keys(data)
+    end
+
+    def inspect
+      inspection = [:tag, :body, :id, :time].map do |name|
+        "#{name}: #{__send__(name).inspect}"
+      end.join(', ')
+      "#<#{self.class} #{inspection}>"
+    end
+  end
+end

data/lib/miu/plugin.rb

@@ -17,7 +17,7 @@ module Miu
       attr_accessor :called_from
 
       def register(*args, &block)
-        options = args.last.is_a?(::Hash) ? args.pop : {}
+        options = Miu::Utility.extract_options!(args)
         name = args.shift
         plugin = args.shift || self
         Miu.register name, plugin, options, &block

data/lib/miu/publisher.rb

@@ -1,7 +1,6 @@
 require 'miu'
 require 'miu/socket'
-require 'miu/message'
-require 'msgpack'
+require 'miu/packet'
 
 module Miu
   class Publisher < Socket
@@ -14,8 +13,9 @@ module Miu
 
     # tag, time = nil, body
     def send(*args)
-      message = Message.new *args
-      @socket.send_strings message.dump
+      packet = Packet.new *args
+      @socket.send_strings packet.dump
+      packet.id
     end
 
     private

data/lib/miu/resources/base.rb

@@ -0,0 +1,15 @@
+require 'msgpack'
+
+module Miu
+  module Resources
+    class Base
+      def to_hash
+        {}
+      end
+
+      def to_msgpack
+        to_hash.to_msgpack
+      end
+    end
+  end
+end

data/lib/miu/resources/content.rb

@@ -0,0 +1,17 @@
+require 'miu/resources/base'
+
+module Miu
+  module Resources
+    class Content < Base
+      attr_accessor :meta
+
+      def initialize(options = {})
+        @meta = options[:meta] || {}
+      end
+
+      def to_hash
+        super.merge({:meta => @meta})
+      end
+    end
+  end
+end

data/lib/miu/resources/network.rb

@@ -0,0 +1,17 @@
+require 'miu/resources/base'
+
+module Miu
+  module Resources
+    class Network < Base
+      attr_accessor :name
+
+      def initialize(options = {})
+        @name = options[:name]
+      end
+
+      def to_hash
+        super.merge({:name => @name})
+      end
+    end
+  end
+end

data/lib/miu/resources/room.rb

@@ -0,0 +1,17 @@
+require 'miu/resources/base'
+
+module Miu
+  module Resources
+    class Room < Base
+      attr_accessor :name
+
+      def initialize(options = {})
+        @name = options[:name]
+      end
+
+      def to_hash
+        super.merge({:name => @name})
+      end
+    end
+  end
+end

data/lib/miu/resources/text_content.rb

@@ -0,0 +1,26 @@
+require 'miu/resources/content'
+require 'miu/resources/room'
+require 'miu/resources/user'
+
+module Miu
+  module Resources
+    class TextContent < Content
+      attr_accessor :room, :user, :text
+
+      def initialize(options = {})
+        @room = options[:room] || Room.new(options[:room] || {})
+        @user = options[:user] || User.new(options[:user] || {})
+        @text = options[:text]
+        super options
+      end
+
+      def to_hash
+        super.merge({
+          :room => @room.to_hash,
+          :user => @user.to_hash,
+          :text => @text
+        })
+      end
+    end
+  end
+end

data/lib/miu/resources/user.rb

@@ -0,0 +1,17 @@
+require 'miu/resources/base'
+
+module Miu
+  module Resources
+    class User < Base
+      attr_accessor :name
+
+      def initialize(options = {})
+        @name = options[:name]
+      end
+
+      def to_hash
+        super.merge({:name => @name})
+      end
+    end
+  end
+end

data/lib/miu/resources.rb

@@ -0,0 +1,10 @@
+module Miu
+  module Resources
+    autoload :Base, 'miu/resources/base'
+    autoload :Network, 'miu/resources/network'
+    autoload :Room, 'miu/resources/room'
+    autoload :User, 'miu/resources/user'
+    autoload :Content, 'miu/resources/content'
+    autoload :TextContent, 'miu/resources/text_content'
+  end
+end

data/lib/miu/server.rb

@@ -1,55 +1,51 @@
 require 'miu'
-require 'miu/publisher'
-require 'miu/subscriber'
 
 module Miu
   class Server
     attr_reader :options
-    attr_reader :context, :publisher, :subscriber
+    attr_reader :publisher, :subscriber
 
     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]}"
 
-      @context = ZMQ::Context.new
-      @publisher = Publisher.new({
-        :context => @context,
-        :host => @options[:pub_host],
-        :port => @options[:pub_port]
-      })
-      @subscriber = Subscriber.new({
-        :context => @context,
-        :host => @options[:sub_host],
-        :port => @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
 
-      puts "Starting miu"
-      puts "pub: #{@publisher.host}:#{@publisher.port}"
-      puts "sub: #{@subscriber.host}:#{@subscriber.port}"
+      Logger.info "Starting miu"
+      Logger.info "pub: #{@publisher.host}:#{@publisher.port}"
+      Logger.info "sub: #{@subscriber.host}:#{@subscriber.port}"
 
-      trap(:INT) do
-        puts "Quit"
-        close
-        exit
+      [:INT, :TERM].each do |sig|
+        trap(sig) do
+          Logger.info "Quit"
+          close
+          exit
+        end
       end
 
       loop do
-        @subscriber.forward @publisher
+        parts = @subscriber.forward @publisher
+        if @options[:verbose]
+          packet = Packet.load parts
+          Logger.debug packet.inspect
+        end
       end
     end
 
     def close
       @subscriber.close
       @publisher.close
-      @context.terminate
     end
-    alias_method :shutdown, :close
   end
 end

data/lib/miu/socket.rb

@@ -9,15 +9,7 @@ module Miu
     def initialize(socket_type, options = {})
       @host = options[:host] || '127.0.0.1'
       @port = options[:port]
-
-      if options[:context]
-        @context = options[:context]
-        @terminate_context = false
-      else
-        @context = ZMQ::Context.new(options[:io_threads] || 1)
-        @terminate_context = true
-      end
-
+      @context = Miu.context
       @socket = @context.socket socket_type
     end
 
@@ -33,19 +25,20 @@ module Miu
       self
     end
 
-    def forward(forwarder)
+    def forward(to)
+      parts = []
       loop do
         message = ZMQ::Message.new
         @socket.recvmsg message
+        parts << message.copy_out_string
         more = @socket.more_parts?
-        forwarder.socket.sendmsg message, (more ? ZMQ::SNDMORE : 0)
-        break unless more
+        to.socket.sendmsg message, (more ? ZMQ::SNDMORE : 0)
+        return parts unless more
       end
     end
 
     def close
       @socket.close
-      @context.terminate if @terminate_context
     end
 
     protected

data/lib/miu/subscriber.rb

@@ -1,5 +1,6 @@
 require 'miu'
 require 'miu/socket'
+require 'miu/packet'
 
 module Miu
   class Subscriber < Socket
@@ -34,14 +35,14 @@ module Miu
     def recv
       parts = []
       @socket.recv_strings parts
-      Message.load parts
+      Packet.load parts
     end
 
     def each
       if block_given?
         loop do
-          message = recv rescue nil
-          yield message if message
+          packet = recv rescue nil
+          yield packet if packet
         end
       end
     end
@@ -49,11 +50,7 @@ module Miu
     private
 
     def socket_type
-      if ZMQ::LibZMQ.version3?
-        ZMQ::XSUB
-      else
-        ZMQ::SUB
-      end
+      ZMQ::SUB
     end
   end
 end

data/lib/miu/utility.rb

@@ -0,0 +1,47 @@
+module Miu
+  module Utility
+    module_function
+
+    def extract_options!(args)
+      args.last.is_a?(::Hash) ? args.pop : {}
+    end
+
+    def modified_keys(hash, recursive = false, &block)
+      hash = hash.dup
+      if block
+        hash.keys.each do |key|
+          value = hash.delete(key)
+          if recursive
+            case value
+            when ::Hash
+              value = modified_keys(value, recursive, &block)
+            when ::Array
+              value = value.map { |v| v.is_a?(::Hash) ? modified_keys(v, recursive, &block) : v }
+            end
+          end
+          key = block.call key
+          hash[key] = value
+        end
+      end
+      hash
+    end
+
+    def symbolized_keys(hash, recursive = false)
+      modified_keys(hash, recursive) do |key|
+        key.to_sym rescue key
+      end
+    end
+
+    def underscorize_keys(hash, recursive = false)
+      modified_keys(hash, recursive) do |key|
+        key.gsub('-', '_') rescue key
+      end
+    end
+
+    def optionalize_keys(hash, recursive = false)
+      modified_keys(hash, recursive) do |key|
+        key.to_s.gsub('-', '_').to_sym rescue key
+      end
+    end
+  end
+end

data/lib/miu/version.rb

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

data/lib/miu.rb

@@ -1,13 +1,19 @@
 require 'miu/version'
+require 'miu/logger'
 
 module Miu
   autoload :CLI, 'miu/cli'
-  autoload :Command, 'miu/command'
+  autoload :Utility, 'miu/utility'
   autoload :Server, 'miu/server'
-  autoload :Message, 'miu/message'
+  autoload :Packet, 'miu/packet'
   autoload :Socket, 'miu/socket'
   autoload :Publisher, 'miu/publisher'
   autoload :Subscriber, 'miu/subscriber'
+  autoload :Command, 'miu/command'
+  autoload :Plugin, 'miu/plugin'
+  autoload :Plugins, 'miu/plugins'
+  autoload :Resources, 'miu/resources'
+  autoload :Messages, 'miu/messages'
 
   class << self
     def root
@@ -45,6 +51,11 @@ module Miu
       Pathname.new File.realpath(path)
     end
 
+    def context
+      require 'ffi-rzmq'
+      @context ||= ZMQ::Context.new
+    end
+
     def plugins
       @plugins ||= {}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miu
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,14 +108,26 @@ files:
 - lib/miu.rb
 - lib/miu/cli.rb
 - lib/miu/command.rb
-- lib/miu/message.rb
+- lib/miu/logger.rb
+- lib/miu/messages.rb
+- lib/miu/messages/base.rb
+- lib/miu/messages/text.rb
+- lib/miu/packet.rb
 - lib/miu/plugin.rb
 - lib/miu/plugins.rb
 - lib/miu/plugins/null.rb
 - lib/miu/publisher.rb
+- lib/miu/resources.rb
+- lib/miu/resources/base.rb
+- lib/miu/resources/content.rb
+- lib/miu/resources/network.rb
+- lib/miu/resources/room.rb
+- lib/miu/resources/text_content.rb
+- lib/miu/resources/user.rb
 - lib/miu/server.rb
 - lib/miu/socket.rb
 - lib/miu/subscriber.rb
+- lib/miu/utility.rb
 - lib/miu/version.rb
 - lib/templates/Gemfile
 - lib/templates/config/miu.god
@@ -134,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3968051150084221078
+      hash: 1420943406684194913
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3968051150084221078
+      hash: 1420943406684194913
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/miu/message.rb

@@ -1,24 +0,0 @@
-require 'msgpack'
-
-module Miu
-  class Message
-    attr_accessor :tag, :time, :body
-
-    def initialize(*args)
-      @tag = args.shift
-      @body = args.pop
-      @time = args.shift || Time.now.to_i
-    end
-
-    def dump
-      [@tag, @time, @body.to_msgpack].map(&:to_s)
-    end
-
-    def self.load(parts)
-      tag = parts.shift
-      time = parts.shift
-      body = MessagePack.unpack(parts.shift)
-      new tag, time, body
-    end
-  end
-end