amf_socket 0.1.4 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amf_socket (0.1.4)
+    amf_socket (0.2.0)
       RocketAMF (>= 0.2.1)
       eventmachine (>= 0.12.10)
 
@@ -9,7 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RocketAMF (0.2.1)
-    eventmachine (1.0.0.rc.4)
+    eventmachine (0.12.10)
 
 PLATFORMS
   ruby

data/README.md

@@ -23,22 +23,36 @@ Or install it yourself as:
         def post_init
           super
 
-          puts 'Sending a request'
-          send_request('hello', :foo => 'bar') do |response|
-            puts "received a response to my request: #{response.result}"
+          puts 'Connected.'
+
+          puts 'Sending a request.'
+          send_request('hello', :foo => 'bar') do |request|
+            request.succeeded do |response|
+              puts "Request received a response. result=#{response.result}"
+            end
+
+            request.failed do |reason|
+              puts "Request failed to receive a response. reason=#{reason}"
+            end
           end
 
-          puts 'Sending a message'
-          send_message('hey there', ['hello', 'world'])
+          puts 'Sending a message.'
+          send_message('hey there', :bar => ['hello', 'world'])
         end
 
         def receive_request(request)
-          puts "received a request: #{request.command}"
+          puts "Received a request. command=#{request.command}, params=#{request.params}"
           request.reply('Here is my response')
         end
 
         def receive_message(message)
-          puts "received a message: #{message.command}"
+          puts "Received a message. command=#{message.command}, params=#{message.params}"
+        end
+
+        def unbind
+          super
+
+          puts 'Disconnected.'
         end
       end
 

data/Rakefile

@@ -37,22 +37,36 @@ task :harness => :environment do
       def post_init
         super
 
-        puts 'Sending a request'
-        send_request('hello', :foo => 'bar') do |response|
-          puts "received a response to my request: #{response.result}"
+        puts 'Connected.'
+
+        puts 'Sending a request.'
+        send_request('hello', :foo => 'bar') do |request|
+          request.succeeded do |response|
+            puts "Request received a response. result=#{response.result}"
+          end
+
+          request.failed do |reason|
+            puts "Request failed to receive a response. reason=#{reason}"
+          end
         end
 
-        puts 'Sending a message'
-        send_message('hey there', ['hello', 'world'])
+        puts 'Sending a message.'
+        send_message('hey there', :bar => ['hello', 'world'])
       end
 
       def receive_request(request)
-        puts "received a request: #{request.command}"
+        puts "Received a request. command=#{request.command}, params=#{request.params}"
         request.reply('Here is my response')
       end
 
       def receive_message(message)
-        puts "received a message: #{message.command}"
+        puts "Received a message. command=#{message.command}, params=#{message.params}"
+      end
+
+      def unbind
+        super
+
+        puts 'Disconnected.'
       end
     end
 

data/amf_socket.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["chad@remesch.com"]
   gem.description   = %q{Ruby implementation of AMF Socket (https://github.com/chadrem/amf_socket)}
   gem.summary       = %q{AMF Socket is a bi-directional RPC system for Adobe Flash (Actionscript) programs.}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/chadrem/observation"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/amf_socket/amf_rpc_connection.rb

@@ -1,32 +1,16 @@
 class AmfSocket::AmfRpcConnection < AmfSocket::AmfConnection
   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)
+    request = AmfSocket::RpcRequest.new(command, params)
+    block.call(request)
+    @sent_requests[request.message_id] = request
+    send_object(request.to_hash)
   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)
+    message = AmfSocket::RpcMessage.new(command, params)
+    send_object(message.to_hash)
   end
 
-  private
-
   #
   # EM Callbacks.
   #
@@ -42,21 +26,31 @@ class AmfSocket::AmfRpcConnection < AmfSocket::AmfConnection
 
       case object[:type]
       when 'rpcRequest'
-        request = AmfSocket::RpcRequest.new(object, self)
+        request = AmfSocket::RpcReceivedRequest.new(object, self)
         receive_request(request)
       when 'rpcResponse'
         receive_response(object)
       when 'rpcMessage'
-        message = AmfSocket::RpcMessage.new(object, self)
+        message = AmfSocket::RpcReceivedMessage.new(object, self)
         receive_message(message)
       else
         raise AmfSocket::InvalidObject
       end
-    rescue AmfSocket::InvalidObject => e
+    rescue AmfSocket::InvalidObject
       close_connection
     end
   end
 
+  def unbind
+    @sent_requests.each do |message_id, request|
+      if request.failed_callback.is_a?(Proc)
+        request.failed_callback.call('disconnected')
+      end
+    end
+
+    @sent_requests.clear
+  end
+
   #
   # AMF RPC Connection Callbacks.
   #
@@ -72,14 +66,13 @@ class AmfSocket::AmfRpcConnection < AmfSocket::AmfConnection
 
   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)
+    raise AmfSocket::InvalidObject unless (request = @sent_requests[message_id])
 
+    response = AmfSocket::RpcResponse.new(request, response_object)
     @sent_requests.delete(message_id)
 
-    block.call(response)
+    if request.succeeded_callback.is_a?(Proc)
+      request.succeeded_callback.call(response)
+    end
   end
 end

data/lib/amf_socket/exceptions.rb

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

data/lib/amf_socket/rpc_message.rb

@@ -1,35 +1,26 @@
 class AmfSocket::RpcMessage
-  attr_reader :connection
+  attr_reader :message_id
+  attr_reader :command
+  attr_reader :params
 
-  def initialize(object, connection)
-    raise AmfSocket::InvalidObject unless validate_object(object)
+  def initialize(command, params = {})
+    raise AmfSocket::InvalidArg.new('Command must be a String.') unless command.is_a?(String)
+    raise AmfSocket::InvalidArg.new('Params must be a Hash.') unless params.is_a?(Hash)
 
-    @message_obj = object[:message]
-    @connection = connection
+    @command = command
+    @params = params
+    @message_id = SecureRandom.hex
   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 to_hash
+    object = {}
 
-  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)
+    object[:type] = 'rpcMessage'
+    object[:message] = {}
+    object[:message][:messageId] = message_id
+    object[:message][:command] = command
+    object[:message][:params] = params
 
-    return true
+    return object
   end
 end

data/lib/amf_socket/rpc_received_message.rb

@@ -0,0 +1,35 @@
+class AmfSocket::RpcReceivedMessage
+  attr_reader :connection
+
+  def initialize(object, connection)
+    raise AmfSocket::InvalidObject unless validate_object(object)
+
+    @message_obj = object[:message]
+    @connection = 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_received_request.rb

@@ -0,0 +1,51 @@
+class AmfSocket::RpcReceivedRequest
+  attr_reader :connection
+  attr_reader :state # Valid states: :initialized, replied.
+
+  def initialize(object, connection)
+    raise AmfSocket::InvalidObject unless validate_object(object)
+
+    @request_obj = object[:request]
+    @connection = connection
+    @state = :initialized
+  end
+
+  def message_id
+    return @request_obj[:messageId]
+  end
+
+  def command
+    return @request_obj[:command]
+  end
+
+  def params
+    return @request_obj[:params]
+  end
+
+  def reply(result)
+    return false if @state == :replied
+
+    object = {}
+    object[:type] = 'rpcResponse'
+    object[:response] = {}
+    object[:response][:messageId] = message_id
+    object[:response][:result] = result
+
+    @connection.send_object(object)
+
+    return true
+  end
+
+  private
+
+  def validate_object(object)
+    return false unless object.is_a?(Hash)
+    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)
+    return false unless object[:request][:messageId].is_a?(String)
+
+    return true
+  end
+end

data/lib/amf_socket/rpc_request.rb

@@ -1,51 +1,40 @@
 class AmfSocket::RpcRequest
-  attr_reader :connection
-  attr_reader :state # Valid states: :initialized, replied.
+  attr_reader :state # Valid states: :initialized, :sent, :responded.
+  attr_reader :message_id
+  attr_reader :command
+  attr_reader :params
 
-  def initialize(object, connection)
-    raise AmfSocket::InvalidObject unless validate_object(object)
+  attr_accessor :succeeded_callback
+  attr_accessor :failed_callback
+  attr_accessor :timeout
 
-    @request_obj = object[:request]
-    @connection = connection
-    @state = :initialized
-  end
+  def initialize(command, params = {})
+    raise AmfSocket::InvalidArg.new('Command must be a String.') unless command.is_a?(String)
+    raise AmfSocket::InvalidArg.new('Params must be a Hash.') unless params.is_a?(Hash)
 
-  def message_id
-    return @request_obj[:messageId]
+    @command = command
+    @params = params
+    @state = :initialized
+    @message_id = SecureRandom.hex
   end
 
-  def command
-    return @request_obj[:command]
+  def succeeded(&block)
+    @succeeded_callback = block
   end
 
-  def params
-    return @request_obj[:params]
+  def failed(&block)
+    @failed_callback = block
   end
 
-  def reply(result)
-    return false if @state == :replied
-
+  def to_hash
     object = {}
-    object[:type] = 'rpcResponse'
-    object[:response] = {}
-    object[:response][:messageId] = message_id
-    object[:response][:result] = result
-
-    @connection.send_object(object)
-
-    return true
-  end
-
-  private
 
-  def validate_object(object)
-    return false unless object.is_a?(Hash)
-    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)
-    return false unless object[:request][:messageId].is_a?(String)
+    object[:type] = 'rpcRequest'
+    object[:request] = {}
+    object[:request][:messageId] = message_id
+    object[:request][:command] = command
+    object[:request][:params] = params
 
-    return true
+    return object
   end
 end

data/lib/amf_socket/rpc_response.rb

@@ -1,21 +1,12 @@
 class AmfSocket::RpcResponse
-  attr_reader :connection
-  attr_reader :message_id
-  attr_reader :command
-  attr_reader :params
+  attr_reader :request
   attr_reader :result
 
-  def initialize(request_object, response_object, connection)
+  def initialize(request, response_object)
     raise AmfSocket::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]
+    @result = response_object[:response][:result]
+    @request = request
   end
 
   private

data/lib/amf_socket/version.rb

@@ -1,3 +1,3 @@
 module AmfSocket
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/amf_socket.rb

@@ -1,5 +1,6 @@
 require 'eventmachine'
 require 'rocketamf'
+require 'securerandom'
 
 module AmfSocket; end
 
@@ -7,7 +8,9 @@ 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/rpc_message'
+require 'amf_socket/rpc_received_request'
+require 'amf_socket/rpc_received_message'
 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.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -62,11 +62,13 @@ files:
 - lib/amf_socket/amf_rpc_connection.rb
 - lib/amf_socket/exceptions.rb
 - lib/amf_socket/rpc_message.rb
+- lib/amf_socket/rpc_received_message.rb
+- lib/amf_socket/rpc_received_request.rb
 - lib/amf_socket/rpc_request.rb
 - lib/amf_socket/rpc_response.rb
 - lib/amf_socket/serializer.rb
 - lib/amf_socket/version.rb
-homepage: ''
+homepage: https://github.com/chadrem/observation
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -80,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3888358199244684483
+      hash: -337065738793524363
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -89,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3888358199244684483
+      hash: -337065738793524363
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24