rfetion 0.5.5 → 0.5.6

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/rfetion/buddy_list.rb

@@ -8,6 +8,10 @@ class Fetion
       @contacts = []
     end
     
+    def to_json
+      {:bid => @bid, :name => @name, :contacts => @contacts}.to_json
+    end
+    
     def self.parse(buddy_list)
       self.new(buddy_list['id'], buddy_list['name'])
     end

data/lib/rfetion/contact.rb

@@ -9,6 +9,10 @@ class Fetion
       "600" => "繁忙",
       "0" => "脱机"
     }
+    
+    def to_json
+      {:uid => @uid, :sid => @sid, :bid => @bid, :uri => @uri, :mobile_no => @mobile_no, :nickname => @nickname, :impresa => @impresa, :status => @status}.to_json
+    end
 
     def self.parse_buddy(b)
       self.new(:uid => b['i'], :uri => b['u'], :nickname => b['n'], :bid => b['l'].empty? ? "0" : b['l'])

data/lib/rfetion/fetion.rb

@@ -6,6 +6,7 @@ require 'nokogiri'
 require 'digest/sha1'
 require 'openssl'
 require 'logger'
+require 'json'
 
 class Fetion
   attr_accessor :mobile_no, :sid, :password, :call, :seq, :alive, :ssic, :guid, :uri
@@ -31,6 +32,10 @@ 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
+  end
+  
   def logger_level=(level)
     @logger.level = level
   end
@@ -74,7 +79,7 @@ class Fetion
         receivers = Array(receivers)
         receivers.collect! {|receiver| receiver.to_s}
         get_contacts
-        contacts.each do |contact|
+        contacts.flatten.each do |contact|
           if receivers.include? contact.mobile_no.to_s or receivers.any? { |receiver| contact.uri.index(receiver) }
             send_sms(contact.uri, content)
           end
@@ -101,7 +106,7 @@ class Fetion
         receivers = Array(receivers)
         receivers.collect! {|receiver| receiver.to_s}
         get_contacts
-        contacts.each do |contact|
+        contacts.flatten.each do |contact|
           if receivers.include? contact.mobile_no.to_s or receivers.any? { |receiver| contact.uri.index(receiver) }
             send_msg(contact.uri, content)
           end
@@ -130,7 +135,7 @@ class Fetion
       if receivers
         receivers = Array(receivers)
         receivers.collect! {|receiver| receiver.to_s}
-        new_receivers = contacts.collect do |contact|
+        new_receivers = contacts.flatten.collect do |contact|
           if receivers.include? contact.mobile_no.to_s or receivers.any? { |receiver| contact.uri.index(receiver) }
             contact.uri
           end

data/rfetion.gemspec

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

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe Fetion do
   class Fetion
-    attr_accessor :mobile_no, :sid, :password, :status_code, :user_status, :uid, :ssic, :nonce, :key, :signature, :response
+    attr_accessor :mobile_no, :sid, :password, :status_code, :user_status, :uid, :nickname, :impresa, :ssic, :nonce, :key, :signature, :response
   end
 
   before :each do
@@ -12,6 +12,47 @@ describe Fetion do
   after :each do
     FakeWeb.clean_registry
   end
+  
+  describe "to_json" do
+    before :each do
+      @fetion.mobile_no = '15800681509'
+      @fetion.sid = "730020377"
+      @fetion.password = "password"
+      @fetion.uid = "390937727"
+      @fetion.status_code = "200"
+      @fetion.user_status = "101"
+      @fetion.nickname = "flyerhzm"
+      @fetion.impresa = "http://www.fetionrobot.com"
+      @buddy_list0 = Fetion::BuddyList.new("0", "未分组")
+      @buddy_list1 = Fetion::BuddyList.new("1", "我的好友")
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "226911221", :uri => "sip:572512981@fetion.com.cn;p=3544", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "295098062", :uri => "sip:638993408@fetion.com.cn;p=2242", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "579113578", :uri => "sip:838271744@fetion.com.cn;p=4805", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "665046562", :uri => "sip:926157269@fetion.com.cn;p=12906", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "687455743", :uri => "sip:881033150@fetion.com.cn;p=5493", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "714355089", :uri => "sip:973921799@fetion.com.cn;p=12193", :bid => "1"))
+      @buddy_list1.add_contact(Fetion::Contact.new(:uid => "732743291", :uri => "sip:480867781@fetion.com.cn;p=16105", :bid => "1"))
+      @buddy_list2 = Fetion::BuddyList.new("2", "好友")
+      @buddy_list3 = Fetion::BuddyList.new("3", "同学")
+      @buddy_list3.add_contact(Fetion::Contact.new(:uid => "222516658", :uri => "sip:793401629@fetion.com.cn;p=1919", :bid => "3"))
+      @buddy_list3.add_contact(Fetion::Contact.new(:uid => "227091544", :uri => "sip:669700695@fetion.com.cn;p=3546", :nickname => "郭庆", :bid => "3"))
+      @buddy_list3.add_contact(Fetion::Contact.new(:uid => "228358286", :uri => "sip:660250260@fetion.com.cn;p=3854", :nickname => "蔡智武", :bid => "3"))
+      @buddy_list3.add_contact(Fetion::Contact.new(:uid => "229415466", :uri => "sip:737769829@fetion.com.cn;p=4078", :nickname => "ice", :bid => "3"))
+      @buddy_list3.add_contact(Fetion::Contact.new(:uid => "296436724", :uri => "sip:760087520@fetion.com.cn;p=2467", :bid => "3"))
+      @buddy_lists = [@buddy_list0, @buddy_list1, @buddy_list2, @buddy_list3]
+      @fetion.instance_variable_set(:@buddy_lists, @buddy_lists)
+    end
+
+    it "should get all user attributes" do
+      fetion_json = @fetion.to_json
+      fetion_json.should be_include %Q|"mobile_no":"15800681509"|
+      fetion_json.should be_include %Q|"sid":"730020377"|
+      fetion_json.should be_include %Q|"uid":"390937727"|
+      fetion_json.should be_include %Q|"status_code":"200"|
+      fetion_json.should be_include %Q|"nickname":"flyerhzm"|
+      fetion_json.should be_include %Q|"impresa":"http://www.fetionrobot.com"|
+    end
+  end
 
   describe "login" do
     it "should login by mobile no" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Richard Huang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 +08:00
+date: 2010-05-24 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency