messagemedia-ruby 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjM5ZTNkNjA1YzUzMGY2YmQ1ZmUwYWU2NzBlNDE3NDgwYjQxNGZhMg==
-  data.tar.gz: !binary |-
-    YjRjNjM1YjgxNjZhN2QwYmIxMjE4NmMyMDRlYzhiZmY1ZGM4MTJjMA==
+SHA1:
+  metadata.gz: 935902a5a49ea6a540f5b09d20c6adc75aee1969
+  data.tar.gz: 6938c8ba949cc4006a49b4a7eb9b42dfd2494639
 SHA512:
-  metadata.gz: !binary |-
-    ZjI4ZDYyNTQ1YTBhMmVhN2E5MWY1ZTk1OGUzMGIyYWYzMDkwNThjN2UwZDRh
-    ZDdhNWQ4MjQwZTRkZmI5N2YwZWQ0ZDJiOWI1ZTc5OTU0NmI0OWI1ZDI0NmM0
-    Nzg2ODQyY2ViMTI1ZTIxODQ3OTk4ZjQ4YWQyYjdlNWQ2ZDgyNTE=
-  data.tar.gz: !binary |-
-    YTc5NWQ0M2IzNGI0ZTAzODM1M2ZjYzE0MDU0ZWYzZmE1Y2EyMjg2MjEwN2Vh
-    MjM4YmE4NmU4OTI5OTE3NmYzMmI3NTM4N2FhZDBmY2MzYjI0ZWEzMWRkZjQ2
-    YTk2NTdmMzI1ODgzYmY2YzgzZWMzYjAyMGU5YjkwNDViMDljY2Q=
+  metadata.gz: 4c0ec1f0a52e1f89c60122d03065f12683857ba449541be3ffb0f19ed08ec0e267478c62fe37e41d4fae5dbfd85f17eba1e5972353ca674f2fdc4de07cf860b6
+  data.tar.gz: 44975416d2ea2db6c0708292ea1521aa02f316188d75ccbed2f512f6c476346cdcab293118adc30a4ed1a0d2415ad6e675149c5451c60fe4e91addb15221f5d1

data/CHANGES.md

@@ -0,0 +1,9 @@
+messagemedia-ruby changelog
+===========================
+
+Version 0.7.0
+-------------
+
+Released March 26, 2015
+
+- Renamed gem from messagemedia-soap to messagemedia-ruby

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/messagemedia-soap.svg)](http://badge.fury.io/rb/messagemedia-soap)
+[![Gem Version](https://badge.fury.io/rb/messagemedia-ruby.svg)](http://badge.fury.io/rb/messagemedia-ruby)
 [![Build Status](https://travis-ci.org/messagemedia/messagemedia-ruby.svg)](https://travis-ci.org/messagemedia/messagemedia-ruby)
 
 # MessageMedia Ruby SDK

data/Rakefile

@@ -1,8 +1,8 @@
 require 'rake/testtask'
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-end
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new
 
 desc 'Run tests'
-task :default => :test
+task :default => :spec

data/lib/messagemedia/soap/client.rb

@@ -1,5 +1,7 @@
 require 'savon'
 
+require_relative 'message'
+
 module Messagemedia
   module SOAP
 

data/lib/messagemedia/version.rb

@@ -1,3 +1,3 @@
 module Messagemedia
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/messagemedia-ruby.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_dependency 'rake'
+  spec.add_dependency 'rspec'
   spec.add_dependency 'savon', '~> 2.4'
-  spec.add_dependency 'test-unit'
+  spec.add_dependency 'simplecov', '~> 0.9.2'
 
 end

data/spec/messagemedia/soap/client_spec.rb

@@ -0,0 +1,260 @@
+require_relative '../../spec_helper'
+
+require 'savon/mock/spec_helper'
+
+describe Messagemedia::SOAP::Client do
+  include Savon::SpecHelper
+
+  before(:all) { savon.mock! }
+  after(:all) { savon.unmock! }
+
+  describe '#send_message' do
+    it 'sends a message' do
+
+      expected_request_body = {
+          :'api:authentication' => {
+              :'api:userId' => 'username',
+              :'api:password' => 'password'
+          },
+          :'api:requestBody' => {
+              :'api:messages' => {
+                  :@sendMode => 'normal',
+                  :'api:message' => [
+                      {
+                          :'api:content' => 'Test',
+                          :'api:recipients' => {
+                              :'api:recipient' => ['0491570156'],
+                              :attributes! => {
+                                  :'api:recipient' => {
+                                      :uid => [0]
+                                  }
+                              }
+                          },
+                          :@format => 'SMS',
+                          :@sequenceNumber => 0,
+                          :'api:deliveryReport' => true,
+                          :'api:validityPeriod' => 1,
+                          :'api:origin' => '0491570110'
+                      }
+                  ]
+              }
+          }
+      }
+
+      packaged_response = {
+          :code => 200,
+          :headers => {},
+          :body => Gyoku.xml({
+              :'SOAP-ENV:Envelope' => {
+                  :'@xmlns:SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
+                  :'@xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
+                  :'@xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                  :'@xmlns:SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/',
+                  :'SOAP-ENV:Body' => {
+                      :send_messages_response => {
+                          :@xmlns => 'http://xml.m4u.com.au/2009',
+                          :result => {
+                              :account_details => {
+                                  :@type => 'daily',
+                                  :@credit_limit => '500',
+                                  :@credit_remaining => '497'
+                              },
+                              :@sent => '1',
+                              :@scheduled => '0',
+                              :@failed => '0'
+                          }
+                      }
+                  }
+              }
+          },
+          {
+              :key_converter => :none
+          })
+      }
+
+      savon.expects(:send_messages).with(message: expected_request_body).returns(packaged_response)
+
+      client = described_class.new('username', 'password')
+      result = client.send_message('0491570156', 'Test', 0, '0491570110')
+
+      expect(result).to_not be_nil
+      expect(result[:account_details]).to_not be_nil
+      expect(result[:account_details][:@type]).to eq('daily')
+      expect(result[:account_details][:@credit_limit]).to eq('500')
+      expect(result[:account_details][:@credit_remaining]).to eq('497')
+      expect(result[:@sent]).to eq('1')
+      expect(result[:@scheduled]).to eq('0')
+      expect(result[:@failed]).to eq('0')
+
+    end
+  end
+
+  describe '#send_messages' do
+    it 'sends multiple message' do
+      expected_request_body = {
+          :'api:authentication' => {
+              :'api:userId' => 'username',
+              :'api:password' => 'password'
+          },
+          :'api:requestBody' => {
+              :'api:messages' => {
+                  :@sendMode => 'normal',
+                  :'api:message' => [
+                      {
+                          :'api:content' => 'Test 1',
+                          :'api:recipients' => {
+                              :'api:recipient' => ['0491570156'],
+                              :attributes! => {
+                                  :'api:recipient' => {
+                                      :uid => [0]
+                                  }
+                              }
+                          },
+                          :@format => 'SMS',
+                          :@sequenceNumber => 0,
+                          :'api:deliveryReport' => true,
+                          :'api:validityPeriod' => 1,
+                          :'api:origin' => '0491570110'
+                      },
+                      {
+                          :'api:content' => 'Test 2',
+                          :'api:recipients' => {
+                              :'api:recipient' => ['0491570157'],
+                              :attributes! => {
+                                  :'api:recipient' => {
+                                      :uid => [1]
+                                  }
+                              }
+                          },
+                          :@format => 'SMS',
+                          :@sequenceNumber => 0,
+                          :'api:deliveryReport' => false,
+                          :'api:validityPeriod' => 2,
+                          :'api:origin' => '0491570109'
+                      }
+                  ]
+              }
+          }
+      }
+
+      packaged_response = {
+          :code => 200,
+          :headers => {},
+          :body => Gyoku.xml({
+              :'SOAP-ENV:Envelope' => {
+                  :'@xmlns:SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
+                  :'@xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
+                  :'@xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                  :'@xmlns:SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/',
+                  :'SOAP-ENV:Body' => {
+                      :send_messages_response => {
+                          :@xmlns => 'http://xml.m4u.com.au/2009',
+                          :result => {
+                              :account_details => {
+                                  :@type => 'daily',
+                                  :@credit_limit => '500',
+                                  :@credit_remaining => '497'
+                              },
+                              :@sent => '2',
+                              :@scheduled => '0',
+                              :@failed => '0'
+                          }
+                      }
+                  }
+              }
+          },
+          {
+             :key_converter => :none
+          })
+      }
+
+      savon.expects(:send_messages).with(message: expected_request_body).returns(packaged_response)
+
+      client = described_class.new('username', 'password')
+
+      message_1 = Messagemedia::SOAP::Message.new
+      message_1.content = 'Test 1'
+      message_1.add_recipient(0, '0491570156')
+      message_1.origin = '0491570110'
+
+      message_2 = Messagemedia::SOAP::Message.new
+      message_2.content = 'Test 2'
+      message_2.add_recipient(1, '0491570157')
+      message_2.delivery_report = false
+      message_2.validity_period = 2
+      message_2.origin = '0491570109'
+
+      result = client.send_messages([message_1, message_2])
+
+      expect(result).to_not be_nil
+      expect(result[:account_details]).to_not be_nil
+      expect(result[:account_details][:@type]).to eq('daily')
+      expect(result[:account_details][:@credit_limit]).to eq('500')
+      expect(result[:account_details][:@credit_remaining]).to eq('497')
+      expect(result[:@sent]).to eq('2')
+      expect(result[:@scheduled]).to eq('0')
+      expect(result[:@failed]).to eq('0')
+
+    end
+  end
+
+  describe '#get_user_info' do
+    it 'returns user info' do
+
+      expected_request_body = {
+          :'api:authentication' => {
+              :'api:userId' => 'username',
+              :'api:password' => 'password'
+          }
+      }
+
+      packaged_response = {
+          :code => 200,
+          :headers => {},
+          :body => Gyoku.xml({
+              :'SOAP-ENV:Envelope' => {
+                  :'@xmlns:SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
+                  :'@xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
+                  :'@xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                  :'@xmlns:SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/',
+                  :'SOAP-ENV:Body' => {
+                      :check_user_response => {
+                          :@xmlns => 'http://xml.m4u.com.au/2009',
+                          :result => {
+                              :account_details => {
+                                  :@type => 'daily',
+                                  :@credit_limit => '500',
+                                  :@credit_remaining => '497'
+                              },
+                              :@sent => '2',
+                              :@scheduled => '0',
+                              :@failed => '0'
+                          }
+                      }
+                  }
+              }
+          },
+          {
+              :key_converter => :none
+          })
+      }
+
+      savon.expects(:check_user).with(message: expected_request_body).returns(packaged_response)
+
+      client = described_class.new('username', 'password')
+
+      result = client.get_user_info
+
+      expect(result).to_not be_nil
+      expect(result[:account_details]).to_not be_nil
+      expect(result[:account_details][:@type]).to eq('daily')
+      expect(result[:account_details][:@credit_limit]).to eq('500')
+      expect(result[:account_details][:@credit_remaining]).to eq('497')
+      expect(result[:@sent]).to eq('2')
+      expect(result[:@scheduled]).to eq('0')
+      expect(result[:@failed]).to eq('0')
+
+    end
+  end
+
+end

data/spec/messagemedia/soap/message_spec.rb

@@ -0,0 +1,46 @@
+require_relative '../../spec_helper'
+
+describe Messagemedia::SOAP::Message do
+  let!(:message) { described_class.new }
+
+  describe '#to_api_hash' do
+    context 'multiple recipients' do
+      let!(:message_id_1) { 100 }
+      let!(:recipient_1) { 123456 }
+      let!(:recipient_2) { 456789 }
+
+      before do
+        # First test recipient, with a custom message ID
+        message.add_recipient(message_id_1, recipient_1)
+        # Second test recipient, no message ID
+        message.add_recipient(nil, recipient_2)
+      end
+
+      it 'should produce the correct hash' do
+        expected_hash = {
+            :'@format' => message.format,
+            :'@sequenceNumber' => message.sequence_number,
+            :'api:deliveryReport' => message.delivery_report,
+            :'api:validityPeriod' => message.validity_period,
+            :'api:content' => message.content,
+            :'api:recipients' => {
+                :'api:recipient' => [
+                    recipient_1,
+                    recipient_2
+                ],
+                :attributes! => {
+                    :'api:recipient' => {
+                        :uid => [
+                            message_id_1,
+                            nil
+                        ]
+                    }
+                }
+            }
+        }
+        expect(message.to_api_hash).to eq(expected_hash)
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'simplecov'
+SimpleCov.start
+
+require 'rspec'
+require_relative '../lib/messagemedia-ruby'

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: messagemedia-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Tristan Penman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
 description: Support for Ruby applications to integrate with the MessageMedia SOAP
   API
 email:
@@ -75,8 +89,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -88,7 +103,9 @@ files:
 - lib/messagemedia/soap/recipient.rb
 - lib/messagemedia/version.rb
 - messagemedia-ruby.gemspec
-- test/test_message.rb
+- spec/messagemedia/soap/client_spec.rb
+- spec/messagemedia/soap/message_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.messagemedia.com/
 licenses:
 - Apache
@@ -99,12 +116,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -114,4 +131,6 @@ signing_key:
 specification_version: 4
 summary: Simple Ruby interface for the MessageMedia SOAP API
 test_files:
-- test/test_message.rb
+- spec/messagemedia/soap/client_spec.rb
+- spec/messagemedia/soap/message_spec.rb
+- spec/spec_helper.rb

data/test/test_message.rb

@@ -1,46 +0,0 @@
-require 'test/unit'
-
-require_relative '../lib/messagemedia/soap/recipient'
-require_relative '../lib/messagemedia/soap/message'
-
-class TestMessage < Test::Unit::TestCase
-
-  def test_to_api_hash
-    message = Messagemedia::SOAP::Message.new
-
-    # First test recipient, with a custom message ID
-    message_id_1 = 100
-    recipient_1 = 123456
-    message.add_recipient(message_id_1, recipient_1)
-
-    # Second test recipient, no message ID
-    recipient_2 = 456789
-    message.add_recipient(nil, recipient_2)
-
-    expected_hash = {
-        :'@format' => message.format,
-        :'@sequenceNumber' => message.sequence_number,
-        :'api:deliveryReport' => message.delivery_report,
-        :'api:validityPeriod' => message.validity_period,
-        :'api:content' => message.content,
-        :'api:recipients' => {
-            :'api:recipient' => [
-                recipient_1,
-                recipient_2
-            ],
-            :attributes! => {
-                :'api:recipient' => {
-                    :uid => [
-                        message_id_1,
-                        nil
-                    ]
-                }
-            }
-        }
-    }
-
-    assert_equal(expected_hash, message.to_api_hash)
-
-  end
-
-end