rumeme 0.2.0 → 0.3.0

data/.gitignore

@@ -0,0 +1,3 @@
+.idea
+run_simple_test.rb
+pkg

data/CHANGELOG

@@ -1,3 +1,10 @@
+Version 0.3.0 - 2012-02-17
+===============================================================================
+
+Anatoliy Plastinin (1):
+      some fixes for ruby 1.9.3 support
+
+
 Version 0.2.0 - 2010-08-18
 ===============================================================================
 
@@ -77,3 +84,5 @@ antlypls (5):
 
 
 
+
+

data/Gemfile

@@ -0,0 +1,4 @@
+source 'http://rubygems.org'
+
+# Specify your gem's dependencies in requeues-next.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,7 @@
+GEM
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES

data/README.rdoc

@@ -38,7 +38,6 @@ Where xxxxxxxxxxx is phone number.
 = To Do
 * 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.

data/Rakefile

@@ -1,11 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/gempackagetask'
-
-GEM_ROOT     = File.dirname(__FILE__).freeze
-VERSION_FILE = File.join(GEM_ROOT, 'lib', 'rumeme', 'version')
-
-require VERSION_FILE
+require 'bundler/gem_tasks'
 
 desc 'Test the rumeme gem'
 Rake::TestTask.new(:test) do |t|
@@ -14,43 +9,6 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-
-gemspec = Gem::Specification.new do |s|
-  s.name        = 'rumeme'
-  s.version     = Rumeme::VERSION
-  s.summary     = 'Ruby SDK for Message Media SMS Gateway API'
-
-  s.files        = FileList['[A-Z]*', 'lib/**/*.rb']
-  s.require_path = 'lib'
-
-  s.extra_rdoc_files = ['README.rdoc']
-  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'
-  s.homepage = 'http://github.com/programmable/rumeme'
-
-  s.platform = Gem::Platform::RUBY
-end
-
-Rake::GemPackageTask.new gemspec do |pkg|
-  pkg.need_tar = true
-  pkg.need_zip = true
-end
-
-desc "Clean files generated by rake tasks"
-task :clobber => [:clobber_package]
-
-desc "Generate a gemspec file"
-task :gemspec do
-  File.open("#{gemspec.name}.gemspec", 'w') do |f|
-    f.write gemspec.to_ruby
-  end
-end
-
 desc "Bumps the version by a minor or patch version, depending on what was passed in."
 task :bump, :part do |t, args|
   if Rumeme::VERSION  =~ /^(\d+)\.(\d+)\.(\d+)(?:\.(.*?))?$/
@@ -77,7 +35,7 @@ task :bump, :part do |t, args|
   File.open(File.join("lib", "rumeme", "version.rb"), "w") do |f|
     f.write <<EOF
 module Rumeme
-  VERSION = "#{version}".freeze
+  VERSION = "#{version}"
 end
 EOF
   end
@@ -101,7 +59,7 @@ Version #{version} - #{Date.today}
 EOF
   end
 
