freec 0.2.5 → 0.2.6

data/Rakefile

@@ -9,7 +9,7 @@ end
 
 spec = Gem::Specification.new do |s| 
   s.name              = "freec"
-  s.version           = '0.2.5'
+  s.version           = '0.2.6'
   s.author            = "Jan Kubr"
   s.email             = "mail@jankubr.com"
   s.homepage          = "http://github.com/jankubr/freec"
@@ -24,19 +24,19 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files  = FileList["README*"].to_a
   s.rdoc_options << '--line-numbers' << '--inline-source'
   s.add_dependency "daemons"
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '> 2.0.1'
 end
 
-desc "Generate a gemspec file for GitHub"
+desc "Generate a gemspec file"
 task :gemspec do
   File.open("#{spec.name}.gemspec", 'w') do |f|
     f.write spec.to_ruby
   end
 end
 
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 desc "Run all specs"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = FileList['spec/**/*.rb']
 end

data/lib/freec_base.rb

@@ -74,7 +74,7 @@ private
   end
   
   def disconnect_notice?
-    call_vars[:content_type] == 'text/disconnect-notice'
+    @io.closed? || call_vars[:content_type] == 'text/disconnect-notice'
   end
 
   def callback(callback_name, *args)
@@ -152,8 +152,7 @@ private
   def read_response_info
     @response = ''
     begin
-      line = @io.gets.to_s
-      @response += line
+      @response += read_line_from_io
     end until @response[-2..-1] == "\n\n"    
   end
   
@@ -162,8 +161,7 @@ private
     return if header_length == 0
     header = ''
     begin
-      line = @io.gets.to_s
-      header += line.to_s
+      header += read_line_from_io
     end until header[-2..-1] == "\n\n"
     @response += header        
   end
@@ -172,9 +170,8 @@ private
     body_length = @response.sub(/^Content-Length.*^Content-Length: ([0-9]+)$.*/m, '\1').to_i
     return if body_length == 0
     body = ''
-    begin
-      line = @io.read(body_length).to_s
-      body += line.to_s
+    begin      
+      body += read_block_from_io(body_length)
     end until body.length == body_length
     @response += body    
   end
@@ -202,4 +199,20 @@ private
     true
   end
   
+  def read_line_from_io
+    line = @io.gets
+    raise io_disconnected_message unless line
+    line
+  end
+  
+  def read_block_from_io(length)
+    block = @io.read(length)
+    raise io_disconnected_message  unless block
+    block
+  end
+  
+  def io_disconnected_message
+    "IO disconnected - FreeSWITCH crashed?"
+  end
+  
 end

data/spec/freec_base_spec.rb

@@ -59,6 +59,16 @@ describe Freec do
       @io.should_receive(:gets).and_return(event_parts(EVENT)[0], event_parts(EVENT)[1])
       @freec.send(:read_response)
     end
+
+    it "raises exception if IO is disconnected while reading response info" do
+      @io.should_receive(:gets).and_return(nil)
+      lambda { @freec.send(:read_response) }.should raise_error(RuntimeError, 'IO disconnected - FreeSWITCH crashed?')
+    end
+
+    it "raises exception if IO is disconnected while reading event header" do
+      @io.should_receive(:gets).and_return(event_parts(EVENT)[0], nil)
+      lambda { @freec.send(:read_response) }.should raise_error(RuntimeError, 'IO disconnected - FreeSWITCH crashed?')
+    end
     
     it "reads the full event with body" do
       @io.should_receive(:gets).and_return(event_parts(EVENT_WITH_BODY)[0], 
@@ -66,6 +76,13 @@ describe Freec do
       @io.should_receive(:read).and_return(event_parts(EVENT_WITH_BODY)[2].strip.chomp)
       @freec.send(:read_response)
     end
+    
+    it "raises exception if IO is disconnected while reading body" do
+      @io.should_receive(:gets).and_return(event_parts(EVENT_WITH_BODY)[0], 
+                                          event_parts(EVENT_WITH_BODY)[1])
+      @io.should_receive(:read).and_return(nil)
+      lambda { @freec.send(:read_response) }.should raise_error(RuntimeError, 'IO disconnected - FreeSWITCH crashed?')
+    end
   
   end
   

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 
 $:.unshift(File.join(File.dirname(__FILE__), "..", 'lib')).unshift(File.dirname(__FILE__)).
   unshift(File.join(File.dirname(__FILE__), 'data'))

metadata

@@ -1,60 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: freec
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.5
+version: !ruby/object:Gem::Version
+  version: 0.2.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jan Kubr
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-28 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: daemons
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70325537302580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70325537302580
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70325537302100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70325537302100
 description: 
 email: mail@jankubr.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - Rakefile
 - lib/call_variables.rb
@@ -70,40 +55,30 @@ files:
 - spec/freec_base_spec.rb
 - spec/freeswitch_applications_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/jankubr/freec
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: freec
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The layer between your Ruby voice app and FreeSWITCH.
 test_files: []
-