rumeme 0.1.4 → 0.1.5

data/CHANGELOG

@@ -1,3 +1,10 @@
+Version 0.1.5 - 2010-03-12
+===============================================================================
+
+antlypls (1):
+      refactoring
+
+
 Version 0.1.4 - 2010-03-12
 ===============================================================================
 
@@ -43,3 +50,4 @@ antlypls (5):
 
 
 
+

data/lib/rumeme/configuration.rb

@@ -16,6 +16,7 @@ module Rumeme
 
     def initialize
       @replies_auto_confirm = true
+      @long_messages_strategy = :send
     end
   end
 end

data/lib/rumeme/sms_interface.rb

@@ -2,11 +2,13 @@ require "net/http"
 require "net/https"
 require 'rubygems'
 require 'nokogiri'
+require 'generator'
 
 module Rumeme
 
   # This is the main class used to interface with the M4U SMS messaging server.
   class SmsInterface
+    class BadServerResponse < StandardError; end
 
     # allow_splitting, allow_long_messages, response_code, response_message, username, password, use_message_id, secure, http_connection, server_list, message_list,
     # http_proxy, http_proxy_port, http_proxy_auth, https_proxy, https_proxy_port, https_proxy_auth, text_buffer,
@@ -28,16 +30,24 @@ module Rumeme
         @long_messages_strategy = cfg.long_messages_strategy
         @replies_auto_confirm = cfg.replies_auto_confirm
       }
-      
+
       @response_code = -1
       @response_message = nil
       @message_list = []
       @server_list = ["smsmaster.m4u.com.au", "smsmaster1.m4u.com.au", "smsmaster2.m4u.com.au"]
+
+      @long_messages_processor = case @long_messages_strategy
+        when :send
+          lambda {|message| [message]}
+        when :cut
+          lambda {|message| [message[0..159]]}
+        when :split
+          lambda {|message| SmsInterface.split_message message}
+      end
     end
 
     # Add a message to be sent.
     def add_message args
-      p 'in add_message '
       phone_number = self.class.strip_invalid(args[:phone_number]) #not good idea, modifying original args, from outer scope (antlypls)
       message = args[:message]
 
@@ -70,8 +80,6 @@ module Rumeme
 
     # Return the list of replies we have received.
     def check_replies
-      p 'in check_replies'
-
       response_message, response_code = post_data_to_server("CHECKREPLY2.0\r\n.\r\n")
       return if response_code != 150
 
@@ -83,39 +91,31 @@ module Rumeme
 
     # sends confirmation to server
     def confirm_replies_received
-      p 'in confirm_replies_received'
       post_data_to_server "CONFIRM_RECEIVED\r\n.\r\n"
     end
 
     # Returns the credits remaining (for prepaid users only).
     def get_credits_remaining
-      p 'in get_credits_remaining'
-
       response_message, response_code = post_data_to_server("MESSAGES\r\n.\r\n")
 
       if response_message =~ /^(\d+)\s+OK\s+(\d+).+/
         if response_code != 100
-          p 'M4U code is not 100'
-          return -1
+          raise BadServerResponse.new 'M4U code is not 100'
         end
         return $2.to_i
       else
-        p "cant parse response: #{response_message}"
-        return -1
+        raise BadServerResponse.new "cant parse response: #{response_message}"
       end
     end
 
     # Sends all the messages that have been added with the
     # add_message command.
     def send_messages
-      post_string = @message_list.map{ |message|
-        "#{message.message_id} #{message.phone_number} #{message.delay} #{message.validity_period} #{message.delivery_report ? 1 : 0} #{message.message}\r\n"
-      }.join
-
+      post_string = @message_list.map(&:post_string).join
       text_buffer = "MESSAGES2.0\r\n#{post_string}.\r\n"
       response_message, response_code = post_data_to_server(text_buffer)
 
-      return response_code == 100 ? true : false
+      raise 'error during sending messages' if response_code != 100
     end
 
     private
@@ -129,12 +129,10 @@ module Rumeme
 
     def self.split_message_internal message
       list =[]
-
-      head, message = head_tail_split(message, 152)
-      list << head
+      sizes = Generator.new { |g|  g.yield 152; g.yield 155 while true }
 
       while !message.nil? do
-        head, message = head_tail_split(message, 155)
+        head, message = head_tail_split(message, sizes.next)
         list << head
       end
 
@@ -149,16 +147,7 @@ module Rumeme
 
     def process_long_message message
       return [message] if message.length <= 160
-      case @long_messages_strategy
-        when :send
-          [message]
-        when :cut
-          [message[0..160]]
-        when :split
-          split_message message
-        else
-          raise 'unknown long_messages_strategy'
-      end
+      @long_messages_processor.call(message)
     end
 
     # Strip invalid characters from the phone number.
@@ -167,18 +156,16 @@ module Rumeme
       "+#{phone.gsub(/[^0-9]/, '')}"
     end
 
+    def create_login_string # can be calculate once at initialization
+      message_id_sign = @use_message_id? '#' :''
+      "m4u\r\nUSER=#{@username}#{message_id_sign}\r\nPASSWORD=#{@password}\r\nVER=PHP1.0\r\n"
+    end
+
     def post_data_to_server data
       p 'post_data_to_server'
 
       http_connection = open_server_connection(@server_list[0])
-
-      text_buffer = "m4u\r\nUSER=#{@username}"
-      if @use_message_id
-        text_buffer << "#"
-      end
-      text_buffer << "\r\nPASSWORD=#{@password}\r\nVER=PHP1.0\r\n"
-
-      text_buffer << data
+      text_buffer = create_login_string + data
 
       p "buffer: #{text_buffer}"
       headers = {'Content-Length' => text_buffer.length.to_s}
@@ -191,17 +178,14 @@ module Rumeme
         p data.inspect
       rescue
         p "error: #{$!}"
-        return false
+        raise BadServerResponse.new("error: #{$!}")
       end
 
-      if resp.code.to_i != 200
-        p 'http response code != 200'
-        return false
-      end
+      raise BadServerResponse.new('http response code != 200') if resp.code.to_i != 200
 
       doc = Nokogiri::HTML(data)
 
-      return false if doc.xpath('//title').text != "M4U SMSMASTER"
+      raise BadServerResponse.new('bad title') if doc.xpath('//title').text != "M4U SMSMASTER"
 
       response_message = doc.xpath('//body').text.strip
       response_code = nil
@@ -210,7 +194,7 @@ module Rumeme
       end
 
       p "latest response code: #{response_code}"
-      p "response #{response_message }"
+      p "response: #{response_message }"
 
       [response_message, response_code]
     end

data/lib/rumeme/sms_message.rb

@@ -15,5 +15,9 @@ module Rumeme
 
       @message = @message.gsub("\n",'\n').gsub("\r",'\r').gsub("\\",'\\\\')
     end
+    
+    def post_string
+      "#{@message_id} #{@phone_number} #{@delay} #{@validity_period} #{@delivery_report ? 1 : 0} #{@message}\r\n"
+    end
   end
 end

data/lib/rumeme/version.rb

@@ -1,3 +1,3 @@
 module Rumeme
-  VERSION = "0.1.4".freeze
+  VERSION = "0.1.5".freeze
 end

data/lib/rumeme.rb

@@ -12,6 +12,8 @@ module Rumeme
     def configure
       self.configuration ||= Configuration.new
       yield(configuration)
+      
+      raise 'unknown long_messages_strategy' unless [:split, :send, :cut].include?(configuration.long_messages_strategy)
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - antlypls