-  editor = ENV["EDITOR"] || 'kate'
+  editor = ENV["EDITOR"] || 'mvim'
 
   system ["#{editor} #{file}",
         "git commit -aqm '#{message}'",
@@ -127,18 +85,9 @@ task :push do
   system("git push origin $(git tag | tail -1)")
 end
 
-desc "Push gem to Gemcutter"
-task :push_gem do
-  system "echo '\n\n\033[31mPushing gem to gemcutter\033[0m\n\n'"
-  system "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
-end
-
-desc 'Preparing release'
-task :prepare_release, :part do |t, args|
-  Rake::Task['bump'].invoke(args[:part])
-  Rake::Task['change'].invoke
-  Rake::Task['push'].invoke
-end
-
-desc 'Building and publishing gem'
-task :publish_release => [:gem, :push_gem]
+#desc 'Preparing release'
+#task :prepare_release, :part do |t, args|
+#  Rake::Task['bump'].invoke(args[:part])
+#  Rake::Task['change'].invoke
+#  Rake::Task['push'].invoke
+#end

data/lib/rumeme.rb

@@ -4,6 +4,7 @@ require "rumeme/validity_period"
 require "rumeme/sms_message"
 require "rumeme/sms_reply"
 require "rumeme/sms_interface"
+require "rumeme/generator"
 
 module Rumeme
   class << self
@@ -11,7 +12,7 @@ module Rumeme
 
     def configure
       @configuration ||= Configuration.new
-      yield(@configuration)
+      yield @configuration
       
       raise 'unknown long_messages_strategy' unless [:split, :send, :cut].include?(@configuration.long_messages_strategy)
     end

data/lib/rumeme/generator.rb

@@ -0,0 +1,110 @@
+# 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

data/lib/rumeme/sms_interface.rb

@@ -1,8 +1,5 @@
 require "net/http"
 require "net/https"
-require 'rubygems'
-require 'nokogiri'
-require 'generator'
 
 module Rumeme
 
@@ -43,7 +40,7 @@ module Rumeme
       }
 
       @message_list = []
-      @server_list = ["smsmaster.m4u.com.au", "smsmaster1.m4u.com.au", "smsmaster2.m4u.com.au"]
+      @server_list = %W(smsmaster.m4u.com.au smsmaster1.m4u.com.au smsmaster2.m4u.com.au)
 
     end
 
@@ -87,7 +84,7 @@ module Rumeme
       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
 
-      return messages
+      messages
     end
 
     # sends confirmation to server
@@ -103,7 +100,7 @@ module Rumeme
         if response_code != 100
           raise BadServerResponse.new 'M4U code is not 100'
         end
-        return $2.to_i
+        $2.to_i
       else
         raise BadServerResponse.new "cant parse response: #{response_message}"
       end
@@ -132,7 +129,7 @@ module Rumeme
       list =[]
       sizes = Generator.new { |generator|  generator.yield 152; generator.yield 155 while true }
 
-      while !message.nil? do
+      until message.nil? do
         head, message = head_tail_split(message, sizes.next)
         list << head
       end
@@ -164,31 +161,29 @@ module Rumeme
     end
 
     def post_data_to_server data
-      p 'post_data_to_server'
+      puts 'post_data_to_server'
 
       http_connection = open_server_connection(@server_list[0])
       text_buffer = create_login_string + data
 
-      p "buffer: #{text_buffer}"
+      puts "buffer: #{text_buffer}"
       headers = {'Content-Length' => text_buffer.length.to_s}
 
       path = '/'
 
-      resp, data = http_connection.post(path, text_buffer, headers)
-      p resp.inspect
-      p data.inspect
+      resp = http_connection.post(path, text_buffer, headers)
+      data = resp.body
+      p resp
+      p data
 
       raise BadServerResponse.new('http response code != 200') if resp.code.to_i != 200
 
-      #parsed_title, parsed_body = nil, nil
-
       if data =~ /^.+<TITLE>(.+)<\/TITLE>.+<BODY>(.+)<\/BODY>.+/m
         parsed_title, parsed_body = $1, $2
       else
         raise BadServerResponse.new('not html')
       end
 
-      #doc = Nokogiri::HTML(data)
       raise BadServerResponse.new('bad title') if parsed_title != "M4U SMSMASTER"
 
       response_message = parsed_body.strip
@@ -196,8 +191,8 @@ module Rumeme
       response_message.match /^(\d+)\s+/
       response_code = $1.to_i
 
-      p "latest response code: #{response_code}"
-      p "response: #{response_message }"
+      puts "latest response code: #{response_code}"
+      puts "response: #{response_message }"
 
       [response_message, response_code]
     end

data/lib/rumeme/sms_reply.rb

@@ -1,7 +1,6 @@
 module Rumeme
   # This class represents an SMS reply.
   class SmsReply
-    #attr_accessor :phone_number, :message, :message_id, :when, :status
     attr_reader :phone_number, :message, :message_id, :when, :status
 
     #Constructor.

data/lib/rumeme/version.rb

@@ -1,3 +1,3 @@
 module Rumeme
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0"
 end

data/rumeme.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+
+GEM_ROOT     = File.dirname(__FILE__).freeze
+VERSION_FILE = File.join(GEM_ROOT, 'lib', 'rumeme', 'version')
+
+require VERSION_FILE
+
+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.homepage = "http://github.com/programmable/rumeme"
+  s.summary = "Ruby SDK for Message Media SMS Gateway API"
+  s.description = "Ruby SDK for Message Media SMS Gateway API"
+
+
+  s.add_development_dependency 'shoulda'
+
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = %W(lib)
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.rdoc_options = ["--line-numbers", "--main", "README.rdoc"]
+
+end

data/test/sms_message_test.rb

@@ -0,0 +1,57 @@
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+require 'test/unit'
+require "rubygems"
+require 'shoulda'
+require "rumeme"
+
+class SmsMessageTest < Test::Unit::TestCase
+  context "SmsMessage constructor" do
+    should "correctly assign all parameters" do
+      sms = SmsMessage.new :phone_number => "12345678901",
+                           :message => "qwertasdfzxcv",
+                           :message_id => 100,
+                           :delay => 10,
+                           :validity_period => ValidityPeriod::MINIMUM,
+                           :delivery_report => true
+
+      assert_equal "12345678901", sms.phone_number
+      assert_equal "qwertasdfzxcv", sms.message
+      assert_equal 100, sms.message_id
+      assert_equal 10, sms.delay
+      assert_equal ValidityPeriod::MINIMUM, sms.validity_period
+      assert_equal true, sms.delivery_report
+    end
+
+    should "correctly assign default values" do
+      sms = SmsMessage.new :phone_number => "12345678901",
+                           :message => "qwertasdfzxcv"
+
+      assert_equal "12345678901", sms.phone_number
+      assert_equal "qwertasdfzxcv", sms.message
+      assert_equal 0, sms.message_id
+      assert_equal 0, sms.delay
+      assert_equal ValidityPeriod::THREE_DAYS, sms.validity_period
+      assert_equal false, sms.delivery_report
+    end
+
+    should "raise ArgumentError if phone number is not provided" do
+      e = assert_raise(ArgumentError) { SmsMessage.new :message => "qwertasdfzxcv" }
+      assert_match(/phone_number is empty/, e.message)
+    end
+
+    should "raise ArgumentError if phone number is empty" do
+      e = assert_raise(ArgumentError) { SmsMessage.new :phone_number => "", :message => "qwertasdfzxcv" }
+      assert_match(/phone_number is empty/, e.message)
+    end
+
+    should "raise ArgumentError if message is not provided" do
+      e = assert_raise(ArgumentError) { SmsMessage.new :phone_number => "12345678901" }
+      assert_match(/message is empty/, e.message)
+    end
+    
+    should "raise ArgumentError if message is empty" do
+      e = assert_raise(ArgumentError) { SmsMessage.new :phone_number => "12345678901", :message => "" }
+      assert_match(/message is empty/, e.message)
+    end
+  end
+end

data/test/sms_reply_test.rb

@@ -0,0 +1,114 @@
+#units test for rumeme
+
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+require 'test/unit'
+require "rubygems"
+require 'shoulda'
+require "rumeme"
+
+include Rumeme
+
+class SmsReplyTest < Test::Unit::TestCase
+  context "SmsReply.parse method (for reply with id)" do
+    setup do
+      @sms_reply = SmsReply.parse("12 79270123456 100 asdfgh")
+    end
+
+    should "correctly parse message id" do
+      assert_equal 12, @sms_reply.message_id
+    end
+
+    should "correctly parse phone number" do
+      assert_equal '79270123456', @sms_reply.phone_number
+    end
+
+    should "correctly parse when" do
+      assert_equal 100, @sms_reply.when
+    end
+
+    should "correctly parse message text" do
+      assert_equal 'asdfgh', @sms_reply.message
+    end
+
+    should "assign NONE status " do
+      assert_equal MessageStatus::NONE, @sms_reply.status
+    end
+  end
+
+  context "SmsReply.parse method (for reply with id, phone with +)" do
+    setup do
+      @sms_reply = SmsReply.parse("39 +79270123456 35 105")
+    end
+
+    should "correctly parse message id" do
+      assert_equal 39, @sms_reply.message_id
+    end
+
+    should "correctly parse phone number" do
+      assert_equal '79270123456', @sms_reply.phone_number
+    end
+
+    should "correctly parse when" do
+      assert_equal 35, @sms_reply.when
+    end
+
+    should "correctly parse message text" do
+      assert_equal '105', @sms_reply.message
+    end
+
+    should "assign NONE status " do
+      assert_equal MessageStatus::NONE, @sms_reply.status
+    end
+  end
+
+  context "SmsReply.parse method (for reply without id)" do
+    setup do
+      @sms_reply = SmsReply.parse("79270123456 100 asdfgh")
+    end
+
+    should "assign nil for message id" do
+      assert_nil @sms_reply.message_id
+    end
+
+    should "correctly parse phone number" do
+      assert_equal '79270123456', @sms_reply.phone_number
+    end
+
+    should "correctly parse when" do
+      assert_equal 100, @sms_reply.when
+    end 
+
+    should "correctly parse message text" do
+      assert_equal 'asdfgh', @sms_reply.message
+    end
+
+    should "assign NONE status" do
+      assert_equal MessageStatus::NONE, @sms_reply.status
+    end
+  end
+
+  context "SmsReply.parse method (for delivery report: pending)" do
+    setup do
+      @sms_reply = SmsReply.parse("12 1 100")
+    end
+
+    should "correctly parse message id" do
+      assert_equal 12, @sms_reply.message_id
+    end
+
+    should "correctly parse when" do
+      assert_equal 100, @sms_reply.when
+    end
+
+    should "assign PENDING status" do
+      assert_equal MessageStatus::PENDING, @sms_reply.status
+    end
+  end
+
+  context "SmsReply.parse method (for delivery report: pending)" do
+    should "raise ArgumentError if incorrect string passed into" do
+      e = assert_raise(ArgumentError) { SmsReply.parse("jzxhcjkvhiusdfyhg") }
+      assert_match(/can't parse line: jzxhcjkvhiusdfyhg/, e.message)
+    end
+  end
+end

metadata

@@ -1,108 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rumeme
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
-- antlypls
+authors:
+- Anatoliy Plastinin, Cloud Castle LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-18 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
-        version: 1.4.1
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2012-02-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70265569651140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: 
-email: antlypls@gmail.com
+  prerelease: false
+  version_requirements: *70265569651140
+description: Ruby SDK for Message Media SMS Gateway API
+email:
+- antlypls@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
+- .gitignore
+- CHANGELOG
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
-- CHANGELOG
 - lib/rumeme.rb
-- lib/rumeme/sms_interface.rb
-- lib/rumeme/version.rb
 - lib/rumeme/configuration.rb
-- lib/rumeme/sms_message.rb
+- lib/rumeme/generator.rb
 - lib/rumeme/message_status.rb
+- lib/rumeme/sms_interface.rb
+- lib/rumeme/sms_message.rb
 - lib/rumeme/sms_reply.rb
 - lib/rumeme/validity_period.rb
-has_rdoc: true
+- lib/rumeme/version.rb
+- rumeme.gemspec
+- test/sms_message_test.rb
+- test/sms_reply_test.rb
 homepage: http://github.com/programmable/rumeme
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby SDK for Message Media SMS Gateway API
-test_files: []
-
+test_files:
+- test/sms_message_test.rb
+- test/sms_reply_test.rb