messagemedia-soap 0.6.4 → 0.6.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzlmOTNhYjdhNmNkNThhODdjY2Q3YTA5M2Q1NzdjM2UwNjg0OTM0NA==
+    MDg4Y2JhNzk4OTM1MWMwZWM0NDdkMmRkNWNhM2NmNmVlYzg4NGMyNQ==
   data.tar.gz: !binary |-
-    MWRhN2IwMzhlOTI3YmQ2MDhhNzQ3YjExZjI4OGQ0ZmQ1Y2NlOGM0Mg==
+    N2QxOGQ1OWI1MWNlZWI2NzlmNzZlMDBmOTUwY2E5YTVhYmZkZjYzMw==
 SHA512:
   metadata.gz: !binary |-
-    MmJlNmY5ZGRkMmNiMjYzMWNiYjM2NzY2YWQ5OGUzOWNlNTY1YWRiOTU1NTI4
-    NzZiM2YxZTE4YjI2ZjJiMmQyMGM2YTExNDZjYmQ0ZWI3MzJkZjMxOTRmMGFm
-    NTA3Zjc1ODc5OThmM2NjYTcyZTNjNWMxNGZmMDcwYjYyOGNmZGY=
+    ZDg3M2ViNDJlNmNiNGFmNTNkNGFkN2VhMjUzZDYwNGRhZDZlOTI2ZmMyMzM3
+    NDIxMDNiNzFlYmQ3NGI2MTQxNGU1NDQ1YjUwYTNlZTBmZjk4MWYwYzcxNzU2
+    MTFmNzg5NDk0NjQyZTE3ZDAxZWRmMGRlMDMyYTUzYzkwYTY2M2M=
   data.tar.gz: !binary |-
-    NTk0MDEzMTUyN2IwNjcyYWU4MjdlMjM5YTZhZDg5NTRlYWJiNWMwOTI0N2Yy
-    NmE0YWE0MWI0MWQwMmU2NzExYWU0Y2I4MGZjMTk5YmI5MTVhMzhlODUyMTFk
-    Yjc0NTJhZWI1MWQ5MzExMDgyN2NjYTg2YTQ4ODZmMTQ0YTEzN2I=
+    ODAxMWQ3NWY1NDkxNjIxODEyZDVjNmYwNDAxZjFkYjhkMzc2NmYxNWI4MGU4
+    NTM2OTVlMzVmMzhmYjA0ZTJhZDQ0ZDU0ZTdlYWZmOWEwNDU1N2FjMWRiM2Qz
+    YjhkMjczZGFjNmRlNTNhNDEyYTdkN2Y2NDk4ODk2YzZkODVjODY=

data/lib/messagemedia/soap/message.rb

@@ -54,7 +54,14 @@ module Messagemedia
                     :'api:deliveryReport' => @delivery_report,
                     :'api:validityPeriod' => @validity_period,
                     :'api:content' => @content,
-                    :'api:recipients' => @recipients.map { |r| r.to_api_hash }
+                    :'api:recipients' => {
+                        :'api:recipient' => @recipients.map { |r| r.destination_number },
+                        :attributes! => {
+                            :'api:recipient' => {
+                                :uid => @recipients.map { |r| r.message_id }
+                            }
+                        }
+                    }
                 }
 
                 if not @origin.nil? then

data/lib/messagemedia/soap/recipient.rb

@@ -24,29 +24,6 @@ module Messagemedia
                 @destination_number = destination_number
             end
 
-            #
-            # Return a hash that can be passed to the Savon SOAP library to
-            # represent a recipient. This will be converted to XML of the form:
-            #
-            #     <api:recipient uid="1">+61422000000</api:recipient>
-            #
-            # If the recipient does not have a non-nil ID, then the 'uid'
-            # attribute will be omitted.
-            #
-            def to_api_hash
-                if @message_id.nil? then
-                    {
-                        :'api:recipient' => @destination_number
-                    }
-                else
-                    {
-                        :'api:recipient' => @destination_number,
-                        :'attributes!' => {
-                            :'api:recipient' => { 'uid' => @message_id }
-                        }
-                    }
-                end
-            end
         end
     end
 end

data/lib/messagemedia/soap/version.rb

@@ -2,7 +2,7 @@ module Messagemedia
 
   module SOAP
 
-    VERSION = "0.6.4"
+    VERSION = "0.6.5"
 
   end
 

data/test/test_message.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 
+require_relative '../lib/messagemedia/soap/recipient'
 require_relative '../lib/messagemedia/soap/message'
 
 class TestMessage < Test::Unit::TestCase
@@ -23,19 +24,20 @@ class TestMessage < Test::Unit::TestCase
             :'api:deliveryReport' => message.delivery_report,
             :'api:validityPeriod' => message.validity_period,
             :'api:content' => message.content,
-            :'api:recipients' => [
-                {
-                    :'api:recipient' => recipient_1,
-                    :'attributes!' => {
-                        :'api:recipient' => {
-                            'uid' => message_id_1
-                        }
+            :'api:recipients' => {
+                :'api:recipient' => [
+                    recipient_1,
+                    recipient_2
+                ],
+                :attributes! => {
+                    :'api:recipient' => {
+                        :uid => [
+                            message_id_1,
+                            nil
+                        ]
                     }
-                },
-                {
-                    :'api:recipient' => recipient_2
                 }
-            ]
+            }
         }
 
         assert_equal(expected_hash, message.to_api_hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: messagemedia-soap
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Chris Hawkins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,7 +76,6 @@ files:
 - lib/messagemedia/soap/version.rb
 - messagemedia-soap.gemspec
 - test/test_message.rb
-- test/test_recipient.rb
 homepage: http://www.messagemedia.com/
 licenses:
 - Apache
@@ -103,4 +102,3 @@ specification_version: 4
 summary: Simple Ruby interface for the MessageMedia SOAP API
 test_files:
 - test/test_message.rb
-- test/test_recipient.rb

data/test/test_recipient.rb

@@ -1,26 +0,0 @@
-require 'test/unit'
-
-require_relative '../lib/messagemedia/soap/recipient'
-
-class TestRecipient < Test::Unit::TestCase
-
-    def test_to_api_hash
-
-        # First test receipient, with a custom message ID
-        recipient = Messagemedia::SOAP::Recipient.new(123, 123456)
-        assert_equal({
-            :'api:recipient' => 123456,
-            :'attributes!' => {
-                :'api:recipient' => { 'uid' => 123 }
-            }
-        }, recipient.to_api_hash)
-
-        # Second test recipient, no message ID
-        recipient = Messagemedia::SOAP::Recipient.new(nil, 123456)
-        assert_equal({
-            :'api:recipient' => 123456
-        }, recipient.to_api_hash)
-
-    end
-
-end