rumeme 0.3.0 → 0.4.0

data/CHANGELOG

@@ -1,3 +1,15 @@
+Version 0.4.0 - 2012-10-30
+===============================================================================
+
+Stan Carver II (6):
+      changed send_messages to return true or false instead of raising an error
+			added send_messages! to raise an error
+			change inverted if not conditionals to unless
+			refactored message_id_sign out of create_login_string
+			consolidated self references with a << self block
+			added my name to the credits as a contributor
+
+
 Version 0.3.0 - 2012-02-17
 ===============================================================================
 

data/README.rdoc

@@ -9,7 +9,7 @@ Just execute
  gem install rumeme
 
 == Usage
-Firs of all add Rumeme initialization
+First, add Rumeme initialization
 
  Rumeme.configure do |config|
    config.username = 'xxx'
@@ -40,7 +40,10 @@ Where xxxxxxxxxxx is phone number.
 * Add unit tests,
 
 = Credits
-RuMeMe is maintained by antlypls, and is funded by Programmable, LLC.
+RuMeMe is maintained by Anatoliy Plastinin, and is funded by {Cloud Castle, LLC}[http://cloudcastlegroup.com/].
+
+= Contributors
+Stan Carver II
 
 = License
-Still looking for license. But the software is provided "as is", without warranty of any kind.
+Still looking for license. But the software is provided "as is", without warranty of any kind.

data/lib/rumeme/sms_interface.rb

@@ -79,7 +79,7 @@ module Rumeme
     # Return the list of replies we have received.
     def check_replies
       response_message, response_code = post_data_to_server("CHECKREPLY2.0\r\n.\r\n")
-      return if response_code != 150
+      return unless response_code == 150
 
       messages = response_message.split("\r\n")[1..-2].map{|message_line| SmsReply.parse(message_line)} # check @use_message_id
       confirm_replies_received if @replies_auto_confirm && messages.size > 0
@@ -106,57 +106,66 @@ module Rumeme
       end
     end
 
-    # Sends all the messages that have been added with the
-    # add_message command.
+    # Sends all the messages that have been added with the add_message command.
+    # returns boolean. true if successful, false if not.
     def send_messages
       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)
+      response_code == 100
+    end
 
-      raise BadServerResponse.new('error during sending messages') if response_code != 100
+    # Sends all the messages that have been added with the add_message command.
+    # Raises exception if not successful
+    def send_messages!
+      raise BadServerResponse.new('error during sending messages') unless send_messages
     end
 
     private
 
-    def self.head_tail_split message, max_len
-      return [message, nil] if message.length < max_len
-      pattern = /\s\.,!;:-\)/
-      index = message[0..max_len].rindex(pattern) || max_len
-      [message[0..index], message[index+1 .. -1]]
-    end
+    class << self
+      def head_tail_split message, max_len
+        return [message, nil] if message.length < max_len
+        pattern = /\s\.,!;:-\)/
+        index = message[0..max_len].rindex(pattern) || max_len
+        [message[0..index], message[index+1 .. -1]]
+      end
 
-    def self.split_message_internal message
-      list =[]
-      sizes = Generator.new { |generator|  generator.yield 152; generator.yield 155 while true }
+      def split_message_internal message
+        list =[]
+        sizes = Enumerator.new {|yielder| yielder << 152; yielder << 155 while true}
 
-      until message.nil? do
-        head, message = head_tail_split(message, sizes.next)
-        list << head
+        until message.nil? do
+          head, message = head_tail_split(message, sizes.next)
+          list << head
+        end
+
+        list
       end
 
-      list
-    end
+      def split_message message
+        messages = split_message_internal message
+        message_index = 1
+        total_messages = messages.size
+        ["#{messages[0]}...(1/#{total_messages})"].concat(messages[1..-1].map {|msg| "(#{message_index+=1}/#{total_messages})#{msg}"})
+      end
 
-    def self.split_message message
-      messages = split_message_internal message
-      message_index = 1
-      total_messages = messages.size
-      ["#{messages[0]}...(1/#{total_messages})"].concat(messages[1..-1].map {|msg| "(#{message_index+=1}/#{total_messages})#{msg}"})
+      # Strip invalid characters from the phone number.
+      def strip_invalid phone
+        phone.nil? ? "+#{phone.gsub(/[^0-9]/, '')}" : nil
+      end
     end
-
+    
     def process_long_message message
       return [message] if message.length <= 160
       @long_messages_processor.call(message)
     end
 
-    # Strip invalid characters from the phone number.
-    def self.strip_invalid phone
-      return nil if phone.nil?
-      "+#{phone.gsub(/[^0-9]/, '')}"
+    def message_id_sign
+      @use_message_id ? '#' : ''
     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
 
@@ -175,8 +184,8 @@ module Rumeme
       data = resp.body
       p resp
       p data
-
-      raise BadServerResponse.new('http response code != 200') if resp.code.to_i != 200
+      
+      raise BadServerResponse.new('http response code != 200') unless response.code.to_i == 200
 
       if data =~ /^.+<TITLE>(.+)<\/TITLE>.+<BODY>(.+)<\/BODY>.+/m
         parsed_title, parsed_body = $1, $2
@@ -184,7 +193,7 @@ module Rumeme
         raise BadServerResponse.new('not html')
       end
 
-      raise BadServerResponse.new('bad title') if parsed_title != "M4U SMSMASTER"
+      raise BadServerResponse.new('bad title') unless parsed_title == "M4U SMSMASTER"
 
       response_message = parsed_body.strip
 

data/lib/rumeme/sms_reply.rb

@@ -8,34 +8,36 @@ module Rumeme
       @phone_number, @message, @message_id, @when, @status = phone_number, message, message_id, _when, status
     end
 
-    # Unescape any escaped characters in the string.
-    def self.unescape line
-      line.nil? ? nil : line.gsub('\n', "\n").gsub('\r', "\r").gsub('\\\\', "\\")
-    end
+    class << self
+      # Unescape any escaped characters in the string.
+      def unescape line
+        line.nil? ? nil : line.gsub('\n', "\n").gsub('\r', "\r").gsub('\\\\', "\\")
+      end
 
-    # Parse a reply from a string.
-    # Format is: messageID phone when message /(\d+)\s(\d+)\s(\d+)\s(.+)/
-    # Or if no message ID: phone when message /(\d+)\s(\d+)\s(.+)/
-    # Or if delivery receipt: messageID messageStatus when /(\d+)\s(\d)\s(\d+)/
-    # current implementation ignores use_message_id setting (as original code)
-    def self.parse line
-      p "parsing line: #{line}"
+      # Parse a reply from a string.
+      # Format is: messageID phone when message /(\d+)\s(\d+)\s(\d+)\s(.+)/
+      # Or if no message ID: phone when message /(\d+)\s(\d+)\s(.+)/
+      # Or if delivery receipt: messageID messageStatus when /(\d+)\s(\d)\s(\d+)/
+      # current implementation ignores use_message_id setting (as original code)
+      def parse line
+        p "parsing line: #{line}"
 
-      message_id, status, message, phone, when_ = case line
-        when /^(\d+)\s(\d)\s(\d+)/
-          #process delivery report
-          [$1.to_i, $2.to_i, nil, nil, $3.to_i]
-        when /^(\d+)\s\+?(\d+)\s(\d+)\s(.+)/
-          #process message with id
-          [$1.to_i, MessageStatus::NONE, unescape($4), $2, $3.to_i]
-        when /^\+?(\d+)\s(\d+)\s(.+)/
-          #process message without id
-          [nil, MessageStatus::NONE, unescape($3), $1, $2.to_i]
-        else
-          raise ArgumentError.new("can't parse line: #{line}")
-      end
+        message_id, status, message, phone, when_ = case line
+          when /^(\d+)\s(\d)\s(\d+)/
+            #process delivery report
+            [$1.to_i, $2.to_i, nil, nil, $3.to_i]
+          when /^(\d+)\s\+?(\d+)\s(\d+)\s(.+)/
+            #process message with id
+            [$1.to_i, MessageStatus::NONE, unescape($4), $2, $3.to_i]
+          when /^\+?(\d+)\s(\d+)\s(.+)/
+            #process message without id
+            [nil, MessageStatus::NONE, unescape($3), $1, $2.to_i]
+          else
+            raise ArgumentError.new("can't parse line: #{line}")
+        end
 
-      return SmsReply.new(phone, message, message_id, when_, status)
+        return SmsReply.new(phone, message, message_id, when_, status)
+      end
     end
 
     def delivery_report?

data/lib/rumeme/version.rb

@@ -1,3 +1,3 @@
 module Rumeme
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/rumeme.rb

@@ -4,7 +4,6 @@ require "rumeme/validity_period"
 require "rumeme/sms_message"
 require "rumeme/sms_reply"
 require "rumeme/sms_interface"
-require "rumeme/generator"
 
 module Rumeme
   class << self

data/rumeme.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.name = "rumeme"
   s.version = Rumeme::VERSION
 
-  s.authors     = ["Anatoliy Plastinin, Cloud Castle LLC"]
-  s.email       = ["antlypls@gmail.com"]
+  s.authors     = ["Anatoliy Plastinin, Cloud Castle LLC", "Stan Carver II, A1 Web Consulting"]
+  s.email       = ["antlypls@gmail.com", "stan@a1webconsulting.com"]
 
   s.homepage = "http://github.com/programmable/rumeme"
   s.summary = "Ruby SDK for Message Media SMS Gateway API"

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rumeme
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
 - Anatoliy Plastinin, Cloud Castle LLC
+- Stan Carver II, A1 Web Consulting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70265569651140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,16 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70265569651140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby SDK for Message Media SMS Gateway API
 email:
 - antlypls@gmail.com
+- stan@a1webconsulting.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -38,7 +45,6 @@ files:
 - Rakefile
 - lib/rumeme.rb
 - lib/rumeme/configuration.rb
-- lib/rumeme/generator.rb
 - lib/rumeme/message_status.rb
 - lib/rumeme/sms_interface.rb
 - lib/rumeme/sms_message.rb
@@ -71,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby SDK for Message Media SMS Gateway API

data/lib/rumeme/generator.rb

@@ -1,110 +0,0 @@
-# from ruby 1.8.7 source
-
-class Generator
-  include Enumerable
-
-  # Creates a new generator either from an Enumerable object or from a
-  # block.
-  #
-  # In the former, block is ignored even if given.
-  #
-  # In the latter, the given block is called with the generator
-  # itself, and expected to call the +yield+ method for each element.
-  def initialize(enum = nil, &block)
-    if enum
-      @block = proc { |g|
-	enum.each { |x| g.yield x }
-      }
-    else
-      @block = block
-    end
-
-    @index = 0
-    @queue = []
-    @cont_next = @cont_yield = @cont_endp = nil
-
-    if @cont_next = callcc { |c| c }
-      @block.call(self)
-
-      @cont_endp.call(nil) if @cont_endp
-    end
-
-    self
-  end
-
-  # Yields an element to the generator.
-  def yield(value)
-    if @cont_yield = callcc { |c| c }
-      @queue << value
-      @cont_next.call(nil)
-    end
-
-    self
-  end
-
-  # Returns true if the generator has reached the end.
-  def end?()
-    if @cont_endp = callcc { |c| c }
-      @cont_yield.nil? && @queue.empty?
-    else
-      @queue.empty?
-    end
-  end
-
-  # Returns true if the generator has not reached the end yet.
-  def next?()
-    !end?
-  end
-
-  # Returns the current index (position) counting from zero.
-  def index()
-    @index
-  end
-
-  # Returns the current index (position) counting from zero.
-  def pos()
-    @index
-  end
-
-  # Returns the element at the current position and moves forward.
-  def next()
-    if end?
-      raise EOFError, "no more elements available"
-    end
-
-    if @cont_next = callcc { |c| c }
-      @cont_yield.call(nil) if @cont_yield
-    end
-
-    @index += 1
-
-    @queue.shift
-  end
-
-  # Returns the element at the current position.
-  def current()
-    if @queue.empty?
-      raise EOFError, "no more elements available"
-    end
-
-    @queue.first
-  end
-
-  # Rewinds the generator.
-  def rewind()
-    initialize(nil, &@block) if @index.nonzero?
-
-    self
-  end
-
-  # Rewinds the generator and enumerates the elements.
-  def each
-    rewind
-
-    until end?
-      yield self.next
-    end
-
-    self
-  end
-end