rfetion 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/rfetion/command.rb

@@ -9,9 +9,11 @@ OptionParser.new do |opts|
   opts.separator ""
   opts.separator <<-EOF
     Example: rfetion -m mobile -p password -c sms_content
+             rfetion -s sip -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 -s sip -p password --add-buddy-with-mobile friend_mobile
              rfetion -m mobile -p password --add-buddy-with-sip friend_sip
              
   EOF
@@ -20,6 +22,10 @@ OptionParser.new do |opts|
     options[:mobile_no] = mobile
   end
 
+  opts.on('-s', '--sip FETION_SIP', 'Fetion sid number') do |sid|
+    options[:sid] = sid
+  end
+
   opts.on('-p', '--password PASSWORD', 'Fetion password') do |password|
     options[:password] = password
   end
@@ -28,7 +34,7 @@ OptionParser.new do |opts|
     options[:content] = content
   end
 
-  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|
+  opts.on('-r', '--receivers MOBILE,SIP', Array, "Receivers' Fetion mobile numbers or fetion sip numbers, if no recievers, send sms to yourself") do |receivers|
     options[:receivers] = receivers
   end
 
@@ -37,22 +43,22 @@ OptionParser.new do |opts|
   end
 
   opts.on('--add-buddy-with-mobile MOBILE', 'Add friend mobile as fetion friend') do |mobile|
-    options[:add_mobile] = mobile
+    options[:friend_mobile] = mobile
   end
 
   opts.on('--add-buddy-with-sip SIP', 'Add friend fetion sip as fetion friend') do |sip|
-    options[:add_sip] = sip
+    options[:friend_sip] = sip
   end
 
   opts.separator ""
   opts.separator "different mode:"
 
   opts.on('--debug', 'debug mode') do
-    options[:debug] = true
+    options[:logger_level] = Logger::DEBUG
   end
 
   opts.on('--silence', 'silence mode') do
-    options[:silence] = true
+    options[:logger_level] = Logger::ERROR
   end
 
   opts.separator ""
@@ -71,25 +77,18 @@ OptionParser.new do |opts|
   opts.parse!
 end
 
-def level(options)
-  return Logger::DEBUG if options[:debug]
-  return Logger::ERROR if options[:silence]
-  return Logger::INFO
-end
-
 begin
-  if options[:add_mobile] or options[:add_sip]
-    raise FetionException.new('You must input your mobile number and password') unless options[:mobile_no] and options[:password]
-    Fetion.add_buddy_with_mobile(options[:mobile_no], options[:password], options[:add_mobile], level(options)) if options[:add_mobile]
-    Fetion.add_buddy_with_sip(options[:mobile_no], options[:password], options[:add_sip], level(options)) if options[:add_sip]
+  if options[:friend_mobile] or options[:friend_sip]
+    raise FetionException.new('You must input your mobile number or fetion sid, and password') unless (options[:mobile_no] or options[:sid]) and options[:password]
+    Fetion.add_buddy(options)
     exit
   end
   
-  raise FetionException.new('You must input your mobile number, password and content') unless options[:mobile_no] and options[:password] and options[:content]
+  raise FetionException.new('You must input your mobile number or fetion sid, password and content') unless (options[:mobile_no] or options[:sid]) and options[:password] and options[:content]
   if options[:time]
-    Fetion.schedule_sms(options[:mobile_no], options[:password], options[:receivers], options[:content], options[:time], level(options))
+    Fetion.schedule_sms(options)
   else
-    Fetion.send_sms(options[:mobile_no], options[:password], options[:receivers], options[:content], level(options))
+    Fetion.send_sms(options)
   end
 rescue FetionException => e
   puts e.message

data/lib/rfetion/fetion.rb

@@ -2,7 +2,7 @@ class FetionException < Exception
 end
 
 class Fetion
-  attr_accessor :mobile_no, :password
+  attr_accessor :mobile_no, :sid, :password
   attr_reader :uri, :contacts
 
   FETION_URL = 'http://221.130.44.194/ht/sd.aspx'
@@ -26,17 +26,23 @@ class Fetion
     @logger.level = level
   end
 
-  def set_cat=(cat)
-    @cat = cat
-  end
-
-  def Fetion.send_sms(mobile_no, password, receivers, content, level = Logger::INFO)
+  # options
+  #   mobile_no
+  #   sid
+  #   password
+  #   receivers
+  #   content
+  #   logger_level
+  def Fetion.send_sms(options)
     fetion = Fetion.new
-    fetion.logger_level = level
-    fetion.mobile_no = mobile_no
-    fetion.password = password
+    fetion.logger_level = options[:logger_level] || Logger::INFO
+    fetion.mobile_no = options[:mobile_no]
+    fetion.sid = options[:sid]
+    fetion.password = options[:password]
     fetion.login
     fetion.register
+    receivers = options[:receivers]
+    content = options[:content]
     if receivers
       receivers = Array(receivers)
       receivers.collect! {|receiver| receiver.to_s}
@@ -54,13 +60,25 @@ class Fetion
     fetion.logout
   end
 
-  def Fetion.schedule_sms(mobile_no, password, receivers, content, time, level = Logger::INFO)
+  # options
+  #   mobile_no
+  #   sid
+  #   password
+  #   receivers
+  #   content
+  #   time
+  #   logger_level
+  def Fetion.schedule_sms(options)
     fetion = Fetion.new
-    fetion.logger_level = level
-    fetion.mobile_no = mobile_no
-    fetion.password = password
+    fetion.logger_level = options[:logger_level] || Logger::INFO
+    fetion.mobile_no = options[:mobile_no]
+    fetion.sid = options[:sid]
+    fetion.password = options[:password]
     fetion.login
     fetion.register
+    receivers = options[:receivers]
+    content = options[:content]
+    time = options[:time]
     fetion.get_buddy_list
     fetion.get_contacts_info
     if receivers
@@ -79,33 +97,33 @@ class Fetion
     fetion.logout
   end
 
-  def Fetion.add_buddy_with_mobile(mobile_no, password, friend_mobile, level = Logger::INFO)
-    fetion = Fetion.new
-    fetion.logger_level = level
-    fetion.mobile_no = mobile_no
-    fetion.password = password
-    fetion.login
-    fetion.register
-    fetion.get_personal_info
-    fetion.add_buddy_with_mobile(friend_mobile)
-    fetion.logout
-  end
-
-  def Fetion.add_buddy_with_sip(mobile_no, password, friend_sip, level = Logger::INFO)
+  # options
+  #   mobile_no
+  #   sid
+  #   password
+  #   friend_mobile
+  #   friend_sip
+  #   logger_level
+  def Fetion.add_buddy(options)
     fetion = Fetion.new
-    fetion.logger_level = level
-    fetion.mobile_no = mobile_no
-    fetion.password = password
+    fetion.logger_level = options[:logger_level] || Logger::INFO
+    fetion.mobile_no = options[:mobile_no]
+    fetion.sid = options[:sid]
+    fetion.password = options[:password]
     fetion.login
     fetion.register
     fetion.get_personal_info
-    fetion.add_buddy_with_sip(friend_sip)
+    fetion.add_buddy(options)
     fetion.logout
   end
 
   def login
     @logger.info "fetion login"
-    uri = URI.parse(FETION_LOGIN_URL + "?mobileno=#{@mobile_no}&pwd=#{@password}")
+    if @mobile_no
+      uri = URI.parse(FETION_LOGIN_URL + "?mobileno=#{@mobile_no}&pwd=#{@password}")
+    else
+      uri = URI.parse(FETION_LOGIN_URL + "?sid=#{@sid}&pwd=#{@password}")
+    end
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -282,35 +300,31 @@ class Fetion
     @logger.info "fetion get personal info success"
   end
 
-  def add_buddy_with_mobile(mobile)
-    @logger.info "fetion send request to add mobile:#{mobile} as friend"
-    arg = %Q{<args><contacts><buddies><buddy uri="tel:#{mobile}" local-name="" buddy-lists="1" desc="#{@person['nickname']}" expose-mobile-no="1" expose-name="1" /></buddies></contacts></args>}
+  # options
+  #   friend_mobile
+  #   friend_sip
+  def add_buddy(options)
+    uri = options[:friend_mobile] ? "tel:#{options[:friend_mobile]}" : "sip:#{options[:friend_sip]}"
+
+    @logger.info "fetion send request to add #{uri} as friend"
+    arg = %Q{<args><contacts><buddies><buddy uri="#{uri}" local-name="" buddy-lists="1" desc="#{@person['nickname']}" expose-mobile-no="1" expose-name="1" /></buddies></contacts></args>}
     msg = sip_create('S fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 S', 'N' => 'AddBuddy'}, arg) + FETION_SIPP
     curl_exec(next_url, @ssic, msg)
     response = curl_exec(next_url, @ssic, FETION_SIPP)
     raise FetionException.new("Fetion Error: Add buddy error") unless response.is_a? Net::HTTPSuccess
 
     if response.body =~ /No Subscription/
-      arg = %Q{<args><contacts><mobile-buddies><mobile-buddy uri="tel:#{mobile}" local-name="" buddy-lists="1" desc="#{@person['nickname']}" expose-mobile-no="1" expose-name="1" /></mobile-buddies></contacts></args>}
+      raise FetionException.new("Fetion Error: No #{uri}") if options[:friend_sip]
+
+      arg = %Q{<args><contacts><mobile-buddies><mobile-buddy uri="#{uri}" local-name="" buddy-lists="1" desc="#{@person['nickname']}" expose-mobile-no="1" expose-name="1" /></mobile-buddies></contacts></args>}
       msg = sip_create('S fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 S', 'N' => 'AddMobileBuddy'}, arg) + FETION_SIPP
       curl_exec(next_url, @ssic, msg)
       response = curl_exec(next_url, @ssic, FETION_SIPP)
       raise FetionException.new("Fetion Error: Add buddy error") unless response.is_a? Net::HTTPSuccess
 
-      raise FetionException.new("Fetion Error: No this mobile") if response.body =~ /Not Found/
+      raise FetionException.new("Fetion Error: No #{uri}") if response.body =~ /Not Found/
     end
-    @logger.info "fetion send request to add mobile:#{mobile} as friend success"
-  end
-
-  def add_buddy_with_sip(sip)
-    @logger.info "fetion send request to add sip:#{sip} as friend"
-    arg = %Q{<args><contacts><buddies><buddy uri="sip:#{sip}" local-name="" buddy-lists="1" desc="#{@person['nickname']}" expose-mobile-no="1" expose-name="1" /></buddies></contacts></args>}
-    msg = sip_create('S fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 S', 'N' => 'AddBuddy'}, arg) + FETION_SIPP
-    curl_exec(next_url, @ssic, msg)
-    response = curl_exec(next_url, @ssic, FETION_SIPP)
-
-    raise FetionException.new("Fetion Error: Add buddy error") unless response.is_a? Net::HTTPSuccess
-    @logger.info "fetion send request to add sip:#{sip} as friend success"
+    @logger.info "fetion send request to add #{uri} as friend success"
   end
 
   def logout

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-12-15}
+  s.date = %q{2009-12-17}
   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.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 +08:00
+date: 2009-12-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency