amf_socket 0.0.2 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amf_socket (0.0.2)
+    amf_socket (0.1.0)
       RocketAMF (>= 0.2.1)
       eventmachine (>= 1.0.0.rc.4)
 

data/README.md

@@ -19,7 +19,33 @@ Or install it yourself as:
 
 ## Usage
 
-Currently this library is immature and the API is evolving.
+    EM.run do
+      class MyConnection < AmfSocket::AmfRpcConnection
+        private
+        def post_init
+          super
+
+          puts 'Sending a request'
+          send_request('hello', :foo => 'bar') do |response|
+            puts "received a response to my request: #{response.result}"
+          end
+
+          puts 'Sending a message'
+          send_message('hey there', ['hello', 'world'])
+        end
+
+        def receive_request(request)
+          puts "received a request: #{request.command}"
+          request.reply('Here is my response')
+        end
+
+        def receive_message(message)
+          puts "received a message: #{message.command}"
+        end
+      end
+
+      EM.start_server('localhost', 9000, MyConnection)
+    end
 
 ## Contributing
 

data/Rakefile

@@ -33,6 +33,30 @@ end
 desc 'Start a test server'
 task :harness => :environment do
   EM.run do
-    EM.start_server('localhost', 9000, AmfSocket::AmfRpcConnection)
+    class MyConnection < AmfSocket::AmfRpcConnection
+      private
+      def post_init
+        super
+
+        puts 'Sending a request'
+        send_request('hello', :foo => 'bar') do |response|
+          puts "received a response to my request: #{response.result}"
+        end
+
+        puts 'Sending a message'
+        send_message('hey there', ['hello', 'world'])
+      end
+
+      def receive_request(request)
+        puts "received a request: #{request.command}"
+        request.reply('Here is my response')
+      end
+
+      def receive_message(message)
+        puts "received a message: #{message.command}"
+      end
+    end
+
+    EM.start_server('localhost', 9000, MyConnection)
   end
 end

data/lib/amf_socket/amf_rpc_connection.rb

@@ -1,19 +1,85 @@
 class AmfSocket::AmfRpcConnection < AmfSocket::AmfConnection
-  def receive_object(object)
-    request = nil
+  def send_request(command, params = {}, &block)
+    message_id = SecureRandom.hex
+
+    object = {}
+    object[:type] = 'rpcRequest'
+    object[:request] = {}
+    object[:request][:messageId] = message_id
+    object[:request][:command] = command
+    object[:request][:params] = params
+
+    @sent_requests[message_id] = [object, block]
+
+    send_object(object)
+  end
+
+  def send_message(command, params = {})
+    object = {}
+    object[:type] = 'rpcMessage'
+    object[:message] = {}
+    object[:message][:messageId] = SecureRandom.hex
+    object[:message][:command] = command
+    object[:message][:params] = params
+
+    send_object(object)
+  end
+
+  private
+
+  #
+  # EM Callbacks.
+  #
+
+  def post_init
+    super
+    @sent_requests = {}
+  end
 
+  def receive_object(object)
     begin
-      request = AmfSocket::RpcRequest.new(object, self)
-    rescue AmfSocket::InvalidRequest => e
+      raise AmfSocket::InvalidObject unless object.is_a?(Hash) && object[:type]
+
+      case object[:type]
+      when 'rpcRequest'
+        request = AmfSocket::RpcRequest.new(object, self)
+        receive_request(request)
+      when 'rpcResponse'
+        receive_response(object)
+      when 'rpcMessage'
+        message = AmfSocket::RpcMessage.new(object, self)
+        receive_message(message)
+      else
+        raise AmfSocket::InvalidObject
+      end
+    rescue AmfSocket::InvalidObject => e
       close_connection
-      return
     end
-
-    receive_request(request)
   end
 
+  #
+  # AMF RPC Connection Callbacks.
+  #
+
   # Override this method in your subclass.
   def receive_request(request)
-    request.reply('You should override AmfSocket::AmfRpcConenction in a subclass.')
+    request.reply("You should override #{self.class.to_s}#receive_request.")
+  end
+
+  # Override this method in your subclass.
+  def receive_message(message)
+  end
+
+  def receive_response(response_object)
+    raise AmfSocket::InvalidObject unless (message_id = response_object[:response][:messageId])
+    raise AmfSocket::InvalidObject unless (sent_request = @sent_requests[message_id])
+
+    request_object = sent_request[0]
+    block = sent_request[1]
+    response = AmfSocket::RpcResponse.new(request_object, response_object, self)
+
+    @sent_requests.delete(message_id)
+
+    block.call(response)
   end
 end

data/lib/amf_socket/exceptions.rb

@@ -1,4 +1,4 @@
 module AmfSocket
-  class InvalidRequest < RuntimeError; end
+  class InvalidObject < RuntimeError; end
   class AlreadyReplied < RuntimeError; end
 end

data/lib/amf_socket/rpc_message.rb

@@ -0,0 +1,35 @@
+class AmfSocket::RpcMessage
+  attr_reader :amf_connection
+
+  def initialize(object, amf_connection)
+    raise RpcSocket::InvalidObject unless validate_object(object)
+
+    @message_obj = object[:message]
+    @amf_connection = amf_connection
+  end
+
+  def message_id
+    return @message_obj[:messageId]
+  end
+
+  def command
+    return @message_obj[:command]
+  end
+
+  def params
+    return @message_obj[:params]
+  end
+
+  private
+
+  def validate_object(object)
+    return false unless object.is_a?(Hash)
+    return false unless object[:type] == 'rpcMessage'
+    return false unless object[:message].is_a?(Hash)
+    return false unless object[:message][:command].is_a?(String)
+    return false unless object[:message][:params].is_a?(Hash)
+    return false unless object[:message][:messageId].is_a?(String)
+
+    return true
+  end
+end

data/lib/amf_socket/rpc_request.rb

@@ -1,12 +1,12 @@
 class AmfSocket::RpcRequest
-  attr_reader :amf_connection
+  attr_reader :connection
   attr_reader :state # Valid states: :initialized, replied.
 
-  def initialize(object, amf_connection)
-    raise RpcSocket::InvalidRequest unless validate_object(object)
+  def initialize(object, connection)
+    raise RpcSocket::InvalidObject unless validate_object(object)
 
     @request_obj = object[:request]
-    @amf_connection = amf_connection
+    @connection = connection
     @state = :initialized
   end
 
@@ -31,7 +31,7 @@ class AmfSocket::RpcRequest
     object[:response][:messageId] = message_id
     object[:response][:result] = result
 
-    @amf_connection.send_object(object)
+    @connection.send_object(object)
 
     return true
   end
@@ -40,7 +40,7 @@ class AmfSocket::RpcRequest
 
   def validate_object(object)
     return false unless object.is_a?(Hash)
-    return false unless %(rpcRequest rpcResponse).include?(object[:type])
+    return false unless object[:type] == 'rpcRequest'
     return false unless object[:request].is_a?(Hash)
     return false unless object[:request][:command].is_a?(String)
     return false unless object[:request][:params].is_a?(Hash)

data/lib/amf_socket/rpc_response.rb

@@ -0,0 +1,32 @@
+class AmfSocket::RpcResponse
+  attr_reader :connection
+  attr_reader :message_id
+  attr_reader :command
+  attr_reader :params
+  attr_reader :result
+
+  def initialize(request_object, response_object, connection)
+    raise RpcSocket::InvalidObject unless validate_object(response_object)
+
+    req = request_object[:request]
+    res = response_object[:response]
+
+    @connection = connection
+    @message_id = req[:messageId]
+    @command = req[:command]
+    @params = req[:params]
+    @result = res[:result]
+  end
+
+  private
+
+  def validate_object(object)
+    return false unless object.is_a?(Hash)
+    return false unless object[:type] == 'rpcResponse'
+    return false unless object[:response].is_a?(Hash)
+    return false unless object[:response][:messageId].is_a?(String)
+    return false unless object[:response][:result].is_a?(String)
+
+    return true
+  end
+end

data/lib/amf_socket/version.rb

@@ -1,3 +1,3 @@
 module AmfSocket
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/amf_socket.rb

@@ -7,5 +7,7 @@ require 'amf_socket/version'
 require 'amf_socket/amf_connection'
 require 'amf_socket/amf_rpc_connection'
 require 'amf_socket/rpc_request'
+require 'amf_socket/rpc_message'
+require 'amf_socket/rpc_response'
 require 'amf_socket/serializer'
 require 'amf_socket/exceptions'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amf_socket
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -61,7 +61,9 @@ files:
 - lib/amf_socket/amf_connection.rb
 - lib/amf_socket/amf_rpc_connection.rb
 - lib/amf_socket/exceptions.rb
+- lib/amf_socket/rpc_message.rb
 - lib/amf_socket/rpc_request.rb
+- lib/amf_socket/rpc_response.rb
 - lib/amf_socket/serializer.rb
 - lib/amf_socket/version.rb
 homepage: ''
@@ -78,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4345816040862175630
+      hash: -4118759105506759439
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4345816040862175630
+      hash: -4118759105506759439
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24