rubyfox-client 0.2.0-java → 0.3.0-java

data/README.rdoc

@@ -35,7 +35,7 @@ Or install it yourself as:
     client.send :login, *ARGV
   end
   client.on_event :login do |event|
-    p :login => event.arguments["zone"]
+    p :login => event.params[:zone]
     client.disconnect
   end
   client.on_event :login_error do |event|

data/examples/simple.rb

@@ -10,7 +10,7 @@ client.on_event :connection do |event|
   client.send :login, *ARGV
 end
 client.on_event :login do |event|
-  p :login => event.arguments["zone"]
+  p :login => event.params[:zone]
   client.disconnect
 end
 client.on_event :login_error do |event|

data/lib/rubyfox/client.rb

@@ -11,7 +11,7 @@ module Rubyfox
       require 'rubyfox/sfsobject/core_ext'
 
       require 'rubyfox/client/transport'
-      require 'rubyfox/client/event_handler'
+      require 'rubyfox/client/recorder'
     end
 
     def self.require_libs(dir)

data/lib/rubyfox/client/event.rb

@@ -5,6 +5,8 @@ module Rubyfox
     Event = Java::SFSEvent
 
     class Event
+      self.__persistent__ = true
+
       def self.types(&block)
         constants
       end
@@ -13,13 +15,33 @@ module Rubyfox
         const_get(name.to_s.upcase)
       end
 
-      def method_missing(name, *args, &block)
-        self[name]
+      def params
+        @params ||= EventParams.new(arguments)
       end
 
       def inspect
         "#{super}: #{type}(#{arguments.inspect})"
       end
     end
+
+    class EventParams
+      include Enumerable
+
+      def initialize(hash)
+        @hash = hash
+      end
+
+      def [](key)
+        @hash[key.to_s]
+      end
+
+      def each(&block)
+        @hash.each(&block)
+      end
+
+      def inspect
+        @hash.inspect
+      end
+    end
   end
 end

data/lib/rubyfox/client/java.rb

@@ -4,7 +4,7 @@ module Rubyfox
   module Client
     module Java
       SmartFox  = ::Java.sfs2x.client.SmartFox
-      Requests  = ::Java.sfs2x.client.requests
+      Request   = ::Java.sfs2x.client.requests
       SFSEvent  = ::Java.sfs2x.client.core.SFSEvent
       System    = ::Java.java.lang.System
     end

data/lib/rubyfox/client/recorder.rb

@@ -0,0 +1,81 @@
+require 'timeout'
+require 'rubyfox/client/event'
+
+module Rubyfox
+  module Client
+    # Records all incoming and outgoing events, requests and extension requests
+    # for test purposes.
+    #
+    # == Example
+    #
+    #   client = Rubyfox::Client.new
+    #   recorder = Rubyfox::Rubyfox::Recorder.new(client)
+    #
+    #   client.connect
+    #   client.send :login, "username", "password", "zone"
+    #   client.disconnect
+    #
+    #   assert_equal 1, recorder.events(:connection).size
+    #   assert_equal 1, recorder.events(:login).size
+    #   assert_equal 1, recorder.extensions("Me.User").size
+    #   assert_equal 1, recorder.events(:connection_lost).size
+    class Recorder
+      include Timeout
+
+      def initialize(client)
+        @client     = client
+        @events     = Hash.new { |hash, type| hash[type] = [] }
+        @extensions = Hash.new { |hash, command| hash[command] = [] }
+        @connection_lost = false
+        install_callbacks
+      end
+
+      def events(name)
+        type = Event[name]
+        @events[type]
+      end
+
+      def extensions(command)
+        @extensions[command]
+      end
+
+      def verify(options={}, &block)
+        @client.connect
+        wait = options[:timeout] || 1
+        timeout wait do
+          while not @connection_lost
+            sleep 0.1
+          end
+        end
+      rescue Timeout::Error
+        # ignore
+      ensure
+        yield
+      end
+
+      private
+
+      def install_callbacks
+        @client.on_event(:any) do |event|
+          record_event(event)
+        end
+
+        @client.on_extension(:any) do |extension|
+          record_extension(extension)
+        end
+
+        @client.on_event(:connection_lost) do |event|
+          @connection_lost = true
+        end
+      end
+
+      def record_event(event)
+        @events[event.type] << event
+      end
+
+      def record_extension(extension)
+        @extensions[extension.command] << extension
+      end
+    end
+  end
+end

data/lib/rubyfox/client/request.rb

@@ -0,0 +1,21 @@
+require 'active_support/core_ext/string/inflections'
+require 'rubyfox/client/java'
+
+module Rubyfox
+  module Client
+    Request = Java::Request
+
+    module Request
+      def self.[](name)
+        case name
+        when Request::BaseRequest
+          name
+        else
+          name = name.to_s.camelcase
+          name += "Request" unless name.end_with?("Request")
+          Request.__send__(name)
+        end
+      end
+    end
+  end
+end

data/lib/rubyfox/client/transport.rb

@@ -1,6 +1,6 @@
 require 'rubyfox/client/java'
 require 'rubyfox/client/config'
-require 'rubyfox/client/requests'
+require 'rubyfox/client/request'
 require 'rubyfox/client/event_handler'
 require 'rubyfox/client/extension_handler'
 
@@ -22,6 +22,11 @@ module Rubyfox
         @event_handler.register
         @extension_handler.register
         @smartfox.connect(@config.host, @config.port)
+        sleep 0.1
+      end
+
+      def connected?
+        @smartfox.connected?
       end
 
       def disconnect
@@ -35,8 +40,8 @@ module Rubyfox
         Java::System.exit(ret)
       end
 
-      def send(request, *args)
-        request = Requests[request, *args]
+      def send(command, *args)
+        request = Request[command].new(*args)
         @smartfox.send(request)
       end
 

data/lib/rubyfox/client/version.rb

@@ -1,5 +1,5 @@
 module Rubyfox
   module Client
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: rubyfox-client
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.0
+  version: 0.3.0
 platform: java
 authors:
 - Peter Suschlik
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -104,7 +104,8 @@ files:
 - lib/rubyfox/client/event_handler.rb
 - lib/rubyfox/client/extension_handler.rb
 - lib/rubyfox/client/java.rb
-- lib/rubyfox/client/requests.rb
+- lib/rubyfox/client/recorder.rb
+- lib/rubyfox/client/request.rb
 - lib/rubyfox/client/transport.rb
 - lib/rubyfox/client/vendor/SFS2X_API_Java.jar
 - lib/rubyfox/client/vendor/jdom.jar

data/lib/rubyfox/client/requests.rb

@@ -1,23 +0,0 @@
-require 'active_support/core_ext/string/inflections'
-require 'rubyfox/client/java'
-
-module Rubyfox
-  module Client
-    Requests = Java::Requests
-
-    module Requests
-      def self.[](*args)
-        arg = args.shift
-        case arg
-        when Java::Requests::BaseRequest
-          arg
-        else
-          name = arg.to_s.camelcase
-          name += "Request" unless name.end_with?("Request")
-          request_klass = Requests.__send__(name)
-          request_klass.new(*args)
-        end
-      end
-    end
-  end
-end