freeswitcher 0.1.4 → 0.3.0

data/spec/fsr/app/fs_break.rb

@@ -0,0 +1,12 @@
+require 'spec/helper'
+require "fsr/app"
+FSR::App.load_application("fs_break")
+
+describe "Testing FSR::App::FsBreak" do
+
+  it "should break a connection" do
+    fs_break = FSR::App::FSBreak.new
+    fs_break.sendmsg.should == "call-command: execute\nexecute-app-name: break\n\n"
+  end
+
+end

data/spec/fsr/app/fs_sleep.rb

@@ -0,0 +1,12 @@
+require 'spec/helper'
+require "fsr/app"
+FSR::App.load_application("fs_sleep")
+
+describe "Testing FSR::App::FsSleep" do
+
+  it "should put FreeSWITCH leg to sleep for 7000 miliseconds" do
+    fs_sleep = FSR::App::FSSleep.new(7000)
+    fs_sleep.sendmsg.should == "call-command: execute\nexecute-app-name: sleep\nexecute-app-arg: 7000\n\n"
+  end
+
+end

data/spec/fsr/cmd/originate.rb

@@ -3,10 +3,42 @@ require "fsr/cmd"
 FSR::Cmd.load_command("originate")
 
 describe "Testing FSR::Cmd::Originate" do
+  # Invalid originates
+  it "Must be passed an argument hash" do
+    lambda { FSR::Cmd::Originate.new(nil, :endpoint) }.should.raise(ArgumentError).
+      message.should.match(/args \(Passed: <<<.*?>>>\) must be a hash/)
+  end
+
+  it "Should require args[:target_options] to be a hash" do
+    lambda { FSR::Cmd::Originate.new(nil, :endpoint => "4000", :target => "user/bougyman", :target_options => 1) }.should.raise(ArgumentError).
+      message.should.match(/args\[:target_options\] \(Passed: <<<.*?>>>\) must be a hash/)
+  end
+
+  it "Can not originate without a target" do
+    lambda { FSR::Cmd::Originate.new(nil, :endpoint => "4000") }.should.raise(ArgumentError).
+      message.should.match(/Cannot originate without a :target set/)
+  end
+
+  it "Can not originate without an endpoint" do
+    lambda { FSR::Cmd::Originate.new(nil, :target => "4000") }.should.raise(ArgumentError).
+      message.should.match(/Cannot originate without an :endpoint set/)
+  end
+
   # Originate to an extension
   it "Originates calls to extensions" do
     originate = FSR::Cmd::Originate.new(nil, :target => "user/bougyman", :endpoint => "4000")
     originate.raw.should == "originate {ignore_early_media=true,originate_timeout=30,origination_caller_id_name=FSR,origination_caller_id_number=8675309}user/bougyman 4000"
   end
 
+  # Different options choices
+  it "Honors timeout in :timeout option" do
+    originate = FSR::Cmd::Originate.new(nil, :target => "user/bougyman", :timeout => 10, :endpoint => "4000")
+    originate.raw.should == "originate {ignore_early_media=true,originate_timeout=10,origination_caller_id_name=FSR,origination_caller_id_number=8675309}user/bougyman 4000"
+  end
+
+  it "Honors timeout in :target_options[timeout] option" do
+    originate = FSR::Cmd::Originate.new(nil, :target => "user/bougyman", :target_options => {:timeout => 10}, :endpoint => "4000")
+    originate.raw.should == "originate {ignore_early_media=true,originate_timeout=10,origination_caller_id_name=FSR,origination_caller_id_number=8675309}user/bougyman 4000"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freeswitcher
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jayson Vaughn
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-11 00:00:00 -05:00
+date: 2009-05-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: "========================================================= FreeSWITCHeR Copyright (c) 2009 The Rubyists (Jayson Vaughn, Tj Vanderpoel, Michael Fellinger, Kevin Berry)  Distributed under the terms of the MIT License. ==========================================================  ABOUT ----- A ruby library for interacting with the \"FreeSWITCH\" (http://www.freeswitch.org) opensource telephony platform  REQUIREMENTS ------------ - ruby (>= 1.8) - eventmachine (If you wish to use Outbound and Inbound listener)  USAGE -----  An Outbound Event Listener Example that reads and returns DTMF input: --------------------------------------------------------------------  Simply just create a subclass of FSR::Listner::Outbound and all new calls/sessions will invoke the \"session_initiated\" callback method.  * NOTE:  FSR uses blocks within the 'session_inititated' method to ensure  that the next \"freeswich command\" is not executed until the previous  \"Freeswitch command\" has finished.  This is kicked off by \"answer do\"  require 'fsr' require 'fsr/listener/outbound'  class OutboundDemo < FSR::Listener::Outbound  def session_initiated exten = @session.headers[:caller_caller_id_number] FSR::Log.info \"*** Answering incoming call from #{exten}\"  answer do FSR::Log.info \"***Reading DTMF from #{exten}\" read(\"/home/freeswitch/freeswitch/sounds/music/8000/sweet.wav\", 4, 10, \"input\", 7000) do FSR::Log.info \"*** Updating session for #{exten}\" update_session do FSR::Log.info \"***Success, grabbed #{@session.headers[:variable_input].strip} from #{exten}\" hangup #Hangup the call end end end  end  end  FSR.start_oes! OutboundDemo, :port => 8084, :host => \"127.0.0.1\"   An Inbound Event Socket Listener example using FreeSWITCHeR's hook system: --------------------------------------------------------------------------  require 'pp' require 'fsr' require \"fsr/listener/inbound\"  # EXAMPLE 1  # This adds a hook on CHANNEL_CREATE events. You can also create a method to handle the event you're after. See the next example FSL::Inbound.add_event_hook(:CHANNEL_CREATE) {|event| FSR::Log.info \"*** [#{event.content[:unique_id]}] Channel created - greetings from the hook!\" }  # EXAMPLE 2 # Define a method to handle CHANNEL_HANGUP events. def custom_channel_hangup_handler(event) FSR::Log.info \"*** [#{event.content[:unique_id]}] Channel hangup. The event:\" pp event end  # This adds a hook for EXAMPLE 2 FSL::Inbound.add_event_hook(:CHANNEL_HANGUP) {|event| custom_channel_hangup_handler(event) }   # Start FSR Inbound Listener FSR.start_ies!(FSL::Inbound, :host => \"localhost\", :port => 8021)   An Inbound Event Socket Listener example using the on_event callback method instead of hooks: ---------------------------------------------------------------------------------------------  require 'pp' require 'fsr' require \"fsr/listener/inbound\"   class IesDemo < FSR::Listener::Inbound  def on_event(event) pp event.headers pp event.content[:event_name] end  end  FSR.start_ies!(IesDemo, :host => \"localhost\", :port => 8021)   An example of using FSR::CommandSocket to originate a new call in irb: ----------------------------------------------------------------------  irb(main):001:0> require 'fsr' => true  irb(main):002:0> FSR.load_all_commands => [:sofia, :originate]  irb(main):003:0> sock = FSR::CommandSocket.new => #<FSR::CommandSocket:0xb7a89104 @server=\"127.0.0.1\", @socket=#<TCPSocket:0xb7a8908c>, @port=\"8021\", @auth=\"ClueCon\">  irb(main):007:0> sock.originate(:target => 'sofia/gateway/carlos/8179395222', :endpoint => FSR::App::Bridge.new(\"user/bougyman\")).run => {\"Job-UUID\"=>\"732075a4-7dd5-4258-b124-6284a82a5ae7\", \"body\"=>\"\", \"Content-Type\"=>\"command/reply\", \"Reply-Text\"=>\"+OK Job-UUID: 732075a4-7dd5-4258-b124-6284a82a5ae7\"}    SUPPORT ------- Home page at http://code.rubyists.com/projects/fs #rubyists on FreeNode"
+description: "========================================================= FreeSWITCHeR Copyright (c) 2009 The Rubyists (Jayson Vaughn, Tj Vanderpoel, Michael Fellinger, Kevin Berry)  Distributed under the terms of the MIT License. ==========================================================  ABOUT ----- A ruby library for interacting with the \"FreeSWITCH\" (http://www.freeswitch.org) opensource telephony platform  REQUIREMENTS ------------ * ruby (>= 1.8) * eventmachine (If you wish to use Outbound and Inbound listener)  USAGE -----  An Outbound Event Listener Example that reads and returns DTMF input: --------------------------------------------------------------------  Simply just create a subclass of FSR::Listner::Outbound and all new calls/sessions will invoke the \"session_initiated\" callback method.  <b>NOTE</b>: FSR uses blocks within the 'session_inititated' method to ensure that the next \"freeswich command\" is not executed until the previous \"Freeswitch command\" has finished.  This is kicked off by \"answer do\"  #!/usr/bin/ruby require 'fsr' require 'fsr/listener/outbound'  class OutboundDemo < FSR::Listener::Outbound  def session_initiated exten = @session.headers[:caller_caller_id_number] FSR::Log.info \"*** Answering incoming call from #{exten}\"  answer do FSR::Log.info \"***Reading DTMF from #{exten}\" read(\"/home/freeswitch/freeswitch/sounds/music/8000/sweet.wav\", 4, 10, \"input\", 7000) do |read_var| FSR::Log.info \"***Success, grabbed #{read_var.strip} from #{exten}\" hangup #Hangup the call end end  end  end  FSR.start_oes! OutboundDemo, :port => 8084, :host => \"127.0.0.1\"  An Inbound Event Socket Listener example using FreeSWITCHeR's hook system: --------------------------------------------------------------------------  #!/usr/bin/ruby require 'pp' require 'fsr' require \"fsr/listener/inbound\"  # EXAMPLE 1  # This adds a hook on CHANNEL_CREATE events. You can also create a method to handle the event you're after. See the next example FSL::Inbound.add_event_hook(:CHANNEL_CREATE) {|event| FSR::Log.info \"*** [#{event.content[:unique_id]}] Channel created - greetings from the hook!\" }  # EXAMPLE 2 # Define a method to handle CHANNEL_HANGUP events. def custom_channel_hangup_handler(event) FSR::Log.info \"*** [#{event.content[:unique_id]}] Channel hangup. The event:\" pp event end  # This adds a hook for EXAMPLE 2 FSL::Inbound.add_event_hook(:CHANNEL_HANGUP) {|event| custom_channel_hangup_handler(event) }   # Start FSR Inbound Listener FSR.start_ies!(FSL::Inbound, :host => \"localhost\", :port => 8021)   An Inbound Event Socket Listener example using the on_event callback method instead of hooks: ---------------------------------------------------------------------------------------------  #!/usr/bin/ruby require 'pp' require 'fsr' require \"fsr/listener/inbound\"   class IesDemo < FSR::Listener::Inbound  def on_event(event) pp event.headers pp event.content[:event_name] end  end  FSR.start_ies!(IesDemo, :host => \"localhost\", :port => 8021)   An example of using FSR::CommandSocket to originate a new call in irb: ----------------------------------------------------------------------  irb(main):001:0> require 'fsr' => true  irb(main):002:0> FSR.load_all_commands => [:sofia, :originate]  irb(main):003:0> sock = FSR::CommandSocket.new => #<FSR::CommandSocket:0xb7a89104 @server=\"127.0.0.1\", @socket=#<TCPSocket:0xb7a8908c>, @port=\"8021\", @auth=\"ClueCon\">  irb(main):007:0> sock.originate(:target => 'sofia/gateway/carlos/8179395222', :endpoint => FSR::App::Bridge.new(\"user/bougyman\")).run => {\"Job-UUID\"=>\"732075a4-7dd5-4258-b124-6284a82a5ae7\", \"body\"=>\"\", \"Content-Type\"=>\"command/reply\", \"Reply-Text\"=>\"+OK Job-UUID: 732075a4-7dd5-4258-b124-6284a82a5ae7\"}    SUPPORT ------- Home page at http://code.rubyists.com/projects/fs #rubyists on FreeNode"
 email: FreeSWITCHeR@rubyists.com
 executables: []
 
@@ -89,7 +89,6 @@ files:
 - lib/fsr/listener/inbound.rb
 - lib/fsr/listener/inbound/event.rb
 - lib/fsr/listener/outbound.rb
-- lib/fsr/listener/outbound.rb.orig
 - lib/fsr/model/call.rb
 - lib/fsr/version.rb
 - tasks/authors.rake
@@ -107,26 +106,6 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - spec/helper.rb
-- spec/fsr/app.rb
-- spec/fsr/app/bridge.rb
-- spec/fsr/app/conference.rb
-- spec/fsr/app/fifo.rb
-- spec/fsr/app/hangup.rb
-- spec/fsr/app/limit.rb
-- spec/fsr/app/log.rb
-- spec/fsr/app/play_and_get_digits.rb
-- spec/fsr/app/playback.rb
-- spec/fsr/app/set.rb
-- spec/fsr/app/transfer.rb
-- spec/fsr/cmd.rb
-- spec/fsr/cmd/calls.rb
-- spec/fsr/cmd/originate.rb
-- spec/fsr/cmd/sofia.rb
-- spec/fsr/cmd/sofia/profile.rb
-- spec/fsr/listener.rb
-- spec/fsr/listener/inbound.rb
-- spec/fsr/listener/outbound.rb
-- spec/fsr/loading.rb
 has_rdoc: false
 homepage: http://code.rubyists.com/projects/fs
 post_install_message: |
