rfetion 0.4.7 → 0.4.8

data/README.textile

@@ -21,10 +21,11 @@ gem install rfetion
 
 h2. Usage
 
-* send sms to friends or yourself
+* send sms or msg to friends or yourself
 
 <pre><code>
 Fetion.send_sms(options)
+Fetion.send_msg(options)
 </code></pre>
 
 options can be:

data/Rakefile

@@ -10,6 +10,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.authors = ['Richard Huang']
   gemspec.files.exclude '.gitignore'
   gemspec.add_dependency 'guid', '>= 0.1.1'
+  gemspec.add_dependency 'nokogiri'
   gemspec.executables << 'rfetion'
 end
 Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/lib/rfetion/fetion.rb

@@ -3,7 +3,7 @@ require 'guid'
 require 'time'
 require 'net/http'
 require 'net/https'
-require 'rexml/document'
+require 'nokogiri'
 require 'digest/sha1'
 require 'digest/md5'
 require 'logger'
@@ -69,6 +69,40 @@ class Fetion
     end
     fetion.logout
   end
+  
+  # options
+  #   mobile_no
+  #   sid
+  #   password
+  #   receivers
+  #   content
+  #   logger_level
+  def Fetion.send_msg(options)
+    fetion = Fetion.new
+    fetion.logger_level = options[:logger_level] || Logger::INFO
+    fetion.mobile_no = options[:mobile_no]
+    fetion.sid = options[:sid]
+    fetion.password = options[:password]
+    fetion.login
+    fetion.register
+    receivers = options[:receivers]
+    content = options[:content]
+    if receivers
+      receivers = Array(receivers)
+      receivers.collect! {|receiver| receiver.to_s}
+      fetion.get_buddy_list
+      fetion.get_contacts_info
+      fetion.contacts.each do |contact|
+        if receivers.include? contact.mobile_no.to_s or receivers.any? { |receiver| contact.uri.index(receiver) }
+          fetion.send_msg(contact.uri, content)
+        end
+      end
+      fetion.send_msg(fetion.uri, content) if  receivers.any? { |receiver| fetion.self? receiver }
+    else
+      fetion.send_msg(fetion.uri, content)
+    end
+    fetion.logout
+  end
 
   # options
   #   mobile_no
@@ -145,14 +179,14 @@ class Fetion
 
     @ssic = $1
     @logger.debug response.body
-    doc = REXML::Document.new(response.body)
+    doc = Nokogiri::XML(response.body)
     results = doc.root
-    @status_code = results.attributes["status-code"]
+    @status_code = results["status-code"]
     user = results.children.first
-    @user_status = user.attributes['user-status']
-    @uri = user.attributes['uri']
-    @mobile_no = user.attributes['mobile-no']
-    @user_id = user.attributes['user-id']
+    @user_status = user['user-status']
+    @uri = user['uri']
+    @mobile_no = user['mobile-no']
+    @user_id = user['user-id']
     if @uri =~ /sip:(\d+)@(.+);/
       @sid = $1
       @domain = $2
@@ -233,9 +267,9 @@ class Fetion
     raise FetionException.new("Fetion Error: Get buddy list error") unless response.is_a? Net::HTTPSuccess
 
     response.body.scan(%r{<results>.*?</results>}).each do |results|
-      doc = REXML::Document.new(results)
-      doc.elements.each("results/contacts/allow-list/contact") do |contact|
-        @buddies << {:uri => contact.attributes["uri"]}
+      doc = Nokogiri::XML(results)
+      doc.root.xpath("/results/contacts/allow-list/contact").each do |contact|
+        @buddies << {:uri => contact["uri"]}
       end
     end
     @logger.debug "buddies: #{@buddies.inspect}"
@@ -260,16 +294,26 @@ class Fetion
     end
 
     response.body.scan(%r{<results>.*?</results>}).each do |results|
-      doc = REXML::Document.new(results)
-      doc.elements.each("results/contacts/contact") do |contact|
-        attrs = contact.children.size == 0 ? {} : contact.children.first.attributes
-        @contacts << Contact.new(contact.attributes["uri"], attrs)
+      doc = Nokogiri::XML(results)
+      doc.root.xpath("/results/contacts/contact").each do |contact|
+        attrs = contact.children.size == 0 ? {} : contact.children.first
+        @contacts << Contact.new(contact["uri"], attrs)
       end
     end
     @logger.debug @contacts.inspect
     @logger.info "fetion get contacts info success"
   end
 
+  def send_msg(receiver, content)
+    @logger.info "fetion SendMsg to #{receiver}"
+    msg = sip_create('M fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '3 M', 'T' => receiver, 'C' => 'text/html-fragment', 'K' => 'SaveHistory'}, content) + FETION_SIPP
+    curl_exec(next_url, @ssic, msg)
+    response = curl_exec(next_url, @ssic, FETION_SIPP)
+
+    raise FetionException.new("Fetion Error: Send sms error") unless response.is_a? Net::HTTPSuccess
+    @logger.info "fetion SendMsg to #{receiver} success"
+  end
+
   def send_sms(receiver, content)
     @logger.info "fetion #{send_command} to #{receiver}"
     msg = sip_create('M fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 M', 'T' => receiver, 'N' => send_command}, content) + FETION_SIPP
@@ -307,10 +351,8 @@ class Fetion
     response = curl_exec(next_url, @ssic, FETION_SIPP)
     raise FetionException.new("Fetion Error: Get personal info error") unless response.is_a? Net::HTTPSuccess
 
-    doc = REXML::Document.new(response.body.chomp(FETION_SIPP))
-    doc.elements.each('results/personal') do |person|
-      @person = person.attributes
-    end
+    doc = Nokogiri::XML(response.body.chomp(FETION_SIPP))
+    @person = doc.root.xpath('/results/personal').first
     @logger.info "fetion get personal info success"
   end
 

data/lib/rfetion.rb

@@ -1,2 +1,2 @@
-require 'rfetion/fetion'
-require 'rfetion/contact'
+require File.dirname(__FILE__) + '/rfetion/fetion'
+require File.dirname(__FILE__) + '/rfetion/contact'

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.4.7"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-01-25}
+  s.date = %q{2010-04-27}
   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"]
@@ -39,11 +39,14 @@ Gem::Specification.new do |s|
 
     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<nokogiri>, [">= 0"])
     else
       s.add_dependency(%q<guid>, [">= 0.1.1"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
     end
   else
     s.add_dependency(%q<guid>, [">= 0.1.1"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 +08:00
+date: 2010-04-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.
 email: flyerhzm@gmail.com
 executables: