rfetion 0.3.14 → 0.4.0

data/README.textile

@@ -21,14 +21,9 @@ gem install rfetion
 
 h2. Usage
 
-send sms to yourself
+send sms to friends or yourself
 <pre><code>
-Fetion.send_sms_to_self(mobile_no, password, content)
-</code></pre>
-
-send sms to friends
-<pre><code>
-Fetion.send_sms_to_friends(mobile_no, password, friends_mobile_or_fetion_number, content)
+Fetion.send_sms(mobile_no, password, mobile_or_fetion_numbers, content)
 </code></pre>
 
 add friend with mobile
@@ -41,6 +36,13 @@ add friend with sip
 Fetion.add_buddy_with_sip(mobile_no, password, friend_sip)
 </code></pre>
 
+send schedule sms to friends
+<pre><code>
+Fetion.schedule_sms(mobile_no, password, mobile_or_fetion_number, content, time)
+</code></pre>
+
+Time format is %Y-%m-%d %H:%M:%S
+
 **************************************************************************
 
 h2. Shell command
@@ -50,20 +52,22 @@ you can use it in shell command directly
 <pre><code>
 Usage: rfetion [options]
 
-    Example: rfetion -m mobile -p password -f friends_mobile_or_fetion_number -c sms_content
-
+    Example: rfetion -m mobile -p password -c sms_content
+             rfetion -m mobile -p password -r mobile_or_fetion_numbers -c sms_content
+             rfetion -m mobile -p password -r mobile_or_fetion_numbers -c sms_content -t time
              rfetion -m mobile -p password --add-buddy-with-mobile friend_mobile
-
              rfetion -m mobile -p password --add-buddy-with-sip friend_sip
 
     -m, --mobile MOBILE              Fetion mobile number
     -p, --password PASSWORD          Fetion password
     -c, --content CONTENT            Fetion message content
-    -f, --friends MOBILE,FETION      (optional) Fetion friends mobile number or fetion number, if no friends mobile number and fetion number, send message to yourself
+    -r, --receivers MOBILE,SIP       (optional) Receivers' Fetion mobile numbers or fetion sip numbers, if no recievers, send sms to yourself
+    -t, --time TIME                  Schedule time to send sms, format is "2009-12-10 20:00:00"
         --add-buddy-with-mobile MOBILE
                                      Add friend mobile as fetion friend
         --add-buddy-with-sip SIP     Add friend fetion sip as fetion friend
 
+
 different mode:
         --debug                      debug mode
         --silence                    silence mode

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.4.0

data/lib/rfetion.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'guid'
+require 'time'
 require 'net/http'
 require 'net/https'
 require 'rexml/document'

data/lib/rfetion/command.rb

@@ -8,34 +8,40 @@ OptionParser.new do |opts|
 
   opts.separator ""
   opts.separator <<-EOF
-    Example: rfetion -m mobile -p password -f friends_mobile_or_fetion_number -c sms_content
+    Example: rfetion -m mobile -p password -c sms_content
+             rfetion -m mobile -p password -r mobile_or_fetion_numbers -c sms_content
+             rfetion -m mobile -p password -r mobile_or_fetion_numbers -c sms_content -t time
              rfetion -m mobile -p password --add-buddy-with-mobile friend_mobile
              rfetion -m mobile -p password --add-buddy-with-sip friend_sip
+             
   EOF
 
   opts.on('-m', '--mobile MOBILE', 'Fetion mobile number') do |mobile|
     options[:mobile_no] = mobile
   end
 
-  opts.on('-p', '--password PASSWORD', 'Fetion password') do |f|
-    options[:password] = f
+  opts.on('-p', '--password PASSWORD', 'Fetion password') do |password|
+    options[:password] = password
   end
 
-  opts.on('-c', '--content CONTENT', 'Fetion message content') do |f|
-    options[:content] = f
+  opts.on('-c', '--content CONTENT', 'Fetion message content') do |content|
+    options[:content] = content
   end
 
-  options[:friends] = []
-  opts.on('-f', '--friends MOBILE,FETION', Array, '(optional) Fetion friends mobile number or fetion number, if no friends mobile number and fetion number, send message to yourself') do |f|
-    options[:friends] = f
+  opts.on('-r', '--receivers MOBILE,SIP', Array, "(optional) Receivers' Fetion mobile numbers or fetion sip numbers, if no recievers, send sms to yourself") do |receivers|
+    options[:receivers] = receivers
   end
 
-  opts.on('--add-buddy-with-mobile MOBILE', 'Add friend mobile as fetion friend') do |f|
-    options[:add_mobile] = f
+  opts.on('-t', '--time TIME', 'Schedule time to send sms, format is "2009-12-10 20:00:00"') do |time|
+    options[:time] = time
   end
 
-  opts.on('--add-buddy-with-sip SIP', 'Add friend fetion sip as fetion friend') do |f|
-    options[:add_sip] = f
+  opts.on('--add-buddy-with-mobile MOBILE', 'Add friend mobile as fetion friend') do |mobile|
+    options[:add_mobile] = mobile
+  end
+
+  opts.on('--add-buddy-with-sip SIP', 'Add friend fetion sip as fetion friend') do |sip|
+    options[:add_sip] = sip
   end
 
   opts.separator ""
@@ -80,10 +86,10 @@ begin
   end
   
   raise FetionException.new('You must input your mobile number, password and content') unless options[:mobile_no] and options[:password] and options[:content]
-  if options[:friends].empty?
-    Fetion.send_sms_to_self(options[:mobile_no], options[:password], options[:content], level(options))
+  if options[:time]
+    Fetion.schedule_sms(options[:mobile_no], options[:password], options[:receivers], options[:content], options[:time], level(options))
   else
-    Fetion.send_sms_to_friends(options[:mobile_no], options[:password], options[:friends], options[:content], level(options))
+    Fetion.send_sms(options[:mobile_no], options[:password], options[:receivers], options[:content], level(options))
   end
 rescue FetionException => e
   puts e.message

data/lib/rfetion/fetion.rb

@@ -30,20 +30,31 @@ class Fetion
     @cat = cat
   end
 
-  def Fetion.send_sms_to_self(mobile_no, password, content, level = Logger::INFO)
+  def Fetion.send_sms(mobile_no, password, receivers, content, level = Logger::INFO)
     fetion = Fetion.new
     fetion.logger_level = level
     fetion.mobile_no = mobile_no
     fetion.password = password
     fetion.login
     fetion.register
-    fetion.send_sms(fetion.uri, content)
+    if receivers
+      receivers = Array(receivers)
+      receivers.collect! {|receiver| receiver.to_s}
+      fetion.get_buddy_list
+      fetion.get_contacts_info
+      fetion.contacts.each do |contact|
+        if receivers.include? contact.mobile_no.to_s or receivers.any? { |receiver| contact.uri.index(receiver) }
+          fetion.send_sms(contact.uri, content)
+        end
+      end
+      fetion.send_sms(fetion.uri, content) if  receivers.any? { |receiver| fetion.self? receiver }
+    else
+      fetion.send_sms(fetion.uri, content)
+    end
     fetion.logout
   end
 
-  def Fetion.send_sms_to_friends(mobile_no, password, friends, content, level = Logger::INFO)
-    friends = Array(friends)
-    friends.collect! {|friend| friend.to_s}
+  def Fetion.schedule_sms(mobile_no, password, receivers, content, time, level = Logger::INFO)
     fetion = Fetion.new
     fetion.logger_level = level
     fetion.mobile_no = mobile_no
@@ -52,10 +63,18 @@ class Fetion
     fetion.register
     fetion.get_buddy_list
     fetion.get_contacts_info
-    fetion.contacts.each do |contact|
-      if friends.include? contact.mobile_no.to_s or friends.any? { |friend| contact.uri.index(friend) }
-        fetion.send_sms(contact.uri, content)
-      end
+    if receivers
+      receivers = Array(receivers)
+      receivers.collect! {|receiver| receiver.to_s}
+      new_receivers = fetion.contacts.collect do |contact|
+        if receivers.include? contact.mobile_no.to_s or receivers.any? { |receiver| contact.uri.index(receiver) }
+          contact.uri
+        end
+      end.compact!
+      new_receivers << fetion.uri if receivers.any? { |receiver| fetion.self? receiver }
+      fetion.schedule_sms(new_receivers, content, time)
+    else  
+      fetion.schedule_sms([fetion.uri], content, time)
     end
     fetion.logout
   end
@@ -122,7 +141,7 @@ class Fetion
   def register
     @logger.info "fetion http register"
     call = next_call
-    arg = '<args><device type="PC" version="44" client-version="3.2.0540" /><caps value="simple-im;im-session;temp-group;personal-group" /><events value="contact;permission;system-message;personal-group" /><user-info attributes="all" /><presence><basic value="400" desc="" /></presence></args>'
+    arg = '<args><device type="PC" version="284488270" client-version="3.2.0540" /><caps value="simple-im;im-session;temp-group;personal-group;im-relay;xeno-im;direct-sms;sms2fetion" /><events value="contact;permission;system-message;personal-group;compact" /><user-info attributes="all" /><presence><basic value="400" desc="" /></presence></args>'
 
     register_first(call, arg)
 
@@ -172,14 +191,15 @@ class Fetion
 
   def get_buddy_list
     @logger.info "fetion get buddy list"
-    arg = '<args><contacts><buddy-lists /><buddies attributes="all" /><mobile-buddies attributes="all" /><chat-friends /><blacklist /></contacts></args>'
+    arg = '<args><contacts><buddy-lists /><buddies attributes="all" /><mobile-buddies attributes="all" /><chat-friends /><blacklist /><allow-list /></contacts></args>'
     msg = sip_create('S fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 S', 'N' => 'GetContactList'}, arg) + FETION_SIPP
     curl_exec(next_url, @ssic, msg)
     response = curl_exec(next_url, @ssic, FETION_SIPP)
     raise FetionException.new("Fetion Error: Get buddy list error") unless response.is_a? Net::HTTPSuccess
 
-    response.body.scan(/uri="([^"]+)"/).each do |buddy|
-      @buddies << {:uri => buddy[0]}
+    doc = REXML::Document.new(response.body.chomp(FETION_SIPP))
+    doc.elements.each("results/contacts/allow-list/contact") do |contact|
+      @buddies << {:uri => contact.attributes["uri"]}
     end
     @logger.debug "buddies: #{@buddies.inspect}"
     @logger.info "fetion get buddy list success"
@@ -187,7 +207,7 @@ class Fetion
 
   def get_contacts_info
     @logger.info "fetion get contacts info"
-    arg = '<args><contacts attributes="all">'
+    arg = '<args><contacts attributes="provisioning;impresa;mobile-no;nickname;name;gender;portrait-crc;ivr-enabled" extended-attributes="score-level">'
     @buddies.each do |buddy|
       arg += "<contact uri=\"#{buddy[:uri]}\" />"
     end
@@ -195,28 +215,49 @@ class Fetion
 
     msg = sip_create('S fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 S', 'N' => 'GetContactsInfo'}, arg) + FETION_SIPP
     curl_exec(next_url, @ssic, msg)
-    response = curl_exec(next_url, @ssic, FETION_SIPP)
-    raise FetionException.new("Fetion Error: Get contacts info error") unless response.is_a? Net::HTTPSuccess
+    while true do
+      sleep 1
+      response = curl_exec(next_url, @ssic, FETION_SIPP)
+      raise FetionException.new("Fetion Error: Get contacts info error") unless response.is_a? Net::HTTPSuccess
+      break if response.body.size > FETION_SIPP.size
+    end
 
-    response.body.scan(%r{<events>.*?</events>}).each do |events|
-      doc = REXML::Document.new(events)
-      doc.elements.each("events/event/results/contacts/contact") do |contact|
-        attrs = contact.children.size == 0 ? {} : contact.children.first.attributes
-        @contacts << Contact.new(contact.attributes["uri"], attrs)
-      end
+    doc = REXML::Document.new(response.body.chomp(FETION_SIPP))
+    doc.elements.each("results/contacts/contact") do |contact|
+      attrs = contact.children.size == 0 ? {} : contact.children.first.attributes
+      @contacts << Contact.new(contact.attributes["uri"], attrs)
     end
     @logger.debug @contacts.inspect
     @logger.info "fetion get contacts info success"
   end
 
-  def send_sms(to, content)
-    @logger.info "fetion #{send_command} to #{to}"
-    msg = sip_create('M fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 M', 'T' => to, 'N' => send_command}, content) + FETION_SIPP
+  def send_sms(receiver, content)
+    @logger.info "fetion #{send_command} to #{receiver}"
+    msg = sip_create('M fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 M', 'T' => receiver, 'N' => send_command}, content) + FETION_SIPP
     curl_exec(next_url, @ssic, msg)
     response = curl_exec(next_url, @ssic, FETION_SIPP)
 
     raise FetionException.new("Fetion Error: Send sms error") unless response.is_a? Net::HTTPSuccess
-    @logger.info "fetion #{send_command} to #{to} success"
+    @logger.info "fetion #{send_command} to #{receiver} success"
+  end
+
+  def schedule_sms(receivers, content, time)
+    receivers = Array(receivers)
+    time = time.is_a?(Time) ? time : Time.parse(time)
+    now = Time.now
+    one_year = Time.local(now.year + 1, now.month, now.day, now.hour, now.min, now.sec)
+    raise FetionException.new("Can't schedule send sms to more than 32 receivers") if receivers.size > 32
+    raise FetionException.new("Schedule time must between #{(now + 600).strftime('%Y-%m-%d %H:%M:%S')} and #{one_year.strftime('%Y-%m-%d %H:%M:%S')}") if time < (now + 600) or time > one_year
+    @logger.info "fetion schedule send sms to #{receivers.join(', ')}"
+    
+    receivers_str = receivers.collect { |receiver| %Q[<receiver uri="#{receiver}" />] }.join('')
+    arg = %Q{<args><schedule-sms send-time="#{time.getutc.strftime('%Y-%m-%d %H:%M:%S')}"><message>#{content}</message><receivers>#{receivers_str}</receivers></schedule-sms></args>}
+    msg = sip_create('S fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 S', 'N' => 'SSSetScheduleCatSms'}, arg) + FETION_SIPP
+    curl_exec(next_url, @ssic, msg)
+    response = curl_exec(next_url, @ssic, FETION_SIPP)
+
+    raise FetionException.new("Fetion Error: Schedule sms error") unless response.is_a? Net::HTTPSuccess
+    @logger.info "fetion schedule send sms to #{receivers.join(', ')} success"
   end
 
   def add_buddy_with_mobile(mobile, nickname = nil)
@@ -307,5 +348,9 @@ class Fetion
   def send_command
     @cat ? 'SendCatSMS' : 'SendSMS'
   end
+
+  def self?(mobile_or_sid)
+    mobile_or_sid == @mobile_no or mobile_or_sid == @sid
+  end
 end
 

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.3.14"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-10}
   s.description = %q{rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.}
   s.email = %q{flyerhzm@gmail.com}
   s.executables = ["rfetion", "rfetion"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.3.14
+  version: 0.4.0
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +08:00
+date: 2009-12-10 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency