punchblock 1.5.0 → 1.5.1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v1.5.1](https://github.com/adhearsion/punchblock/compare/v1.5.0...v1.5.1) - [2012-10-11](https://rubygems.org/gems/punchblock/versions/1.5.1)
+  * Update: Bump Celluloid dependency
+  * Bugfix: Input grammars referenced by URL now no longer specify a content type
+  * Bugfix: FreeSWITCH `Dial#from` values now parsed more flexibly
+
 # [v1.5.0](https://github.com/adhearsion/punchblock/compare/v1.4.1...v1.5.0) - [2012-10-01](https://rubygems.org/gems/punchblock/versions/1.5.0)
   * Feature: Input component now supports grammar URLs
   * Bugfix: Hanging up Asterisk calls now correctly specifies normal clearing cause

data/lib/punchblock/component/input.rb

@@ -205,7 +205,8 @@ module Punchblock
         # @param [String] content_type Defaults to GRXML
         #
         def content_type=(content_type)
-          write_attr 'content-type', content_type || grxml_content_type
+          return unless content_type
+          write_attr 'content-type', content_type
         end
 
         ##
@@ -223,6 +224,7 @@ module Punchblock
         # @param [String, RubySpeech::GRXML::Grammar] value the grammar document
         def value=(value)
           return unless value
+          self.content_type = grxml_content_type unless self.content_type
           if grxml? && !value.is_a?(RubySpeech::GRXML::Element)
             value = RubySpeech::GRXML.import value
           end

data/lib/punchblock/translator/freeswitch/call.rb

@@ -127,17 +127,17 @@ module Punchblock
           @direction = :outbound
 
           cid_number, cid_name = dial_command.from, nil
-          dial_command.from.match(/(?<cid_name>.*) <(?<cid_number>.*)>/) do |m|
-            cid_name = m[:cid_name]
+          dial_command.from.match(/(?<cid_name>.*)<(?<cid_number>.*)>/) do |m|
+            cid_name = m[:cid_name].strip
             cid_number = m[:cid_number]
           end
 
           options = {
-            :return_ring_ready            => true,
-            :origination_uuid             => id,
-            :origination_caller_id_number => "'#{cid_number}'"
+            :return_ring_ready  => true,
+            :origination_uuid   => id
           }
-          options[:origination_caller_id_name] = "'#{cid_name}'" if cid_name
+          options[:origination_caller_id_number] = "'#{cid_number}'" if cid_number.present?
+          options[:origination_caller_id_name] = "'#{cid_name}'" if cid_name.present?
           options[:originate_timeout] = dial_command.timeout/1000 if dial_command.timeout
           opts = options.inject([]) do |a, (k, v)|
             a << "#{k}=#{v}"

data/lib/punchblock/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Punchblock
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/punchblock.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency %q<state_machine>, ["~> 1.0"]
   s.add_runtime_dependency %q<future-resource>, ["~> 1.0"]
   s.add_runtime_dependency %q<has-guarded-handlers>, ["~> 1.3"]
-  s.add_runtime_dependency %q<celluloid>, ["~> 0.11.1"]
-  s.add_runtime_dependency %q<ruby_ami>, ["~> 1.2", ">= 1.2.1", "< 1.2.2"]
-  s.add_runtime_dependency %q<ruby_fs>, ["~> 1.0", "< 1.0.1"]
+  s.add_runtime_dependency %q<celluloid>, ["~> 0.12", ">= 0.12.1"]
+  s.add_runtime_dependency %q<ruby_ami>, ["~> 1.2", ">= 1.2.1"]
+  s.add_runtime_dependency %q<ruby_fs>, ["~> 1.0"]
   s.add_runtime_dependency %q<ruby_speech>, ["~> 1.0"]
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]

data/spec/punchblock/component/input_spec.rb

@@ -122,7 +122,8 @@ module Punchblock
 
           subject { Input::Grammar.new :url => url }
 
-          its(:url) { should be == url }
+          its(:url)           { should be == url }
+          its(:content_type)  { should be nil}
 
           describe "comparison" do
             it "should be the same with the same url" do

data/spec/punchblock/translator/freeswitch/call_spec.rb

@@ -249,6 +249,36 @@ module Punchblock
             end
           end
 
+          context 'with a name and empty channel in the from field' do
+            let(:from_name)   { 'Jane Smith' }
+            let(:from_number) { '' }
+            let(:from)        { "#{from_name} <#{from_number}>" }
+
+            it 'sends an originate bgapi command with the cid fields set correctly' do
+              stream.expects(:bgapi).once.with "originate {return_ring_ready=true,origination_uuid=#{subject.id},origination_caller_id_name='#{from_name}'}#{to} &park()"
+              subject.dial dial_command
+            end
+          end
+
+          context 'with a number in the from field with angled brackets' do
+            let(:from_number) { '1001' }
+            let(:from)        { "<#{from_number}>" }
+
+            it 'sends an originate bgapi command with the cid fields set correctly' do
+              stream.expects(:bgapi).once.with "originate {return_ring_ready=true,origination_uuid=#{subject.id},origination_caller_id_number='#{from_number}'}#{to} &park()"
+              subject.dial dial_command
+            end
+          end
+
+          context 'with an empty from attribute' do
+            let(:from) { '' }
+
+            it 'sends an originate bgapi command with the cid fields set correctly' do
+              stream.expects(:bgapi).once.with "originate {return_ring_ready=true,origination_uuid=#{subject.id}}#{to} &park()"
+              subject.dial dial_command
+            end
+          end
+
           context 'with a timeout specified' do
             let :dial_command_options do
               { :timeout => 10000 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
@@ -116,7 +116,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0.12'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +127,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0.12'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: ruby_ami
   requirement: !ruby/object:Gem::Requirement
@@ -136,9 +142,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -150,9 +153,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: ruby_fs
   requirement: !ruby/object:Gem::Requirement
@@ -161,9 +161,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -172,9 +169,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: ruby_speech
   requirement: !ruby/object:Gem::Requirement
@@ -521,7 +515,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -689196999409732364
+      hash: -2734494276677076274
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: