rfetion 0.5.4 → 0.5.5

data/README.textile

@@ -2,6 +2,8 @@ h1. rfetion
 
 rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.
 
+I'm still developing according to the Fetion 2010 version which adds the verification code to protect bot. You should download the version before 0.5.0 which does not trigger the verification.
+
 **************************************************************************
 
 h2. Demo

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/lib/rfetion.rb

@@ -2,5 +2,6 @@ require 'rubygems'
 require File.dirname(__FILE__) + '/rfetion/buddy_list'
 require File.dirname(__FILE__) + '/rfetion/contact'
 require File.dirname(__FILE__) + '/rfetion/message'
+require File.dirname(__FILE__) + '/rfetion/pic_certificate'
 require File.dirname(__FILE__) + '/rfetion/sipc_message'
 require File.dirname(__FILE__) + '/rfetion/fetion'

data/lib/rfetion/buddy_list.rb

@@ -1,14 +1,27 @@
 class Fetion
   class BuddyList
-    attr_reader :id, :name
+   attr_reader :bid, :name, :contacts
     
-    def initialize(id, name)
-      @id = id
+    def initialize(bid, name)
+      @bid = bid
       @name = name
+      @contacts = []
     end
     
     def self.parse(buddy_list)
       self.new(buddy_list['id'], buddy_list['name'])
     end
+
+    def add_contact(contact)
+      @contacts << contact
+    end
+
+    def online_contacts_count
+      @contacts.select {|contact| contact.status == "400"}.size
+    end
+
+    def total_contacts_count
+      @contacts.size
+    end
   end
-end
+end

data/lib/rfetion/contact.rb

@@ -1,7 +1,7 @@
 #coding: utf-8
 class Fetion
   class Contact
-    attr_accessor :id, :sid, :uri, :mobile_no, :nickname, :impresa, :nickname, :status
+    attr_accessor :uid, :sid, :bid, :uri, :mobile_no, :nickname, :impresa, :status
 
     STATUS = {
       "400" => "在线",
@@ -10,17 +10,44 @@ class Fetion
       "0" => "脱机"
     }
 
+    def self.parse_buddy(b)
+      self.new(:uid => b['i'], :uri => b['u'], :nickname => b['n'], :bid => b['l'].empty? ? "0" : b['l'])
+    end
+
     def self.parse(c)
-      contact = self.new
-      contact.id = c['id']
       p = c.children.first
-      contact.sid = p["sid"]
-      contact.uri = p["su"]
-      contact.mobile_no = p["m"]
-      contact.nickname = p["n"]
-      contact.impresa = p["i"]
-      contact.status = p["b"]
-      contact
+      self.new(:uid => c['id'], :sid => p['sid'], :uri => p['su'], :mobile_no => p['m'], :nickname => p['n'], :impresa => p['i'], :status => p['b'], :bid => p['l'])
+    end
+
+    def self.parse_request(c)
+      self.new(:uri => c['uri'], :uid => c['user-id'], :sid => c['sid'], :mobile_no => c['mobile-no'], :nickname => c['nickname'])
+    end
+
+    def initialize(options={})
+      options.each do |key, value|
+        send("#{key}=", value)
+      end
+    end
+
+    def update(p)
+      self.sid = p["sid"] if p["sid"] and !p["sid"].empty?
+      self.uri = p["su"] if p["su"] and !p["su"].empty?
+      self.mobile_no = p["m"] if p["m"] and !p["m"].empty?
+      self.nickname = p["n"] if p["n"] and !p["n"].empty?
+      self.impresa = p["i"] if p["i"] and !p["i"].empty?
+      self.status = p["b"] if p["b"] and !p["b"].empty?
+    end
+
+    def display
+      if self.impresa and !self.impresa.empty?
+        "#{self.nickname}(#{self.impresa})"
+      elsif self.nickname and !self.nickname.empty?
+        self.nickname
+      else
+        if self.uri =~ /^(tel|sip):(\d+)/
+          $2
+        end
+      end
     end
   end
 end

data/lib/rfetion/fetion.rb

@@ -9,10 +9,11 @@ require 'logger'
 
 class Fetion
   attr_accessor :mobile_no, :sid, :password, :call, :seq, :alive, :ssic, :guid, :uri
-  attr_reader :user_id, :contacts, :buddy_lists, :response, :nickname, :receives
+  attr_reader :uid, :buddy_lists, :add_requests, :response, :nickname, :impresa, :receives
 
   FETION_URL = 'http://221.176.31.39/ht/sd.aspx'
   FETION_LOGIN_URL = 'https://uid.fetion.com.cn/ssiportal/SSIAppSignInV4.aspx?mobileno=%mobileno%sid=%sid%&domains=fetion.com.cn;m161.com.cn;www.ikuwa.cn&v4digest-type=1&v4digest=%digest%'
+  FETION_PIC_URL = 'http://nav.fetion.com.cn/nav/GetPicCodeV4.aspx?algorithm=%algorithm'
 
   SIPP = 'SIPP'
   USER_AGENT = "IIC2.0/PC 3.6.2020"
@@ -21,10 +22,10 @@ class Fetion
 
   def initialize
     @call = @alive = @seq = 0
-    @buddy_lists = []
-    @buddies = []
+    @buddy_lists = [Fetion::BuddyList.new("0", "未分组")]
     @contacts = []
     @receives = []
+    @add_requests = []
     @logger = Logger.new(STDOUT)
     @logger.level = Logger::INFO
     @guid = Guid.new.to_s
@@ -198,7 +199,7 @@ class Fetion
   def register_second
     @logger.debug "fetion register second"
 
-    body = %Q|<args><device machine-code="B04B5DA2F5F1B8D01A76C0EBC841414C" /><caps value="ff" /><events value="7f" /><user-info mobile-no="#{@mobile_no}" user-id="#{@user_id}"><personal version="0" attributes="v4default" /><custom-config version="0" /><contact-list version="0"   buddy-attributes="v4default" /></user-info><credentials domains="fetion.com.cn;m161.com.cn;www.ikuwa.cn;games.fetion.com.cn" /><presence><basic value="400" desc="" /></presence></args>|
+    body = %Q|<args><device machine-code="B04B5DA2F5F1B8D01A76C0EBC841414C" /><caps value="ff" /><events value="7f" /><user-info mobile-no="#{@mobile_no}" user-id="#{@uid}"><personal version="0" attributes="v4default" /><custom-config version="0" /><contact-list version="0"   buddy-attributes="v4default" /></user-info><credentials domains="fetion.com.cn;m161.com.cn;www.ikuwa.cn;games.fetion.com.cn" /><presence><basic value="400" desc="" /></presence></args>|
     curl_exec(SipcMessage.register_second(self))
     pulse
 
@@ -267,19 +268,30 @@ class Fetion
   #   mobile_no
   #   sip
   def get_contact_info(options)
-    uri = options[:mobile_no] ? "tel:#{options[:mobile_no]}" : "sip:#{options[:sip]}"
+    uri = if options[:mobile_no]
+            "tel:#{options[:mobile_no]}"
+          elsif options[:sip]
+            "sip:#{options[:sip]}"
+          else
+            "uri:#{options[:uri]}"
+          end
     @logger.info "fetion get contact info of #{uri}"
     
     curl_exec(SipcMessage.get_contact_info(self, uri))
-    pulse
+    sipc_response = pulse
+    results = sipc_response.sections.first.scan(%r{<results>.*?</results>}).first
+    doc = Nokogiri::XML(results)
+    c = doc.root.xpath("/results/contact").first
+    contact = Contact.parse_request(c)
 
     @logger.info "fetion get contact info of #{uri} success"
+    contact
   end
 
   def keep_alive
     @logger.info "fetion keep alive"
     
-    pulse
+    curl_exec(SipcMessage.keep_alive(self))
 
     @logger.info "fetion keep alive success"
   end
@@ -287,9 +299,10 @@ class Fetion
   def pulse(expected=SipcMessage::OK)
     @logger.info "fetion pulse"
 
-    curl_exec(SIPP, next_url, expected)
+    sipc_response = curl_exec(SIPP, next_url, expected)
 
     @logger.info "fetion pulse success"
+    sipc_response
   end
 
   def logout
@@ -327,14 +340,39 @@ class Fetion
   end
 
   def close_session
-    @logger.info "fetion close_session"
+    @logger.info "fetion close session"
 
     curl_exec(SipcMessage.close_session(self))
 
-    @logger.info "fetion close_session success"
+    @logger.info "fetion close session success"
+  end
+
+  def handle_contact_request(uid, options)
+    @logger.info "fetion handle contact request"
+
+    contact = @add_requests.find {|contact| contact.uid == uid}
+    curl_exec(SipcMessage.handle_contact_request(self, contact, options))
+    pulse
+
+    @logger.info "fetion handle contact request success"
+  end
+
+  def get_pic_certificate(algorithm)
+    @logger.info "fetion get pic"
+    
+    uri = URI.parse(FETION_PIC_URL.sub('%algorithm', algorithm))
+    http = Net::HTTP.new(uri.host, uri.port)
+    headers = {'User-Agent' => USER_AGENT}
+    response = http.request_get(uri.request_uri, headers)
+    pic_certificate = parse_pic_certificate(response)
+
+    @logger.info "fetion get pic success"
+    pic_certificate
   end
 
   def parse_ssic(response)
+    raise Fetion::PasswordError.new('Fetion Error: 帐号或密码不正确') if Net::HTTPUnauthorized === response
+    raise Fetion::PasswordMaxError.new('Fetion Error: 您已连续输入错误密码，为了保障您的帐户安全，请输入图形验证码：') if Net::HTTPClientError === response
     raise Fetion::LoginException.new('Fetion Error: Login failed.') unless Net::HTTPSuccess === response
     raise Fetion::LoginException.new('Fetion Error: No ssic found in cookie.') unless response['set-cookie'] =~ /ssic=(.*);/
 
@@ -347,7 +385,7 @@ class Fetion
     @user_status = user['user-status']
     @uri = user['uri']
     @mobile_no = user['mobile-no']
-    @user_id = user['user-id']
+    @uid = user['user-id']
     if @uri =~ /sip:(\d+)@(.+);/
       @sid = $1
     end
@@ -357,10 +395,17 @@ class Fetion
     @logger.debug "user_status: " + @user_status
     @logger.debug "uri: " + @uri
     @logger.debug "mobile_no: " + @mobile_no
-    @logger.debug "user_id: " + @user_id
+    @logger.debug "uid: " + @uid
     @logger.debug "sid: " + @sid
   end
 
+  def parse_pic_certificate(response)
+    raise FetionException.new('Fetion Error: Get verification code failed.') unless Net::HTTPSuccess === response
+    doc = Nokogiri::XML(response.body)
+    certificate = doc.root.xpath('/results/pic-certificate').first
+    PicCertificate.parse(certificate)
+  end
+
   def curl_exec(body='', url=next_url, expected=SipcMessage::OK)
     @logger.debug "fetion curl exec"
     @logger.debug "url: #{url}"
@@ -397,8 +442,7 @@ class Fetion
       create_session(sipc_response) if sipc_response.contain?('I')
       session_connected(sipc_response) if sipc_response.contain?('O')
       if sipc_response.contain?('M')
-        receive_messages = response.body.scan(%r{M #{@sid} SIP-C/4.0.*?BN}m)
-        receive_messages = response.body.scan(%r{M #{@sid} SIP-C/4.0.*?SIPP\r?\n?$}m) if receive_messages.empty?
+        receive_messages = sipc_response.sections.select {|section| section =~ /^M/}
         receive_messages.each do |message_response|
           message_header, message_content = message_response.split(/\r\n\r\n/)
           sip = sent_at = length = nil
@@ -419,26 +463,37 @@ class Fetion
         doc = Nokogiri::XML(results)
         doc.root.xpath("/results/user-info/personal").each do |personal_element|
           @nickname = personal_element['nickname']
-          @logger.debug "nickname: #@nickname"
+          @impresa = personal_element['impresa']
         end
         doc.root.xpath("/results/user-info/contact-list/buddy-lists/buddy-list").each do |buddy_list|
           @buddy_lists << Fetion::BuddyList.parse(buddy_list)
         end
         doc.root.xpath("/results/user-info/contact-list/buddies/b").each do |buddy|
-          @buddies << {:uri => buddy["u"]}
+          contact = Fetion::Contact.parse_buddy(buddy)
+          @buddy_lists.find {|buddy_list| buddy_list.bid == contact.bid}.add_contact(contact)
         end
       end
       
       response.body.scan(%r{<events>.*?</events>}).each do |events|
         doc = Nokogiri::XML(events)
         doc.root.xpath("/events/event[@type='PresenceChanged']/contacts/c").each do |c|
-          contact = contacts.find {|contact| contact.id == c['id']}
-          if contact
-            contact.status = c.children.first['b']
-          else
-            @contacts << Fetion::Contact.parse(c) unless c['id'] == @user_id
+          unless self.uid == c['id']
+            contact = contacts.find {|contact| contact.uid == c['id']}
+            if contact
+              contact.update(c.children.first)
+            else
+              contact = Fetion::Contact.parse(c)
+              if @buddy_lists.size > 1
+                @buddy_lists.find {|buddy_list| buddy_list.bid == contact.bid}.add_contact(contact)
+              else
+                @contacts << contact
+              end
+            end
           end
         end
+        doc.root.xpath("/events/event[@type='AddBuddyApplication']/application").each do |application|
+          @add_requests << get_contact_info(:uri => application['uri'])
+        end
       end
     end
     sipc_response
@@ -461,7 +516,7 @@ class Fetion
   end
 
   def calc_response
-    encrypted_password = Digest::SHA1.hexdigest([@user_id.to_i].pack("V*") + [Digest::SHA1.hexdigest("#{DOMAIN}:#{@password}")].pack("H*"))
+    encrypted_password = Digest::SHA1.hexdigest([@uid.to_i].pack("V*") + [Digest::SHA1.hexdigest("#{DOMAIN}:#{@password}")].pack("H*"))
     rsa_result = "4A026855890197CFDF768597D07200B346F3D676411C6F87368B5C2276DCEDD2"
     str = @nonce + [encrypted_password].pack("H*") + [rsa_result].pack("H*")
     rsa_key = OpenSSL::PKey::RSA.new
@@ -476,10 +531,20 @@ class Fetion
   def self?(mobile_or_sid)
     mobile_or_sid == @mobile_no or mobile_or_sid == @sid
   end
+
+  def contacts
+    if @buddy_lists.size > 1
+      @buddy_lists.collect {|buddy_list| buddy_list.contacts}.flatten
+    else
+      @contacts
+    end
+  end
 end
 
 class FetionException < Exception; end
 class Fetion::LoginException < FetionException; end
+class Fetion::PasswordError < Fetion::LoginException; end
+class Fetion::PasswordMaxError < Fetion::LoginException; end
 class Fetion::NoNonceException < FetionException; end
 class Fetion::RegisterException < FetionException; end
 class Fetion::SendSmsException < FetionException; end

data/lib/rfetion/pic_certificate.rb

@@ -0,0 +1,12 @@
+class PicCertificate
+  attr_reader :id, :pic
+
+  def initialize(id, pic)
+    @id = id
+    @pic = pic
+  end
+
+  def self.parse(c)
+    PicCertificate.new(c['id'], c['pic'])
+  end
+end

data/lib/rfetion/sipc_message.rb

@@ -6,7 +6,7 @@ class SipcMessage
   end
 
   def self.register_second(fetion)
-    body = %Q|<args><device machine-code="B04B5DA2F5F1B8D01A76C0EBC841414C" /><caps value="ff" /><events value="7f" /><user-info mobile-no="#{fetion.mobile_no}" user-id="#{fetion.user_id}"><personal version="0" attributes="v4default" /><custom-config version="0" /><contact-list version="0"   buddy-attributes="v4default" /></user-info><credentials domains="fetion.com.cn;m161.com.cn;www.ikuwa.cn;games.fetion.com.cn" /><presence><basic value="400" desc="" /></presence></args>|
+    body = %Q|<args><device machine-code="B04B5DA2F5F1B8D01A76C0EBC841414C" /><caps value="ff" /><events value="7f" /><user-info mobile-no="#{fetion.mobile_no}" user-id="#{fetion.uid}"><personal version="0" attributes="v4default" /><custom-config version="0" /><contact-list version="0"   buddy-attributes="v4default" /></user-info><credentials domains="fetion.com.cn;m161.com.cn;www.ikuwa.cn;games.fetion.com.cn" /><presence><basic value="400" desc="" /></presence></args>|
     sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => "#{fetion.next_alive} R", :A => %Q|Digest response="#{fetion.response}",algorithm="SHA1-sess-v4"|, :AK => 'ak-value', :body => body)
   end
 
@@ -110,6 +110,11 @@ class SipcMessage
     sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => "#{fetion.next_alive} R", :N => 'KeepAlive', :body => body)
   end
 
+  def self.handle_contact_request(fetion, contact, options)
+    body = %Q|<args><contacts><buddies><buddy user-id="#{contact.uid}" uri="#{contact.uri}" result="#{options[:result]}" buddy-lists="" expose-mobile-no="0" expose-name="0" /></buddies></contacts></args>|
+    sipc_create(:command => 'S', :F => fetion.sid, :I => fetion.next_call, :Q => "1 S", :N => "HandleContactRequestV4", :body => body)
+  end
+
   def self.sipc_response(http_response_body, fetion)
     return if http_response_body == Fetion::SIPP
     

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-05-17}
+  s.date = %q{2010-05-23}
   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"]
@@ -27,8 +27,10 @@ Gem::Specification.new do |s|
      "lib/rfetion/contact.rb",
      "lib/rfetion/fetion.rb",
      "lib/rfetion/message.rb",
+     "lib/rfetion/pic_certificate.rb",
      "lib/rfetion/sipc_message.rb",
      "rfetion.gemspec",
+     "spec/rfetion/buddy_list_spec.rb",
      "spec/rfetion/fetion_spec.rb",
      "spec/rfetion/sipc_message_spec.rb",
      "spec/spec.opts",
@@ -37,10 +39,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/flyerhzm/rfetion}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.}
   s.test_files = [
-    "spec/rfetion/fetion_spec.rb",
+    "spec/rfetion/buddy_list_spec.rb",
+     "spec/rfetion/fetion_spec.rb",
      "spec/rfetion/sipc_message_spec.rb",
      "spec/spec_helper.rb"
   ]

data/spec/rfetion/buddy_list_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe Fetion::BuddyList do
+  before :each do
+    @buddy_list = Fetion::BuddyList.new("1", "我的好友")
+    @buddy_list.add_contact(Fetion::Contact.new(:uid => "226911221", :uri => "sip:572512981@fetion.com.cn;p=3544", :bid => "1", :status => "400"))
+    @buddy_list.add_contact(Fetion::Contact.new(:uid => "295098062", :uri => "sip:638993408@fetion.com.cn;p=2242", :bid => "1"))
+    @buddy_list.add_contact(Fetion::Contact.new(:uid => "579113578", :uri => "sip:838271744@fetion.com.cn;p=4805", :bid => "1"))
+    @buddy_list.add_contact(Fetion::Contact.new(:uid => "665046562", :uri => "sip:926157269@fetion.com.cn;p=12906", :bid => "1", :status => "400"))
+    @buddy_list.add_contact(Fetion::Contact.new(:uid => "687455743", :uri => "sip:881033150@fetion.com.cn;p=5493", :bid => "1"))
+    @buddy_list.add_contact(Fetion::Contact.new(:uid => "714355089", :uri => "sip:973921799@fetion.com.cn;p=12193", :bid => "1", :status => "400"))
+    @buddy_list.add_contact(Fetion::Contact.new(:uid => "732743291", :uri => "sip:480867781@fetion.com.cn;p=16105", :bid => "1"))
+  end
+
+  it "should get total contacts count" do
+    @buddy_list.total_contacts_count.should == 7
+  end
+
+  it "should get online contacts count" do
+    @buddy_list.online_contacts_count.should == 3
+  end
+end

data/spec/rfetion/fetion_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe Fetion do
   class Fetion
-    attr_accessor :mobile_no, :sid, :password, :status_code, :user_status, :user_id, :ssic, :nonce, :key, :signature, :response
+    attr_accessor :mobile_no, :sid, :password, :status_code, :user_status, :uid, :ssic, :nonce, :key, :signature, :response
   end
 
   before :each do
@@ -23,11 +23,25 @@ describe Fetion do
       @fetion.status_code.should == "200"
       @fetion.user_status.should == "101"
       @fetion.mobile_no.should == "15800681509"
-      @fetion.user_id.should == "390937727"
+      @fetion.uid.should == "390937727"
       @fetion.sid.should == "730020377"
       @fetion.ssic.should == "DhIOAADVEY68pV4EcRHsJ/GIIeltaYJsYJR2pj7b2+hCYLtgUd2j2mFaOqoqR98S3dm5pPH9t7W1yH5Cp/lVRP6VTwpLVvwxhhvj8qDz/p8rrW/Ljor6P4ZQKUZYz80JHjMt8R4AAA=="
     end
 
+    it "should login failed with wrong password" do
+      @fetion.mobile_no = '15800681509'
+      @fetion.password = 'password'
+      FakeWeb.register_uri(:get, 'https://uid.fetion.com.cn/ssiportal/SSIAppSignInV4.aspx?mobileno=15800681509&domains=fetion.com.cn;m161.com.cn;www.ikuwa.cn&v4digest-type=1&v4digest=79cd56b93f21298dc8ae9d26de1258e3d6ce85a7', :body => %Q|<?xml version="1.0" encoding="utf-8" ?><results status-code="401" desc="password error" />|, :status => ['401', 'password error'])
+      lambda { @fetion.login }.should raise_exception(Fetion::PasswordError)
+    end
+
+    it "should get verification code when password error max" do
+      @fetion.mobile_no = '15800681509'
+      @fetion.password = 'password'
+      FakeWeb.register_uri(:get, 'https://uid.fetion.com.cn/ssiportal/SSIAppSignInV4.aspx?mobileno=15800681509&domains=fetion.com.cn;m161.com.cn;www.ikuwa.cn&v4digest-type=1&v4digest=79cd56b93f21298dc8ae9d26de1258e3d6ce85a7', :body => %Q|<?xml version="1.0" encoding="utf-8" ?><results status-code="421" desc="password error max"><verification algorithm="picc-PasswordErrorMax" type="GeneralPic" text="您已连续输入错误密码，为了保障您的帐户安全，请输入图形验证码：" tips="温馨提示：建议您直接用手机编辑短信P发送到12520获取新密码。"></verification></results>|, :status => ['421'])
+      lambda { @fetion.login }.should raise_exception(Fetion::PasswordMaxError)
+    end
+
     it "should login by sid" do
       @fetion.sid = "730020377"
       @fetion.password = 'password'
@@ -37,7 +51,7 @@ describe Fetion do
       @fetion.status_code.should == "200"
       @fetion.user_status.should == "101"
       @fetion.mobile_no.should == "15800681509"
-      @fetion.user_id.should == "390937727"
+      @fetion.uid.should == "390937727"
       @fetion.sid.should == "730020377"
       @fetion.ssic.should == "DhIOAADVEY68pV4EcRHsJ/GIIeltaYJsYJR2pj7b2+hCYLtgUd2j2mFaOqoqR98S3dm5pPH9t7W1yH5Cp/lVRP6VTwpLVvwxhhvj8qDz/p8rrW/Ljor6P4ZQKUZYz80JHjMt8R4AAA=="
     end
@@ -52,7 +66,7 @@ describe Fetion do
 
   describe "register" do
     before :each do
-      @fetion.instance_variable_set(:@user_id, "390937727")
+      @fetion.instance_variable_set(:@uid, "390937727")
       @fetion.instance_variable_set(:@password, "password")
     end
 
@@ -100,7 +114,7 @@ EOF
     describe "register second" do
       before :each do
         @fetion.mobile_no = "15800681509"
-        @fetion.user_id = "390937727"
+        @fetion.uid = "390937727"
         @fetion.response = "458F72ED91E149D28D8467772AB7AD366527B55AC1A10CD18BA1B9BD95F2E082B1594B6C9B116E0BDECC315A2ABA0F4DD20591BF305FCDCDA4CA7B6434EA7788B893E0BB26E4E02097B6707BE0BD60E704D560DDDCB539A3E6FD49B985631FCA02C44D09A6713358BF1D323BA62B5273C7096B97D6A75C6BF9708768FF0113D0"
         @fetion.instance_variable_set(:@seq, 3)
       end
@@ -127,7 +141,10 @@ EOF
         @fetion.register_second
 
         @fetion.nickname.should == "flyerhzm"
-        @fetion.buddy_lists.collect {|buddy_list| buddy_list.name}.should == ['我的好友', '好友', '同学']
+        @fetion.impresa.should == "http://www.fetionrobot.com"
+        @fetion.buddy_lists.collect {|buddy_list| buddy_list.name}.should == ['未分组', '我的好友', '好友', '同学']
+        @fetion.buddy_lists[1].contacts.collect {|contact| contact.uid}.should == ['226911221', '295098062', '579113578', '665046562', '687455743', '714355089', '732743291']
+        @fetion.buddy_lists.last.contacts.collect {|contact| contact.uid}.should == ['222516658', '227091544', '228358286', '229415466', '296436724']
       end
     end
   end
@@ -136,7 +153,25 @@ EOF
     before :each do
       @fetion.instance_variable_set(:@seq, 5)
       @fetion.instance_variable_set(:@sid, "730020377")
-      @fetion.instance_variable_set(:@user_id, "390937727")
+      @fetion.instance_variable_set(:@uid, "390937727")
+      @buddy_list0 = Fetion::BuddyList.new("0", "未分组")
+      @buddy_list1 = Fetion::BuddyList.new("1", "我的好友")
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "226911221", :uri => "sip:572512981@fetion.com.cn;p=3544", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "295098062", :uri => "sip:638993408@fetion.com.cn;p=2242", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "579113578", :uri => "sip:838271744@fetion.com.cn;p=4805", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "665046562", :uri => "sip:926157269@fetion.com.cn;p=12906", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "687455743", :uri => "sip:881033150@fetion.com.cn;p=5493", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "714355089", :uri => "sip:973921799@fetion.com.cn;p=12193", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "732743291", :uri => "sip:480867781@fetion.com.cn;p=16105", :bid => "1"))
+      @buddy_list2 = Fetion::BuddyList.new("2", "好友")
+      @buddy_list3 = Fetion::BuddyList.new("3", "同学")
+      @buddy_list3.add_contact(Fetion::Contact.new(:uid => "222516658", :uri => "sip:793401629@fetion.com.cn;p=1919", :bid => "3"))
+      @buddy_list3.add_contact(Fetion::Contact.new(:uid => "227091544", :uri => "sip:669700695@fetion.com.cn;p=3546", :nickname => "郭庆", :bid => "3"))
+      @buddy_list3.add_contact(Fetion::Contact.new(:uid => "228358286", :uri => "sip:660250260@fetion.com.cn;p=3854", :nickname => "蔡智武", :bid => "3"))
+      @buddy_list3.add_contact(Fetion::Contact.new(:uid => "229415466", :uri => "sip:737769829@fetion.com.cn;p=4078", :nickname => "ice", :bid => "3"))
+      @buddy_list3.add_contact(Fetion::Contact.new(:uid => "296436724", :uri => "sip:760087520@fetion.com.cn;p=2467", :bid => "3"))
+      @buddy_lists = [@buddy_list0, @buddy_list1, @buddy_list2, @buddy_list3]
+      @fetion.instance_variable_set(:@buddy_lists, @buddy_lists)
     end
 
     it "should get all contacts" do
@@ -235,7 +270,7 @@ EOF
       response_body.gsub!("\n", "\r\n")
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=10", :body => response_body)
       @fetion.get_contacts
-      @fetion.contacts.collect {|contact| contact.sid}.should == ["793401629", "737769829", "660250260", "926157269", "669700695", "760087520", "480867781", "572512981", "638993408"]
+      @fetion.contacts.collect {|contact| contact.sid}.should == ["572512981", "638993408", nil, "926157269", nil, nil, "480867781", "793401629", "669700695", "660250260", "737769829", "760087520"]
     end
 
     it "should get received msg while get contacts" do
@@ -343,7 +378,7 @@ EOF
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=10", :body => response_body)
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=11", :body => "SIPP")
       @fetion.get_contacts
-      @fetion.contacts.collect {|c| c.sid}.should == ["793401629", "737769829", "660250260", "926157269", "669700695", "760087520", "480867781", "572512981", "638993408"]
+      @fetion.contacts.collect {|c| c.sid}.should == ["572512981", "638993408", nil, "926157269", nil, nil, "480867781", "793401629", "669700695", "660250260", "737769829", "760087520"]
       @fetion.receives.collect {|r| r.sip}.should == ["480867781@fetion.com.cn;p=16105"]
       @fetion.receives.collect {|r| r.sent_at}.should == [Time.parse("Mon, 10 May 2010 14:26:17 GMT")]
       @fetion.receives.collect {|r| r.text}.should == ["testtesttest"]
@@ -499,12 +534,15 @@ EOF
     before :each do
       @fetion.instance_variable_set(:@seq, 10)
       @fetion.instance_variable_set(:@sid, "730020377")
-      contact = Fetion::Contact.new
-      contact.id = '295098062'
+      contact = Fetion::Contact.new(:uid => '295098062')
       @fetion.instance_variable_set(:@contacts, [contact])
     end
 
     it "should get presence with online" do
+      buddy_list = Fetion::BuddyList.new(1, 'friends')
+      contact = Fetion::Contact.new(:uid => "295098062")
+      buddy_list.add_contact(contact)
+      @fetion.instance_variable_set(:@buddy_lists, [buddy_list])
       response_body =<<-EOF
 BN 730020377 SIP-C/4.0
 N: PresenceV4
@@ -517,7 +555,7 @@ EOF
       response_body.gsub!("\n", "\r\n")
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=11", :body => response_body)
       @fetion.pulse
-      @fetion.contacts.find {|contact| contact.id == '295098062'}.status.should == "400"
+      @fetion.contacts.find {|contact| contact.uid == '295098062'}.status.should == "400"
     end
 
 
@@ -660,5 +698,102 @@ EOF
       @fetion.receives.collect {|r| r.sent_at}.should == [Time.parse("Tue, 11 May 2010 15:18:56 GMT")]
       @fetion.receives.collect {|r| r.text}.should == ["testtesttest"]
     end
+
+    it "should get multiple receive msgs" do
+      response_body =<<-EOF
+M 730020377 SIP-C/4.0
+I: -11
+Q: 4 M
+F: sip:638993408@fetion.com.cn;p=2242
+C: text/html-fragment
+K: SaveHistory
+L: 8
+D: Sat, 22 May 2010 15:17:26 GMT
+XI: b1344eca984c418ba4b72a6fed5011e5
+
+testtestM 730020377 SIP-C/4.0
+I: -11
+Q: 5 M
+F: sip:638993408@fetion.com.cn;p=2242
+C: text/html-fragment
+K: SaveHistory
+L: 4
+D: Sat, 22 May 2010 15:17:26 GMT
+XI: 9b9eba984eb4468babf70f5dcceca39d
+
+testSIPP
+EOF
+      response_body.gsub!("\n", "\r\n")
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=11", :body => response_body)
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=12", :body => "SIPP")
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=13", :body => "SIPP")
+      @fetion.pulse
+      @fetion.receives.collect {|r| r.sip}.should == ["638993408@fetion.com.cn;p=2242", "638993408@fetion.com.cn;p=2242"]
+      @fetion.receives.collect {|r| r.sent_at}.should == [Time.parse("Sat, 22 May 2010 15:17:26 GMT"), Time.parse("Sat, 22 May 2010 15:17:26 GMT")]
+      @fetion.receives.collect {|r| r.text}.should == ["testtest", "test"]
+    end
+
+    it "should get add buddy message" do
+      response_body =<<-EOF
+BN 480867781 SIP-C/4.0
+N: contact
+I: 1
+Q: 5 BN
+L: 207
+
+<events><event type="AddBuddyApplication"><application uri="sip:638993408@fetion.com.cn;p=2242" desc="梦研" type="0" time="2010-05-18 13:32:58" addbuddy-phrase-id="1" user-id="295098062"/></event></events>SIPP
+EOF
+      response_body.gsub!("\n", "\r\n")
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=11", :body => response_body)
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=12", :body => "SIPP")
+      response_body =<<-EOF
+SIP-C/4.0 200 OK
+I: 7
+Q: 1 S
+L: 368
+
+<results><contact uri="sip:638993408@fetion.com.cn;p=2242" version="0" user-id="295098062" sid="638993408" mobile-no="13634102006" basic-service-status="1" carrier="CMCC" carrier-status="0" portrait-crc="0" name="" nickname="梦研" gender="0" birth-date="1900-01-01" birthday-valid="0" impresa="" carrier-region="CN.zj.571." user-region="" score-level="0"/></results>EOF
+EOF
+      response_body.gsub!("\n", "\r\n")
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=13", :body => response_body)
+      @fetion.pulse
+    end
+
+    it "should handle contact request" do
+      contact = Fetion::Contact.new(:uid => '295098062', :uri => 'sip:638993408@fetion.com.cn;p=2242')
+      @fetion.instance_variable_set(:@add_requests, [contact])
+      buddy_list = Fetion::BuddyList.new("1", "friends")
+      @fetion.instance_variable_set(:@buddy_lists, [buddy_list])
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=11", :body => "SIPP")
+      response_body =<<-EOF
+SIP-C/4.0 200 OK
+I: 9
+Q: 1 S
+L: 349
+
+<results><contacts version="327533592"><buddies><buddy uri="sip:638993408@fetion.com.cn;p=2242" local-name="" buddy-lists="" online-notify="0" expose-mobile-no="0" expose-name="0" expose-basic-presence="1" accept-instant-message="1" result="1" relation-status="1" user-id="295098062" permission-values="identity=0;" /></buddies></contacts></results>BN 480867781 SIP-C/4.0
+N: PresenceV4
+I: 1
+L: 329
+Q: 6 BN
+
+<events><event type="PresenceChanged"><contacts><c id="295098062"><p v="326156919" sid="638993408" su="sip:638993408@fetion.com.cn;p=2242" m="13634102006" c="CMCC" cs="0" s="1" l="1" svc="" n="梦研" i="" p="0" sms="0.0:0:0" sp="0" sh="0"/><pr di="PCCL030308238932" b="400" d="" dt="PC" dc="17"/></c></contacts></event></events>SIPP
+EOF
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=12", :body => response_body)
+      @fetion.handle_contact_request('295098062', :result => "1")
+    end
+  end
+
+  describe "pic" do
+    it "should get pic when password error max" do
+      response_body =<<-EOF
+<?xml version="1.0" encoding="UTF-8"?><results><pic-certificate id="2cb24c14-d0d4-4417-a69f-640c91f745c5" pic="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" /></results>
+EOF
+      FakeWeb.register_uri(:get, "http://nav.fetion.com.cn/nav/GetPicCodeV4.aspx?algorithm=picc-PasswordErrorMax", :body => response_body)
+      actual_pic = @fetion.get_pic_certificate("picc-PasswordErrorMax")
+      expected_pic = PicCertificate.parse(Nokogiri::XML(response_body).root.xpath('/results/pic-certificate').first)
+      actual_pic.id.should == expected_pic.id
+      actual_pic.pic.should == expected_pic.pic
+    end
   end
 end

data/spec/rfetion/sipc_message_spec.rb

@@ -2,13 +2,13 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe SipcMessage do
   class Fetion
-    attr_accessor :mobile_no, :sid, :password, :status_code, :user_status, :user_id, :ssic, :nonce, :key, :signature, :response, :call
+    attr_accessor :mobile_no, :sid, :password, :status_code, :user_status, :uid, :ssic, :nonce, :key, :signature, :response, :call
   end
 
   before :each do
     @fetion = Fetion.new
     @fetion.sid = "730020377"
-    @fetion.user_id = "390937727"
+    @fetion.uid = "390937727"
     @fetion.mobile_no = "15800681509"
     @fetion.uri = "730020377@fetion.com.cn;p=6907"
     @fetion.response = "62E57A276EB9B7AAC233B8983A39941870CE74E3B2CD6480B5CA9DCF37C57DECEA250F261543CB4424EE9E72354C9F33C805EB9839BF96501D0261614E69BDF0DBDF484047750B3113DF8850FEF39428ADC17FE86E8800ED5A77AA7F6630F21AE8A24E6ECC2F003BF3B93E35051A7778D238F86D21581BC829679EBEAD36390F"
@@ -183,6 +183,22 @@ EOF
     SipcMessage.get_contact_info(@fetion, "tel:15800681507").should == sipc_message
   end
 
+  it "should get contact info with sip" do
+    @fetion.call = 10
+    sipc_message =<<-EOF
+S fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 11
+Q: 1 S
+N: GetContactInfoV4
+L: 65
+
+<args><contact uri="sip:638993408@fetion.com.cn;p=2242" /></args>SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
+    SipcMessage.get_contact_info(@fetion, "sip:638993408@fetion.com.cn;p=2242").should == sipc_message
+  end
+
   it "should add buddy" do
     @fetion.call = 9
     @fetion.instance_variable_set(:@nickname, 'flyerhzm')
@@ -360,4 +376,23 @@ EOF
     sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.logout(@fetion).should == sipc_message
   end
+
+  it "should handle contact request" do
+    @fetion.call = 8
+    sipc_message =<<-EOF
+S fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 9
+Q: 1 S
+N: HandleContactRequestV4
+L: 186
+
+<args><contacts><buddies><buddy user-id="295098062" uri="sip:638993408@fetion.com.cn;p=2242" result="1" buddy-lists="" expose-mobile-no="0" expose-name="0" /></buddies></contacts></args>SIPP
+    EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
+    contact = Fetion::Contact.new
+    contact.uid = '295098062'
+    contact.uri = 'sip:638993408@fetion.com.cn;p=2242'
+    SipcMessage.handle_contact_request(@fetion, contact, :result => "1").should == sipc_message
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,29 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -06:00
+date: 2010-05-23 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: guid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.
 email: flyerhzm@gmail.com
 executables: 
@@ -52,8 +63,10 @@ files:
 - lib/rfetion/contact.rb
 - lib/rfetion/fetion.rb
 - lib/rfetion/message.rb
+- lib/rfetion/pic_certificate.rb
 - lib/rfetion/sipc_message.rb
 - rfetion.gemspec
+- spec/rfetion/buddy_list_spec.rb
 - spec/rfetion/fetion_spec.rb
 - spec/rfetion/sipc_message_spec.rb
 - spec/spec.opts
@@ -71,22 +84,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.
 test_files: 
+- spec/rfetion/buddy_list_spec.rb
 - spec/rfetion/fetion_spec.rb
 - spec/rfetion/sipc_message_spec.rb
 - spec/spec_helper.rb