tropo-webapi-sdk-ruby 15.10.1 → 15.11.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d318399f0e321377af8bb4f0572664f19c884afe
-  data.tar.gz: d5ca6fac58e74ddc15dd92d3fcf137b8707373c5
+  metadata.gz: bb36ff4f37691dd71545b4998020f0a08a41d7b4
+  data.tar.gz: 3d5aef58d8c54075f6a01e6b57a08cafa366634e
 SHA512:
-  metadata.gz: 4189478223535ee3a44a6dbf0b87a33e70771ca96dea1a1388d93170fd727d20a77cdaa0c7ee49c72dac83275eecbfdc44643126becba2d0ae7943631d091700
-  data.tar.gz: 20f5aabfe66c851d451ea80a3df26c535443b0eb5513b5c0b5253e78242c063a7fb6387c84987c9aba76b865c35c9cc7243c3f71ed19d02f6938db2e8fda1359
+  metadata.gz: f1f40f956b0f1e8cd55f54a360046dc91eb741c3d425c2e62a3c3bd57962cba0bfc7cf214a8d054b0e3f37c59028723b1691118fe42bb6fc0dedf4f5483c4545
+  data.tar.gz: 8627a7f28d19b9c7a1e1833eb7ffdde9732fad1fd18b8b01ca38b36ce74b421695a4916198f5bf551fbae68a71b11358489e100705ecfeeae4f52110f4235d7d

data/lib/tropo-webapi-ruby/tropo-webapi-ruby-helpers.rb

@@ -21,33 +21,33 @@ module Tropo
             end
           end
         when 'call'
-          has_params?(params, 'call', ['to', 'name'])
+          has_params?(params, 'call', ['to'])
         when 'conference'
-          has_params?(params, 'conference', ['name', 'id'])
+          has_params?(params, 'conference', ['id'])
         when 'on'
           has_params?(params, 'on', 'event')
         when 'record'
-          has_params?(params, 'record', ['name', 'url'])
+          has_params?(params, 'record', ['url'])
         when 'start_recording'
           has_params?(params, 'start_recording', ['url'])
 
           # Camelcase this one to be Java friendly
           action = 'startRecording'
         when 'redirect'
-          has_params?(params, 'redirect', ['to', 'name'])
+          has_params?(params, 'redirect', ['to'])
           raise ArgumentError, "Redirect should only be used alone and before the session is answered, use transfer instead" if @nested_hash
         when 'say'
-          has_params?(params, 'say', ['value', 'name'])
+          has_params?(params, 'say', ['value'])
           return build_elements(params)
         when 'nestedSay'
           has_params?(params, 'say', 'value')
           return build_elements(params)
         when 'transfer'
-          has_params?(params, 'transfer', ['to', 'name'])
+          has_params?(params, 'transfer', ['to'])
         when 'wait'
           has_params?(params, 'wait', 'milliseconds')
         when 'message'
-          has_params?(params, 'message', ['say', 'to', 'name'])
+          has_params?(params, 'message', ['say', 'to'])
         end
 
         if action == 'on'
@@ -126,12 +126,36 @@ module Tropo
       # @return [Hash] returns the elements properly formatted in a hash
       def build_elements(params)
         if params[:url]
-          uri = URI.parse params[:url]
-          # Check to see if it is a valid http address
-          if uri.class != URI::HTTP
-            # Check to see if it is a valid email address
-            if params[:url].match(/^[a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/) == false
-              raise ArgumentError, "The 'url' paramater must be a valid URL"
+          if params[:url].is_a? Array
+            for i in params[:url] do  
+              uri = URI.parse i[:url]
+              # Check to see if it is a valid http address
+              if uri.class != URI::HTTP
+                # Check to see if it is a valid email address
+                if params[:url].match(/^[a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/) == false
+                  raise ArgumentError, "The 'url' paramater must be a valid URL"
+                end
+              end
+            end
+          elsif params[:url].nil?
+            if params[:url][:url].nil?
+              uri = URI.parse params[:url][:url]
+              # Check to see if it is a valid http address
+              if uri.class != URI::HTTP
+                # Check to see if it is a valid email address
+                if params[:url].match(/^[a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/) == false
+                  raise ArgumentError, "The 'url' paramater must be a valid URL"
+                end
+              end
+            else
+              uri = URI.parse params[:url]
+              # Check to see if it is a valid http address
+              if uri.class != URI::HTTP
+                # Check to see if it is a valid email address
+                if params[:url].match(/^[a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/) == false
+                  raise ArgumentError, "The 'url' paramater must be a valid URL"
+                end
+              end
             end
           end
         end

data/lib/tropo-webapi-ruby/tropo-webapi-ruby.rb

@@ -565,8 +565,10 @@ module Tropo
     #   if the method has been called from inside a block
     def record(params={}, &block)
       if block_given?
-        create_nested_hash('record', params)
+        @nested_hash = {:record => build_elements(params)}
+        @nested_name = 'record'
         instance_exec(&block)
+        has_params?(@nested_hash[:record], 'record', ['url'])
         @response[:tropo] << @nested_hash
         @nested_hash = nil
         @nested_name = nil

data/tropo-webapi-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tropo-webapi-sdk-ruby}
-  s.version = "15.10.1"
+  s.version = "15.11.0-alpha"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Goecke"]
-  s.date = %q{2017-12-06}
+  s.date = %q{2018-05-11}
   s.description = %q{Ruby library for interacting with the Tropo Web API via REST & JSON}
   s.email = %q{xiangjyu@cisco.com}
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tropo-webapi-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 15.10.1
+  version: 15.11.0.pre.alpha
 platform: ruby
 authors:
 - Jason Goecke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec