rfetion 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/rfetion/contact.rb

@@ -1,3 +1,4 @@
+#coding: utf-8
 class Fetion
   class Contact
     attr_accessor :id, :sid, :uri, :mobile_no, :nickname, :impresa, :nickname, :status

data/lib/rfetion/fetion.rb

@@ -8,8 +8,8 @@ require 'openssl'
 require 'logger'
 
 class Fetion
-  attr_accessor :mobile_no, :sid, :password
-  attr_reader :user_id, :uri, :contacts, :buddy_lists, :response, :nickname, :receives
+  attr_accessor :mobile_no, :sid, :password, :seq, :ssic, :guid, :uri
+  attr_reader :user_id, :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%'
@@ -48,6 +48,16 @@ class Fetion
     fetion.logout
   end
 
+  def Fetion.keep_alive(options)
+    Fetion.open(options) do
+      get_contacts
+      keep_alive
+      sleep(15)
+      keep_alive
+      p receives
+    end
+  end
+
   # options
   #   mobile_no
   #   sid
@@ -283,6 +293,31 @@ class Fetion
     @logger.info "fetion logout success"
   end
 
+  def create_session(sipc_response)
+    @logger.info "fetion create session"
+
+    sipc_response = curl_exec(SipcMessage.create_session(self, sipc_response))
+    pulse unless sipc_response
+
+    @logger.info "fetion create session success"
+  end
+
+  def session_connected(sipc_response)
+    @logger.info "fetion session connected"
+
+    curl_exec(SipcMessage.session_connected(self, sipc_response))
+
+    @logger.info "fetion session connected success"
+  end
+
+  def msg_received(message_response)
+    @logger.info "fetion msg received"
+
+    curl_exec(SipcMessage.msg_received(self, message_response))
+
+    @logger.info "fetion msg received success"
+  end
+
   def parse_ssic(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=(.*);/
@@ -332,9 +367,9 @@ class Fetion
     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
+      raise Fetion::SipcException.new(sipc_response, "request_url: #{url}, request_body: #{body}, sipc_response: #{sipc_response}") unless sipc_response.class == expected
     
-      if sipc_response.code == 401
+      if sipc_response.first_line =~ /401/
         # unauthorized, get nonce, key and signature
         raise Fetion::NoNonceException.new("Fetion Error: No nonce found") unless response.body =~ /nonce="(.*?)",key="(.*?)",signature="(.*?)"/
         @nonce = $1
@@ -346,6 +381,10 @@ class Fetion
         @logger.debug "key: #{@key}"
         @logger.debug "signature: #{@signature}"
         @logger.debug "response: #{@response}"
+      elsif sipc_response.contain?('I')
+        create_session(sipc_response)
+      elsif sipc_response.contain?('O')
+        session_connected(sipc_response)
       else
         response.body.scan(%r{<results>.*?</results>}).each do |results|
           doc = Nokogiri::XML(results)
@@ -355,11 +394,9 @@ class Fetion
           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
         
@@ -376,11 +413,11 @@ class Fetion
         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 = response.body.scan(%r{M #{@sid} SIP-C/4.0.*?SIPP\r?\n?$}m) if receive_messages.empty?
         receive_messages.each do |message_response|
-          message_header, message_content = message_response.split(/(\r)?\n(\r)?\n/)
+          message_header, message_content = message_response.split(/\r\n\r\n/)
           sip = sent_at = length = nil
-          message_header.split(/(\r)?\n/).each do |line|
+          message_header.split(/\r\n/).each do |line|
             case line
             when /^F: sip:(.+)/ then sip = $1
             when /^D: (.+)/ then sent_at = Time.parse($1)
@@ -389,10 +426,11 @@ class Fetion
           end
           text = message_content.slice(0, length)
           @receives << Fetion::Message.new(sip, sent_at, text)
+          msg_received(message_response)
         end
       end
     end
-    response
+    sipc_response
   end
 
   def next_url(t = 's')
@@ -440,11 +478,10 @@ class Fetion::AddBuddyException < FetionException; end
 class Fetion::GetContactsException < FetionException; end
 class Fetion::NoUserException < FetionException; end
 class Fetion::SipcException < FetionException
-  attr_reader :code, :description, :message
+  attr_reader :first_line, :message
   
   def initialize(sipc_response, message)
-    @code = sipc_response.code
-    @description = sipc_response.description
+    @first_line = sipc_response.first_line
     @message = message
   end
-end
+end

data/lib/rfetion/sipc_message.rb

@@ -58,29 +58,98 @@ class SipcMessage
     sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => '3 R', :X => 0, :with_l => false)
   end
 
+  def self.create_session(fetion, last_sipc_response)
+    header = {}
+    last_sipc_response.sections.each do |section|
+      sipc_header = section.split("\r\n\r\n").first
+      if sipc_header.split("\r\n").first =~ %r|I #{fetion.sid} SIP-C/4.0|
+        sipc_header.split("\r\n")[1..-1].each do |line|
+          key, value = line.split(': ', 2)
+          if key == 'K'
+            header['K'] ? header['K'] << value : header['K'] = [value]
+          else
+            header[key] = value
+          end
+        end
+        body = %Q|v=0\r\no=-0 0 IN 127.0.0.1:8001\r\ns=session\r\nc=IN IP4 127.0.0.1:8001\r\nt=0 0\r\nm=message 8001 sip sip:#{fetion.uri}\r\n|
+        return sipc_response_create(:I => header['I'], :Q => header['Q'], :F => header['F'], :K => header['K'], :body => body, :f_first => false)
+      end
+    end
+  end
+
+  def self.session_connected(fetion, last_sipc_response)
+    header = {}
+    last_sipc_response.sections.each do |section|
+      sipc_header = section.split("\r\n\r\n").first
+      if sipc_header.split("\r\n").first =~ %r|O #{fetion.sid} SIP-C/4.0|
+        sipc_header.split("\r\n")[1..-1].each do |line|
+          key, value = line.split(': ', 2)
+          header[key] = value
+        end
+        header['K'] = ['text/html-fragment', 'text/plain']
+        return sipc_response_create(:F => header['F'], :I => header['I'], :Q => header['Q'], :K => header['K'], :with_l => false)
+      end
+    end
+  end
+
+  def self.msg_received(fetion, message_response)
+    header = {}
+    message_response.split("\r\n\r\n").first.split("\r\n")[1..-1].each do |line|
+      key, value = line.split(': ', 2)
+      header[key] = value
+    end
+    sipc_response_create(:F => header['F'], :I => header['I'], :Q => header['Q'], :with_l => false)
+  end
+
+  def self.close_session(fetion, receiver_uri)
+    sipc_create(:command => 'B', :F => fetion.sid, :I => fetion.next_call, :Q => '2 B', :T => "sip:#{receiver_uri}", :with_l => false)
+  end
+
   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)
+    sections = []
+    body = http_response_body
+    while true
+      index = body.index(%r{(BN|M|I|O) #{fetion.sid} SIP-C/4.0}, 1)
+      if index
+        sections << body[0...index]
+        body = body[index..-1]
+      else
+        sections << body
+        break
+      end
     end
+    SipcMessage::Response.new(sections)
   rescue NoMethodError
-    raise FetionException.new("Fetion error: No response to #{code} #{message.join(' ')}")
+    raise FetionException.new("Fetion error: No response to #{sections.first.split("\r\n").first}")
   end
 
   class Response
-    attr_reader :code, :description
+    attr_reader :sections
+
+    def initialize(sections)
+      @sections = sections
+    end
 
-    def initialize(code, description)
-      @code = code
-      @description = description
+    def class
+      if first_line =~ %r|^SIP-C/4.0 (\d{3})|
+        RESPONSES[$1.to_i]
+      else
+        SipcMessage::OK
+      end
+    end
+
+    def first_line
+      @sections.first.split("\r\n").first
+    end
+
+    def contain?(command)
+      @sections.find {|section| section.split("\r\n").first.index(%r|#{command} |) }
     end
 
     def to_s
-      "#@code #@description"
+      @sections.first.split("\r\n").first
     end
   end
 
@@ -116,4 +185,25 @@ class SipcMessage
       sipc += "\r\n#{body}#{Fetion::SIPP}"
       sipc
     end
+
+    def self.sipc_response_create(options)
+      options = {:body => '', :with_l => true, :f_first => true}.merge(options)
+      body = options.delete(:body)
+      with_l = options.delete(:with_l)
+
+      sorted_key = options.delete(:f_first) ? [:F, :I, :Q, :K] : [:I, :Q, :F, :K]
+      sipc = "SIP-C/4.0 200 OK\r\n"
+      sorted_key.each do |k|
+        if options[k]
+          if k == :K
+            sipc += options[:K].collect { |v| "#{k}: #{v}\r\n" }.join("")
+          else
+            sipc += "#{k}: #{options[k]}\r\n"
+          end
+        end
+      end
+      sipc += "L: #{body == '' ? 4 : body.size}\r\n" if with_l
+      sipc += "\r\n#{body}#{Fetion::SIPP}"
+      sipc
+    end
 end

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-05-15}
+  s.date = %q{2010-05-16}
   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"]

data/spec/rfetion/fetion_spec.rb

@@ -69,6 +69,7 @@ W: Digest algorithm="SHA1-sess-v4",nonce="1104E253661D71141DFE3FB020143E5A",key=
 
 SIPP
 EOF
+        response_body.gsub!("\n", "\r\n")
         FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=3", :body => response_body)
         @fetion.register_first
 
@@ -90,6 +91,7 @@ W: Digest algorithm="SHA1-sess-v4",nonce=""
 
 SIPP
 EOF
+        response_body.gsub!("\n", "\r\n")
         FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=3", :body => response_body)
         lambda { @fetion.register_first }.should raise_exception(Fetion::NoNonceException)
       end
@@ -120,6 +122,7 @@ L: 125
 
 <events><event type="SyncUserInfo"><user-info><score value="3760" level="7" level-score="3718"/></user-info></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=5", :body => response_body)
         @fetion.register_second
 
@@ -146,6 +149,7 @@ L: 59
 
 <results><group-list  version ="1" ></group-list></results>SIPP
 EOF
+      response_body.gsub!("\n", "\r\n")
       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
@@ -208,6 +212,7 @@ Q: 10 BN
 
 <events><event type="MobileMailBoxChanged"><mail unread-count="1"/></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=8", :body => response_body)
       response_body =<<-EOF
 SIP-C/4.0 200 OK
@@ -217,6 +222,7 @@ 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
+      response_body.gsub!("\n", "\r\n")
       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
@@ -226,12 +232,13 @@ L: 61
 
 <results><contacts version="326661305" ></contacts></results>SIPP
 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"]
     end
 
-    it "should get received msg" do
+    it "should get received msg while get contacts" 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
@@ -241,6 +248,7 @@ L: 59
 
 <results><group-list  version ="1" ></group-list></results>SIPP
 EOF
+      response_body.gsub!("\n", "\r\n")
       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
@@ -311,6 +319,7 @@ 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
+      response_body.gsub!("\n", "\r\n")
       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
@@ -320,6 +329,7 @@ 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
+      response_body.gsub!("\n", "\r\n")
       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
@@ -329,7 +339,9 @@ L: 61
 
 <results><contacts version="326661305" ></contacts></results>SIPP
 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)
+      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.receives.collect {|r| r.sip}.should == ["480867781@fetion.com.cn;p=16105"]
@@ -355,6 +367,7 @@ T: sip:638993408@fetion.com.cn;p=2242
 
 SIPP
 EOF
+      response_body.gsub!("\n", "\r\n")
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=12", :body => response_body)
       @fetion.send_msg('sip:638993408@fetion.com.cn;p=2242', 'test')
     end
@@ -375,6 +388,7 @@ Q: 1 M
 
 SIPP
 EOF
+      response_body.gsub!("\n", "\r\n")
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=12", :body => response_body)
       @fetion.send_sms('sip:638993408@fetion.com.cn;p=2242', 'test')
     end
@@ -395,6 +409,7 @@ L: 92
 
 <results><schedule-sms-list version="36"/><schedule-sms id="2124923" version="1"/></results>SIPP
 EOF
+      response_body.gsub!("\n", "\r\n")
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=12", :body => response_body)
       @fetion.set_schedule_sms('sip:638993408@fetion.com.cn;p=2242', 'test', Time.at(Time.now + 24*60*60))
     end
@@ -428,6 +443,7 @@ Q: 18 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="0" svc="" n="梦研" i="" p="0" sms="0.0:0:0" sp="0" sh="0"/><pr di="PCCL030333103486" b="400" d="" dt="PC" dc="17"/></c></contacts></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=13", :body => response_body)
       @fetion.add_buddy(:friend_mobile => '13634102006')
     end
@@ -448,6 +464,7 @@ L: 166
 
 <results><contact uri="tel:15800681507" version="0" user-id="625007505" mobile-no="15800681507" basic-service-status="0" carrier="CMCC" carrier-status="0"/></results>SIPP
 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.get_contact_info(:friend_mobile => '15800681507')
     end
@@ -461,6 +478,7 @@ Q: 1 S
 
 SIPP
 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)
       lambda {@fetion.get_contact_info(:friend_mobile => '15800681505')}.should raise_exception(Fetion::SipcException)
     end
@@ -496,11 +514,130 @@ 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
+      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.keep_alive
       @fetion.contacts.find {|contact| contact.id == '295098062'}.status.should == "400"
     end
 
+
+    it "should get receive msg for first session" do
+      response_body =<<-EOF
+I 730020377 SIP-C/4.0
+F: sip:638993408@fetion.com.cn;p=2242
+I: -13
+K: text/plain
+K: text/html-fragment
+K: multiparty
+K: nudge
+Q: 14 I
+L: 21
+
+s=session
+m=message 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
+O 730020377 SIP-C/4.0
+I: -13
+Q: 2 O
+K: text/plain
+K: text/html-fragment
+K: multiparty
+K: nudge
+F: sip:638993408@fetion.com.cn;p=2242
+
+A 730020377 SIP-C/4.0
+F: sip:638993408@fetion.com.cn;p=2242
+I: -13
+Q: 14 A
+
+SIPP
+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)
+      response_body =<<-EOF
+M 730020377 SIP-C/4.0
+I: -13
+Q: 4 M
+F: sip:638993408@fetion.com.cn;p=2242
+C: text/html-fragment
+K: SaveHistory
+L: 4
+D: Sun, 16 May 2010 02:16:00 GMT
+XI: 0dbdc4e81bff425dbcf8b591b497fe94
+
+testSIPP
+EOF
+      response_body.gsub!("\n", "\r\n")
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=14", :body => response_body)
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=15", :body => "SIPP")
+      @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("Sun, 16 May 2010 02:16:00 GMT")]
+      @fetion.receives.collect {|r| r.text}.should == ["test"]
+    end
+
+    it "should get receive msg without pulse for first session" do
+      response_body =<<-EOF
+I 730020377 SIP-C/4.0
+F: sip:638993408@fetion.com.cn;p=2242
+I: -13
+K: text/plain
+K: text/html-fragment
+K: multiparty
+K: nudge
+Q: 14 I
+L: 21
+
+s=session
+m=message 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)
+      response_body =<<-EOF
+O 730020377 SIP-C/4.0
+I: -13
+Q: 2 O
+K: text/plain
+K: text/html-fragment
+K: multiparty
+K: nudge
+F: sip:638993408@fetion.com.cn;p=2242
+
+A 730020377 SIP-C/4.0
+F: sip:638993408@fetion.com.cn;p=2242
+I: -13
+Q: 14 A
+
+SIPP
+EOF
+      response_body.gsub!("\n", "\r\n")
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=12", :body => response_body)
+      response_body =<<-EOF
+M 730020377 SIP-C/4.0
+I: -13
+Q: 4 M
+F: sip:638993408@fetion.com.cn;p=2242
+C: text/html-fragment
+K: SaveHistory
+L: 4
+D: Sun, 16 May 2010 02:16:00 GMT
+XI: 0dbdc4e81bff425dbcf8b591b497fe94
+
+testSIPP
+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)
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=14", :body => "SIPP")
+      @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("Sun, 16 May 2010 02:16:00 GMT")]
+      @fetion.receives.collect {|r| r.text}.should == ["test"]
+    end
+
     it "should get receive msg" do
       response_body =<<-EOF
 M 730020377 SIP-C/4.0
@@ -515,11 +652,8 @@ XI: 7eb8bc4e9df742b2aa557f9e85c8d8af
 
 testtesttestSIPP
 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.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/rfetion/sipc_message_spec.rb

@@ -10,6 +10,7 @@ describe SipcMessage do
     @fetion.sid = "730020377"
     @fetion.user_id = "390937727"
     @fetion.mobile_no = "15800681509"
+    @fetion.uri = "730020377@fetion.com.cn;p=6907"
     @fetion.response = "62E57A276EB9B7AAC233B8983A39941870CE74E3B2CD6480B5CA9DCF37C57DECEA250F261543CB4424EE9E72354C9F33C805EB9839BF96501D0261614E69BDF0DBDF484047750B3113DF8850FEF39428ADC17FE86E8800ED5A77AA7F6630F21AE8A24E6ECC2F003BF3B93E35051A7778D238F86D21581BC829679EBEAD36390F"
   end
 
@@ -18,76 +19,307 @@ describe SipcMessage do
     Guid.stubs(:new).returns(guid)
     guid.stubs(:hexdigest).returns(hexdigest)
     hexdigest.stubs(:upcase).returns("19D28D4978125CAA4F6E54277BA7D9EF")
-    sipc_message = %Q|R fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 1\r\nQ: 1 R\r\nCN: 19D28D4978125CAA4F6E54277BA7D9EF\r\nCL: type="pc" ,version="3.6.2020"\r\n\r\nSIPP|
+    sipc_message =<<-EOF
+R fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 1
+Q: 1 R
+CN: 19D28D4978125CAA4F6E54277BA7D9EF
+CL: type="pc" ,version="3.6.2020"
+
+SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.register_first(@fetion).should == sipc_message
   end
 
   it "should get register_second" do
-    sipc_message = %Q|R fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 1\r\nQ: 2 R\r\nA: Digest response="62E57A276EB9B7AAC233B8983A39941870CE74E3B2CD6480B5CA9DCF37C57DECEA250F261543CB4424EE9E72354C9F33C805EB9839BF96501D0261614E69BDF0DBDF484047750B3113DF8850FEF39428ADC17FE86E8800ED5A77AA7F6630F21AE8A24E6ECC2F003BF3B93E35051A7778D238F86D21581BC829679EBEAD36390F",algorithm="SHA1-sess-v4"\r\nAK: ak-value\r\nL: 447\r\n\r\n<args><device machine-code="B04B5DA2F5F1B8D01A76C0EBC841414C" /><caps value="ff" /><events value="7f" /><user-info mobile-no="15800681509" user-id="390937727"><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>SIPP|
+    sipc_message =<<-EOF
+R fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 1
+Q: 2 R
+A: Digest response="62E57A276EB9B7AAC233B8983A39941870CE74E3B2CD6480B5CA9DCF37C57DECEA250F261543CB4424EE9E72354C9F33C805EB9839BF96501D0261614E69BDF0DBDF484047750B3113DF8850FEF39428ADC17FE86E8800ED5A77AA7F6630F21AE8A24E6ECC2F003BF3B93E35051A7778D238F86D21581BC829679EBEAD36390F",algorithm="SHA1-sess-v4"
+AK: ak-value
+L: 447
+
+<args><device machine-code="B04B5DA2F5F1B8D01A76C0EBC841414C" /><caps value="ff" /><events value="7f" /><user-info mobile-no="15800681509" user-id="390937727"><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>SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.register_second(@fetion).should == sipc_message
   end
 
   it "should get group list" do
     @fetion.call = 2
-    sipc_message = %Q|S fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 3\r\nQ: 1 S\r\nN: PGGetGroupList\r\nL: 54\r\n\r\n<args><group-list attributes="name;identity" /></args>SIPP|
+    sipc_message =<<-EOF
+S fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 3
+Q: 1 S
+N: PGGetGroupList
+L: 54
+
+<args><group-list attributes="name;identity" /></args>SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.get_group_list(@fetion).should == sipc_message
   end
 
   it "should presence" do
     @fetion.call = 3
-    sipc_message = %Q|SUB fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 4\r\nQ: 1 SUB\r\nN: PresenceV4\r\nL: 87\r\n\r\n<args><subscription self="v4default;mail-count" buddy="v4default" version="0" /></args>SIPP|
+    sipc_message =<<-EOF
+SUB fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 4
+Q: 1 SUB
+N: PresenceV4
+L: 87
+
+<args><subscription self="v4default;mail-count" buddy="v4default" version="0" /></args>SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.presence(@fetion).should == sipc_message
   end
 
   it "should get group topic" do
     @fetion.call = 4
-    sipc_message = %Q|S fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 5\r\nQ: 1 S\r\nN: PGGetGroupTopic\r\nL: 27\r\n\r\n<args><topic-list /></args>SIPP|
+    sipc_message =<<-EOF
+S fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 5
+Q: 1 S
+N: PGGetGroupTopic
+L: 27
+
+<args><topic-list /></args>SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.get_group_topic(@fetion).should == sipc_message
   end
 
   it "should get address list" do
     @fetion.call = 5
-    sipc_message = %Q|S fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 6\r\nQ: 1 S\r\nN: GetAddressListV4\r\nL: 37\r\n\r\n<args><contacts version="0" /></args>SIPP|
+    sipc_message =<<-EOF
+S fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 6
+Q: 1 S
+N: GetAddressListV4
+L: 37
+
+<args><contacts version="0" /></args>SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.get_address_list(@fetion).should == sipc_message
   end
 
   it "should send cat sms" do
     @fetion.call = 8
-    sipc_message = %Q|M fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 9\r\nQ: 1 M\r\nT: sip:730020377@fetion.com.cn;p=6907\r\nN: SendCatSMS\r\nL: 4\r\n\r\ntestSIPP|
+    sipc_message =<<-EOF
+M fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 9
+Q: 1 M
+T: sip:730020377@fetion.com.cn;p=6907
+N: SendCatSMS
+L: 4
+
+testSIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.send_cat_sms(@fetion, 'sip:730020377@fetion.com.cn;p=6907', 'test').should == sipc_message
   end
 
   it "should send cat msg" do
     @fetion.call = 8
-    sipc_message = %Q|M fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 9\r\nQ: 2 M\r\nT: sip:638993408@fetion.com.cn;p=2242\r\nK: SaveHistory\r\nN: CatMsg\r\nL: 4\r\n\r\ntestSIPP|
+    sipc_message =<<-EOF
+M fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 9
+Q: 2 M
+T: sip:638993408@fetion.com.cn;p=2242
+K: SaveHistory
+N: CatMsg
+L: 4
+
+testSIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.send_cat_msg(@fetion, 'sip:638993408@fetion.com.cn;p=2242', 'test').should == sipc_message
   end
 
   it "should set schedule sms" do
     @fetion.call = 8
-    sipc_message = %Q|S fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 9\r\nQ: 1 S\r\nN: SSSetScheduleCatSms\r\nSV: 1\r\nL: 182\r\n\r\n<args><schedule-sms send-time="2010-05-08 15:50:00" type="0"><message>test</message><receivers><receiver uri="sip:638993408@fetion.com.cn;p=2242" /></receivers></schedule-sms></args>SIPP|
+    sipc_message =<<-EOF
+S fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 9
+Q: 1 S
+N: SSSetScheduleCatSms
+SV: 1
+L: 182
+
+<args><schedule-sms send-time="2010-05-08 15:50:00" type="0"><message>test</message><receivers><receiver uri="sip:638993408@fetion.com.cn;p=2242" /></receivers></schedule-sms></args>SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.set_schedule_sms(@fetion, ['sip:638993408@fetion.com.cn;p=2242'], 'test', '2010-05-08 15:50:00').should == sipc_message
   end
 
   it "should get contact info" do
     @fetion.call = 10
-    sipc_message = %Q|S fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 11\r\nQ: 1 S\r\nN: GetContactInfoV4\r\nL: 46\r\n\r\n<args><contact uri="tel:15800681507" /></args>SIPP|
+    sipc_message =<<-EOF
+S fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 11
+Q: 1 S
+N: GetContactInfoV4
+L: 46
+
+<args><contact uri="tel:15800681507" /></args>SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.get_contact_info(@fetion, "tel:15800681507").should == sipc_message
   end
 
   it "should add buddy" do
     @fetion.call = 9
     @fetion.instance_variable_set(:@nickname, 'flyerhzm')
-    sipc_message = %Q|S fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 10\r\nQ: 1 S\r\nN: AddBuddyV4\r\nL: 175\r\n\r\n<args><contacts><buddies><buddy uri="tel:13634102006" buddy-lists="" desc="flyerhzm" expose-mobile-no="1" expose-name="1" addbuddy-phrase-id="0" /></buddies></contacts></args>SIPP|
+    sipc_message =<<-EOF
+S fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 10
+Q: 1 S
+N: AddBuddyV4
+L: 175
+
+<args><contacts><buddies><buddy uri="tel:13634102006" buddy-lists="" desc="flyerhzm" expose-mobile-no="1" expose-name="1" addbuddy-phrase-id="0" /></buddies></contacts></args>SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.add_buddy(@fetion, :friend_mobile => "13634102006").should == sipc_message
 
     @fetion.call = 9
-    sipc_message = %Q|S fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 10\r\nQ: 1 S\r\nN: AddBuddyV4\r\nL: 136\r\n\r\n<args><contacts><buddies><buddy uri="sip:638993408" buddy-lists="" desc="flyerhzm" addbuddy-phrase-id="0" /></buddies></contacts></args>SIPP|
+    sipc_message =<<-EOF
+S fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 10
+Q: 1 S
+N: AddBuddyV4
+L: 136
+
+<args><contacts><buddies><buddy uri="sip:638993408" buddy-lists="" desc="flyerhzm" addbuddy-phrase-id="0" /></buddies></contacts></args>SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.add_buddy(@fetion, :friend_sip => "638993408").should == sipc_message
   end
 
+  it "should create session" do
+    http_response_body =<<-EOF
+I 730020377 SIP-C/4.0
+F: sip:638993408@fetion.com.cn;p=2242
+I: -13
+K: text/plain
+K: text/html-fragment
+K: multiparty
+K: nudge
+Q: 14 I
+L: 21
+
+s=session
+m=message SIPP
+EOF
+    http_response_body.gsub!("\n", "\r\n").chomp!
+    last_sipc_response = SipcMessage.sipc_response(http_response_body, @fetion)
+    sipc_message = %Q|SIP-C/4.0 200 OK\r\nI: -13\r\nQ: 14 I\r\nF: sip:638993408@fetion.com.cn;p=2242\r\nK: text/plain\r\nK: text/html-fragment\r\nK: multiparty\r\nK: nudge\r\nL: 129\r\n\r\nv=0\r\no=-0 0 IN 127.0.0.1:8001\r\ns=session\r\nc=IN IP4 127.0.0.1:8001\r\nt=0 0\r\nm=message 8001 sip sip:730020377@fetion.com.cn;p=6907\r\nSIPP|
+    SipcMessage.create_session(@fetion, last_sipc_response).should == sipc_message
+  end
+
+  it "shoud session connected" do
+    http_response_body =<<-EOF
+O 730020377 SIP-C/4.0
+I: -13
+Q: 2 O
+K: text/plain
+K: text/html-fragment
+K: multiparty
+K: nudge
+F: sip:638993408@fetion.com.cn;p=2242
+
+A 730020377 SIP-C/4.0
+F: sip:638993408@fetion.com.cn;p=2242
+I: -13
+Q: 14 A
+
+SIPP
+EOF
+    http_response_body.gsub!("\n", "\r\n").chomp!
+    last_sipc_response = SipcMessage.sipc_response(http_response_body, @fetion)
+    sipc_message =<<-EOF
+SIP-C/4.0 200 OK
+F: sip:638993408@fetion.com.cn;p=2242
+I: -13
+Q: 2 O
+K: text/html-fragment
+K: text/plain
+
+SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
+    SipcMessage.session_connected(@fetion, last_sipc_response).should == sipc_message
+  end
+
+  it "should msg_received" do
+    http_response_body =<<-EOF
+M 730020377 SIP-C/4.0
+I: -13
+Q: 4 M
+F: sip:638993408@fetion.com.cn;p=2242
+C: text/html-fragment
+K: SaveHistory
+L: 4
+D: Sun, 16 May 2010 02:16:00 GMT
+XI: 0dbdc4e81bff425dbcf8b591b497fe94
+
+testSIPP
+EOF
+    http_response_body.gsub!("\n", "\r\n").chomp!
+    sipc_message =<<-EOF
+SIP-C/4.0 200 OK
+F: sip:638993408@fetion.com.cn;p=2242
+I: -13
+Q: 4 M
+
+SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
+    SipcMessage.msg_received(@fetion, http_response_body).should == sipc_message
+  end
+
+  it "should close session" do
+    @fetion.call = 5
+    sipc_message =<<-EOF
+B fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 6
+Q: 2 B
+T: sip:638993408@fetion.com.cn;p=2242
+
+SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
+    SipcMessage.close_session(@fetion, "638993408@fetion.com.cn;p=2242").should == sipc_message
+  end
+
   it "should logout" do
-    sipc_message = %Q|R fetion.com.cn SIP-C/4.0\r\nF: 730020377\r\nI: 1\r\nQ: 3 R\r\nX: 0\r\n\r\nSIPP|
+    sipc_message =<<-EOF
+R fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 1
+Q: 3 R
+X: 0
+
+SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.logout(@fetion).should == sipc_message
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-15 00:00:00 -06:00
+date: 2010-05-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency