rumeme 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,13 @@
+Version 0.1.2 - 2010-03-11
+===============================================================================
+
+antlypls (14):
+      change SmsMessage class constructor parameters to hash
+      modify sms interface to reflect sms message changes
+      minor changes
+      update readme
+
+
 Version 0.1.1 - 2010-03-09
 ===============================================================================
 
@@ -10,3 +20,4 @@ antlypls (5):
 
 
 
+

data/README.rdoc

@@ -25,16 +25,23 @@ Then you can use SmsInterface class to add and send messages.
 
   si = SmsInterface.new
 
-  si.add_message('xxxxxxxxxxx', 'Message text 1')
-  si.add_message('xxxxxxxxxxx', 'Message text 2')
-  si.add_message('xxxxxxxxxxx', 'Message text 3')
-  si.add_message('xxxxxxxxxxx', 'Message text 4')
-  si.add_message('xxxxxxxxxxx', 'Message text 5')
+  si.add_message :phone_number => 'xxxxxxxxxxx', :message => 'Message text 1'
+  si.add_message :phone_number => 'xxxxxxxxxxx', :message => 'Message text 2'
+  si.add_message :phone_number => 'xxxxxxxxxxx', :message => 'Message text 3'
+  si.add_message :phone_number => 'xxxxxxxxxxx', :message => 'Message text 4'
+  si.add_message :phone_number => 'xxxxxxxxxxx', :message => 'Message text 5'
 
   si.send_messages
 
 Where xxxxxxxxxxx is phone number.
 
 = To Do
-* Refactoring to make api more rubyish.
-* Add unit tests
+* Refactoring to make api more rubyish,
+* Add unit tests,
+* Remove dependency to nokogiri
+
+= Credits
+RuMeMe is maintained by antlypls, and is funded by Programmable, LLC.
+
+= License
+Still looking for license. But the software is provided "as is", without warranty of any kind.

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rake'
+require 'rake/testtask'
 require 'rake/gempackagetask'
 
 GEM_ROOT     = File.dirname(__FILE__).freeze
@@ -6,6 +7,14 @@ VERSION_FILE = File.join(GEM_ROOT, 'lib', 'rumeme', 'version')
 
 require VERSION_FILE
 
+desc 'Test the rumeme gem'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+
 gemspec = Gem::Specification.new do |s|
   s.name        = 'rumeme'
   s.version     = Rumeme::VERSION
@@ -18,6 +27,7 @@ gemspec = Gem::Specification.new do |s|
   s.rdoc_options = ['--line-numbers', "--main", "README.rdoc"]
 
   s.add_runtime_dependency('nokogiri', '1.4.1')
+  s.add_development_dependency("shoulda")
 
   s.authors = ['antlypls']
   s.email   = 'antlypls@gmail.com'
@@ -118,10 +128,8 @@ end
 
 desc "Push gem to Gemcutter"
 task :push_gem do
-  system "echo '\n\n\033[31mRun: gem push #{gemspec.name}-#{gemspec.version}.gem\033[0m\n\n'"
-
-  #abort("not implemented yet")
-  #system("git push origin $(git tag | tail -1)")
+  system "echo '\n\n\033[31mPushing gem to gemcutter\033[0m\n\n'"
+  system "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
 end
 
 desc 'release gem'

data/lib/rumeme/configuration.rb

@@ -4,7 +4,6 @@ module Rumeme
     attr_accessor :password
     attr_accessor :use_message_id
     attr_accessor :secure
-    #attr_accessor :proxy_settings
     attr_accessor :allow_splitting
     attr_accessor :allow_long_messages
   end

data/lib/rumeme/sms_interface.rb

@@ -70,28 +70,33 @@ module Rumeme
     attr_reader :response_message
 
     # Add a message to be sent.
-    def  add_message phone, message_text, message_id = 0, delay = 0, validity_period = 169, delivery_report = false
+    def  add_message args
       p 'in  add_message '
-      phone = strip_invalid(phone);
-      return if phone.empty?
+      args[:phone_number] = strip_invalid(args[:phone_number]) #not good idea, modifying original args, from outer scope (antlypls)
 
-      if message_text.length <= 160
-        @message_list << SmsMessage.new(phone, message_text, message_id, delay, validity_period, delivery_report)
+      raise ArgumentError.new("phone_number is empty") if args[:phone_number].nil? || args[:phone_number].empty?
+      raise ArgumentError.new("message is empty") if args[:message].nil? || args[:message].empty?
+
+      if args[:message].length <= 160
+        @message_list << SmsMessage.new(args)
         return
       end
 
       if (@allow_long_messages) # Use concatenation.
-        @message_list << SmsMessage.new(phone, message_text[0..1071], message_id, delay, validity_period, delivery_report) # 1071??? WTF ??? see php code
+        args[:message] = args[:message][0..1071] # 1071??? WTF ??? see php code (antlypls)
+        @message_list << SmsMessage.new(args)
         return
       end
 
       if !@allow_splitting
-        @message_list << SmsMessage.new(phone, message_text[0..160], message_id, delay, validity_period, delivery_report)
+        args[:message] = args[:message][0..160] # maybe 159 ? (antlypls)
+        @message_list << SmsMessage.new(args)
         return
       end
 
       ml = []
-      maxlen = 152;
+      maxlen = 152
+      message_text = args[:message]
       while message_text.length > maxlen
         if (pos = message_text[0..maxlen].rindex(" ")) == 0
           pos = maxlen - 1
@@ -115,7 +120,7 @@ module Rumeme
           m << "...(#{ni}/#{ml.size})"
         end
 
-        @message_list << SmsMessage.new(phone, m, message_id, delay + 30*i, validity_period, delivery_report)
+        @message_list << SmsMessage.new(args.merge({:message => m, :delay => args[:delay] + 30*i}))
       }
     end
 
@@ -246,6 +251,7 @@ module Rumeme
 
     # Strip invalid characters from the phone number.
     def strip_invalid phone
+      return if phone.nil?
       "+#{phone.gsub(/[^0-9]/, '')}"
     end
 
@@ -254,7 +260,9 @@ module Rumeme
       p 'in connect'
       return unless @http_connection.nil?
 
-      @server_list.all? {|server| !open_server_connection(server, @secure)} #unusefull code open_server_connection, do not connetct to server, just creates http object, so we can't check availability of the server
+      @server_list.all? {|server| !open_server_connection(server, @secure)} # unusefull code open_server_connection,
+                                                                            # does not connect to server, just creates http object,
+                                                                            # so we can't check availability of the server at this moment (antlypls)
 
       return if @http_connection.nil?
 
@@ -265,11 +273,9 @@ module Rumeme
       @text_buffer << "\r\nPASSWORD=#{@password}\r\nVER=PHP1.0\r\n";
     end
 
-    # only 4 php compatibility, just free object reference
+    # only for php compatibility, just free object reference
     def close
-      return if @http_connection.nil?
-      #@http_connection.finish
-      @http_connection = nil
+      @http_connection = nil unless @http_connection.nil?
     end
 
     # Flush the text buffer to the HTTP connection.

data/lib/rumeme/sms_message.rb

@@ -4,9 +4,16 @@ module Rumeme
     attr_reader :phone_number, :message, :message_id, :delay, :validity_period, :delivery_report
 
     # Constructor.
-    def initialize phone_number, message, message_id, delay, validity_period, delivery_report
-      @phone_number, @message, @message_id, @delay, @validity_period, @delivery_report = phone_number, message, message_id, delay, validity_period, delivery_report
-      @message = message.gsub("\n",'\n').gsub("\r",'\r').gsub("\\",'\\\\')
+    def initialize args
+      # this defaults must be moved to global configuration
+      defaults = {:phone_number => nil, :message => nil, :message_id => 0, :delay => 0, :validity_period => ValidityPeriod::THREE_DAYS, :delivery_report => false}
+      params = defaults.merge args
+      defaults.keys.each {|k| instance_variable_set("@#{k.to_s}".to_sym, params[k])}
+
+      raise ArgumentError.new("phone_number is empty") if @phone_number.nil? || @phone_number.empty?
+      raise ArgumentError.new("message is empty") if @message.nil? || @message.empty?
+
+      @message = @message.gsub("\n",'\n').gsub("\r",'\r').gsub("\\",'\\\\')
     end
   end
 end

data/lib/rumeme/sms_reply.rb

@@ -21,7 +21,7 @@ module Rumeme
     # php suxx. reimplement using regex
     def self.parse line, use_message_id
       p "parsing line: #{line}. #{use_message_id}."
-      message_id = 0;
+      message_id = nil;
       status = MessageStatus::NONE
 
       prev_idx = 0;

data/lib/rumeme/version.rb

@@ -1,3 +1,3 @@
 module Rumeme
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - antlypls
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +04:00
+date: 2010-03-11 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,6 +31,18 @@ dependencies:
         version: 1.4.1
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: 
 email: antlypls@gmail.com
 executables: []