plivo 0.2.12 → 0.2.13

data/lib/plivo.rb

@@ -21,7 +21,7 @@ module Plivo
       end
 
       def hash_to_params(myhash)
-          return myhash.map{|k,v| "#{CGI.escape(k)}=#{CGI.escape(v)}"}.join("&")
+        return myhash.map { |k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join("&")
       end
 
       def request(method, path, params=nil)
@@ -444,22 +444,39 @@ module Plivo
 
       attr_accessor :node, :name
 
-      def initialize(body=nil, attributes={})
+      def initialize(body=nil, attributes={}, &block)
           @name = self.class.name.split('::')[1]
           @body = body
           @node = REXML::Element.new @name
           attributes.each do |k, v|
-              if self.class.valid_attributes.include?(k)
-                  @node.attributes[k] = convert_value(v)
+              if self.class.valid_attributes.include?(k.to_s)
+                  @node.attributes[k.to_s] = convert_value(v)
               else
-                  raise PlivoError, 'invalid attribute ' + k + ' for ' + @name
+                  raise PlivoError, "invalid attribute #{k.to_s} for #{@name}"
               end
           end
           if @body
               @node.text = @body
           end
+
+          # Allow for nested "nestable" elements using a code block
+          # ie
+          # Plivo::Response.new do |r|
+          #   r.Dial do |n|
+          #     n.Number '+15557779999'
+          #   end
+          # end
+          yield(self) if block_given?
+      end
+
+      def method_missing(method, *args, &block)
+          # Handle the addElement methods
+          method = $1.to_sym if method.to_s =~ /^add(.*)/
+          # Add the element
+          add(Plivo.const_get(method).new(*args, &block))
       end
 
+
       def convert_value(v)
           if v == true
               return "true"
@@ -484,7 +501,7 @@ module Plivo
               @node.elements << element.node
               return element
           else
-              raise PlivoError, element.name + ' not nestable in ' + @name
+              raise PlivoError, "#{element.name} not nestable in #{@name}"
           end
       end
 
@@ -495,62 +512,6 @@ module Plivo
       def to_s
           return @node.to_s
       end
-
-      def addSpeak(body, attributes={})
-          return add(Speak.new(body, attributes))
-      end
-
-      def addPlay(body, attributes={})
-          return add(Play.new(body, attributes))
-      end
-
-      def addGetDigits(attributes={})
-          return add(GetDigits.new(attributes))
-      end
-
-      def addRecord(attributes={})
-          return add(Record.new(attributes))
-      end
-
-      def addDial(attributes={})
-          return add(Dial.new(attributes))
-      end
-
-      def addNumber(body, attributes={})
-          return add(Number.new(body, attributes))
-      end
-
-      def addUser(body, attributes={})
-          return add(User.new(body, attributes))
-      end
-
-      def addRedirect(body, attributes={})
-          return add(Redirect.new(body, attributes))
-      end
-
-      def addWait(attributes={})
-          return add(Wait.new(attributes))
-      end
-
-      def addHangup(attributes={})
-          return add(Hangup.new(attributes))
-      end
-
-      def addPreAnswer(attributes={})
-          return add(PreAnswer.new(attributes))
-      end
-
-      def addConference(body, attributes={})
-          return add(Conference.new(body, attributes))
-      end
-
-      def addMessage(body, attributes={})
-          return add(Message.new(body, attributes))
-      end
-
-      def addDTMF(body, attributes={})
-          return add(DTMF.new(body, attributes))
-      end
   end
 
 
@@ -639,8 +600,8 @@ module Plivo
                           'validDigits', 'playBeep', 'redirect',
                           'digitTimeout']
 
-      def initialize(attributes={})
-          super(nil, attributes)
+      def initialize(attributes={}, &block)
+          super(nil, attributes, &block)
       end
   end
 
@@ -679,8 +640,8 @@ module Plivo
                            'callbackUrl', 'callbackMethod', 'digitsMatch',
                            'sipHeaders']
 
-      def initialize(attributes={})
-          super(nil, attributes)
+      def initialize(attributes={}, &block)
+          super(nil, attributes, &block)
       end
   end
 
@@ -720,8 +681,8 @@ module Plivo
       @nestables = ['Play', 'Speak', 'GetDigits', 'Wait', 'Redirect', 'Message', 'DTMF']
       @valid_attributes = []
 
-      def initialize(attributes={})
-          super(nil, attributes)
+      def initialize(attributes={}, &block)
+          super(nil, attributes, &block)
       end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plivo
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &20717940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *20717940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &20715780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *20715780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &20712520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: 1.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *20712520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.6
 description: A Ruby gem for interacting with the Plivo Platform
 email: support@plivo.com
 executables: []
@@ -51,7 +66,6 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- lib/test.rb
 - lib/plivo.rb
 - README.md
 homepage: http://www.plivo.com
@@ -74,7 +88,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: A Ruby gem for communicating with the Plivo Platform

data/lib/test.rb

@@ -1,7 +0,0 @@
-require 'rubygems'
-require 'plivo'
-include Plivo
-
-
-
-p = RestAPI.new('asdf','asdf')