@@ -142,8 +121,8 @@ post_install_message: |
   
   REQUIREMENTS
   ------------
-  - ruby (>= 1.8)
-  - eventmachine (If you wish to use Outbound and Inbound listener)
+  * ruby (>= 1.8)
+  * eventmachine (If you wish to use Outbound and Inbound listener)
   
   USAGE
   -----
@@ -154,97 +133,94 @@ post_install_message: |
   Simply just create a subclass of FSR::Listner::Outbound and all
   new calls/sessions will invoke the "session_initiated" callback method.
    
-    * NOTE:  FSR uses blocks within the 'session_inititated' method to ensure 
-             that the next "freeswich command" is not executed until the previous 
-             "Freeswitch command" has finished.  This is kicked off by "answer do"
-  
-      require 'fsr'
-      require 'fsr/listener/outbound'
-  
-      class OutboundDemo < FSR::Listener::Outbound
-  
-        def session_initiated
-          exten = @session.headers[:caller_caller_id_number]
-          FSR::Log.info "*** Answering incoming call from #{exten}"
-  
-          answer do
-            FSR::Log.info "***Reading DTMF from #{exten}"
-            read("/home/freeswitch/freeswitch/sounds/music/8000/sweet.wav", 4, 10, "input", 7000) do
-              FSR::Log.info "*** Updating session for #{exten}"
-              update_session do
-                FSR::Log.info "***Success, grabbed #{@session.headers[:variable_input].strip} from #{exten}"
-                hangup #Hangup the call
-              end
-            end
-          end
+  <b>NOTE</b>: FSR uses blocks within the 'session_inititated' method to ensure that the next "freeswich command" is not executed until the previous "Freeswitch command" has finished.  This is kicked off by "answer do"
+  
+    #!/usr/bin/ruby
+    require 'fsr'
+    require 'fsr/listener/outbound'
   
+    class OutboundDemo < FSR::Listener::Outbound
+  
+      def session_initiated
+        exten = @session.headers[:caller_caller_id_number]
+        FSR::Log.info "*** Answering incoming call from #{exten}"
+  
+        answer do
+          FSR::Log.info "***Reading DTMF from #{exten}"
+          read("/home/freeswitch/freeswitch/sounds/music/8000/sweet.wav", 4, 10, "input", 7000) do |read_var|
+              FSR::Log.info "***Success, grabbed #{read_var.strip} from #{exten}"
+              hangup #Hangup the call
+          end
         end
   
       end
   
-      FSR.start_oes! OutboundDemo, :port => 8084, :host => "127.0.0.1"
+    end
   
+    FSR.start_oes! OutboundDemo, :port => 8084, :host => "127.0.0.1"
   
   An Inbound Event Socket Listener example using FreeSWITCHeR's hook system:
   --------------------------------------------------------------------------
   
-      require 'pp'
-      require 'fsr'
-      require "fsr/listener/inbound"
+    #!/usr/bin/ruby
+    require 'pp'
+    require 'fsr'
+    require "fsr/listener/inbound"
   
-      # EXAMPLE 1 
-      # This adds a hook on CHANNEL_CREATE events. You can also create a method to handle the event you're after. See the next example
-      FSL::Inbound.add_event_hook(:CHANNEL_CREATE) {|event| FSR::Log.info "*** [#{event.content[:unique_id]}] Channel created - greetings from the hook!" }
+    # EXAMPLE 1 
+    # This adds a hook on CHANNEL_CREATE events. You can also create a method to handle the event you're after. See the next example
+    FSL::Inbound.add_event_hook(:CHANNEL_CREATE) {|event| FSR::Log.info "*** [#{event.content[:unique_id]}] Channel created - greetings from the hook!" }
   
