verboice 0.5.1 → 0.6.0

data/lib/verboice.rb

@@ -31,20 +31,33 @@ class Verboice
   end
 
   def call address, options = {}
-    args = {:channel => options[:channel] || @default_channel, :address => address}
+    options = options.dup
 
-    args[:not_before] = options[:not_before].iso8601 if options[:not_before]
-    args[:queue] = options[:queue] if options[:queue]
-    args[:project_id] = options[:project_id] if options[:project_id]
+    args = {}
+    if channel = options.delete(:channel)
+      args[:channel] = channel
+    else
+      args[:channel] = @default_channel
+    end
+
+    args[:address] = address
+
+    if not_before = options.delete(:not_before)
+      args[:not_before] = not_before.iso8601
+    end
+
+    flow = options.delete(:flow)
+    callback_url = options.delete(:callback_url)
+
+    args.merge!(options)
 
-    if options[:flow]
-      post "/api/call?#{self.class.to_query args}", options[:flow] do |response, error|
+    if flow
+      post "/api/call?#{self.class.to_query args}", flow do |response, error|
         raise Verboice::Exception.new error.message if error
         JSON.parse response.body
       end
     else
-      args[:callback_url] = options[:callback_url] if options[:callback_url]
-      args[:call_flow_id] = options[:call_flow_id] if options[:call_flow_id]
+      args[:callback_url] = callback_url if callback_url
       get_json "/api/call?#{self.class.to_query args}"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: verboice
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2011-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70192743416520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192743416520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70192743415540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192743415540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Access the Verboice API in ruby.
 email: aromero@manas.com.ar
 executables: []
@@ -61,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Access the Verboice API in ruby