rfetion 0.4.3 → 0.4.4

data/README.textile

@@ -24,30 +24,47 @@ h2. Usage
 * send sms to friends or yourself
 
 <pre><code>
-Fetion.send_sms(mobile_no, password, mobile_or_fetion_numbers, content)
+Fetion.send_sms(options)
 </code></pre>
 
-if mobile_or_fetion_numbers are nil, send sms to yourself.
+options can be:
+<code>mobile_no</code>
+<code>sid</code>
+<code>password</code>
+<code>receivers</code>, if receivers are nil, send sms to yourself
+<code>content</code>
+<code>logger_level</code>
 
-* add friend with mobile
+
+* send schedule sms to friends
 
 <pre><code>
-Fetion.add_buddy_with_mobile(mobile_no, password, friend_mobile)
+Fetion.schedule_sms(options)
 </code></pre>
 
-* add friend with sip
+options can be:
+<code>mobile_no</code>
+<code>sid</code>
+<code>password</code>
+<code>receivers</code>, if receivers are nil, send sms to yourself
+<code>content</code>
+<code>time</code>, time format is %Y-%m-%d %H:%M:%S
+<code>logger_level</code>
 
-<pre><code>
-Fetion.add_buddy_with_sip(mobile_no, password, friend_sip)
-</code></pre>
 
-* send schedule sms to friends
+* add friend
 
 <pre><code>
-Fetion.schedule_sms(mobile_no, password, mobile_or_fetion_number, content, time)
+Fetion.add_buddy(options)
 </code></pre>
 
-Time format is %Y-%m-%d %H:%M:%S
+options can be:
+<code>mobile_no</code>
+<code>sid</code>
+<code>password</code>
+<code>friend_mobile</code>
+<code>friend_sip</code>
+<code>logger_level</code>
 
 **************************************************************************
 
@@ -59,21 +76,24 @@ you can use it in shell command directly
 Usage: rfetion [options]
 
     Example: rfetion -m mobile -p password -c sms_content
+             rfetion -s sip -p password -c sms_content
              rfetion -m mobile -p password -r mobile_or_fetion_numbers -c sms_content
              rfetion -m mobile -p password -r mobile_or_fetion_numbers -c sms_content -t time
              rfetion -m mobile -p password --add-buddy-with-mobile friend_mobile
+             rfetion -s sip -p password --add-buddy-with-mobile friend_mobile
              rfetion -m mobile -p password --add-buddy-with-sip friend_sip
 
+
     -m, --mobile MOBILE              Fetion mobile number
+    -s, --sip FETION_SIP             Fetion sid number
     -p, --password PASSWORD          Fetion password
     -c, --content CONTENT            Fetion message content
-    -r, --receivers MOBILE,SIP       (optional) Receivers' Fetion mobile numbers or fetion sip numbers, if no recievers, send sms to yourself
+    -r, --receivers MOBILE,SIP       Receivers' Fetion mobile numbers or fetion sip numbers, if no recievers, send sms to yourself
     -t, --time TIME                  Schedule time to send sms, format is "2009-12-10 20:00:00"
         --add-buddy-with-mobile MOBILE
                                      Add friend mobile as fetion friend
         --add-buddy-with-sip SIP     Add friend fetion sip as fetion friend
 
-
 different mode:
         --debug                      debug mode
         --silence                    silence mode

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/rfetion/fetion.rb

@@ -222,9 +222,11 @@ class Fetion
     response = curl_exec(next_url, @ssic, FETION_SIPP)
     raise FetionException.new("Fetion Error: Get buddy list error") unless response.is_a? Net::HTTPSuccess
 
-    doc = REXML::Document.new(response.body.chomp(FETION_SIPP))
-    doc.elements.each("results/contacts/allow-list/contact") do |contact|
-      @buddies << {:uri => contact.attributes["uri"]}
+    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"]}
+      end
     end
     @logger.debug "buddies: #{@buddies.inspect}"
     @logger.info "fetion get buddy list success"
@@ -247,10 +249,12 @@ class Fetion
       break if response.body.size > FETION_SIPP.size
     end
 
-    doc = REXML::Document.new(response.body.chomp(FETION_SIPP))
-    doc.elements.each("results/contacts/contact") do |contact|
-      attrs = contact.children.size == 0 ? {} : contact.children.first.attributes
-      @contacts << Contact.new(contact.attributes["uri"], attrs)
+    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)
+      end
     end
     @logger.debug @contacts.inspect
     @logger.info "fetion get contacts info success"

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-12-17}
+  s.date = %q{2010-01-22}
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +08:00
+date: 2010-01-22 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency