zactor 0.0.5 → 0.0.6

data/lib/zactor/log_subscriber.rb

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+require 'active_support/log_subscriber'
+module Zactor
+  class LogSubscriber < ActiveSupport::LogSubscriber
+    def logger
+      Zactor.logger
+    end
+
+    def merge(event)
+      payload   = event.payload
+
+      message = "[Zactor](%.0fms) sending request '#{payload[:event]}' to '#{payload[:actor]}'' with params #{paylaod[:args].inspect}" % event.duration
+      debug message
+    end
+
+    def send_to(event)
+      payload   = event.payload
+
+      message = "[Zactor] sending messages to '#{payload[:actor]}'" % event.duration
+      debug message
+    end
+  end
+end
+
+Zactor::LogSubscriber.attach_to :zactor

data/lib/zactor/message.rb

@@ -0,0 +1,23 @@
+module Zactor
+  class Message
+    attr_accessor :actor, :params
+    attr_accessor :callback_id, :args
+    def initialize(actor, params = {})
+      @actor = actor
+      @params = params
+    end
+    
+    def sender
+      params[:sender]
+    end
+    
+    def args
+      params[:args]
+    end
+    
+    def reply(*args)
+      return false unless params[:callback_id]
+      actor.send_reply sender, params[:callback_id], *args
+    end
+  end
+end

data/lib/zactor/version.rb

@@ -0,0 +1,3 @@
+module Zactor
+  VERSION = "0.0.6"
+end

data/spec/lib/actor_spec.rb

@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+
+require 'spec_helper'
+
+describe "Zactor actor" do
+  class A
+    include Zactor
+  end
+  before do
+    stub(Zactor::Broker).new
+    Zactor.start 8000
+  end
+  describe "init" do
+    let(:actor) { A.new.zactor }
+    let(:sub) { Object.new }
+    let(:local_pub) { Object.new }
+    before do
+      stub(actor).make_sub { sub }
+      stub(actor).make_pub { local_pub }
+    end
+    it "должен зарегистрировать себя" do
+      mock(Zactor).register actor
+      actor.init
+    end
+    
+    it "должен создать sub сокет" do
+      mock(actor).make_sub { sub }
+      actor.init
+      actor.instance_eval { @sub }.should eq(sub)
+    end
+    
+    it "должен создать pub сокет для локальных вызовов" do
+      mock(actor).make_pub("inproc://zactor_broker_sub") { local_pub }      
+      actor.init      
+      actor.instance_eval { @pubs['0.0.0.0:8000'] }.should eq(local_pub)
+    end
+    
+    describe "identity" do
+      it "по-умолчанию" do
+        actor.init
+        actor.actor.should eq({ 'identity' => "actor.#{actor.owner.object_id}-0.0.0.0:8000", 'host' => '0.0.0.0:8000' })
+      end
+      
+      it "с глобальным указанием" do
+        A.zactor.identity "a"
+        actor.init
+        actor.actor.should eq({ 'identity' => "a", 'host' => '0.0.0.0:8000' })
+      end
+      
+      it "с указанием для этого объекта" do
+        actor.identity = "b"
+        actor.init
+        actor.actor.should eq({ 'identity' => "b", 'host' => '0.0.0.0:8000' })
+      end
+    end
+    
+    describe "after init" do
+      include Zactor::ZMQMEssages
+      
+      def assert_messages(got, expected)
+        got.map(&:copy_out_string).should eq(expected.map(&:copy_out_string))
+      end
+      
+      before do
+        actor.init
+      end
+      describe "send_to" do
+        it "должен отправить в локальный pub для локального объекта" do
+          mes = messages { |m|  }
+          stub(local_pub).send_messages do |mes|
+            assert_messages mes, messages { |m|
+              m.str('b')
+              m.str(actor.bson_actor)
+            }
+          end
+          actor.send_to Zactor.get_actor('b')
+        end
+        
+        it "должен отправить в удаленный pub для удаленного объекта, перед этим создав его" do
+          remote_pub = Object.new
+          mock(actor).make_pub("tcp://192.168.1.1:3000") { remote_pub }
+          stub(remote_pub).send_messages do |mes|
+            assert_messages mes, messages { |m| m.str('b'); m.str(actor.bson_actor) }
+          end
+          actor.send_to Zactor.get_actor('b', :host => '192.168.1.1:3000')
+        end
+      end
+
+      describe "send_request" do
+        it "должен отправлять сообщение типа request" do
+          stub(local_pub).send_messages do |mes|
+            assert_messages mes, messages { |m| 
+              m.str('b')
+              m.str(actor.bson_actor)
+
+              m.str 'request'
+              m.str ""
+              m.str "show"
+              m.str BSON.serialize({ 'args' => ['foo', :bar] })
+            }
+          end
+          actor.send_request Zactor.get_actor('b'), :show, 'foo', :bar
+        end
+      end
+
+      describe "send_reply" do
+        it "должен отправлять сообщение типа reply" do
+          stub(local_pub).send_messages do |mes|
+            assert_messages mes, messages { |m| 
+              m.str('b')
+              m.str(actor.bson_actor)
+
+              m.str 'reply'
+              m.str 5
+              m.str BSON.serialize({ 'args' => ['foo', :bar] })
+            }
+          end
+          actor.send_reply Zactor.get_actor('b'), 5, 'foo', :bar
+        end
+      end
+
+      describe "receive_reply" do
+
+      end
+
+      describe "receive_request" do
+
+      end
+
+      describe "finish" do
+
+      end
+    end    
+
+  end
+end

data/spec/lib/exchange_spec.rb

@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+
+require 'spec_helper'
+require "em-spec/rspec"
+
+describe "Zactor" do
+  include EM::SpecHelper
+  module Exchange
+    class A
+      include Zactor
+
+      def initialize
+        zactor.init
+      end
+
+      def ping(actor = Zactor.get_actor("b")) 
+        zactor.send_request actor, :ping do |res|
+          reply
+        end
+      end
+      
+      def reply
+        
+      end
+    end
+
+    class B
+      include Zactor
+
+      zactor do
+        identity "b"
+
+        event(:ping) do |o, msg|
+          o.receive
+          msg.reply "Pong!"
+        end
+      end
+
+      def initialize
+        zactor.init
+      end
+
+      def receive
+        
+      end
+    end
+  end
+  
+  after do
+    Zactor.clear
+    Zactor.finish
+  end
+  
+  it "B должен получить сообщение" do
+    em do
+      Zactor.start 8000, :debug => true
+      Exchange::A.new.ping
+      b = Exchange::B.new
+      mock.proxy(b).receive { done }
+    end
+  end
+  
+  it "A должен получить ответ" do
+    em do
+      Zactor.start 8000, :debug => true
+      a = Exchange::A.new
+      a.ping
+      Exchange::B.new
+      mock.proxy(a).reply { done }
+    end
+  end
+  
+  it "Если задан таймаут, то он должен срабатывать" do
+    em(7) do
+      Zactor.start 8000, :debug => true
+      a = Exchange::A.new.ping.timeout(5) do
+        done
+      end
+    end
+  end
+end

data/spec/lib/link_spec.rb

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+require 'spec_helper'
+require "em-spec/rspec"
+
+describe "Zactor" do
+  include EM::SpecHelper
+  module Link
+    class A
+      include Zactor
+
+      def initialize
+        zactor.init
+      end
+    end
+
+    class B
+      include Zactor
+
+      def initialize
+        zactor.init
+      end
+    end
+  end
+  
+  after do
+    puts "FINISH ZACTOR"
+    Zactor.finish
+  end
+  
+  it "A должен уведомляться о смерти B" do
+    em do
+      Zactor.start 8000, :debug => true
+      a = Link::A.new
+      b = Link::B.new
+      a.zactor.link b.zactor.actor do
+        done
+      end
+      EM.add_timer(0.5) do
+        b.zactor.finish
+      end
+    end
+  end
+  
+  # it "A должен уведомляться о смерти B в случае удаления объекта гарбэйдж коллектором" do
+  #   
+  # end
+  
+  it "A должен уведомляться о смерти B, даже если B закончил выполнение неожиданно" do    
+    em(12) do
+      EM.add_timer(0.5) do #FIXME ZMQ-сокетам нужно время чтобы закрыться. Нужно придумать, что с этим делать
+        Zactor.start 8000, :debug => true
+        a = Link::A.new
+        b = Link::B.new
+        a.zactor.link b.zactor.actor do
+          done
+        end
+        EM.add_timer(0.5) do
+          b.zactor.instance_eval do
+            @linked = []
+          end
+          b.zactor.finish
+        end
+      end
+    end
+  end
+end

data/spec/lib/zactor_spec.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+require 'spec_helper'
+
+describe "Zactor" do
+  describe "start" do
+    before do
+      stub(Zactor::Broker).new
+    end
+    it "должен выставлять хост по-умолчанию 0.0.0.0" do
+      Zactor.start 8000
+      Zactor.host.should eq('0.0.0.0:8000')
+    end
+    
+    it "должен выставлять хост с учетом переданного" do
+      Zactor.start 8000, :host => '192.168.1.1'
+      Zactor.host.should eq('192.168.1.1:8000')
+    end
+    
+    it "должен создавать новый брокер с указаным балансером" do
+      mock(Zactor::Broker).new :balancer => '0.0.0.0:4000'
+      Zactor.start 8000, :balancer => '0.0.0.0:4000'
+    end
+  end
+  
+  describe "get_actor" do
+    before do
+      stub(Zactor::Broker).new
+      Zactor.start 8000
+    end
+    it "в качестве хоста по-умолчанию ставит себя же" do
+      Zactor.get_actor("actor1").should eq({ 'identity' => 'actor1', 'host' => '0.0.0.0:8000' })
+    end
+    
+    
+    it "в качестве хоста ставит переданный" do
+      Zactor.get_actor("actor1", :host => '192.168.1.1:3000').should eq({ 'identity' => 'actor1', 'host' => '192.168.1.1:3000' })
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
+require 'zactor'
 require 'rr'
-require 'ruby_interface'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/{ruby-interface.gemspec → zactor.gemspec}

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "ruby-interface/version"
+require "zactor/version"
 
 Gem::Specification.new do |s|
   s.name = %q{zactor}
-  s.version = RubyInterface::VERSION
-  s.summary = "Ruby interface"
+  s.version = Zactor::VERSION
+  s.summary = "Zactor"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrew Rudenko", "Nick Recobra"]
+  s.authors = ["Andrew Rudenko"]
   s.date = %q{2011-03-24}
-  s.description = %q{Ruby interface}
+  s.description = %q{Zactor}
   s.email = %q{ceo@prepor.ru}
 
   s.files         = `git ls-files`.split("\n")
@@ -17,6 +17,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency('ffi', ["> 0.1"])
+  s.add_dependency('ruby-interface', ["> 0"])
+  s.add_dependency('ffi-rzmq', ["> 0.1"])
+  s.add_dependency('em-zeromq', ["> 0.1"])
+  s.add_dependency('bson', ["> 0.1"])
+  s.add_dependency('bson_ext', ["> 0.1"])
   s.add_dependency('activesupport', ["> 0.1"])
-  s.add_dependency(%q<i18n>, ["> 0.1"])
-end
+end
+

metadata

@@ -5,12 +5,11 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Andrew Rudenko
-- Nick Recobra
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -19,7 +18,7 @@ date: 2011-03-24 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: ffi
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,8 +32,21 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: ruby-interface
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ffi-rzmq
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -45,8 +57,64 @@ dependencies:
         version: "0.1"
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-description: Ruby interface
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: em-zeromq
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bson
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+description: Zactor
 email: ceo@prepor.ru
 executables: []
 
@@ -57,18 +125,32 @@ extra_rdoc_files: []
 files: 
 - .document
 - .gitignore
+- .rake_tasks~
 - .rspec
+- .yardopts
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/ruby-interface/version.rb
-- lib/ruby-interface/yard.rb
-- lib/ruby_interface.rb
-- ruby-interface.gemspec
-- spec/ruby_interface_spec.rb
+- VERSION
+- examples/chat/client.rb
+- examples/chat/server.rb
+- examples/ping/inproc.rb
+- lib/zactor.rb
+- lib/zactor/actor_pub.rb
+- lib/zactor/actor_sub.rb
+- lib/zactor/broker.rb
+- lib/zactor/log_subscriber.rb
+- lib/zactor/message.rb
+- lib/zactor/version.rb
+- spec/lib/actor_spec.rb
+- spec/lib/exchange_spec.rb
+- spec/lib/link_spec.rb
+- spec/lib/zactor_spec.rb
 - spec/spec_helper.rb
+- zactor.gemspec
 has_rdoc: true
 homepage: 
 licenses: []
@@ -83,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -442756119075028289
+      hash: -3870401536511786688
       segments: 
       - 0
       version: "0"
@@ -101,7 +183,10 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Ruby interface
+summary: Zactor
 test_files: 
-- spec/ruby_interface_spec.rb
+- spec/lib/actor_spec.rb
+- spec/lib/exchange_spec.rb
+- spec/lib/link_spec.rb
+- spec/lib/zactor_spec.rb
 - spec/spec_helper.rb