rfetion 0.5.6 → 0.5.7

data/Rakefile

@@ -29,8 +29,10 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.homepage = 'http://github.com/flyerhzm/rfetion'
   gemspec.authors = ['Richard Huang']
   gemspec.files.exclude '.gitignore'
-  gemspec.add_dependency 'guid', '>= 0.1.1'
+  gemspec.add_dependency 'guid'
   gemspec.add_dependency 'nokogiri'
+  gemspec.add_dependency 'json'
+  gemspec.add_dependency 'macaddr'
   gemspec.executables << 'rfetion'
 end
 Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/lib/rfetion/buddy_list.rb

@@ -8,8 +8,8 @@ class Fetion
       @contacts = []
     end
     
-    def to_json
-      {:bid => @bid, :name => @name, :contacts => @contacts}.to_json
+    def to_json(*args)
+      {:bid => @bid, :name => @name, :contacts => @contacts, :total_contacts => total_contacts_count, :online_contacts => online_contacts_count}.to_json(*args)
     end
     
     def self.parse(buddy_list)

data/lib/rfetion/contact.rb

@@ -10,8 +10,8 @@ class Fetion
       "0" => "脱机"
     }
     
-    def to_json
-      {:uid => @uid, :sid => @sid, :bid => @bid, :uri => @uri, :mobile_no => @mobile_no, :nickname => @nickname, :impresa => @impresa, :status => @status}.to_json
+    def to_json(*args)
+      {:uid => @uid, :sid => @sid, :bid => @bid, :uri => @uri, :mobile_no => @mobile_no, :nickname => @nickname, :impresa => @impresa, :status => @status, :display => display}.to_json(*args)
     end
 
     def self.parse_buddy(b)
@@ -28,18 +28,19 @@ class Fetion
     end
 
     def initialize(options={})
+      @status = "0"
       options.each do |key, value|
         send("#{key}=", value)
       end
     end
 
-    def update(p)
+    def update(p, pr)
       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?
+      self.status = pr["b"] if pr["b"] and !pr["b"].empty?
     end
 
     def display

data/lib/rfetion/fetion.rb

@@ -1,15 +1,18 @@
+#coding: utf-8
 require 'guid'
 require 'time'
 require 'net/http'
 require 'net/https'
 require 'nokogiri'
 require 'digest/sha1'
+require 'digest/md5'
+require 'macaddr'
 require 'openssl'
 require 'logger'
 require 'json'
 
 class Fetion
-  attr_accessor :mobile_no, :sid, :password, :call, :seq, :alive, :ssic, :guid, :uri
+  attr_accessor :mobile_no, :sid, :password, :call, :seq, :alive, :ssic, :guid, :uri, :pid, :pic, :algorithm, :machine_code
   attr_reader :uid, :buddy_lists, :add_requests, :response, :nickname, :impresa, :receives
 
   FETION_URL = 'http://221.176.31.39/ht/sd.aspx'
@@ -32,8 +35,8 @@ class Fetion
     @guid = Guid.new.to_s
   end
   
-  def to_json
-    {:mobile_no => @mobile_no, :sid => @sid, :uid => @uid, :uri => @uri, :status_code => @status_code, :buddy_lists => @buddy_lists, :receives => @receives, :add_requests => @add_requests, :nickname => @nickname, :impresa => @impresa, :ssic => @ssic, :guid => @guid, :call => @call, :seq => @seq, :alive => @alive}.to_json
+  def to_json(*args)
+    {:mobile_no => @mobile_no, :sid => @sid, :uid => @uid, :uri => @uri, :status_code => @status_code, :buddy_lists => @buddy_lists, :receives => @receives, :add_requests => @add_requests, :nickname => @nickname, :impresa => @impresa, :ssic => @ssic, :guid => @guid, :call => @call, :seq => @seq, :alive => @alive}.to_json(*args)
   end
   
   def logger_level=(level)
@@ -169,7 +172,9 @@ class Fetion
     else
       url = FETION_LOGIN_URL.sub('%sid%', @sid).sub('mobileno=%mobileno%', '')
     end
-    uri = URI.parse(url.sub('%digest%', Digest::SHA1.hexdigest("#{DOMAIN}:#{@password}")))
+    url.sub!('%digest%', Digest::SHA1.hexdigest("#{DOMAIN}:#{@password}"))
+    url += "&pid=#@pid&pic=#@pic&algorithm=#@algorithm" if @pic
+    uri = URI.parse(url)
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -204,7 +209,6 @@ 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="#{@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
 
@@ -369,17 +373,17 @@ class Fetion
     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)
+    pic_certificate = parse_pic_certificate(response, algorithm)
 
     @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=(.*);/
+    raise Fetion::PasswordError.new('帐号或密码不正确') if Net::HTTPUnauthorized === response
+    raise Fetion::PasswordMaxError.new('您已连续输入错误密码，为了保障您的帐户安全，请输入图形验证码：') if Net::HTTPClientError === response
+    raise Fetion::LoginException.new('Login failed.') unless Net::HTTPSuccess === response
+    raise Fetion::LoginException.new('No ssic found in cookie.') unless response['set-cookie'] =~ /ssic=(.*);/
 
     @ssic = $1
     @logger.debug response.body
@@ -404,11 +408,11 @@ class Fetion
     @logger.debug "sid: " + @sid
   end
 
-  def parse_pic_certificate(response)
-    raise FetionException.new('Fetion Error: Get verification code failed.') unless Net::HTTPSuccess === response
+  def parse_pic_certificate(response, algorithm)
+    raise FetionException.new('Get verification code failed.') unless Net::HTTPSuccess === response
     doc = Nokogiri::XML(response.body)
     certificate = doc.root.xpath('/results/pic-certificate').first
-    PicCertificate.parse(certificate)
+    PicCertificate.parse(certificate, algorithm)
   end
 
   def curl_exec(body='', url=next_url, expected=SipcMessage::OK)
@@ -433,7 +437,7 @@ class Fetion
     
       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="(.*?)"/
+        raise Fetion::NoNonceException.new("No nonce found") unless response.body =~ /nonce="(.*?)",key="(.*?)",signature="(.*?)"/
         @nonce = $1
         @key = $2
         @signature = $3
@@ -485,7 +489,7 @@ class Fetion
           unless self.uid == c['id']
             contact = contacts.find {|contact| contact.uid == c['id']}
             if contact
-              contact.update(c.children.first)
+              contact.update(c.children.first, c.children.last)
             else
               contact = Fetion::Contact.parse(c)
               if @buddy_lists.size > 1
@@ -532,6 +536,10 @@ class Fetion
 
     rsa_key.public_encrypt(str).unpack("H*").first.upcase
   end
+
+  def machine_code
+    @machine_code ||= Digest::MD5.hexdigest(Mac.addr)
+  end
   
   def self?(mobile_or_sid)
     mobile_or_sid == @mobile_no or mobile_or_sid == @sid

data/lib/rfetion/pic_certificate.rb

@@ -1,12 +1,17 @@
 class PicCertificate
-  attr_reader :id, :pic
+  attr_reader :pid, :pic, :algorithm
 
-  def initialize(id, pic)
-    @id = id
+  def initialize(pid, pic, algorithm)
+    @pid = pid
     @pic = pic
+    @algorithm = algorithm
   end
 
-  def self.parse(c)
-    PicCertificate.new(c['id'], c['pic'])
+  def self.parse(c, algorithm)
+    PicCertificate.new(c['id'], c['pic'], algorithm)
+  end
+
+  def to_json(*args)
+    {:pid => @pid, :pic => @pic, :algorithm => @algorithm}
   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.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>|
+    body = %Q|<args><device machine-code="#{fetion.machine_code}" /><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
 

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-05-24}
+  s.date = %q{2010-05-29}
   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"]
@@ -53,15 +53,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<guid>, [">= 0.1.1"])
+      s.add_runtime_dependency(%q<guid>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<macaddr>, [">= 0"])
     else
-      s.add_dependency(%q<guid>, [">= 0.1.1"])
+      s.add_dependency(%q<guid>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<macaddr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<guid>, [">= 0.1.1"])
+    s.add_dependency(%q<guid>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<macaddr>, [">= 0"])
   end
 end
 

data/spec/rfetion/buddy_list_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe Fetion::BuddyList do
   before :each do
-    @buddy_list = Fetion::BuddyList.new("1", "我的好友")
+    @buddy_list = Fetion::BuddyList.new("1", "My friend")
     @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"))
@@ -19,4 +19,13 @@ describe Fetion::BuddyList do
   it "should get online contacts count" do
     @buddy_list.online_contacts_count.should == 3
   end
+
+  it "should to_json" do
+    buddy_list_json = @buddy_list.to_json
+    p buddy_list_json
+    buddy_list_json.should be_include %Q|"bid":"1"|
+    buddy_list_json.should be_include %Q|"name":"My friend"|
+    buddy_list_json.should be_include %Q|"total_contacts":7|
+    buddy_list_json.should be_include %Q|"online_contacts":3|
+  end
 end

data/spec/rfetion/fetion_spec.rb

@@ -312,6 +312,7 @@ 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 {|contact| contact.sid}.should == ["572512981", "638993408", nil, "926157269", nil, nil, "480867781", "793401629", "669700695", "660250260", "737769829", "760087520"]
+      @fetion.contacts.collect {|contact| contact.status}.should == ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "400", "0"]
     end
 
     it "should get received msg while get contacts" do
@@ -832,9 +833,10 @@ EOF
 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
+      expected_pic = PicCertificate.parse(Nokogiri::XML(response_body).root.xpath('/results/pic-certificate').first, 'picc-PasswordErrorMax')
+      actual_pic.pid.should == expected_pic.pid
       actual_pic.pic.should == expected_pic.pic
+      actual_pic.algorithm.should == expected_pic.algorithm
     end
   end
 end

data/spec/rfetion/sipc_message_spec.rb

@@ -48,6 +48,7 @@ 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!
+    @fetion.machine_code = "B04B5DA2F5F1B8D01A76C0EBC841414C"
     SipcMessage.register_second(@fetion).should == sipc_message
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Richard Huang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 +08:00
+date: 2010-05-29 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 1
-        version: 0.1.1
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,6 +41,30 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: macaddr
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.
 email: flyerhzm@gmail.com
 executables: