rfetion 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/rfetion/command.rb

@@ -86,7 +86,7 @@ begin
   
   raise FetionException.new('You must input your mobile number or fetion sid, password and content') unless (options[:mobile_no] or options[:sid]) and options[:password] and options[:content]
   if options[:time]
-    Fetion.schedule_sms(options)
+    Fetion.set_schedule_sms(options)
   else
     Fetion.send_sms(options)
   end

data/lib/rfetion/fetion.rb

@@ -20,9 +20,7 @@ class Fetion
   DOMAIN = "fetion.com.cn"
 
   def initialize
-    @call = 0
-    @alive = 0
-    @seq = 0
+    @call = @alive = @seq = 0
     @buddies = []
     @contacts = []
     @logger = Logger.new(STDOUT)
@@ -146,6 +144,8 @@ class Fetion
   end
 
   def login
+    @logger.info "fetion login"
+
     if @mobile_no
       url = FETION_LOGIN_URL.sub('%mobileno%', @mobile_no).sub('sid=%sid%', '')
     else
@@ -157,74 +157,82 @@ class Fetion
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     headers = {'User-Agent' => USER_AGENT}
     response = http.request_get(uri.request_uri, headers)
+    parse_ssic(response)
 
-    raise FetionException.new('Fetion Error: Login failed.') unless response.is_a? Net::HTTPSuccess
-
-    parse_login_response(response)
+    @logger.info "fetion login success"
   end
 
   def register
+    @logger.info "fetion register"
+
     call = next_call
     register_first
     register_second
     call = next_call
+
+    @logger.info "fetion register success"
   end
 
   def register_first
+    @logger.debug "fetion register first"
+
     curl_exec(SIPP, next_url('i'))
     curl_exec(SipcMessage.register_first(self))
     response = pulse
-    raise Fetion::NoNonceException.new("Fetion Error: no nonce found") unless response.body =~ /nonce="(.*?)",key="(.*?)",signature="(.*?)"/
-      
-    @nonce = $1
-    @key = $2
-    @signature = $3
-    @response = calc_response
+    parse_nonce(response)
 
-    @logger.debug "nonce: #{@nonce}"
-    @logger.debug "key: #{@key}"
-    @logger.debug "signature: #{@signature}"
-    @logger.debug "response: #{@response}"
+    @logger.debug "fetion register first success"
   end
 
   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>|
     curl_exec(SipcMessage.register_second(self))
     response = pulse
+    parse_info(response)
 
-    raise FetionException.new('Fetion Error: Register failed.') unless response.is_a? Net::HTTPSuccess
-
-    parse_info(response.body)
-    parse_buddies(response.body)
+    @logger.debug "fetion register second success"
   end
 
   def get_contacts
+    @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))
-    raise FetionException.new('Fetion Error: get contacts failed.') unless response.is_a? Net::HTTPSuccess
-    parse_contacts(response.body)
+    parse_contacts(response)
 
     curl_exec(SipcMessage.get_address_list(self))
     pulse
+
+    @logger.info "fetion get contacts success"
   end
 
   def send_msg(receiver, content)
-    @logger.info "fetion send msg to #{receiver}"
-    curl_exec(SipcMessage.send_msg(self, receiver, content))
+    @logger.info "fetion send cat msg to #{receiver}"
+
+    curl_exec(SipcMessage.send_cat_msg(self, receiver, content))
     response = pulse
 
-    raise SendMsgException.new("Fetion Error: Send sms error") unless response.is_a? Net::HTTPSuccess
-    @logger.info "fetion send msg to #{receiver} success"
+    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
+
+    @logger.info "fetion send cat msg to #{receiver} success"
   end
 
   def send_sms(receiver, content)
     @logger.info "fetion send cat sms to #{receiver}"
+
     curl_exec(SipcMessage.send_cat_sms(self, receiver, content))
     response = pulse
 
-    raise SendSmsException.new("Fetion Error: Send cat sms error") unless response.is_a? Net::HTTPSuccess
+    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
+
     @logger.info "fetion send cat sms to #{receiver} success"
   end
 
@@ -240,7 +248,10 @@ class Fetion
     curl_exec(SipcMessage.set_schedule_sms(self, receivers, content, time.strftime('%Y-%m-%d %H:%M:%S')))
     response = pulse
 
-    raise SetScheduleSmsException.new("Fetion Error: Set schedule sms error") unless response.is_a? Net::HTTPSuccess
+    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
+
     @logger.info "fetion schedule send sms to #{receivers.join(', ')} success"
   end
 
@@ -253,7 +264,9 @@ class Fetion
     @logger.info "fetion send request to add #{uri} as friend"
     curl_exec(SipcMessage.add_buddy(self, options))
     response = pulse
-    raise AddBuddyException.new("Fetion Error: Add buddy error") unless response.is_a? Net::HTTPSuccess
+    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
 
     @logger.info "fetion send request to add #{uri} as friend success"
   end
@@ -265,23 +278,28 @@ class Fetion
     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, options))
+    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.to_s}") unless SipcMessage::OK === sipc_response
+    raise Fetion::NoUserException.new("Fetion Error: get contact info #{uri} with #{sipc_response}") unless SipcMessage::OK === sipc_response
 
     @logger.info "fetion get contact info of #{uri} success"
   end
 
   def logout
+    @logger.info "fetion logout"
+
     curl_exec(SipcMessage.logout(self))
     response = pulse
 
     # raise FetionException.new("Fetion Error: Logout error") unless response.is_a? Net::HTTPSuccess
+    @logger.info "fetion logout success"
   end
 
-  def parse_login_response(response)
+  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=(.*);/
 
     @ssic = $1
@@ -306,34 +324,54 @@ 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_body)
-    response_body.scan(%r{<results>.*?</results>}).each do |results|
+  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']
-    end
-
-    @logger.debug "nickname: #@nickname"
-  end
-  
-  def parse_buddies(response_body)
-    response_body.scan(%r{<results>.*?</results>}).each do |results|
-      doc = Nokogiri::XML(results)
       doc.root.xpath("/results//buddies/b").each do |buddy|
         @buddies << {:uri => buddy["u"]}
       end
     end
+
+    @logger.debug "nickname: #@nickname"
     @logger.debug "buddies: #{@buddies.inspect}"
   end
 
-  def parse_contacts(response_body)
-    response_body.scan(%r{<events>.*?</events>}).each do |results|
+  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
 
@@ -388,30 +426,6 @@ class Fetion
   def self?(mobile_or_sid)
     mobile_or_sid == @mobile_no or mobile_or_sid == @sid
   end
-
-  [:login, :register, :get_contacts, :logout].each do |method|
-    class_eval <<-EOF
-      alias_method :origin_#{method}, :#{method}
-
-      def #{method}
-        @logger.info "fetion #{method.to_s.gsub(/_/, ' ')}"
-        origin_#{method}
-        @logger.info "fetion #{method.to_s.gsub(/_/, ' ')} success"
-      end
-    EOF
-  end
-
-  [:register_first, :register_second].each do |method|
-    class_eval <<-EOF
-      alias_method :origin_#{method}, :#{method}
-
-      def #{method}
-        @logger.debug "fetion #{method.to_s.gsub(/_/, ' ')}"
-        origin_#{method}
-        @logger.debug "fetion #{method.to_s.gsub(/_/, ' ')} success"
-      end
-    EOF
-  end
 end
 
 class FetionException < Exception; end
@@ -422,4 +436,5 @@ class Fetion::SendSmsException < FetionException; end
 class Fetion::SendMsgException < FetionException; end
 class Fetion::SetScheduleSmsException < FetionException; end
 class Fetion::AddBuddyException < FetionException; end
+class Fetion::GetContactsException < FetionException; end
 class Fetion::NoUserException < FetionException; end

data/lib/rfetion/sipc_message.rb

@@ -34,8 +34,8 @@ class SipcMessage
     sipc_create(:command => 'M', :F => fetion.sid, :I => fetion.next_call, :Q => '1 M', :T => receiver, :N => 'SendCatSMS', :body => content)
   end
 
-  def self.send_msg(fetion, receiver, content)
-    sipc_create(:command => 'M', :F => fetion.sid, :I => fetion.next_call, :Q => '3 M', :T => receiver, :K => 'SaveHistory', :body => content)
+  def self.send_cat_msg(fetion, receiver, content)
+    sipc_create(:command => 'M', :F => fetion.sid, :I => fetion.next_call, :Q => '2 M', :T => receiver, :K => 'SaveHistory', :N => 'CatMsg', :body => content)
   end
 
   def self.set_schedule_sms(fetion, receivers, content, time)
@@ -49,8 +49,8 @@ class SipcMessage
     sipc_create(:command => 'S', :F => fetion.sid, :I => fetion.next_call, :Q => '1 S', :N => 'AddBuddyV4', :body => body)
   end
 
-  def self.get_contact_info(fetion, mobile_no)
-    body = %Q|<args><contact uri="tel:#{mobile_no}" /></args>|
+  def self.get_contact_info(fetion, uri)
+    body = %Q|<args><contact uri="#{uri}" /></args>|
     sipc_create(:command => 'S', :F => fetion.sid, :I => fetion.next_call, :Q => '1 S', :N => 'GetContactInfoV4', :body => body)
   end
 
@@ -66,7 +66,7 @@ class SipcMessage
     body = options.delete(:body)
     with_l = options.delete(:with_l)
 
-    sorted_key = [:F, :I, :Q, :CN, :CL, :A, :AK, :X, :T, :N, :K, :SV]
+    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
@@ -75,8 +75,10 @@ class SipcMessage
   end
 
   def self.sipc_response(http_response_body)
-    sipc, code, message = http_response_body.to_a.first.split(' ')
+    sipc, code, message = http_response_body.split(/(\r)?\n/).first.split(' ')
     RESPONSES[code.to_i].new(code, message)
+  rescue NoMethodError
+    raise FetionException.new("Fetion error: No response to #{code} #{message}")
   end
 
   class Response
@@ -93,11 +95,17 @@ class SipcMessage
   end
 
   class OK < Response; end
+  class Send < Response; end
+  class Bad < Response; end
+  class Unauthoried < Response; end
   class NotFound < Response; end
   class ExtentionRequired < Response; end
 
   RESPONSES = {
     200 => SipcMessage::OK,
+    280 => SipcMessage::Send,
+    400 => SipcMessage::Bad,
+    401 => SipcMessage::Unauthoried,
     404 => SipcMessage::NotFound,
     421 => SipcMessage::ExtentionRequired
   }

data/rfetion.gemspec

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

@@ -87,6 +87,7 @@ F: 730020377
 I: 1
 Q: 1 R
 W: Digest algorithm="SHA1-sess-v4",nonce=""
+
 SIPP
 EOF
         FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=3", :body => response_body)

data/spec/rfetion/sipc_message_spec.rb

@@ -57,10 +57,10 @@ describe SipcMessage do
     SipcMessage.send_cat_sms(@fetion, 'sip:730020377@fetion.com.cn;p=6907', 'test').should == sipc_message
   end
 
-  it "should send msg" do
+  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: 3 M\r\nT: sip:638993408@fetion.com.cn;p=2242\r\nK: SaveHistory\r\nL: 4\r\n\r\ntestSIPP|
-    SipcMessage.send_msg(@fetion, 'sip:638993408@fetion.com.cn;p=2242', 'test').should == sipc_message
+    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|
+    SipcMessage.send_cat_msg(@fetion, 'sip:638993408@fetion.com.cn;p=2242', 'test').should == sipc_message
   end
 
   it "should set schedule sms" do
@@ -72,7 +72,7 @@ describe SipcMessage do
   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|
-    SipcMessage.get_contact_info(@fetion, 15800681507).should == sipc_message
+    SipcMessage.get_contact_info(@fetion, "tel:15800681507").should == sipc_message
   end
 
   it "should add buddy" do

metadata

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