rfetion 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/rfetion/contact.rb

@@ -0,0 +1,11 @@
+class Contact
+  attr_reader :uri, :mobile_no, :nickname, :impresa, :nickname
+
+  def initialize(uri, attrs)
+    @uri = uri
+    @mobile_no = attrs["mobile-no"]
+    @nickname = attrs["nickname"]
+    @impresa = attrs["impresa"]
+    @nickname = attrs["nickname"]
+  end
+end

data/lib/rfetion/fetion.rb

@@ -38,7 +38,7 @@ class Fetion
 
   def Fetion.send_sms_to_friends(mobile_no, password, friends, content, level = Logger::INFO)
     friends = Array(friends)
-    friends.collect! {|friend| friend.to_i}
+    friends.collect! {|friend| friend.to_s}
     fetion = Fetion.new
     fetion.logger_level = level
     fetion.mobile_no = mobile_no
@@ -48,9 +48,9 @@ class Fetion
     fetion.get_buddy_list
     fetion.get_contacts_info
     fetion.contacts.each do |contact|
-      if friends.include? contact[:mobile_no].to_i
-        fetion.send_sms(contact[:sip], content)
-      elsif friends.any? { |friend| contact[:sip].index(friend) }
+      if friends.include? contact.mobile_no.to_s
+        fetion.send_sms(contact.uri, content)
+      elsif friends.any? { |friend| contact.uri.index(friend) }
         fetion.send_sms
       end
     end
@@ -81,6 +81,7 @@ class Fetion
     raise FetionException.new('Fetion Error: No ssic found in cookie.') unless response['set-cookie'] =~ /ssic=(.*);/
 
     @ssic = $1
+    @logger.debug response.body
     doc = REXML::Document.new(response.body)
     results = doc.root
     @status_code = results.attributes["status-code"]
@@ -163,8 +164,11 @@ class Fetion
     response = curl_exec(next_url, @ssic, FETION_SIPP)
     raise FetionException.new("Fetion Error: Get contacts info error") unless response.is_a? Net::HTTPSuccess
 
-    response.body.scan(/uri="([^"]+)".*?mobile-no="([^"]+)"/).each do |contact|
-      @contacts << {:sip => contact[0], :mobile_no => contact[1]}
+    response.body.scan(%r{<events>.*?</events>}).each do |events|
+      doc = REXML::Document.new(events)
+      doc.elements.each("events/event/results/contacts/contact") do |contact|
+        @contacts << Contact.new(contact.attributes["uri"], contact.elements.first.attributes)
+      end
     end
     @logger.debug @contacts.inspect
     @logger.info "fetion get contacts info success"

data/lib/rfetion.rb

@@ -6,3 +6,4 @@ require 'rexml/document'
 require 'digest/sha1'
 require 'logger'
 require 'rfetion/fetion'
+require 'rfetion/contact'

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-10-25}
+  s.date = %q{2009-10-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"]
@@ -21,8 +21,10 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/rfetion",
+     "lib/contact.rb",
      "lib/rfetion.rb",
      "lib/rfetion/command.rb",
+     "lib/rfetion/contact.rb",
      "lib/rfetion/fetion.rb",
      "rfetion.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 +08:00
+date: 2009-10-29 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,8 +36,10 @@ files:
 - Rakefile
 - VERSION
 - bin/rfetion
+- lib/contact.rb
 - lib/rfetion.rb
 - lib/rfetion/command.rb
+- lib/rfetion/contact.rb
 - lib/rfetion/fetion.rb
 - rfetion.gemspec
 has_rdoc: true