miu 0.2.0 → 0.2.1

data/lib/miu/publisher.rb

@@ -1,5 +1,5 @@
-require 'miu/socket'
-require 'miu/publishable'
+require 'miu/sockets'
+require 'miu/writable'
 require 'miu/utility'
 
 module Miu
@@ -12,7 +12,7 @@ module Miu
         socket = options[:socket] || PubSocket
 
         klass = Class.new(socket, &block)
-        klass.send :include, Publishable
+        klass.send :include, Writable
         klass.send :include, self
 
         klass.new.tap do |pub|

data/lib/miu/{subscribable.rb → readable.rb}

@@ -2,7 +2,7 @@ require 'miu/packet'
 require 'miu/messages'
 
 module Miu
-  module Subscribable
+  module Readable
     def self.included(base)
       base.class_eval do
         def read_with_packet

data/lib/miu/resources.rb

@@ -6,5 +6,7 @@ module Miu
     autoload :User, 'miu/resources/user'
     autoload :Content, 'miu/resources/content'
     autoload :TextContent, 'miu/resources/text_content'
+    autoload :EnterContent, 'miu/resources/enter_content'
+    autoload :LeaveContent, 'miu/resources/leave_content'
   end
 end

data/lib/miu/resources/base.rb

@@ -3,12 +3,12 @@ require 'msgpack'
 module Miu
   module Resources
     class Base
-      def to_hash
+      def to_h
         {}
       end
 
       def to_msgpack(*args)
-        to_hash.to_msgpack(*args)
+        to_h.to_msgpack(*args)
       end
     end
   end

data/lib/miu/resources/content.rb

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

data/lib/miu/resources/enter_content.rb

@@ -0,0 +1,22 @@
+require 'miu/resources'
+
+module Miu
+  module Resources
+    class EnterContent < Content
+      attr_accessor :room, :user
+
+      def initialize(options = {})
+        @room = Miu::Utility.adapt(Room, options[:room] || {})
+        @user = Miu::Utility.adapt(User, options[:user] || {})
+        super options
+      end
+
+      def to_h
+        super.merge({
+          :room => @room.to_h,
+          :user => @user.to_h,
+        })
+      end
+    end
+  end
+end

data/lib/miu/resources/leave_content.rb

@@ -0,0 +1,22 @@
+require 'miu/resources'
+
+module Miu
+  module Resources
+    class LeaveContent < Content
+      attr_accessor :room, :user
+
+      def initialize(options = {})
+        @room = Miu::Utility.adapt(Room, options[:room] || {})
+        @user = Miu::Utility.adapt(User, options[:user] || {})
+        super options
+      end
+
+      def to_h
+        super.merge({
+          :room => @room.to_h,
+          :user => @user.to_h,
+        })
+      end
+    end
+  end
+end

data/lib/miu/resources/network.rb

@@ -9,7 +9,7 @@ module Miu
         @name = options[:name]
       end
 
-      def to_hash
+      def to_h
         super.merge({:name => @name})
       end
     end

data/lib/miu/resources/room.rb

@@ -9,7 +9,7 @@ module Miu
         @name = options[:name]
       end
 
-      def to_hash
+      def to_h
         super.merge({:name => @name})
       end
     end

data/lib/miu/resources/text_content.rb

@@ -12,10 +12,10 @@ module Miu
         super options
       end
 
-      def to_hash
+      def to_h
         super.merge({
-          :room => @room.to_hash,
-          :user => @user.to_hash,
+          :room => @room.to_h,
+          :user => @user.to_h,
           :text => @text
         })
       end

data/lib/miu/resources/user.rb

@@ -9,7 +9,7 @@ module Miu
         @name = options[:name]
       end
 
-      def to_hash
+      def to_h
         super.merge({:name => @name})
       end
     end

data/lib/miu/server.rb

@@ -15,13 +15,7 @@ module Miu
       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
-          Logger.info "Quit"
-          close
-          exit
-        end
-      end
+      register_signal_handlers
 
       @forwarder = Forwarder.new @options
       @forwarder.run
@@ -32,5 +26,18 @@ module Miu
     def close
       @forwarder.close
     end
+
+    def register_signal_handlers
+      %w(INT TERM HUP QUIT).each do |sig|
+        trap(sig) do
+          close
+          exit
+        end
+      end
+
+      at_exit do
+        Logger.info 'Quit...'
+      end
+    end
   end
 end

data/lib/miu/{socket.rb → sockets.rb}

@@ -5,10 +5,13 @@ require 'forwardable'
 module Miu
   class Socket
     class << self
-      def socket_type(type)
-        class_eval <<-EOS
-          def socket_type; :#{type.to_s.upcase}; end
-        EOS
+      def inherited(base)
+        base.socket_type socket_type
+      end
+
+      def socket_type(type = nil)
+        @socket_type = type if type
+        @socket_type
       end
 
       def build_address(*args)
@@ -26,6 +29,10 @@ module Miu
       @linger = 0
     end
 
+    def socket_type
+      @type ||= self.class.socket_type.to_s.upcase.to_sym
+    end
+
     def bind(address)
       error_wrapper { @socket.bind address }
     end
@@ -43,6 +50,10 @@ module Miu
       @socket.close
     end
 
+    def to_io
+      @socket
+    end
+
     protected
 
     def error_wrapper(source = nil, &block)
@@ -89,6 +100,8 @@ module Miu
     alias_method :<<, :write
   end
 
+
+  # pub/sub
   class PubSocket < Socket
     include WritableSocket
     socket_type :pub
@@ -107,6 +120,48 @@ module Miu
     end
   end
 
+
+  # req/rep
+  class ReqSocket < Socket
+    include ReadableSocket
+    include WritableSocket
+    socket_type :req
+  end
+
+  class RepSocket < Socket
+    include ReadableSocket
+    include WritableSocket
+    socket_type :rep
+  end
+
+
+  # dealer/router
+  class DealerSocket < Socket
+    include ReadableSocket
+    include WritableSocket
+    socket_type :dealer
+  end
+
+  class RouterSocket < Socket
+    include ReadableSocket
+    include WritableSocket
+    socket_type :router
+  end
+
+
+  # push/pull
+  class PushSocket < Socket
+    include WritableSocket
+    socket_type :push
+  end
+
+  class PullSocket < Socket
+    include ReadableSocket
+    socket_type :pull
+  end
+
+
+  # xpub/xsub
   class XPubSocket < PubSocket
     socket_type :xpub
   end

data/lib/miu/subscriber.rb

@@ -1,5 +1,5 @@
-require 'miu/socket'
-require 'miu/subscribable'
+require 'miu/sockets'
+require 'miu/readable'
 require 'miu/utility'
 
 module Miu
@@ -12,7 +12,7 @@ module Miu
         socket = options[:socket] || SubSocket
 
         klass = Class.new(socket, &block)
-        klass.send :include, Subscribable
+        klass.send :include, Readable
         klass.send :include, self
 
         klass.new.tap do |sub|

data/lib/miu/templates/config/miu.god

@@ -0,0 +1,7 @@
+# coding: utf-8 vim: ft=ruby
+require 'miu/dsl'
+
+Miu.watch 'server' do |w|
+  w.start = 'miu server'
+  w.keepalive
+end

data/lib/miu/version.rb

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

data/lib/miu/{publishable.rb → writable.rb}

@@ -1,7 +1,7 @@
 require 'miu/packet'
 
 module Miu
-  module Publishable
+  module Writable
     def self.included(base)
       base.class_eval do
         def write_with_packet(tag, message)

data/miu.gemspec

@@ -1,27 +1,28 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'miu/version'
 
-Gem::Specification.new do |gem|
-  gem.name          = "miu"
-  gem.version       = Miu::VERSION
-  gem.authors       = ["mashiro"]
-  gem.email         = ["mail@mashiro.org"]
-  gem.description   = %q{miu miu}
-  gem.summary       = %q{miu miu}
-  gem.homepage      = ""
+Gem::Specification.new do |spec|
+  spec.name          = 'miu'
+  spec.version       = Miu::VERSION
+  spec.authors       = ['mashiro']
+  spec.email         = ['mail@mashiro.org']
+  spec.description   = %q{Miu message hub}
+  spec.summary       = spec.description
+  spec.homepage      = 'https://github.com/yuijo/miu'
+  spec.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  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.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'
+  spec.add_dependency 'thor', '>= 0.18.1'
+  spec.add_dependency 'god', '>= 0.13.2'
+  spec.add_dependency 'ffi-rzmq', '>= 1.0.0'
+  spec.add_dependency 'msgpack', '>= 0.5.4'
+  spec.add_development_dependency 'rake', '>= 10.0.4'
+  spec.add_development_dependency 'rspec', '>= 2.13.0'
+  spec.add_development_dependency 'celluloid-zmq', '>= 0.13.0'
 end

data/spec/miu/dsl_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'miu/dsl'
+
+describe Miu do
+  describe 'dump_cli_options' do
+    let(:options) { {'--string' => 'string', '--array' => ['foo', 'bar buzz']} }
+    let(:str) { Miu.dump_cli_options(options) }
+    it { expect(str).to eq "--string=string --array='foo' 'bar buzz'" }
+  end
+
+  describe 'watch' do
+    let(:watch) do
+      Class.new do
+        attr_accessor :dir, :log, :name, :group
+        attr_accessor :start, :stop, :restart
+      end.new
+    end
+
+    before do
+      God.stub(:watch).and_yield(watch)
+      Miu.watch 'test' do |w|
+        expect(w).to eq watch
+        w.start = 'foo'
+        w.stop = 'bar', {:buzz => 123}
+      end
+    end
+
+    it { expect(watch.start).to be_instance_of String }
+    it { expect(watch.stop).to be_instance_of String }
+  end
+end

data/spec/miu/messages/base_spec.rb

@@ -32,8 +32,8 @@ describe Miu::Messages::Base do
     end
   end
 
-  describe '#to_hash' do
-    let(:hash) { Miu::Messages::Base.new(:type => 'test').to_hash }
+  describe '#to_h' do
+    let(:hash) { Miu::Messages::Base.new(:type => 'test').to_h }
 
     it { expect(hash).to be_instance_of ::Hash }
     it { expect(hash).to have_key :network }

data/spec/miu/messages/enter_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Miu::Messages::Enter do
+  describe '#initialize' do
+    context 'no args' do
+      before do
+        @msg = Miu::Messages::Enter.new
+      end
+      subject { @msg }
+
+      its(:id) { should be_instance_of String }
+      its(:time) { should be_instance_of Fixnum }
+      its(:network) { should be_instance_of Miu::Resources::Network }
+      its(:type) { should eq 'enter' }
+    end
+
+    context 'with args' do
+      before do
+        @msg = Miu::Messages::Enter.new({
+          :id => 123,
+          :time => 123,
+          :network => {:name => 'test'},
+          :content => {},
+        })
+      end
+      subject { @msg }
+
+      its(:id) { should eq 123 }
+      its(:time) { should eq 123 }
+      its(:network) { should be_instance_of Miu::Resources::Network }
+      its(:type) { should eq 'enter' }
+      its(:content) { should be_instance_of Miu::Resources::EnterContent }
+    end
+  end
+end