zactor 0.0.4 → 0.0.5

metadata

@@ -5,11 +5,12 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Andrew Rudenko
+- Nick Recobra
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -18,7 +19,7 @@ date: 2011-03-24 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ffi
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,21 +33,8 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ruby-interface
+  name: i18n
   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: 
     - - ">"
@@ -57,64 +45,8 @@ dependencies:
         version: "0.1"
   type: :runtime
   prerelease: false
-  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
+  version_requirements: *id002
+description: Ruby interface
 email: ceo@prepor.ru
 executables: []
 
@@ -125,32 +57,18 @@ extra_rdoc_files: []
 files: 
 - .document
 - .gitignore
-- .rake_tasks~
 - .rspec
-- .yardopts
 - Gemfile
 - Gemfile.lock
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- 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
+- lib/ruby-interface/version.rb
+- lib/ruby-interface/yard.rb
+- lib/ruby_interface.rb
+- ruby-interface.gemspec
+- spec/ruby_interface_spec.rb
 - spec/spec_helper.rb
-- zactor.gemspec
 has_rdoc: true
 homepage: 
 licenses: []
@@ -165,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4054841788636265293
+      hash: -442756119075028289
       segments: 
       - 0
       version: "0"
@@ -183,10 +101,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Zactor
+summary: Ruby interface
 test_files: 
-- spec/lib/actor_spec.rb
-- spec/lib/exchange_spec.rb
-- spec/lib/link_spec.rb
-- spec/lib/zactor_spec.rb
+- spec/ruby_interface_spec.rb
 - spec/spec_helper.rb

data/.rake_tasks~

@@ -1,19 +0,0 @@
-build
-console[script]
-gemcutter:release
-gemspec
-gemspec:debug
-gemspec:generate
-gemspec:release
-gemspec:validate
-git:release
-install
-rcov
-release
-spec
-version
-version:bump:major
-version:bump:minor
-version:bump:patch
-version:write
-yard

data/.yardopts

@@ -1 +0,0 @@
--m markdown -e ruby-interface/yard

data/Guardfile

@@ -1,12 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec', :version => 2 do
-  watch(/^spec\/(.*)_spec.rb/)
-  watch(/^lib\/(.*)\.rb/)                              { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(/^spec\/spec_helper.rb/)                       { "spec" }
-  
-  # watch(/^lib\/zactor.rb/)                             { "spec/lib/actor_spec.rb" }
-  
-  watch(/^app\/(.*)\.rb/)                              { |m| "spec/app/#{m[1]}_spec.rb" }
-end

data/VERSION

@@ -1 +0,0 @@
-0.0.3

data/examples/chat/client.rb

@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# ruby client.rb SELF_PORT SERVER LOGIN
-# ruby client.rb 6001 0.0.0.0:8000 lolo
-require 'bundler'
-ENV['BUNDLE_GEMFILE'] = File.join(File.dirname(__FILE__), '..', '..', 'Gemfile')
-
-Bundler.setup(:default)
-
-require 'zactor'
-class Client
-  include Zactor
-  
-  zactor do
-    event(:message) do |o, msg, text|
-      puts text
-    end
-  end
-  
-  def initialize(login)
-    @login = login
-    @persons = {}
-  end
-  
-  def start(server)
-    zactor.init 
-    @server = Zactor.get_actor("server", :host => server)
-    connect
-  end
-  
-  def connect
-    puts "Подключаемся"
-    zactor.send_request(@server, :new_client, @login) do
-      puts "Поключились!"
-      zactor.link(@server) { connect }
-    end.timeout(5) { puts "Проблемы с подключением..." }
-  end
-  
-  def send_message(text)
-    if text =~ /(\w+) -> (.+)/
-      send_personal($1, $2)
-    else
-      zactor.send_request(@server, :message, text)
-    end
-  end
-  
-  def send_personal(login, text)
-    if client = @persons[login]
-      zactor.send_request(client, :message, "(personally) #{@login}:" + "#{text}")
-    else
-      zactor.send_request(@server, :client_request, login) do |res, client|
-        case res
-        when :ok
-          @persons[login] = client
-          zactor.link(client) { @persons.delete login }
-          zactor.send_request(client, :message, "(personally) #{@login}:" + "#{text}")
-        else
-          puts "Ошибка отправки сообщения"
-        end
-      end
-    end
-  end
-  
-  def stop
-    zactor.finish
-    EM.stop
-  end
-  
-  module KeyboardInput
-    include EM::Protocols::LineText2
-    attr_accessor :client
-    def receive_line(data)
-      client.send_message data
-    end
-  end
-   
-end
-
-client = Client.new ARGV[2]
-
-Signal.trap('INT') { client.stop } 
-Signal.trap('TERM') { client.stop }
-
-EM.run do
-  Zactor.start ARGV[0]#, :debug => true
-  client.start ARGV[1]
-  EM.open_keyboard(Client::KeyboardInput) { |c| c.client = client }
-end

data/examples/chat/server.rb

@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# ruby server.rb PORT
-# ruby server.rb 8000
-require 'bundler'
-ENV['BUNDLE_GEMFILE'] = File.join(File.dirname(__FILE__), '..', '..', 'Gemfile')
-Bundler.setup(:default)
-
-require 'zactor'
-
-class Server
-  include Zactor
-  
-  zactor do
-    identity "server"
-    
-    event(:new_client) do |o, msg, login|
-      o.new_client msg.sender, login
-      msg.reply :ok
-    end
-    
-    event(:client_request) do |o, msg, login|
-      if client = o.clients.detect { |k, v| v == login }
-        msg.reply :ok, client.first
-      else
-        msg.reply :error
-      end
-    end
-    
-    event(:message) do |o, msg, text|
-      o.send_message msg.sender, text
-    end
-  end
-  
-  attr_accessor :clients
-  def initialize
-    zactor.init
-    @clients = {}
-  end
-  
-  def new_client(client, login)
-    @clients[client] = login
-    send_message client, "присоединился"
-    zactor.link client do
-      send_message client, "отсоединился"
-      clients.delete client
-    end
-  end
-  
-  def send_message(from, message)
-    (clients.keys - [from]).each { |c| zactor.send_request c, :message, "#{clients[from]}: #{message}"}
-  end
-end
-
-EM.run do
-  Zactor.start ARGV[0]#, :debug => true
-  Server.new
-  puts "Server started"
-end

data/examples/ping/inproc.rb

@@ -1,50 +0,0 @@
-require "rubygems"
-require "bundler"
-
-ENV['BUNDLE_GEMFILE'] = File.join(File.dirname(__FILE__), '..', '..', 'Gemfile')
-
-Bundler.setup(:default, :development)
-
-require 'zactor'
-require 'eventmachine'
-
-class A
-  include Zactor
-
-  def initialize
-    zactor.init
-    ping Zactor.get_actor("b")
-  end
-
-  def ping(actor) 
-    puts "Ping!"
-    zactor.send_request actor, :ping do |res|
-      puts res
-    end
-  end
-end
-
-
-class B
-  include Zactor
-
-  zactor do
-    identity "b"
-  
-    event(:ping) do |o, msg|
-      msg.reply "Pong!"
-    end
-  end
-
-  def initialize
-    zactor.init
-  end
-
-end
-
-EM.run do
-  Zactor.start 8000
-
-  a = A.new
-  b = B.new
-end

data/lib/zactor/actor_pub.rb

@@ -1,19 +0,0 @@
-module Zactor
-  class ActorPub
-    include ZMQMEssages
-    
-    attr_accessor :actor
-    def initialize(actor, endpoint)
-      Zactor.logger.debug "ZactorPub (#{actor.actor}): starting"
-      @actor = actor
-      @connection = Zactor.zmq.connect ZMQ::PUB, endpoint, self
-      @socket = @connection.socket
-    end
-    
-    def close
-      @connection.unbind
-    rescue
-    end
-  end
- 
-end

data/lib/zactor/actor_sub.rb

@@ -1,46 +0,0 @@
-module Zactor
-  class ActorSub
-    attr_accessor :actor
-    def initialize(actor)
-      Zactor.logger.debug "ZactorSub (#{actor.actor}): starting"
-      @actor = actor
-      @connection = Zactor.zmq.connect ZMQ::SUB, "inproc://zactor_broker_pub", self
-      @connection.subscribe actor.actor['identity']
-    end
-    
-    def on_readable(socket, messages)
-      @connection.notify_readable = true
-      Zactor.logger.debug "ZactorSub for #{actor.actor}: Messages!"
-      to = messages.shift
-      sender = messages.shift
-      case messages.shift.copy_out_string
-      when "reply"
-        reply messages
-      when "request"
-        request sender, messages
-      end      
-    end
-    
-    def request(sender_mes, messages)
-      Zactor.logger.debug "ZactorSub for #{actor.actor}: request!"
-      sender = BSON.deserialize(sender_mes.copy_out_string)
-      callback_id = messages[0].copy_out_string
-      event = messages[1].copy_out_string
-      args = BSON.deserialize(messages[2].copy_out_string)['args']      
-      actor.receive_request sender, event, callback_id, *args
-    end
-    
-    def reply(messages)
-      Zactor.logger.debug "ZactorSub for #{actor.actor}: reply!"
-      callback_id = messages[0].copy_out_string
-      if callback_id != ''
-        actor.receive_reply callback_id, *BSON.deserialize(messages[1].copy_out_string)['args']
-      end
-    end
-    
-    def close
-       @connection.unbind
-    rescue
-    end
-  end 
-end

data/lib/zactor/broker.rb

@@ -1,71 +0,0 @@
-module Zactor
-  class BrokerIn
-    attr_accessor :broker, :params 
-    def initialize(broker, params = {})
-      @broker = broker
-      @params = params
-      init_connection
-    end
-    
-    def on_readable(socket, messages)
-      Zactor.logger.debug "Broker: messages"
-      @broker.pub.request messages
-    end
-    
-    def close
-       @connection.unbind
-    rescue
-    end
-  end
-  
-  class BrokerPub
-    include ZMQMEssages
-    def initialize(broker)
-      @broker = broker
-      @connection = Zactor.zmq.bind ZMQ::PUB, "inproc://zactor_broker_pub", self
-      @socket = @connection.socket
-    end
-    
-    def request(messages)
-      Zactor.logger.debug { "Broker: request #{messages.map(&:copy_out_string).inspect}" }
-      send_messages messages
-    end
-    
-    def close
-       @connection.unbind
-    rescue
-    end
-  end
-  
-  class BrokerSub < BrokerIn
-    def init_connection
-      Zactor.logger.info "Starting sub broker tcp://0.0.0.0:#{Zactor.broker_port}"
-      @connection = Zactor.zmq.bind ZMQ::SUB, "tcp://0.0.0.0:#{Zactor.broker_port}", self
-      @connection.bind "inproc://zactor_broker_sub"
-      @connection.subscribe ''
-    end
-  end
-  
-  class BrokerPull < BrokerIn
-    def init_connection
-      Zactor.logger.info "Starting pull broker tcp://#{params[:host]}"
-      @connection = Zactor.zmq.connect ZMQ::PULL, "tcp://#{params[:host]}", self
-    end
-  end
-  
-  class Broker
-    attr_accessor :sub, :pub
-    def initialize(params = {})
-      Zactor.logger.info "Broker: starting"
-      @pub = BrokerPub.new self
-      @subs = []
-      @subs << BrokerSub.new(self)
-      @subs << BrokerPull.new(self, :host => params[:balancer]) if params[:balancer]
-    end
-    
-    def finish
-      @pub.close
-      @subs.each(&:close)
-    end
-  end
-end

data/lib/zactor/log_subscriber.rb

@@ -1,25 +0,0 @@
-# -*- 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

@@ -1,23 +0,0 @@
-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

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