esendex 0.4.0 → 0.5.0

data/lib/esendex/message_failed_event.rb

@@ -1,30 +1,30 @@
-require 'nokogiri'
-
-# <MessageFailed>
-#  <Id>{guid-of-push-notification}</Id>
-#  <MessageId>{guid-of-inbound-message}</MessageId>
-#  <AccountId>{guid-of-esendex-account-for-message}</AccountId>
-#  <OccurredAt>
-#   {the UTC DateTime (yyyy-MM-ddThh:mm:ss) the message failed}
-#  </OccurredAt>
-# </MessageDelivered>
-
-module Esendex
-  class MessageFailedEvent
-    include HashSerialisation
-
-    attr_accessor :id, :message_id, :account_id, :occurred_at
-
-    def self.from_xml(source)
-      doc = Nokogiri::XML source
-      event = MessageFailedEvent.new
-      event.id = doc.at_xpath("/MessageFailed/Id").content
-      event.message_id = doc.at_xpath("/MessageFailed/MessageId").content
-      event.account_id = doc.at_xpath("/MessageFailed/AccountId").content
-      occurred_at_s = doc.at_xpath("/MessageFailed/OccurredAt").content
-      event.occurred_at = DateTime.strptime(occurred_at_s, "%Y-%m-%dT%H:%M:%S").to_time
-      event
-    end
-
-  end
+require 'nokogiri'
+
+# <MessageFailed>
+#  <Id>{guid-of-push-notification}</Id>
+#  <MessageId>{guid-of-inbound-message}</MessageId>
+#  <AccountId>{guid-of-esendex-account-for-message}</AccountId>
+#  <OccurredAt>
+#   {the UTC DateTime (yyyy-MM-ddThh:mm:ss) the message failed}
+#  </OccurredAt>
+# </MessageDelivered>
+
+module Esendex
+  class MessageFailedEvent
+    include HashSerialisation
+
+    attr_accessor :id, :message_id, :account_id, :occurred_at
+
+    def self.from_xml(source)
+      doc = Nokogiri::XML source
+      event = MessageFailedEvent.new
+      event.id = doc.at_xpath("/MessageFailed/Id").content
+      event.message_id = doc.at_xpath("/MessageFailed/MessageId").content
+      event.account_id = doc.at_xpath("/MessageFailed/AccountId").content
+      occurred_at_s = doc.at_xpath("/MessageFailed/OccurredAt").content
+      event.occurred_at = DateTime.strptime(occurred_at_s, "%Y-%m-%dT%H:%M:%S").to_time
+      event
+    end
+
+  end
 end

data/lib/esendex/railtie.rb

@@ -1,12 +1,12 @@
-require 'esendex'
-require 'rails'
-
-module Esendex
-  class Railtie < Rails::Railtie
-    railtie_name :esendex
-
-    rake_tasks do
-      load "tasks/esendex.rake"
-    end
-  end
+require 'esendex'
+require 'rails'
+
+module Esendex
+  class Railtie < Rails::Railtie
+    railtie_name :esendex
+
+    rake_tasks do
+      load "tasks/esendex.rake"
+    end
+  end
 end

data/lib/esendex/version.rb

@@ -1,3 +1,3 @@
-module Esendex
-  VERSION = "0.4.0"
-end
+module Esendex
+  VERSION = "0.5.0"
+end

data/lib/esendex/voice_message.rb

@@ -0,0 +1,25 @@
+module Esendex
+  class VoiceMessage
+    attr_accessor :to, :body, :from
+
+    def initialize(to, body, from = nil)
+      @to = to
+      @body = body
+      @from = from
+    end
+
+    def xml_node
+      doc = Message.new(to, body, from).xml_node
+
+      lang = Nokogiri::XML::Node.new 'lang', doc
+      lang.content = 'en-GB'
+      doc.add_child(lang)
+
+      type = Nokogiri::XML::Node.new 'type', doc
+      type.content = 'Voice'
+      doc.add_child(type)
+
+      doc
+    end
+  end
+end

data/lib/tasks/esendex.rake

@@ -1,30 +1,30 @@
-require_relative '../esendex'
-
-namespace :esendex do
-  desc "Validates whether credentials are correct and returns message credit balance"
-  task :validate, [:username, :password, :account_reference] do |t, args|
-    begin
-      Esendex.configure do |config|
-        config.username = args.username
-        config.password = args.password
-        config.account_reference = args.account_reference
-      end
-      account = Esendex::Account.new
-      messages_remaining = account.messages_remaining
-      puts "Validated user #{Esendex.username} on account #{account.reference}. #{messages_remaining} messages remaining"
-    rescue => e
-      puts "Failed to validate credentials #{e.message}"
-    end
-  end
-
-  desc "Sends a message using the credentials specifed in the environment"
-  task :send_message, [:to, :body, :from] do |t, args|
-    begin
-      account = Esendex::Account.new
-      batch_id = account.send_message(args)
-      puts "Message sent to #{args.to}. Batch ID: #{batch_id}"
-    rescue => e
-      puts "Failed to send message #{e.message}"
-    end
-  end
+require_relative '../esendex'
+
+namespace :esendex do
+  desc "Validates whether credentials are correct and returns message credit balance"
+  task :validate, [:username, :password, :account_reference] do |t, args|
+    begin
+      Esendex.configure do |config|
+        config.username = args.username
+        config.password = args.password
+        config.account_reference = args.account_reference
+      end
+      account = Esendex::Account.new
+      messages_remaining = account.messages_remaining
+      puts "Validated user #{Esendex.username} on account #{account.reference}. #{messages_remaining} messages remaining"
+    rescue => e
+      puts "Failed to validate credentials #{e.message}"
+    end
+  end
+
+  desc "Sends a message using the credentials specifed in the environment"
+  task :send_message, [:to, :body, :from] do |t, args|
+    begin
+      account = Esendex::Account.new
+      batch_id = account.send_message(args)
+      puts "Message sent to #{args.to}. Batch ID: #{batch_id}"
+    rescue => e
+      puts "Failed to send message #{e.message}"
+    end
+  end
 end

data/licence.txt

@@ -1,24 +1,24 @@
-Copyright (c) 2013, Esendex Ltd.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of Esendex nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL ESENDEX LTD BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+Copyright (c) 2013, Esendex Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Esendex nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL ESENDEX LTD BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/readme.md

@@ -1,186 +1,186 @@
-# Esendex Ruby SDK
-
-Ruby Gem for interacting with the Esendex API. Full docs for the API can be found at [developers.esendex.com](http://developers.esendex.com).
-
-This is in early stages of development but supports the primary requirements around sending and receiving messages as well as push notifications.
-
-## Usage
-
-### Setting up
-
-From the command line
-
-    gem install esendex
-
-or in your project's Gemfile.
-
-    gem 'esendex'
-
-Before sending messages you need to configure the gem with your credentials. In a Rails app this would typically go into a file called `esendex.rb` in the *config/initializers*.
-
-```ruby
-Esendex.configure do |config|
-  config.username = "<username>"
-  config.password = "<password>"
-  config.account_reference = "<account_reference>"
-end
-```
-
-You can omit account reference and specify it when you instantiate an account object if you're using multiple accounts.
-
-You can also specify these using the environment variables `ESENDEX_USERNAME`, `ESENDEX_PASSWORD` and `ESENDEX_ACCOUNT`.
-
-### Sending Messages
-
-First instantiate an Account with the reference. You can omit the reference if you've already configured one to use in the *Esendex.configure* step.
-Then, call the send method on the account object with a hash describing the message. The return value is a *DispatcherResult* which has the *batch_id* you can use to obtain the status of the *messages* you have sent.
-
-```ruby
-account = Account.new
-result = account.send_message( to: "07777111222", body: "Saying hello to the world with the help of Esendex")
-```
-You can specify a different account to the default by passing the reference in as an initialization argument
-
-```ruby
-account = Account.new('EX23847')
-```
-
-Multiple messages are sent by passing an array of `Messages` to the `send_messages` method
-	
-```ruby
-result = account.send_messages([Message.new("07777111222", "Hello"), Message.new("07777111333", "Hi")])
-```
-
-Sent messages can be retrieved by calling the `sent_messages` method. The return value is a *SentMessagesResult*
-
-```ruby
-result = account.sent_messages
-puts result
-result.messages.each do |message|
-  puts message
-end
-```
-
-### Testing Configuration
-
-The Esendex Gem ships with a couple of rake tasks that allow you to simply validate that all is well.
-
-    rake esendex:validate['<username>,'<password>','<account_reference>']
-
-This will confirm that the credentials passed can access the account.
-
-You can also send a message
-
-    rake esendex:send_message["<mobile_number>","<message_body>"]
-
-You will need to set the credentials as enviroment variables which can also be done inline
-
-    rake esendex:send_message["<mobile_number>","<message_body>"] ESENDEX_USERNAME=<username> ESENDEX_PASSWORD=<password> ESENDEX_ACCOUNT=<account_reference>
-
-
-## Push Notifications
-
-You can configure your Esendex account to send Push Notifications when the following occur
-
-+ MessageDeliveredEvent
-+ MessageFailedEvent
-+ InboundMessage
-
-While it is possible to poll our API to check the status of outbound messages and to check for new inbound messages, the recommended approach is to allow the Esendex Platform to notify your system when these events occur.
-
-To do this you need to setup web accessible end points to accept the notifications. These end points are configured in [Esendex Developer Tools](https://www.esendex.com/developertools).
-
-Classes are provided in the gem for deserialising the notifications: `MessageDeliveredEvent`, `MessageFailedEvent` and `InboundMessage`. They all expose a `.from_xml` method to support this.
-
-```ruby
-message = InboundMessage.from_xml request.body
-```
-
-### Rails 3 / Rails 4
-
-In order to simplify receipt of push notifications for Rails 3 users, the gem ships with mountable Rails controllers to handle the receipt of these notifications.
-
-To mount the end points, add this to `routes.rb`
-
-```ruby
-RailsApp::Application.routes.draw do
-  ...
-  mount Esendex::Engine => "/esendex"
-end
-```
-
-To configure the behaviour in response to a notification, you need to configure a lambda to use.
-
-```ruby
-Esendex.message_delivered_event_handler = lambda { |notification| 
-  # process the notification
-}
-```
-
-Please be kind to us and don't perform anything potentially long running in this call back as our notifier may timeout the request and pass the notififation to the retry queue. 
-
-If you need to perform processing that may run for a longer time then using an async task system like [Resque](https://github.com/defunkt/resque) is recommended.
-
-All notification classes expose a `.to_hash` method and can be initialised from the hash for serialisatiion and deserialisation.
-
-For example:
-
-```ruby
-
-Esendex.inbound_message_handler = lambda { |notification| 
-  Resque.enqueue InboundMessageProcessor, notification.to_hash
-}
-
-class InboundMessageProcessor
-
-  def self.perform(notification)
-    message = Esendex::InboundMessage.new notification
-    # do some processing of the message here
-  end
-
-end
-``` 
-
-The handlers are defined as follows:
-
-| End Point| Config Setting | Notification Class | Developer Tools |
-| -------- | -------------- | ------------------ | --------------- |
-| /esendex/inbound_messages | Esendex.inbound_message_handler | InboundMessage | SMS received |
-| /esendex/message_delivered_events | Esendex.message_delivered_event_handler | MessageDeliveredEvent | SMS delivered |
-| /esendex/message_failed_events | Esendex.message_failed_event_handler | MessageFailedEvent | SMS failed |
-
-#### Errors
-
-When an error occur in the handler lambdas then the controller returns a `500` status along with some error information back to the the Esendex Platform. This information is emailed to the technical notifications contact for the account.
-
-The notification then enters the retry cycle. 
-
-Included by default is the backtrace for the error to assist you in identifying the issue. You can suppress backtrace with the following config option.
-
-```ruby
-Esendex.configure do |config|
-  config.suppress_error_backtrace = true
-end
-```
-
-## Testing
-
-    bundle exec rspec
-  
-Will run specs. The spec folder contains a dummy Rails project for testing the Rails Engine.
-
-This project also ships with a `Guardfile` so you can run tests continuously.
-
-    bundle exec guard
-
-
-## Contributing
-
-We really welcome any thoughts or guidance on how this gem could best provide the hooks you need to consume our services in your applicaiton. Please fork and raise pull requests for any features you would like us to add or raise an [issue]((https://github.com/esendex/esendex.gem/issues)
-
-Customers with more pressing issues should contact our support teams via the usual local phone number or by email: [support@esendex.com](mailto:support@esendex.com).
-
-## Copyright
-
-Copyright (c) 2011-13 Esendex Ltd. See licence.txt for further details.
-
+# Esendex Ruby SDK
+
+Ruby Gem for interacting with the Esendex API. Full docs for the API can be found at [developers.esendex.com](http://developers.esendex.com).
+
+This is in early stages of development but supports the primary requirements around sending and receiving messages as well as push notifications.
+
+## Usage
+
+### Setting up
+
+From the command line
+
+    gem install esendex
+
+or in your project's Gemfile.
+
+    gem 'esendex'
+
+Before sending messages you need to configure the gem with your credentials. In a Rails app this would typically go into a file called `esendex.rb` in the *config/initializers*.
+
+```ruby
+Esendex.configure do |config|
+  config.username = "<username>"
+  config.password = "<password>"
+  config.account_reference = "<account_reference>"
+end
+```
+
+You can omit account reference and specify it when you instantiate an account object if you're using multiple accounts.
+
+You can also specify these using the environment variables `ESENDEX_USERNAME`, `ESENDEX_PASSWORD` and `ESENDEX_ACCOUNT`.
+
+### Sending Messages
+
+First instantiate an Account with the reference. You can omit the reference if you've already configured one to use in the *Esendex.configure* step.
+Then, call the send method on the account object with a hash describing the message. The return value is a *DispatcherResult* which has the *batch_id* you can use to obtain the status of the *messages* you have sent.
+
+```ruby
+account = Account.new
+result = account.send_message( to: "07777111222", body: "Saying hello to the world with the help of Esendex")
+```
+You can specify a different account to the default by passing the reference in as an initialization argument
+
+```ruby
+account = Account.new('EX23847')
+```
+
+Multiple messages are sent by passing an array of `Messages` to the `send_messages` method
+	
+```ruby
+result = account.send_messages([Message.new("07777111222", "Hello"), Message.new("07777111333", "Hi")])
+```
+
+Sent messages can be retrieved by calling the `sent_messages` method. The return value is a *SentMessagesResult*
+
+```ruby
+result = account.sent_messages
+puts result
+result.messages.each do |message|
+  puts message
+end
+```
+
+### Testing Configuration
+
+The Esendex Gem ships with a couple of rake tasks that allow you to simply validate that all is well.
+
+    rake esendex:validate['<username>,'<password>','<account_reference>']
+
+This will confirm that the credentials passed can access the account.
+
+You can also send a message
+
+    rake esendex:send_message["<mobile_number>","<message_body>"]
+
+You will need to set the credentials as enviroment variables which can also be done inline
+
+    rake esendex:send_message["<mobile_number>","<message_body>"] ESENDEX_USERNAME=<username> ESENDEX_PASSWORD=<password> ESENDEX_ACCOUNT=<account_reference>
+
+
+## Push Notifications
+
+You can configure your Esendex account to send Push Notifications when the following occur
+
++ MessageDeliveredEvent
++ MessageFailedEvent
++ InboundMessage
+
+While it is possible to poll our API to check the status of outbound messages and to check for new inbound messages, the recommended approach is to allow the Esendex Platform to notify your system when these events occur.
+
+To do this you need to setup web accessible end points to accept the notifications. These end points are configured in [Esendex Developer Tools](https://www.esendex.com/developertools).
+
+Classes are provided in the gem for deserialising the notifications: `MessageDeliveredEvent`, `MessageFailedEvent` and `InboundMessage`. They all expose a `.from_xml` method to support this.
+
+```ruby
+message = InboundMessage.from_xml request.body
+```
+
+### Rails 3 / Rails 4
+
+In order to simplify receipt of push notifications for Rails 3 users, the gem ships with mountable Rails controllers to handle the receipt of these notifications.
+
+To mount the end points, add this to `routes.rb`
+
+```ruby
+RailsApp::Application.routes.draw do
+  ...
+  mount Esendex::Engine => "/esendex"
+end
+```
+
+To configure the behaviour in response to a notification, you need to configure a lambda to use.
+
+```ruby
+Esendex.message_delivered_event_handler = lambda { |notification| 
+  # process the notification
+}
+```
+
+Please be kind to us and don't perform anything potentially long running in this call back as our notifier may timeout the request and pass the notififation to the retry queue. 
+
+If you need to perform processing that may run for a longer time then using an async task system like [Resque](https://github.com/defunkt/resque) is recommended.
+
+All notification classes expose a `.to_hash` method and can be initialised from the hash for serialisatiion and deserialisation.
+
+For example:
+
+```ruby
+
+Esendex.inbound_message_handler = lambda { |notification| 
+  Resque.enqueue InboundMessageProcessor, notification.to_hash
+}
+
+class InboundMessageProcessor
+
+  def self.perform(notification)
+    message = Esendex::InboundMessage.new notification
+    # do some processing of the message here
+  end
+
+end
+``` 
+
+The handlers are defined as follows:
+
+| End Point| Config Setting | Notification Class | Developer Tools |
+| -------- | -------------- | ------------------ | --------------- |
+| /esendex/inbound_messages | Esendex.inbound_message_handler | InboundMessage | SMS received |
+| /esendex/message_delivered_events | Esendex.message_delivered_event_handler | MessageDeliveredEvent | SMS delivered |
+| /esendex/message_failed_events | Esendex.message_failed_event_handler | MessageFailedEvent | SMS failed |
+
+#### Errors
+
+When an error occur in the handler lambdas then the controller returns a `500` status along with some error information back to the the Esendex Platform. This information is emailed to the technical notifications contact for the account.
+
+The notification then enters the retry cycle. 
+
+Included by default is the backtrace for the error to assist you in identifying the issue. You can suppress backtrace with the following config option.
+
+```ruby
+Esendex.configure do |config|
+  config.suppress_error_backtrace = true
+end
+```
+
+## Testing
+
+    bundle exec rspec
+  
+Will run specs. The spec folder contains a dummy Rails project for testing the Rails Engine.
+
+This project also ships with a `Guardfile` so you can run tests continuously.
+
+    bundle exec guard
+
+
+## Contributing
+
+We really welcome any thoughts or guidance on how this gem could best provide the hooks you need to consume our services in your applicaiton. Please fork and raise pull requests for any features you would like us to add or raise an [issue]((https://github.com/esendex/esendex.gem/issues)
+
+Customers with more pressing issues should contact our support teams via the usual local phone number or by email: [support@esendex.com](mailto:support@esendex.com).
+
+## Copyright
+
+Copyright (c) 2011-13 Esendex Ltd. See licence.txt for further details.
+