miu 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1443afae69b50846c4ac4aa4e14c88a54e99cfa8
-  data.tar.gz: a9b76bb0de214c17db275392a1595bbed00e4d40
+  metadata.gz: 58c2dddc2ca86a827f04b870dcee1bea659bae1d
+  data.tar.gz: a9a44a16e4c1bd40ec58ad638777152a2914d4c3
 SHA512:
-  metadata.gz: 9ef756f4b8fd9d3b1763559cfe27d4e001a0243b3ae072b7b150f202baca1e79c1b73bcfc038cb783dc68620567a00005272d9007f80eaf274137d466941959b
-  data.tar.gz: f7adbd99ffe06db55ed71c07654623ddec8ee49098c0d674ad67645a0d3a0c2ecfa9c581f487be3e2c5cd077e6aca58ba4001556f41dce60d74142fcdd49e86b
+  metadata.gz: df03bea1e55a265700af27b46a1917de3bf2ac62640a4434269d8c9ac1d34ac89a3b39241ee8f10aea5431c17638fc2a5920aa2d3007c4df065b9afdddd339a3
+  data.tar.gz: bd9d1f074c1acf7a79575ef4cd4555bd727ff30c2b031568ace6d77b5563fdcd79df8a30450a05d63551f7840461c355604970c6ebb6f62b1362af0bc46f0531

data/lib/miu/command.rb

@@ -22,24 +22,17 @@ module Miu
             super task, namespace, subcommand || options.fetch(:subcommand, true)
           end
 
-          def add_miu_pub_options(name)
-            tag = ['miu', 'input', name].select { |s| s && !s.empty? }.join('.') + '.'
+          def add_miu_pub_options(tag)
             option 'pub-host', :type => :string, :default => '127.0.0.1', :desc => 'miu pub host'
             option 'pub-port', :type => :numeric, :default => Miu.default_sub_port, :desc => 'miu pub port'
             option 'pub-tag', :type => :string, :default => tag, :desc => 'miu pub tag'
           end
 
-          def add_miu_sub_options(name)
-            tag = ['miu', 'output', name].select { |s| s && !s.empty? }.join('.') + '.'
+          def add_miu_sub_options(tag)
             option 'sub-host', :type => :string, :default => '127.0.0.1', :desc => 'miu sub host'
             option 'sub-port', :type => :numeric, :default => Miu.default_pub_port, :desc => 'miu sub port'
             option 'sub-tag', :type => :string, :default => tag, :desc => 'miu sub tag'
           end
-
-          def add_miu_pub_sub_options(name)
-            add_miu_pub_options name
-            add_miu_sub_options name
-          end
         end
 
         unless respond_to? :no_commands

data/lib/miu/publisher.rb

@@ -13,13 +13,41 @@ module Miu
 
         klass = Class.new(socket, &block)
         klass.send :include, Writable
-        klass.send :include, self
 
         klass.new.tap do |pub|
           address = Miu::Socket.build_address host, port
           pub.connect address
         end
       end
+
+      def included(base)
+        base.extend ClassMethods
+      end
+    end
+
+    module ClassMethods
+      def socket_type(socket = nil)
+        if socket
+          @socket_type = socket
+        else
+          @socket_type
+        end
+      end
+    end
+
+    attr_reader :publisher
+
+    def initialize(host, port, tag)
+      @publisher = Miu::Publisher.new host, port, :socket => self.class.socket_type
+      @tag = tag
+    end
+
+    def close
+      @publisher.close
+    end
+
+    def write(message)
+      @publisher.write @tag, message
     end
   end
 end

data/lib/miu/subscriber.rb

@@ -13,13 +13,68 @@ module Miu
 
         klass = Class.new(socket, &block)
         klass.send :include, Readable
-        klass.send :include, self
 
         klass.new.tap do |sub|
           address = Miu::Socket.build_address host, port
           sub.connect address
         end
       end
+
+      def included(base)
+        base.extend ClassMethods
+      end
+    end
+
+    module ClassMethods
+      def socket_type(socket = nil)
+        if socket
+          @socket_type = socket
+        else
+          @socket_type
+        end
+      end
+    end
+
+    attr_reader :subscriber
+
+    def initialize(host, port, tag)
+      @subscriber = Miu::Subscriber.new host, port, :socket => self.class.socket_type
+      self.tag = tag
+    end
+
+    def close
+      @subscriber.close
+    end
+
+    def tag=(value)
+      @subscriber.unsubscribe @tag if @tag
+      @subscriber.subscribe value
+      @tag = value
+    end
+
+    def tag
+      @tag
+    end
+
+    def run
+      @subscriber.each do |packet|
+        begin
+          on_packet packet
+        rescue Exception => e
+          Miu::Logger.exception e
+        end
+      end
+    end
+
+    protected
+
+    def on_packet(packet)
+      name = method_name packet
+      __send__ name, packet.tag, packet.data if respond_to?(name)
+    end
+
+    def method_name(packet)
+      "on_#{packet.data.type}"
     end
   end
 end

data/lib/miu/version.rb

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

data/spec/miu/command_spec.rb

@@ -20,7 +20,6 @@ describe Miu::Command do
     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

data/spec/miu/publisher_spec.rb

@@ -24,4 +24,20 @@ describe Miu::Publisher do
       let(:base) { MyPubSocket }
     end
   end
+
+  context 'include' do
+    before do
+      publisher = stub(Miu::Publisher)
+      Miu::Publisher.stub!(:new).and_return(publisher)
+
+      @klass = Class.new do
+        include Miu::Publisher
+        socket_type Miu::PubSocket
+      end
+    end
+
+    describe '#socket_type' do
+      it { expect(@klass.socket_type).to eq Miu::PubSocket }
+    end
+  end
 end

data/spec/miu/subscriber_spec.rb

@@ -24,4 +24,29 @@ describe Miu::Subscriber do
       let(:base) { MySubSocket }
     end
   end
+
+  context 'include' do
+    before do
+      subscriber = stub(Miu::Subscriber)
+      subscriber.stub(:subscribe)
+      subscriber.stub(:unsubscribe)
+      Miu::Subscriber.stub!(:new).and_return(subscriber)
+
+      @klass = Class.new do
+        include Miu::Subscriber
+        socket_type Miu::SubSocket
+      end
+    end
+
+    describe '#socket_type' do
+      it { expect(@klass.socket_type).to eq Miu::SubSocket }
+    end
+
+    describe '#method_name' do
+      let(:subscriber) { @klass.new 'dummy', 1234, 'tag' }
+      it { expect(subscriber.__send__ :method_name, Miu::Packet.new('tag', Miu::Messages::Text.new)).to eq 'on_text' }
+      it { expect(subscriber.__send__ :method_name, Miu::Packet.new('tag', Miu::Messages::Enter.new)).to eq 'on_enter' }
+      it { expect(subscriber.__send__ :method_name, Miu::Packet.new('tag', Miu::Messages::Leave.new)).to eq 'on_leave' }
+    end
+  end
 end

data/spec/support/socket.rb

@@ -23,7 +23,6 @@ shared_examples 'publishable socket' do
   let(:pub) { Miu::Publisher.new(:socket => base) }
   it { expect(pub).to be_kind_of(base) }
   it { expect(pub).to be_kind_of(Miu::Writable) }
-  it { expect(pub).to be_kind_of(Miu::Publisher) }
   it { expect(pub).to be_respond_to(:connect, :write) }
 end
 
@@ -31,6 +30,5 @@ shared_examples 'subscribable socket' do
   let(:sub) { Miu::Subscriber.new(:socket => base) }
   it { expect(sub).to be_kind_of(base) }
   it { expect(sub).to be_kind_of(Miu::Readable) }
-  it { expect(sub).to be_kind_of(Miu::Subscriber) }
   it { expect(sub).to be_respond_to(:connect, :read) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miu
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - mashiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor