mikka 1.1.0-java → 1.1.1-java

data/.rvmrc

@@ -1 +1 @@
-rvm --create use jruby-1.6.3@mikka
+rvm --create use jruby-1.6.5@mikka

data/examples/remoting.rb

@@ -1,16 +1,70 @@
 $: << File.expand_path('../../lib', __FILE__)
 
+# Run this with the argument 'server' to start a server, then run again 
+# without argument to run a client
+
 require 'mikka'
 
 
-if ARGV.first == '1'
-  ping_actor = Mikka.actor do |message|
-    puts message
+SERVICE_NAME = 'translation-service'
+SERVER_PORT = 1337
+
+
+if ARGV.any? && ARGV.first == 'server'
+  # this is the server, it spawns the actor, starts a server and registers the 
+  # actor with the server
+
+  class ServerActor < Mikka::Actor
+    TRANSLATIONS = {
+      'bonjour' => 'hello'
+    }
+    
+    def receive(message)
+      context.reply_safe(TRANSLATIONS[message])
+    end
   end
 
-  server = Mikka::Remote.start(:port => 1337)
-  server.register('ping', ping_actor)
+  # start the server, the host can be specified with :host and defaults to
+  # localhost (the port defaults to 2552, but 1337 is cooler)
+  server = Mikka::Remote.start(:port => SERVER_PORT)
+
+  # create and register an actor with the server, this ID is used by the 
+  # client to get a reference to the actor
+  server.register(SERVICE_NAME, Mikka.actor_of(ServerActor))
+  
+  # now we're just waiting for messages
 else
-  ping_actor = Mikka::Remote.actor_for('ping', :port => 1337)
-  ping_actor << 'hello'
+  # this is the client code, it connects to the remote actor and sends it a message
+  
+  class ClientActor < Mikka::Actor
+    def initialize(word)
+      super() # remember to use super with parentheses!
+      @word = word
+    end
+    
+    def pre_start
+      # this gets an actor reference to the remote actor, you need to supply
+      # the ID the actor was registered with, and the host and port where it's
+      # running (these default to localhost and 2552)
+      @translation_actor = Mikka::Remote.actor_for(SERVICE_NAME, :port => SERVER_PORT)
+      @translation_actor << @word
+    end
+    
+    def receive(message)
+      if message
+        puts "#{@word} means #{message}"
+      else
+        puts "#{@word} has no meaning"
+      end
+      context.exit
+    end
+  end
+  
+  # if you want to receive replies you need to start a server on the client 
+  # side too, but you can use the no-args constructor to use the defaults
+  # (just don't use the defaults for both server and client)
+  Mikka::Remote.start
+  
+  client = Mikka.actor_of { ClientActor.new('bonjour') }
+  client.start
 end

data/lib/mikka.rb

@@ -34,14 +34,23 @@ module Mikka
   end
   
   module Remote
-    def self.start(options={})
-      raise ArgumentError, %(No port given) unless options.key?(:port)
-      Akka::Actors.remote.start(options.fetch(:host, 'localhost'), options[:port])
+    DEFAULT_HOST = 'localhost'
+    DEFAULT_PORT = 2552
+    
+    def self.start(options=nil)
+      if options
+      then remote_support.start(options.fetch(:host, DEFAULT_HOST), options.fetch(:port, DEFAULT_PORT))
+      else remote_support.start
+      end
     end
     
     def self.actor_for(id, options={})
-      raise ArgumentError, %(No port given) unless options.key?(:port)
-      Akka::Actors.remote.actor_for(id, options.fetch(:host, 'localhost'), options[:port])
+      remote_support.actor_for(id, options.fetch(:host, DEFAULT_HOST), options.fetch(:port, DEFAULT_PORT))
+    end
+    
+  private
+    def self.remote_support
+      Akka::Actors.remote
     end
   end
   
@@ -60,26 +69,34 @@ module Mikka
   end
   
   module ImplicitSender
+    def onReceive(*args)
+      capture_current_actor { super }
+    end
+    
+    def preStart(*args)
+      capture_current_actor { super }
+    end
+    
+    def postStop(*args)
+      capture_current_actor { super }
+    end
+    
+    def preRestart(*args)
+      capture_current_actor { super }
+    end
+    
+    def postRestart(*args)
+      capture_current_actor { super }
+    end
+    
+  private
+    
     def capture_current_actor
       Thread.current[:mikka_current_actor] = context
       yield
     ensure
       Thread.current[:mikka_current_actor] = nil
     end
-    
-    def self.included(mod)
-      mod.class_eval do
-        [:onReceive, :preStart, :postStop, :preRestart, :postRestart].each do |method_name|
-          actual_method_name = :"__actual_#{method_name}"
-          alias_method actual_method_name, method_name
-          define_method method_name do |*args|
-            capture_current_actor do
-              send(actual_method_name, *args)
-            end
-          end
-        end
-      end
-    end
   end
   
   module SupervisionDsl
@@ -103,12 +120,14 @@ module Mikka
       end
     
       def life_cycle(type)
-        @life_cycle = case type
-                      when :permanent then Akka::Config::Supervision.permanent
-                      when :temporary then Akka::Config::Supervision.temporary
-                      when :undefined then Akka::Config::Supervision.undefined_life_cycle
-                      else raise ArgumentError, 'type must be one of :permanent, :temporary or :undefined'
-                      end
+        @life_cycle = begin
+          case type
+          when :permanent then Akka::Config::Supervision.permanent
+          when :temporary then Akka::Config::Supervision.temporary
+          when :undefined then Akka::Config::Supervision.undefined_life_cycle
+          else raise ArgumentError, 'type must be one of :permanent, :temporary or :undefined'
+          end
+        end
       end
     
       def registered_life_cycle

data/lib/mikka/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Mikka
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,60 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mikka
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 1.1.1
 platform: java
-authors: 
+authors:
 - Theo Hultberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2011-10-25 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-25 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: akka-actor-jars
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: &2056 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
+    none: false
+  requirement: *2056
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: akka-remote-jars
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: &2074 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
+    none: false
+  requirement: *2074
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
 description: Mikka adapts Akka's Java API to fit better with Ruby
-email: 
+email:
 - theo@iconara.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -71,35 +56,29 @@ files:
 - lib/mikka.rb
 - lib/mikka/version.rb
 - mikka.gemspec
-has_rdoc: true
 homepage: http://github.com/iconara/mikka
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+  none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+  none: false
 requirements: []
-
 rubyforge_project: mikka
-rubygems_version: 1.3.6
-signing_key: 
+rubygems_version: 1.8.9
+signing_key:
 specification_version: 3
 summary: Mikka is a JRuby wrapper for Akka
 test_files: []
-
+...