freeswitcher 0.5.4 → 0.5.5

data/lib/fsr/listener/inbound.rb

@@ -21,6 +21,15 @@ module FSR
         @output_format = args[:output_format] || "json"
       end
 
+      def connection_completed
+        authorize_and_register_for_events
+      end
+
+      def unbind
+        return unless @host && @port
+        EM.add_timer(1){ reconnect @host, @port }
+      end
+
       # post_init is called upon each "new" socket connection.
       #
       # If Freeswitcher hasn't started listening for inbound socket connections
@@ -30,10 +39,7 @@ module FSR
       def post_init
         if error?
           reconnect_until_succeeding
-        else
-          authorize_and_register_for_events
         end
-        before_session
       end
 
       def reconnect_until_succeeding

data/lib/fsr/model/agent.rb

@@ -1,18 +1,18 @@
-require_relative "../model"
+require 'ostruct'
 module FSR
   module Model
-    class Agent
-      attr_reader :fields, :extension, :full_name
-      include FSR::Model
-
-      def initialize(headers, *data)
-        @fields = headers
-        @fields.each_with_index do |h,i|
-          (class << self; self; end).send(:define_method,h.to_sym) { data[i] }
-        end
+    class Agent < OpenStruct
+      attr_accessor :extension, :full_name
 
+      def initialize(fields, *data)
+        super(Hash[fields.zip(data)])
         @extension, @full_name = name.split("-", 2)
       end
+
+      def fields
+        raise NotImplementedError, "This class is now an OpenStruct"
+      end
+
     end
   end
 end

data/lib/fsr/model/call.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+
 module FSR
   module Model
     class Call < OpenStruct
@@ -9,6 +10,7 @@ module FSR
       def fields
         raise NotImplementedError, "This class is now an OpenStruct"
       end
+
     end
   end
 end

data/lib/fsr/model/channel.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+
 module FSR
   module Model
     class Channel < OpenStruct
@@ -9,6 +10,7 @@ module FSR
       def fields
         raise NotImplementedError, "This class is now an OpenStruct"
       end
+
     end
   end
 end

data/lib/fsr/model/queue.rb

@@ -1,15 +1,16 @@
-require_relative "../model"
+require 'ostruct'
+
 module FSR
   module Model
-    class Queue
-      attr_reader :fields
-      include FSR::Model
-      def initialize(headers, *data)
-        @fields = headers
-        @fields.each_with_index do |h,i| 
-          (class << self; self; end).send(:define_method,h.to_sym) { data[i] }
-        end
+    class Queue < OpenStruct
+      def initialize(fields, *data)
+        super(Hash[fields.zip(data)])
       end
+
+      def fields
+        raise NotImplementedError, "This class is now an OpenStruct"
+      end
+
     end
   end
 end

data/lib/fsr/model/tier.rb

@@ -1,15 +1,17 @@
-require_relative "../model"
+require 'ostruct'
+
 module FSR
   module Model
-    class Tier
-      attr_reader :fields
-      include FSR::Model
-      def initialize(headers, *data)
-        @fields = headers
-        @fields.each_with_index do |h,i| 
-          (class << self; self; end).send(:define_method,h.to_sym) { data[i] }
-        end
+    class Tier < OpenStruct
+
+      def initialize(fields, *data)
+        super(Hash[fields.zip(data)])
       end
+
+      def fields
+        raise NotImplementedError, "This class is now an OpenStruct"
+      end
+
     end
   end
 end

data/lib/fsr/version.rb

@@ -1,3 +1,3 @@
 module FSR
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/spec/fsr/listener/inbound.rb

@@ -84,8 +84,7 @@ EM.describe InboundListener do
 
   should "be able to add custom event hooks with sub events" do
     listener = InboundListener3.new(1234, {:auth => 'SecretPassword'})
-    @listener.receive_data("Content-Length: 18\nContent-Type: text/event-plain\n\nEvent-Name: CUSTOM\n\n")
-    @listener.custom_event.should.not.be.nil
+    @listener.receive_data("Content-Length: 22\nContent-Type: text/event-plain\n\nEvent-Name: CUSTOM\n\n")
     @listener.custom_event.should.equal @listener.recvd_event.first
     done
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Jayson Vaughn
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -06:00
+date: 2011-02-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency