ruby_fs 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # develop
 
+# 1.0.2
+  * Bugfix: Interpret API responses correctly
+
 # 1.0.1
   * Bugfix: Bump celluloid dependency
 

data/README.md

@@ -1,6 +1,8 @@
 # RubyFS [![Build Status](https://secure.travis-ci.org/adhearsion/ruby_fs.png?branch=master)](http://travis-ci.org/adhearsion/ruby_fs)
 RubyFS is a FreeSWITCH EventSocket client library in Ruby and based on Celluloid actors with the sole purpose of providing a connection to the EventSocket API. RubyFS does not provide any features beyond connection management and protocol parsing. Actions are sent over the wire, and responses come back via callbacks. It's up to you to match these up into something useful. In this regard, RubyFS is very similar to [Blather](https://github.com/sprsquish/blather) for XMPP or [Punchblock](https://github.com/adhearsion/punchblock), the Ruby 3PCC library. In fact, Punchblock uses RubyFS under the covers for its FreeSWITCH implementation.
 
+NB: If you're looking to develop an application on FreeSWITCH, you should take a look at the [Adhearsion](http://adhearsion.com) framework first. This library is much lower level.
+
 ## Installation
     gem install ruby_fs
 

data/lib/ruby_fs/stream.rb

@@ -152,11 +152,12 @@ module RubyFS
     end
 
     def receive_request(headers, content)
+      content.strip!
       case headers[:content_type]
       when 'text/event-json'
         fire_event Event.new(headers, json_content_2_hash(content))
-      when 'command/reply'
-        @command_callbacks.pop.call CommandReply.new(headers)
+      when 'command/reply', 'api/response'
+        @command_callbacks.pop.call CommandReply.new(headers, (content == '' ? nil : content))
       when 'auth/request'
         command "auth #{@secret}" do
           command! "event json ALL" if @events

data/lib/ruby_fs/version.rb

@@ -1,3 +1,3 @@
 module RubyFS
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/ruby_fs/stream_spec.rb

@@ -165,12 +165,14 @@ foo-bar: doo_dah
     it "can send API commands and returns the response" do
       expect_connected_event
       expect_disconnected_event
-      reply = CommandReply.new(:content_type => 'command/reply', :reply_text => '+OK accepted')
+      reply = CommandReply.new({:content_type => 'api/response', :content_length => '41'}, '+OK 396dd34a-10ba-11e2-b64a-37a9f8360f21')
       mocked_server(1, lambda { |server| @stream.api('foo').should == reply }) do |val, server|
         val.should == "api foo\n\n"
         server.send_data %Q(
-Content-Type: command/reply
-Reply-Text: +OK accepted
+Content-Type: api/response
+Content-Length: 41
+
++OK 396dd34a-10ba-11e2-b64a-37a9f8360f21
 
 )
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_fs
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -247,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3554104999927593934
+      hash: 3964546558106237063
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3554104999927593934
+      hash: 3964546558106237063
 requirements: []
 rubyforge_project: ruby_fs
 rubygems_version: 1.8.23