-      # EXAMPLE 2
-      # Define a method to handle CHANNEL_HANGUP events.
-      def custom_channel_hangup_handler(event)
-        FSR::Log.info "*** [#{event.content[:unique_id]}] Channel hangup. The event:"
-        pp event
-      end
+    # EXAMPLE 2
+    # Define a method to handle CHANNEL_HANGUP events.
+    def custom_channel_hangup_handler(event)
+      FSR::Log.info "*** [#{event.content[:unique_id]}] Channel hangup. The event:"
+      pp event
+    end
   
-      # This adds a hook for EXAMPLE 2
-      FSL::Inbound.add_event_hook(:CHANNEL_HANGUP) {|event| custom_channel_hangup_handler(event) }
+    # This adds a hook for EXAMPLE 2
+    FSL::Inbound.add_event_hook(:CHANNEL_HANGUP) {|event| custom_channel_hangup_handler(event) }
   
   
-      # Start FSR Inbound Listener
-      FSR.start_ies!(FSL::Inbound, :host => "localhost", :port => 8021)
+    # Start FSR Inbound Listener
+    FSR.start_ies!(FSL::Inbound, :host => "localhost", :port => 8021)
   
   
   An Inbound Event Socket Listener example using the on_event callback method instead of hooks:
   ---------------------------------------------------------------------------------------------
   
-      require 'pp'
-      require 'fsr'
-      require "fsr/listener/inbound"
+    #!/usr/bin/ruby
+    require 'pp'
+    require 'fsr'
+    require "fsr/listener/inbound"
   
   
-      class IesDemo < FSR::Listener::Inbound
-  
-        def on_event(event)
-          pp event.headers
-          pp event.content[:event_name]
-        end
+    class IesDemo < FSR::Listener::Inbound
   
+      def on_event(event)
+        pp event.headers
+        pp event.content[:event_name]
       end
   
-      FSR.start_ies!(IesDemo, :host => "localhost", :port => 8021)
+    end
+  
+    FSR.start_ies!(IesDemo, :host => "localhost", :port => 8021)
   
   
   An example of using FSR::CommandSocket to originate a new call in irb:
   ----------------------------------------------------------------------
   
-      irb(main):001:0> require 'fsr'
-      => true
+    irb(main):001:0> require 'fsr'
+    => true
   
-      irb(main):002:0> FSR.load_all_commands
-      => [:sofia, :originate]
+    irb(main):002:0> FSR.load_all_commands
+    => [:sofia, :originate]
   
-      irb(main):003:0> sock = FSR::CommandSocket.new
-      => #<FSR::CommandSocket:0xb7a89104 @server="127.0.0.1", @socket=#<TCPSocket:0xb7a8908c>, @port="8021", @auth="ClueCon">
+    irb(main):003:0> sock = FSR::CommandSocket.new
+    => #<FSR::CommandSocket:0xb7a89104 @server="127.0.0.1", @socket=#<TCPSocket:0xb7a8908c>, @port="8021", @auth="ClueCon">
   
-      irb(main):007:0> sock.originate(:target => 'sofia/gateway/carlos/8179395222', :endpoint => FSR::App::Bridge.new("user/bougyman")).run
-      => {"Job-UUID"=>"732075a4-7dd5-4258-b124-6284a82a5ae7", "body"=>"", "Content-Type"=>"command/reply", "Reply-Text"=>"+OK Job-UUID: 732075a4-7dd5-4258-b124-6284a82a5ae7"}
+    irb(main):007:0> sock.originate(:target => 'sofia/gateway/carlos/8179395222', :endpoint => FSR::App::Bridge.new("user/bougyman")).run
+    => {"Job-UUID"=>"732075a4-7dd5-4258-b124-6284a82a5ae7", "body"=>"", "Content-Type"=>"command/reply", "Reply-Text"=>"+OK Job-UUID: 732075a4-7dd5-4258-b124-6284a82a5ae7"}
   
   
   
@@ -278,9 +254,12 @@ specification_version: 2
 summary: A library for interacting with the "FreeSWITCH":http://freeswitch.org telephony platform
 test_files: 
 - spec/fsr/app.rb
+- spec/fsr/app/answer.rb
 - spec/fsr/app/bridge.rb
 - spec/fsr/app/conference.rb
 - spec/fsr/app/fifo.rb
+- spec/fsr/app/fs_break.rb
+- spec/fsr/app/fs_sleep.rb
 - spec/fsr/app/hangup.rb
 - spec/fsr/app/limit.rb
 - spec/fsr/app/log.rb

data/lib/fsr/listener/outbound.rb.orig

@@ -1,131 +0,0 @@
-require "yaml"
-require "fsr/listener"
-module FSR
-  load_all_applications
-  module Listener
-    module Outbound
-      include FSR::Listener
-
-      # Include FSR::App to get all the applications defined as methods
-      include FSR::App
-
-      # Redefine the FSR::App methods to wrap sendmsg around them
-      SENDMSG_METHOD_DEFINITION = "def %s(*args, &block); sendmsg super; end"
-      APPLICATIONS.each { |app, obj| module_eval(SENDMSG_METHOD_DEFINITION % app.to_s) }
-
-      def post_init
-        @session = nil # holds the session object
-        send_data("connect\n\n")
-        FSR::Log.debug "Accepting connections."
-      end
-
-      # Received data dispatches the data received by the EM socket,
-      # Either as a Session, a continuation of a Session, or as a Session's last CommandReply
-      def receive_data(data)
-        FSR::Log.debug("received #{data}")
-        if @session.nil? # if @session is nil, create a new Session object
-          @session = Session.new(data)
-          session_initiated(@session) if @session.initiated?
-        else
-          # If it's not nil, we add the data to this session, Session knows whether
-          # or not to create a CommandReply, complete a CommandReply, or simply add to
-          # its own @data array and @headers/@body structures
-          if @session.initiated?
-            @session << data
-            reply_received(@session.replies.last) if @session.replies.last.complete?
-          else
-            @session << data
-            session_initiated(@session) if @session.initiated?
-          end
-        end
-        @session
-      end
-
-      def session_initiated(session)
-        session
-      end
-
-      def reply_received(command_reply)
-        command_reply
-      end
-
-      alias :receive_response :reply_received
-      # sendmsg sends data to the EM app socket via #send_data, or
-      # returns the string it would send if #send_data is not defined.
-      # It expects an object which responds to either #sendmsg or #to_s, 
-      # which should return a EM Outbound Event Socket formatted instruction
-      def sendmsg(message)
-        text = message.respond_to?(:sendmsg) ? message.sendmsg : message.to_s
-        FSR::Log.debug "sending #{text}"
-        message = "sendmsg\n%s\n" % text
-        self.respond_to?(:send_data) ? send_data(message) : message
-      end
-
-
-      class SocketResponse
-        attr_accessor :headers, :body, :data
-        def initialize(data = "")
-          @data = [data]
-          @headers = {}
-          if data.match(/\n$/)
-            headers, @body = data.split("\n\n")
-            headers.each_line do |line|
-              key, value = line.split(":")
-              @headers[key] = value.to_s.strip
-            end
-          end
-          @body ||= ""
-          FSR::Log.debug("New #{self.class.name} created: #{self}")
-        end
-
-        def <<(data)
-          if data.match(/\n$/)
-            @data.last.match(/\n$/) ? @data << data : @data.last << data
-            extra_headers, more_body = @data.last.split("\n\n")
-            extra_headers.each_line do |line|
-              key, value = line.split(":")
-              @headers[key] = value.to_s.strip
-            end
-            @body << more_body unless more_body.nil?
-          else
-            @data.last.match(/\n$/) ? @data << data : @data.last << data
-          end
-          self
-        end
-      end
-
-      class Session < SocketResponse
-        attr_accessor :replies
-        def initialize(data = "")
-          super
-          @replies = []
-        end
-
-        def <<(data)
-          if initiated?
-            if @replies.empty? or @replies.last.complete?
-              @replies << CommandReply.new(data)
-            else
-              @replies.last << data
-            end
-          else
-            super
-          end
-        end
-
-        def initiated?
-          @headers.keys.include?("Control")
-        end
-        
-      end
-
-      class CommandReply < SocketResponse
-        # Set this to true for now, fill it in when we know what completed a reply
-        def complete?
-          true
-        end
-      end
-    end
-
-  end
-end