esendex 0.2.1 → 0.2.2

data/lib/esendex/account.rb

@@ -1,4 +1,3 @@
-require 'nestful'
 require 'nokogiri'
 
 module Esendex
@@ -14,9 +13,11 @@ module Esendex
     end
 
     def messages_remaining
-      response = api_connection.get "/v1.0/accounts/#{@reference}"
+      response = api_connection.get "/v1.0/accounts"
       doc = Nokogiri::XML(response.body)
-      (doc.at_xpath("//accounts/account/reference[contains(.,'#{@reference}')]").parent > "messagesremaining").first.content.to_i
+	  node = doc.at_xpath("//api:account[api:reference='#{@reference}']/api:messagesremaining", 'api' => Esendex::API_NAMESPACE)
+	  raise AccountReferenceError.new() if node.nil?
+	  node.content.to_i
     end
 
     def send_message(args={})

data/lib/esendex/api_connection.rb

@@ -16,13 +16,13 @@ class ApiConnection
   def get(url)
     @connection.get url, default_headers
   rescue => e
-    raise ApiErrorFactory.new.get_api_error(e)
+    raise Esendex::ApiErrorFactory.new.get_api_error(e)
   end
 
   def post(url, body)
     @connection.post url, body, default_headers
   rescue => e
-    raise ApiErrorFactory.new.get_api_error(e)
+    raise Esendex::ApiErrorFactory.new.get_api_error(e)
   end
 
 end

data/lib/esendex/exceptions.rb

@@ -20,4 +20,7 @@ module Esendex
   
   class ForbiddenError < ApiError
   end
+  
+  class AccountReferenceError < ApiError
+  end
 end

data/lib/esendex/message.rb

@@ -1,6 +1,4 @@
-require 'rexml/document'
 require 'nokogiri'
-include REXML
 
 #  <message>
 #    <to>$TO</to>
@@ -14,6 +12,7 @@ module Esendex
     def initialize(to, body, from=nil)
       @to = to
       @body = body
+      @from = from
     end
     
     def xml_node

data/lib/esendex/railtie.rb

@@ -1,7 +1,7 @@
 require 'esendex'
 require 'rails'
 
-module MyPlugin
+module EsendexPlugin
   class Railtie < Rails::Railtie
     railtie_name :esendex
 

data/lib/esendex/version.rb

@@ -1,3 +1,3 @@
 module Esendex
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/account_spec.rb

@@ -6,13 +6,13 @@ describe Account do
   let(:messages_remaining) { random_integer }
   let(:account_xml) {
     "<?xml version=\"1.0\" encoding=\"utf-8\"?>
-      <accounts>
+      <accounts xmlns=\"http://api.esendex.com/ns/\">
         <account id=\"2b4a326c-41de-4a57-a577-c7d742dc145c\" uri=\"http://api.esendex.com/v1.0/accounts/2b4a326c-41de-4a57-a577-c7d742dc145c\">
           <balanceremaining domesticmessages=\"100\" internationalmessages=\"100\">$0.00</balanceremaining>
-          <reference>#{"not this one"}</reference>
+          <reference>not this one</reference>
           <address>447786204254</address>
           <type>Professional</type>
-          <messagesremaining>#{1234}</messagesremaining>
+          <messagesremaining>1234</messagesremaining>
           <expireson>2015-12-31T00:00:00</expireson>
           <role>PowerUser</role>
           <defaultdialcode>44</defaultdialcode>
@@ -34,7 +34,7 @@ describe Account do
   let(:api_connection) { mock("Connection", :get => mock('Response', :body => account_xml), :post => true )}
 
   before(:each) do
-    account.stub(:api_connection) { api_connection}
+    account.stub(:api_connection) { api_connection }
   end
 
   describe "#messages_remaining" do
@@ -42,13 +42,23 @@ describe Account do
     subject { account.messages_remaining }
 
     it "should get the account resource" do
-      api_connection.should_receive(:get).with("/v1.0/accounts/#{account_reference}")
+      api_connection.should_receive(:get).with("/v1.0/accounts")
       subject
     end
-    it "should get the messages remaining from the documeny" do
+    it "should get the messages remaining from the document" do
       subject.should eq(messages_remaining)
     end
   end
+  
+  describe "#messages_remaining_invalid_reference" do
+    before(:each) do
+      account.reference = "invalid"
+	end
+  
+    it "should raise AccountReferenceError" do
+      expect { account.messages_remaining }.to raise_error(AccountReferenceError)
+    end
+  end
 
   describe "#send_message" do
     let(:batch_id) { random_string }

data/spec/message_spec.rb

@@ -1,6 +1,25 @@
 require 'spec_helper'
 
 describe Message do
+  describe "#initialize" do
+    let(:to) { random_mobile }
+    let(:from) { random_mobile }
+    let(:body) { random_string }
+    let(:message) { Esendex::Message.new(to, body, from) }
+    
+    it "should have to set" do
+      message.to.should eq(to)
+    end
+    
+    it "should have from set" do
+      message.from.should eq(from)
+    end
+    
+    it "should have body set" do
+      message.body.should eq(body)
+    end
+  end
+  
   describe "#xml_node" do
     let(:to) { random_mobile }
     let(:body) { random_string }

data/tasks/esendex.rake

@@ -0,0 +1,29 @@
+require_relative '../lib/esendex'
+include Esendex
+
+namespace :esendex do
+  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 = 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
+
+  task :send_message, [:to, :body, :from] do |t, args|
+    begin
+      account = 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esendex
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
-dependencies: []
-description: Gem for interacting with the Esendex API
+date: 2013-02-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: nestful
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4.1
+description: Send SMS from you application using the Esendex API
 email:
 - support@esendex.com
 executables: []
@@ -28,6 +60,7 @@ files:
 - lib/esendex/railtie.rb
 - lib/esendex/version.rb
 - lib/esendex.rb
+- tasks/esendex.rake
 - LICENSE.txt
 - readme.md
 - spec/account_spec.rb
@@ -35,7 +68,7 @@ files:
 - spec/message_batch_submission_spec.rb
 - spec/message_spec.rb
 - spec/spec_helper.rb
-homepage: http://www.esendex.com
+homepage: http://developers.esendex.com
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -65,4 +98,3 @@ test_files:
 - spec/message_batch_submission_spec.rb
 - spec/message_spec.rb
 - spec/spec_helper.rb
-has_rdoc: