esendex4soap 0.5.4 → 0.6.0

data/Gemfile

@@ -2,10 +2,11 @@ source "http://rubygems.org"
 gem 'jruby-openssl', :platform => :jruby
 gem 'savon', '~> 0.9.7'
 gem 'log4r'
-gem 'wtf_lang'
+gem 'wtf_lang', '~> 0.3.1'
+
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "shoulda" #, ">= 0"
+  gem "bundler" #, "~> 1.0.0"
+  gem "jeweler" #, "~> 1.6.4"
+  gem "rcov" #, ">= 0"
 end

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.6.0

data/esendex4soap.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{esendex4soap}
-  s.version = "0.5.4"
+  s.name = "esendex4soap"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Voip Scout}]
-  s.date = %q{2011-12-02}
-  s.description = %q{thanks to savon library}
-  s.email = %q{voipscout@gmail.com}
+  s.authors = ["Voip Scout"]
+  s.date = "2012-02-26"
+  s.description = "thanks to savon library"
+  s.email = "voipscout@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -28,11 +28,11 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_esendex4soap.rb"
   ]
-  s.homepage = %q{http://github.com/voipscout/esendex4soap}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.9}
-  s.summary = %q{esendex SOAP-XML-API for ruby}
+  s.homepage = "http://github.com/voipscout/esendex4soap"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.15"
+  s.summary = "esendex SOAP-XML-API for ruby"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -41,29 +41,29 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_runtime_dependency(%q<savon>, ["~> 0.9.7"])
       s.add_runtime_dependency(%q<log4r>, [">= 0"])
-      s.add_runtime_dependency(%q<wtf_lang>, [">= 0"])
+      s.add_runtime_dependency(%q<wtf_lang>, ["~> 0.3.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_dependency(%q<savon>, ["~> 0.9.7"])
       s.add_dependency(%q<log4r>, [">= 0"])
-      s.add_dependency(%q<wtf_lang>, [">= 0"])
+      s.add_dependency(%q<wtf_lang>, ["~> 0.3.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<jruby-openssl>, [">= 0"])
     s.add_dependency(%q<savon>, ["~> 0.9.7"])
     s.add_dependency(%q<log4r>, [">= 0"])
-    s.add_dependency(%q<wtf_lang>, [">= 0"])
+    s.add_dependency(%q<wtf_lang>, ["~> 0.3.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end
 end

data/lib/esendex4soap.rb

@@ -6,74 +6,105 @@ require 'wtf_lang'
 module Esendex
   class Client
     include Log4r
-      INBOX_SERVICE_WSDL = 'https://www.esendex.com/secure/messenger/soap/InboxService.asmx?wsdl'
-      SEND_SERVICE_WSDL = 'https://www.esendex.com/secure/messenger/soap/SendService.asmx?wsdl'
-    
-      attr_accessor :username, :password, :account_reference
-      attr_reader :sent_message_ids
-
-      def initialize(*args)
-        @username = args.shift
-        @password = args.shift
-        @account_reference = args.shift
-        @sent_message_ids = []
-
-        Savon.configure do |config|
+    INBOX_SERVICE_WSDL = 'https://www.esendex.com/secure/messenger/soap/InboxService.asmx?wsdl'
+    SEND_SERVICE_WSDL = 'https://www.esendex.com/secure/messenger/soap/SendService.asmx?wsdl'
+    ACCOUNT_SERVICE_WSDL = 'https://www.esendex.com/secure/messenger/soap/AccountService.asmx?wsdl'
+
+    attr_accessor :username, :password, :account_reference
+    attr_reader :sent_message_ids, :sent_message_statuses
+
+    def initialize(*args)
+      @username = args.shift
+      @password = args.shift
+      @account_reference = args.shift
+      @sent_message_ids, @sent_message_statuses = [], {}
+
+      Savon.configure do |config|
         config.raise_errors = true
         config.log = false
         config.log_level = :error
         HTTPI.log = false
-        end
+      end
 
-        @log = Logger.new "#{self.class.name}"
-        @log.outputters = Outputter.stdout
-        @log.level = ERROR
+      @log = Logger.new "#{self.class.name}"
+      @log.outputters = Outputter.stdout
+      @log.level = ERROR
 
-        @message_kind = String.new
+      @message_kind = String.new
 
-      end
+    end
 
-      def send_message(recipient, text, originator, validityperiod)
-        @log.debug "TO:#{recipient} text size:#{text.size} in #{text.full_lang} language"
-        #TODO: handle other languages as well
-        unless text.full_lang == 'russian'
-          sms_parts = text.scan(/.{610}/mu)
-          sms_parts << text[sms_parts.to_s.size..text.size]
-          @message_kind = 'Text'
-          @log.debug "#{@message_kind}:#{text.scan(/./mu)} = #{text.size}. #{sms_parts.size} part/s."
-          sms(recipient, sms_parts, originator, validityperiod)
-        else
-          sms_parts = text.scan(/.{70}/mu)
-          sms_parts << text[sms_parts.to_s.size..text.size]
-          @message_kind = 'Unicode'
-          @log.debug "#{@message_kind}:#{text.scan(/./mu)} != #{text.size}. #{sms_parts.size} part/s."
-          sms(recipient, sms_parts, originator, validityperiod)
-        end
+    def send_message(recipient, text, originator, validityperiod)
+      @log.debug "TO:#{recipient} text size:#{text.size} in #{text.full_lang} language"
+      #TODO: handle other languages as well
+      unless text.full_lang == 'russian'
+        sms_parts = text.scan(/.{610}/mu)
+        sms_parts << text[sms_parts.to_s.size..text.size]
+        @message_kind = 'Text'
+        @log.debug "#{@message_kind}:#{text.scan(/./mu)} = #{text.size}. #{sms_parts.size} part/s."
+        sms(recipient, sms_parts, originator, validityperiod)
+      else
+        sms_parts = text.scan(/.{70}/mu)
+        sms_parts << text[sms_parts.to_s.size..text.size]
+        @message_kind = 'Unicode'
+        @log.debug "#{@message_kind}:#{text.scan(/./mu)} != #{text.size}. #{sms_parts.size} part/s."
+        sms(recipient, sms_parts, originator, validityperiod)
       end
-      
-      private
-      def connect
-        @client = Savon::Client.new(SEND_SERVICE_WSDL)
-        #http://jira.codehaus.org/browse/JRUBY-5529 - jruby-openssl in --1.9 jruby mode
-        @client.http.auth.ssl.verify_mode=(:none)
+    end
+
+    def get_credit
+      client = Savon::Client.new(ACCOUNT_SERVICE_WSDL)
+      #http://jira.codehaus.org/browse/JRUBY-5529 - jruby-openssl in --1.9 jruby mode
+      client.http.auth.ssl.verify_mode=(:none)
+      resp = client.request :com, :get_message_limit do |soap|
+        soap.header["com:MessengerHeader"] = {"com:Username" => @username, "com:Password" => @password, "com:Account" => @account_reference}
       end
-      
-      def sms(recipient, messages, originator, validityperiod)
-        @log.debug "#{@message_kind}:#{messages.size} parts."
-        connect
-        messages.each do |message|
-          @log.debug "#{@message_kind}:#{message.size} bytes. Sending..."
-          resp = @client.request :com, :send_message_full do |soap|
+      resp.to_hash[:get_message_limit_response][:get_message_limit_result].to_i
+    end
+
+    def get_status(*message_id)
+      connect unless @client
+
+      if message_id.size > 1
+        message_id.each do |id|
+          resp = @client.request :com, :get_message_status do |soap|
             soap.header["com:MessengerHeader"] = {"com:Username" => @username, "com:Password" => @password, "com:Account" => @account_reference}
-            soap.body = {"com:recipient" => recipient, "com:body" => message, "com:type" => @message_kind, "com:originator" => originator, "com:validityperiod" => validityperiod}
+            soap.body = {"com:id" => id.to_s}
           end
-          @log.debug "Sent #{@message_kind}:#{recipient}:#{message.size} bytes"
-          @sent_message_ids << resp.to_hash[:send_message_full_response][:send_message_full_result]
+          @sent_message_statuses << resp.to_hash[:get_message_status_response][:get_message_status_result]
+        end
+      else
+        resp = @client.request :com, :get_message_status do |soap|
+          soap.header["com:MessengerHeader"] = {"com:Username" => @username, "com:Password" => @password, "com:Account" => @account_reference}
+          soap.body = {"com:id" => message_id.first}
+        end
+        resp.to_hash[:get_message_status_response][:get_message_status_result]
+      end
+    end
+
+    private
+    def connect
+      @client = Savon::Client.new(SEND_SERVICE_WSDL)
+      #http://jira.codehaus.org/browse/JRUBY-5529 - jruby-openssl in --1.9 jruby mode
+      @client.http.auth.ssl.verify_mode=(:none)
+    end
+
+    def sms(recipient, messages, originator, validityperiod)
+      @log.debug "#{@message_kind}:#{messages.size} parts."
+      connect
+      messages.each do |message|
+        @log.debug "#{@message_kind}:#{message.size} bytes. Sending..."
+        resp = @client.request :com, :send_message_full do |soap|
+          soap.header["com:MessengerHeader"] = {"com:Username" => @username, "com:Password" => @password, "com:Account" => @account_reference}
+          soap.body = {"com:recipient" => recipient, "com:body" => message, "com:type" => @message_kind, "com:originator" => originator, "com:validityperiod" => validityperiod}
         end
-        @log.debug "-=| #{messages.join(' + ')} |=-"
-        @log.debug "-----"
+        @log.debug "Sent #{@message_kind}:#{recipient}:#{message.size} bytes"
+        @sent_message_ids << resp.to_hash[:send_message_full_response][:send_message_full_result]
       end
-    
+      @log.debug "-=| #{messages.join(' + ')} |=-"
+      @log.debug "-----"
+    end
+
   end #module Client
 
 

metadata

@@ -2,7 +2,7 @@
 name: esendex4soap
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors: 
   - Voip Scout
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2012-02-26 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl
@@ -50,9 +50,9 @@ dependencies:
     version_requirements: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: 0.3.1
     requirement: *id004
     prerelease: false
     type: :runtime
@@ -72,9 +72,9 @@ dependencies:
     version_requirements: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: "0"
     requirement: *id006
     prerelease: false
     type: :development
@@ -83,9 +83,9 @@ dependencies:
     version_requirements: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.6.4
+            version: "0"
     requirement: *id007
     prerelease: false
     type: :development
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: esendex SOAP-XML-API for ruby