rfetion 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/rfetion/buddy_list.rb

@@ -0,0 +1,14 @@
+class Fetion
+  class BuddyList
+    attr_reader :id, :name
+    
+    def initialize(id, name)
+      @id = id
+      @name = name
+    end
+    
+    def self.parse(buddy_list)
+      self.new(buddy_list['id'], buddy_list['name'])
+    end
+  end
+end

data/lib/rfetion/contact.rb

@@ -1,11 +1,25 @@
-class Contact
-  attr_reader :sid, :uri, :mobile_no, :nickname, :impresa, :nickname
+class Fetion
+  class Contact
+    attr_accessor :id, :sid, :uri, :mobile_no, :nickname, :impresa, :nickname, :status
 
-  def initialize(attrs)
-    @sid = attrs["sid"]
-    @uri = attrs["su"]
-    @mobile_no = attrs["m"]
-    @nickname = attrs["n"]
-    @impresa = attrs["i"]
+    STATUS = {
+      "400" => "在线",
+      "300" => "离开",
+      "600" => "繁忙",
+      "0" => "脱机"
+    }
+
+    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
+    end
   end
 end

data/lib/rfetion/fetion.rb

@@ -9,7 +9,7 @@ require 'logger'
 
 class Fetion
   attr_accessor :mobile_no, :sid, :password
-  attr_reader :user_id, :uri, :contacts, :response, :nickname
+  attr_reader :user_id, :uri, :contacts, :buddy_lists, :response, :nickname, :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%'
@@ -21,8 +21,10 @@ class Fetion
 
   def initialize
     @call = @alive = @seq = 0
+    @buddy_lists = []
     @buddies = []
     @contacts = []
+    @receives = []
     @logger = Logger.new(STDOUT)
     @logger.level = Logger::INFO
     @guid = Guid.new.to_s
@@ -178,8 +180,7 @@ class Fetion
 
     curl_exec(SIPP, next_url('i'))
     curl_exec(SipcMessage.register_first(self))
-    response = pulse
-    parse_nonce(response)
+    pulse(SipcMessage::Unauthoried)
 
     @logger.debug "fetion register first success"
   end
@@ -189,8 +190,7 @@ class Fetion
 
     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>|
     curl_exec(SipcMessage.register_second(self))
-    response = pulse
-    parse_info(response)
+    pulse
 
     @logger.debug "fetion register second success"
   end
@@ -199,11 +199,8 @@ class Fetion
     @logger.info "fetion get contacts"
 
     curl_exec(SipcMessage.get_group_list(self))
-
-    response = curl_exec(SipcMessage.presence(self))
-    response = curl_exec(SipcMessage.get_group_topic(self))
-    parse_contacts(response)
-
+    curl_exec(SipcMessage.presence(self))
+    curl_exec(SipcMessage.get_group_topic(self))
     curl_exec(SipcMessage.get_address_list(self))
     pulse
 
@@ -214,11 +211,7 @@ class Fetion
     @logger.info "fetion send cat msg to #{receiver}"
 
     curl_exec(SipcMessage.send_cat_msg(self, receiver, content))
-    response = pulse
-
-    raise FetionException.new("Fetion Error: Send cat msg error") unless Net::HTTPSuccess === response
-    sipc_message = SipcMessage.sipc_response(response.body)
-    raise Fetion::SendMsgException.new("Fetion Error: Send cat msg error with #{sipc_message}") unless SipcMessage::OK === sipc_message
+    pulse
 
     @logger.info "fetion send cat msg to #{receiver} success"
   end
@@ -227,11 +220,7 @@ class Fetion
     @logger.info "fetion send cat sms to #{receiver}"
 
     curl_exec(SipcMessage.send_cat_sms(self, receiver, content))
-    response = pulse
-
-    raise FetionException.new("Fetion Error: Send cat sms error") unless Net::HTTPSuccess === response
-    sipc_message = SipcMessage.sipc_response(response.body)
-    raise Fetion::SendSmsException.new("Fetion Error: Send cat sms error with #{sipc_message}") unless SipcMessage::Send === sipc_message
+    pulse(SipcMessage::Send)
 
     @logger.info "fetion send cat sms to #{receiver} success"
   end
@@ -246,11 +235,7 @@ class Fetion
     @logger.info "fetion schedule send sms to #{receivers.join(', ')}"
     
     curl_exec(SipcMessage.set_schedule_sms(self, receivers, content, time.strftime('%Y-%m-%d %H:%M:%S')))
-    response = pulse
-
-    raise FetionException.new("Fetion Error: Set schedule sms error") unless Net::HTTPSuccess === response
-    sipc_message = SipcMessage.sipc_response(response.body)
-    raise Fetion::SetScheduleSmsException.new("Fetion Error: Set schedule sms error with #{sipc_message}") unless SipcMessage::OK === sipc_message
+    pulse
 
     @logger.info "fetion schedule send sms to #{receivers.join(', ')} success"
   end
@@ -260,13 +245,10 @@ class Fetion
   #   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"
+    
     curl_exec(SipcMessage.add_buddy(self, options))
-    response = pulse
-    raise FetionException.new("Fetion Error: Add buddy error") unless Net::HTTPSuccess === response
-    sipc_message = SipcMessage.sipc_response(response.body)
-    raise Fetion::AddBuddyException.new("Fetion Error: Add buddy error with #{sipc_message}") unless SipcMessage::OK === sipc_message
+    pulse
 
     @logger.info "fetion send request to add #{uri} as friend success"
   end
@@ -276,25 +258,28 @@ class Fetion
   #   sip
   def get_contact_info(options)
     uri = options[:mobile_no] ? "tel:#{options[:mobile_no]}" : "sip:#{options[:sip]}"
-
     @logger.info "fetion get contact info of #{uri}"
+    
     curl_exec(SipcMessage.get_contact_info(self, uri))
-    response = pulse
-
-    raise FetionException.new("Fetion Error: get contact info error") unless Net::HTTPSuccess === response
-    sipc_response = SipcMessage.sipc_response(response.body)
-    raise Fetion::NoUserException.new("Fetion Error: get contact info #{uri} with #{sipc_response}") unless SipcMessage::OK === sipc_response
+    pulse
 
     @logger.info "fetion get contact info of #{uri} success"
   end
 
+  def keep_alive
+    @logger.info "fetion keep alive"
+    
+    pulse
+
+    @logger.info "fetion keep alive success"
+  end
+
   def logout
     @logger.info "fetion logout"
 
     curl_exec(SipcMessage.logout(self))
-    response = pulse
+    pulse
 
-    # raise FetionException.new("Fetion Error: Logout error") unless response.is_a? Net::HTTPSuccess
     @logger.info "fetion logout success"
   end
 
@@ -324,65 +309,16 @@ class Fetion
     @logger.debug "user_id: " + @user_id
     @logger.debug "sid: " + @sid
   end
-  
-  def parse_nonce(response)
-    raise FetionException.new("Fetion Error: Register first error.") unless Net::HTTPSuccess === response
-    sipc_response = SipcMessage.sipc_response(response.body)
-    raise Fetion::RegisterException.new("Fetion Error: Register first should get unauthorized response with #{sipc_response}.") unless SipcMessage::Unauthoried === sipc_response
-    raise Fetion::NoNonceException.new("Fetion Error: No nonce found") unless response.body =~ /nonce="(.*?)",key="(.*?)",signature="(.*?)"/
-      
-    @nonce = $1
-    @key = $2
-    @signature = $3
-    @response = calc_response
-
-    @logger.debug "nonce: #{@nonce}"
-    @logger.debug "key: #{@key}"
-    @logger.debug "signature: #{@signature}"
-    @logger.debug "response: #{@response}"
-  end
-
-  def parse_info(response)
-    raise Fetion::FetionException.new("Fetion Error: Register second error.") unless Net::HTTPSuccess === response
-    sipc_response = SipcMessage.sipc_response(response.body)
-    raise Fetion::RegisterException.new("Fetion Error: Register second error with #{sipc_response}.") unless SipcMessage::OK === sipc_response
-
-    response.body.scan(%r{<results>.*?</results>}).each do |results|
-      doc = Nokogiri::XML(results)
-      personal = doc.root.xpath("/results/user-info/personal").first
-      @nickname = personal['nickname']
-      doc.root.xpath("/results//buddies/b").each do |buddy|
-        @buddies << {:uri => buddy["u"]}
-      end
-    end
 
-    @logger.debug "nickname: #@nickname"
-    @logger.debug "buddies: #{@buddies.inspect}"
+  def pulse(expected=SipcMessage::OK)
+    curl_exec(SIPP, next_url, expected)
   end
 
-  def parse_contacts(response)
-    raise FetionException.new('Fetion Error: get contacts error.') unless Net::HTTPSuccess === response
-    sipc_response = SipcMessage.sipc_response(response.body)
-    raise Fetion::GetContactsException.new("Fetion Error: get contacts failed with #{sipc_response}.") unless Net::HTTPSuccess === response and SipcMessage::OK === sipc_response
-
-    response.body.scan(%r{<events>.*?</events>}).each do |results|
-      doc = Nokogiri::XML(results)
-      doc.root.xpath("/events//c/p").each do |person|
-        @contacts << Contact.new(person) if person['sid']
-      end
-    end
-
-    @logger.debug "contacts: #{@contacts.inspect}"
-  end
-
-  def pulse
-    curl_exec(SIPP)
-  end
-
-  def curl_exec(body='', url=next_url)
+  def curl_exec(body='', url=next_url, expected=SipcMessage::OK)
     @logger.debug "fetion curl exec"
     @logger.debug "url: #{url}"
     @logger.debug "body: #{body}"
+    
     uri = URI.parse(url)
     http = Net::HTTP.new(uri.host, uri.port)
     headers = {'Content-Type' => 'application/oct-stream', 'Pragma' => "xz4BBcV#{@guid}", 'User-Agent' => USER_AGENT, 'Cookie' => "ssic=#{@ssic}", 'Content-Length' => body.length.to_s}
@@ -391,6 +327,71 @@ class Fetion
     @logger.debug "response: #{response.inspect}"
     @logger.debug "response body: #{response.body}"
     @logger.debug "fetion curl exec complete"
+    
+    raise FetionException.new("request_url: #{url}, request_body: #{body}, response: #{response.code}, response_body: #{response.body}") unless Net::HTTPSuccess === response
+    sipc_response = SipcMessage.sipc_response(response.body, self)
+    
+    if sipc_response
+      raise Fetion::SipcException.new(sipc_response, "request_url: #{url}, request_body: #{body}, sipc_response: #{sipc_response}") unless expected === sipc_response
+    
+      if sipc_response.code == 401
+        # unauthorized, get nonce, key and signature
+        raise Fetion::NoNonceException.new("Fetion Error: No nonce found") unless response.body =~ /nonce="(.*?)",key="(.*?)",signature="(.*?)"/
+        @nonce = $1
+        @key = $2
+        @signature = $3
+        @response = calc_response
+
+        @logger.debug "nonce: #{@nonce}"
+        @logger.debug "key: #{@key}"
+        @logger.debug "signature: #{@signature}"
+        @logger.debug "response: #{@response}"
+      else
+        response.body.scan(%r{<results>.*?</results>}).each do |results|
+          doc = Nokogiri::XML(results)
+          doc.root.xpath("/results/user-info/personal").each do |personal_element|
+            @nickname = personal_element['nickname']
+            @logger.debug "nickname: #@nickname"
+          end
+          doc.root.xpath("/results/user-info/contact-list/buddy-lists/buddy-list").each do |buddy_list|
+            @buddy_lists << Fetion::BuddyList.parse(buddy_list)
+            @logger.debug "buddy_lists: #{@buddy_lists.inspect}"
+          end
+          doc.root.xpath("/results/user-info/contact-list/buddies/b").each do |buddy|
+            @buddies << {:uri => buddy["u"]}
+            @logger.debug "buddies: #{@buddies.inspect}"
+          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
+            end
+          end
+        end
+        
+        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$}m) if receive_messages.empty?
+        receive_messages.each do |message_response|
+          message_header, message_content = message_response.split(/(\r)?\n(\r)?\n/)
+          sip = sent_at = length = nil
+          message_header.split(/(\r)?\n/).each do |line|
+            case line
+            when /^F: sip:(.+)/ then sip = $1
+            when /^D: (.+)/ then sent_at = Time.parse($1)
+            when /^L: (\d+)/ then length = $1.to_i
+            end
+          end
+          text = message_content.slice(0, length)
+          @receives << Fetion::Message.new(sip, sent_at, text)
+        end
+      end
+    end
     response
   end
 
@@ -438,3 +439,12 @@ class Fetion::SetScheduleSmsException < FetionException; end
 class Fetion::AddBuddyException < FetionException; end
 class Fetion::GetContactsException < FetionException; end
 class Fetion::NoUserException < FetionException; end
+class Fetion::SipcException < FetionException
+  attr_reader :code, :description, :message
+  
+  def initialize(sipc_response, message)
+    @code = sipc_response.code
+    @description = sipc_response.description
+    @message = message
+  end
+end

data/lib/rfetion/message.rb

@@ -0,0 +1,11 @@
+class Fetion
+  class Message
+    attr_reader :sip, :sent_at, :text
+
+    def initialize(sip, sent_at, text)
+      @sip = sip
+      @sent_at = sent_at
+      @text = text
+    end
+  end
+end

data/lib/rfetion/sipc_message.rb

@@ -58,39 +58,29 @@ class SipcMessage
     sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => '3 R', :X => 0, :with_l => false)
   end
 
-  # command       one of 'R', 'S'
-  # with_l        display L or not
-  # body          sipc body
-  def self.sipc_create(options)
-    options = {:body => '', :with_l => true}.merge(options)
-    body = options.delete(:body)
-    with_l = options.delete(:with_l)
-
-    sorted_key = [:F, :I, :Q, :CN, :CL, :A, :AK, :X, :T, :K, :N, :SV]
-    sipc = "#{options.delete(:command)} fetion.com.cn SIP-C/4.0\r\n"
-    sorted_key.each {|k| sipc += "#{k}: #{options[k]}\r\n" if options[k]}
-    sipc += "L: #{body == '' ? 4 : body.size}\r\n" if with_l
-    sipc += "\r\n#{body}#{Fetion::SIPP}"
-    sipc
-  end
-
-  def self.sipc_response(http_response_body)
-    sipc, code, message = http_response_body.split(/(\r)?\n/).first.split(' ')
-    RESPONSES[code.to_i].new(code, message)
+  def self.sipc_response(http_response_body, fetion)
+    return if http_response_body == Fetion::SIPP
+    
+    if http_response_body =~ %r{^SIP-C/4.0}
+      sipc, code, *message = http_response_body.split(/(\r)?\n/).first.split(' ')
+      RESPONSES[code.to_i].new(code.to_i, message.join(' '))
+    elsif http_response_body =~ %r{(BN|M) #{fetion.sid} SIP-C/4.0}
+      SipcMessage::OK.new(200, $1)
+    end
   rescue NoMethodError
-    raise FetionException.new("Fetion error: No response to #{code} #{message}")
+    raise FetionException.new("Fetion error: No response to #{code} #{message.join(' ')}")
   end
 
   class Response
-    attr_reader :code, :message
+    attr_reader :code, :description
 
-    def initialize(code, message)
+    def initialize(code, description)
       @code = code
-      @message = message
+      @description = description
     end
 
     def to_s
-      "#@code #@message"
+      "#@code #@description"
     end
   end
 
@@ -109,4 +99,21 @@ class SipcMessage
     404 => SipcMessage::NotFound,
     421 => SipcMessage::ExtentionRequired
   }
+
+  private
+    # command       one of 'R', 'S'
+    # with_l        display L or not
+    # body          sipc body
+    def self.sipc_create(options)
+      options = {:body => '', :with_l => true}.merge(options)
+      body = options.delete(:body)
+      with_l = options.delete(:with_l)
+
+      sorted_key = [:F, :I, :Q, :CN, :CL, :A, :AK, :X, :T, :K, :N, :SV]
+      sipc = "#{options.delete(:command)} fetion.com.cn SIP-C/4.0\r\n"
+      sorted_key.each {|k| sipc += "#{k}: #{options[k]}\r\n" if options[k]}
+      sipc += "L: #{body == '' ? 4 : body.size}\r\n" if with_l
+      sipc += "\r\n#{body}#{Fetion::SIPP}"
+      sipc
+    end
 end

data/lib/rfetion.rb

@@ -1,4 +1,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/sipc_message'
 require File.dirname(__FILE__) + '/rfetion/fetion'

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-05-10}
+  s.date = %q{2010-05-15}
   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"]
@@ -22,9 +22,11 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/rfetion",
      "lib/rfetion.rb",
+     "lib/rfetion/buddy_list.rb",
      "lib/rfetion/command.rb",
      "lib/rfetion/contact.rb",
      "lib/rfetion/fetion.rb",
+     "lib/rfetion/message.rb",
      "lib/rfetion/sipc_message.rb",
      "rfetion.gemspec",
      "spec/rfetion/fetion_spec.rb",

data/spec/rfetion/fetion_spec.rb

@@ -124,6 +124,7 @@ EOF
         @fetion.register_second
 
         @fetion.nickname.should == "flyerhzm"
+        @fetion.buddy_lists.collect {|buddy_list| buddy_list.name}.should == ['我的好友', '好友', '同学']
       end
     end
   end
@@ -131,6 +132,8 @@ EOF
   describe "get contacts" do
     before :each do
       @fetion.instance_variable_set(:@seq, 5)
+      @fetion.instance_variable_set(:@sid, "730020377")
+      @fetion.instance_variable_set(:@user_id, "390937727")
     end
 
     it "should get all contacts" do
@@ -227,6 +230,112 @@ EOF
       @fetion.get_contacts
       @fetion.contacts.collect {|contact| contact.sid}.should == ["793401629", "737769829", "660250260", "926157269", "669700695", "760087520", "480867781", "572512981", "638993408"]
     end
+
+    it "should get received msg" do
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=6", :body => "SIPP")
+      response_body =<<-EOF
+SIP-C/4.0 200 OK
+I: 3
+Q: 1 S
+L: 59
+
+<results><group-list  version ="1" ></group-list></results>SIPP
+EOF
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=7", :body => "SIPP")
+      response_body =<<-EOF
+SIP-C/4.0 200 OK
+I: 4
+Q: 1 SUB
+
+M 730020377 SIP-C/4.0
+F: sip:480867781@fetion.com.cn;p=16105
+I: -1
+C: text/plain
+Q: 2 M
+D: Mon, 10 May 2010 14:26:17 GMT
+L: 12
+
+testtesttestBN 730020377 SIP-C/4.0
+N: SystemNotifyV4
+L: 84
+I: 1
+Q: 3 BN
+
+<events><event type="MobileMailBoxChanged"><mail unread-count="1"/></event></events>BN 730020377 SIP-C/4.0
+N: PresenceV4
+I: 1
+L: 322
+Q: 4 BN
+
+<events><event type="PresenceChanged"><contacts><c id="222516658"><p v="0" sid="793401629" su="sip:793401629@fetion.com.cn;p=1919" m="13601804916" c="CMCC" cs="0" s="1" l="0" svc="" n="Peter" i="人生哈哈哈" p="428986348" sms="0.0:0:0" sp="0" sh="0"/><pr di="" b="0" d="" dt="" dc="0"/></c></contacts></event></events>BN 730020377 SIP-C/4.0
+N: PresenceV4
+I: 1
+L: 329
+Q: 5 BN
+
+<events><event type="PresenceChanged"><contacts><c id="229415466"><p v="0" sid="737769829" su="sip:737769829@fetion.com.cn;p=4078" m="13817731963" c="CMCC" cs="0" s="1" l="8" svc="" n="ice" i="" p="-2000590228" sms="0.0:0:0" sp="0" sh="0"/><pr di="PCCL030516427968" b="400" d="" dt="PC" dc="137"/></c></contacts></event></events>BN 730020377 SIP-C/4.0
+N: PresenceV4
+I: 1
+L: 303
+Q: 6 BN
+
+<events><event type="PresenceChanged"><contacts><c id="228358286"><p v="0" sid="660250260" su="sip:660250260@fetion.com.cn;p=3854" m="13795359343" c="CMCC" cs="0" s="1" l="4" svc="" n="蔡智武" i="" p="0" sms="0.0:0:0" sp="0" sh="0"/><pr di="" b="0" d="" dt="" dc="0"/></c></contacts></event></events>BN 730020377 SIP-C/4.0
+N: PresenceV4
+I: 1
+L: 643
+Q: 7 BN
+
+<events><event type="PresenceChanged"><contacts><c id="390937727"><p v="0" cs="0" n="flyerhzm" i="http://www.fetionrobot.com" sms="0.0:0:0" sp="0"/></c><c id="665046562"><p v="0" sid="926157269" su="sip:926157269@fetion.com.cn;p=12906" m="" c="CMCC" cs="0" s="1" l="0" svc="" n="黄雅莉" i="" p="0" sms="10099.12:57:24" sp="0" sh="0"/><pr di="" b="0" d="" dt="" dc="0"/></c><c id="227091544"><p v="0" sid="669700695" su="sip:669700695@fetion.com.cn;p=3546" m="13764589545" c="CMCC" cs="0" s="1" l="10" svc="" n="郭庆" i="looloo" p="598224859" sms="0.0:0:0" sp="0" sh="0"/><pr di="" b="0" d="" dt="" dc="0"/></c></contacts></event></events>BN 730020377 SIP-C/4.0
+N: PresenceV4
+I: 1
+L: 338
+Q: 8 BN
+
+<events><event type="PresenceChanged"><contacts><c id="296436724"><p v="0" sid="760087520" su="sip:760087520@fetion.com.cn;p=2467" m="13656681075" c="CMCC" cs="0" s="1" l="5" svc="" n="蒋健" i="TD只需成功，不许失败" p="2074595345" sms="0.0:0:0" sp="0" sh="0"/><pr di="" b="0" d="" dt="" dc="0"/></c></contacts></event></events>BN 730020377 SIP-C/4.0
+N: PresenceV4
+I: 1
+L: 291
+Q: 9 BN
+
+<events><event type="PresenceChanged"><contacts><c id="732743291"><p v="0" sid="480867781" su="sip:480867781@fetion.com.cn;p=16105" m="" c="" cs="1" s="1" l="0" svc="" n="黄志敏" i="" p="0" sms="365.0:0:0" sp="0" sh="1"/><pr di="" b="0" d="" dt="" dc="0"/></c></contacts></event></events>BN 730020377 SIP-C/4.0
+N: PresenceV4
+I: 1
+L: 369
+Q: 10 BN
+
+<events><event type="PresenceChanged"><contacts><c id="226911221"><p v="0" sid="572512981" su="sip:572512981@fetion.com.cn;p=3544" m="13764325001" c="CMCC" cs="0" s="1" l="10" svc="" n="陈勇sh" i="http://slide.news.sina.com.cn/c/slide_1_797_11165.html#p=1" p="-98773891" sms="0.0:0:0" sp="0" sh="0"/><pr di="" b="0" d="" dt="" dc="0"/></c></contacts></event></events>BN 730020377 SIP-C/4.0
+N: PresenceV4
+I: 1
+L: 300
+Q: 11 BN
+
+<events><event type="PresenceChanged"><contacts><c id="295098062"><p v="0" sid="638993408" su="sip:638993408@fetion.com.cn;p=2242" m="13634102006" c="CMCC" cs="0" s="1" l="0" svc="" n="梦妍" i="" p="0" sms="0.0:0:0" sp="0" sh="0"/><pr di="" b="0" d="" dt="" dc="0"/></c></contacts></event></events>SIPP
+EOF
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=8", :body => response_body)
+      response_body =<<-EOF
+SIP-C/4.0 200 OK
+I: 5
+Q: 1 S
+L: 835
+
+<results><topic-list event="RecommendGroupTopic" version="171" max-count="5"><topic title="陌上人如玉 韩庚世无双" url="http://group.fetion.com.cn/topic/common/31333572/196313?c=[c:m161.com.cn]" create-date="2010-5-6 15:36:30" id="171" topic-type="1"  /><topic title="世博园10大最美景观" url="http://group.fetion.com.cn/topic/common/8249155/196251?c=[c:m161.com.cn]" create-date="2010-5-6 15:33:49" id="170" topic-type="1"  /><topic title="诺基亚价值百万的手机" url="http://group.fetion.com.cn/topic/common/7366464/196288?c=[c:m161.com.cn]" create-date="2010-5-6 15:31:57" id="169" topic-type="1"  /><topic title="选秀调查：伪娘的真相" url="http://group.fetion.com.cn/topic/common/30660603/196323?c=[c:m161.com.cn]" create-date="2010-5-6 15:22:51" id="168" topic-type="1"  /></topic-list></results>SIPP
+EOF
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=9", :body => response_body)
+      response_body =<<-EOF
+SIP-C/4.0 200 OK
+I: 6
+Q: 1 S
+L: 61
+
+<results><contacts version="326661305" ></contacts></results>SIPP
+EOF
+      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 {|c| c.sid}.should == ["793401629", "737769829", "660250260", "926157269", "669700695", "760087520", "480867781", "572512981", "638993408"]
+      @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"]
+    end
   end
 
   describe "send msg" do
@@ -353,7 +462,7 @@ Q: 1 S
 SIPP
 EOF
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=13", :body => response_body)
-      lambda {@fetion.get_contact_info(:friend_mobile => '15800681505')}.should raise_exception(Fetion::NoUserException)
+      lambda {@fetion.get_contact_info(:friend_mobile => '15800681505')}.should raise_exception(Fetion::SipcException)
     end
   end
 
@@ -363,8 +472,54 @@ EOF
     end
 
     it "should logout" do
-      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=13", :body => '')
-      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=14", :body => '')
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=13", :body => "SIPP")
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=14", :body => "SIPP")
+    end
+  end
+
+  describe "keep-alive" do
+    before :each do
+      @fetion.instance_variable_set(:@seq, 10)
+      @fetion.instance_variable_set(:@sid, "730020377")
+      contact = Fetion::Contact.new
+      contact.id = '295098062'
+      @fetion.instance_variable_set(:@contacts, [contact])
+    end
+
+    it "should get presence with online" do
+      response_body =<<-EOF
+BN 730020377 SIP-C/4.0
+N: PresenceV4
+I: 1
+L: 154
+Q: 11 BN
+
+<events><event type="PresenceChanged"><contacts><c id="295098062"><pr di="PCCL030340538483" 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=11", :body => response_body)
+      @fetion.keep_alive
+      @fetion.contacts.find {|contact| contact.id == '295098062'}.status.should == "400"
+    end
+
+    it "should get receive msg" do
+      response_body =<<-EOF
+M 730020377 SIP-C/4.0
+I: -17
+Q: 4 M
+F: sip:638993408@fetion.com.cn;p=2242
+C: text/html-fragment
+K: SaveHistory
+L: 12
+D: Tue, 11 May 2010 15:18:56 GMT
+XI: 7eb8bc4e9df742b2aa557f9e85c8d8af
+
+testtesttestSIPP
+EOF
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=11", :body => response_body)
+      @fetion.keep_alive
+      @fetion.receives.collect {|r| r.sip}.should == ["638993408@fetion.com.cn;p=2242"]
+      @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
   end
 end

data/spec/spec.opts

@@ -4,5 +4,6 @@ specdoc
 --reverse
 --timeout
 20
+--backtrace
 --loadby
 mtime

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -06:00
+date: 2010-05-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,9 +47,11 @@ files:
 - VERSION
 - bin/rfetion
 - lib/rfetion.rb
+- lib/rfetion/buddy_list.rb
 - lib/rfetion/command.rb
 - lib/rfetion/contact.rb
 - lib/rfetion/fetion.rb
+- lib/rfetion/message.rb
 - lib/rfetion/sipc_message.rb
 - rfetion.gemspec
 - spec/rfetion/fetion_spec.rb