sipgate_io 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b17a778854facd17224ca88b612bae3fef9a52c
-  data.tar.gz: 355292121b876c9892579d2966f89debe73abaf4
+  metadata.gz: b13b762011c328c801c9a905c793b6eaea62c4cc
+  data.tar.gz: b3bc9206cacb88eeed3064a00b547fad894cd61e
 SHA512:
-  metadata.gz: f8788976a23b97d954d8ecf49635f583f8a842e8f5763ca44538eceb5078bca7e6b2c9491510296d8ace41153e7ab29d6888d80cb0cd544dc29031c8e257f2c9
-  data.tar.gz: ff2504faac215e638e8869dd87ef399328229b9d0d57b1cb5f681529d55459e49a198a305286dd5c002280e9b1e4b99e7c70b8f0b26a7027d9b1eb2b6aacaa7f
+  metadata.gz: fecd57fcc0d9a2e27bbc258befdc98ee974f39420d2061786b412db19179c333d3ed6cbeeddd723ed19cd1509e56db5b16c2a6cf91038ab1612f71c6895e70b3
+  data.tar.gz: 9db396cfca44e8710670c2024ff91c9ab2c84664d1f44b3f3479a6d1daf68c21b43fd34fe6e64b9f5cfd1b747c17b619ad01ca68cacbce77afbe336125402809

data/lib/sipgate_io/version.rb

@@ -1,3 +1,3 @@
 module SipgateIo
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/lib/sipgate_io/xml_response.rb

@@ -3,65 +3,63 @@ require 'builder'
 module SipgateIo
   class XmlResponse
 
-    def self.dial(target, options = nil)
-      self.builder.Response do |b|
-        if target == :voicemail
-          b.Dial { |b| b.Voicemail }
-        elsif options.nil?
-          b.Dial { |b| b.Number(target) }
-        elsif !options[:anonymous].nil?
-          b.Dial(anonymous: true) { |b| b.Number(target) }
-        elsif !options[:caller_id].nil?
-          b.Dial(callerId: options[:caller_id]) { |b| b.Number(target) }
+    def self.dial(options = {})
+      anonymous = options[:clip] == :anonymous ? Hash[ anonymous: true ] : nil
+      caller_id = !!/\d+/.match(options[:clip]) ? Hash[ callerId: options[:clip] ] : nil
+      self.builder.Response(set_callback(options)) do |b|
+        b.Dial(anonymous, caller_id) do |b|
+          options[:target] == :voicemail ? b.Voicemail : b.Number(options[:target])
         end
       end
     end
 
-    def self.play(url)
-      self.builder.Response { |b| b.Play { |b| b.Url(url) } }
+    def self.play(options = {})
+      url = options[:soundfile_url]
+      self.builder.Response(set_callback(options)) { |b| b.Play { |b| b.Url(url) } }
     end
 
-    def self.gather(options = nil)
-      options ||= {}
-      options[:type] ||= :dtmf
-      options[:callback_url] ||= SipgateIo.configuration.callback_url
-      options[:max_digits] ||= 1
-      options[:timeout] ||= 1000
-      self.builder.Response do |b|
-        b.Gather(onData: options[:callback_url],
-                 maxDigits: options[:max_digits],
-                 timeout: options[:timeout]) do |b|
-          unless options[:play_url].nil?
-            b.Play { |b| b.Url(options[:play_url]) }
+    def self.gather(options = {})
+      on_data = Hash[ onData: SipgateIo.configuration.callback_url ]
+      max_digits = options.key?(:max_digits) ? Hash[ maxDigits: options[:max_digits] ] : nil
+      timeout = options.key?(:timeout) ? Hash[ timeout: options[:timeout] ] : nil
+      play_url = options.key?(:soundfile_url) ? options[:soundfile_url] : nil
+
+      self.builder.Response(set_callback(options)) do |b|
+        b.Gather(on_data,
+                 max_digits,
+                 timeout) do |b|
+          unless play_url.nil?
+            b.Play { |b| b.Url(play_url) }
           end
         end
       end
     end
 
-    def self.reject(reason = nil)
-      self.builder.Response do |b|
-        if reason.nil?
-          b.Reject
-        else
-          b.Reject(reason: reason)
-        end
-      end
+    def self.reject(options = {})
+      reason = options.key?(:reason) ? Hash[ reason: options[:reason] ] : nil
+      self.builder.Response(set_callback(options)) { |b| b.Reject(reason) }
     end
 
-    def self.hangup
-      self.builder.Response { |b| b.Hangup }
+    def self.hangup(options = {})
+      self.builder.Response(set_callback(options)){ |b| b.Hangup }
     end
 
     def self.on_answer
-      self.builder.Response(onAnswer: SipgateIo.configuration.callback_url)
+      self.builder.Response(set_callback(Hash[ callback: :on_answer ]) )
     end
 
     def self.on_hangup
-      self.builder.Response(onHangup: SipgateIo.configuration.callback_url)
+      self.builder.Response(set_callback(Hash[ callback: :on_hangup ]) )
     end
 
     private
 
+    def self.set_callback(options)
+      return nil unless options.key?(:callback)
+      type = (options[:callback] == :on_answer) ? :onAnswer : :onHangup
+      Hash[ type => SipgateIo.configuration.callback_url ]
+    end
+
     def self.builder
       b = Builder::XmlMarkup.new(indent: 2)
       b.instruct!
@@ -70,17 +68,3 @@ module SipgateIo
 
   end
 end
-
-# puts SipgateIo::XmlResponse.gather()
-# puts SipgateIo::XmlResponse.gather(play_url: "http://google.de")
-
-# puts SipgateIo::XmlResponse.play("http://google.de")
-# puts SipgateIo::XmlResponse.dial(:voicemail)
-# puts SipgateIo::XmlResponse.dial("491234567")
-# puts SipgateIo::XmlResponse.dial("491234567", anonymous: true)
-# puts SipgateIo::XmlResponse.dial("491234567", caller_id: "555")
-
-# puts SipgateIo::XmlResponse.reject
-# puts SipgateIo::XmlResponse.reject(:busy)
-# puts SipgateIo::XmlResponse.reject(:rejected)
-# puts SipgateIo::XmlResponse.hangup

data/test/dummy/app/models/event_processor.rb

@@ -4,10 +4,6 @@ class EventProcessor
   end
 
   def process
-    puts "#" * 40
-    puts "EventProcessor"
-    puts @event.inspect
-    puts "#" * 40
     return SipgateIo::XmlResponse.reject
   end
 end