esendex4soap 0.4.0 → 0.4.2

data/Gemfile

@@ -1,11 +1,7 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 gem 'jruby-openssl' if defined?(JRUBY_VERSION)
 gem 'savon'
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+gem 'log4r'
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.2

data/esendex4soap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{esendex4soap}
-  s.version = "0.4.0"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Voip Scout}]
-  s.date = %q{2011-11-18}
+  s.date = %q{2011-11-29}
   s.description = %q{thanks to savon library}
   s.email = %q{voipscout@gmail.com}
   s.extra_rdoc_files = [
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_runtime_dependency(%q<savon>, [">= 0"])
+      s.add_runtime_dependency(%q<log4r>, [">= 0"])
       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"])
@@ -47,6 +48,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_dependency(%q<savon>, [">= 0"])
+      s.add_dependency(%q<log4r>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -55,6 +57,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<jruby-openssl>, [">= 0"])
     s.add_dependency(%q<savon>, [">= 0"])
+    s.add_dependency(%q<log4r>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/esendex4soap.rb

@@ -1,8 +1,10 @@
 # -*- encoding : utf-8 -*-
 require 'savon'
+require 'log4r'
 
 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'
     
@@ -10,9 +12,9 @@ module Esendex
       attr_reader :sent_message_ids
 
       def initialize(*args)
-        @username = args[0]
-        @password = args[1]
-        @account_reference = args[2]
+        @username = args.shift
+        @password = args.shift
+        @account_reference = args.shift
         @sent_message_ids = []
         
         Savon.configure do |config|
@@ -20,19 +22,32 @@ module Esendex
         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
+
+        @message_kind = String.new
+
       end
 
       def send_message(recipient, text)
-        if text.size < 139
+        @log.debug "------- Going to deliver #{text.size} bytes long message"
+        if text.size < 140
+          @log.debug "#{text.size} is < 140"
           sms(recipient, text.to_a)
         elsif text.scan(/./mu).size == text.size
-          sms_parts = text.scan(/.{139}/mu)
+          @log.debug "Processing non-UTF8 message"
+          sms_parts = text.scan(/.{610}/mu)
           sms_parts << text[sms_parts.to_s.size..text.size]
+          @message_kind = 'Text'
           sms(recipient, sms_parts)
         else
-          sms_parts = text.scan(/.{69}/mu)
+          @log.debug "Processing UTF-8 message"
+          sms_parts = text.scan(/.{70}/mu)
           sms_parts << text[sms_parts.to_s.size..text.size]
+          @message_kind = 'Unicode'
           sms(recipient, sms_parts)
         end
       end
@@ -45,11 +60,14 @@ module Esendex
       
       def sms(recipient, messages)
         connect
+        @log.debug "*#{@message_kind}*" # message: #{messages.join('|<->|')}"
         messages.each do |message|
+          @log.debug "Sending message _ #{message.size} bytes long"
           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" => 'Unicode'}
+            soap.body = {"com:recipient" => recipient, "com:body" => message, "com:type" => @message_kind}
           end
+          @log.debug "Message sent"
           @sent_message_ids << resp.to_hash[:send_message_full_response][:send_message_full_result]
         end
       end
@@ -60,4 +78,4 @@ module Esendex
 end #module Esendex
 
 #sms = Esendex::Client.new('username', 'password', 'account_reference')
-#sms.send_message 'PHONENUMBER', 'Сообщение любой длины UTF-8. | UTF-8 message of any size goes here'
+#sms.send_message 'PHONENUMBER', 'message in any language'

metadata

@@ -2,7 +2,7 @@
 name: esendex4soap
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors: 
   - Voip Scout
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 Z
+date: 2011-11-29 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl
@@ -35,7 +35,7 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: shoulda
+    name: log4r
     version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -44,38 +44,49 @@ dependencies:
             version: "0"
     requirement: *id003
     prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: shoulda
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id004
+    prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: bundler
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.0.0
-    requirement: *id004
+    requirement: *id005
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: jeweler
-    version_requirements: &id005 !ruby/object:Gem::Requirement 
+    version_requirements: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.6.4
-    requirement: *id005
+    requirement: *id006
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: rcov
-    version_requirements: &id006 !ruby/object:Gem::Requirement 
+    version_requirements: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id006
+    requirement: *id007
     prerelease: false
     type: :development
 description: thanks to savon library