douban-ruby 0.0.5 → 0.0.6

data/History.txt

@@ -1,3 +1,16 @@
+=== 0.0.6 / 2010-07-10
+* Douban::Authorize
+  * add verify_token and delete_token
+  * support get_book(:isbn => isbn)
+  * support get_movie(:imdb => imdb)
+  * add get_miniblog_comments
+  * add create_miniblog_comment
+  * add delete_miniblog_comment
+* Douban::Book
+  * add method: isbn, isbn10, isbn13
+* Douban::Movie
+  * add method: imdb
+
 === 0.0.5 / 2010-07-04
 * Douban::Authorize
   * all modify_* functions will return an Object if success, otherwise nil. In

data/Manifest.txt

@@ -11,7 +11,10 @@ lib/douban/equal.rb
 lib/douban/event.rb
 lib/douban/mail.rb
 lib/douban/miniblog.rb
+lib/douban/miniblog_comment.rb
+lib/douban/miniblog_comments.rb
 lib/douban/note.rb
+lib/douban/page_info.rb
 lib/douban/people.rb
 lib/douban/recommendation.rb
 lib/douban/recommendation_comment.rb
@@ -23,12 +26,16 @@ spec/douban/authorize_spec.rb
 spec/douban/collection_spec.rb
 spec/douban/event_spec.rb
 spec/douban/mail_spec.rb
+spec/douban/miniblog_comment_spec.rb
+spec/douban/miniblog_comments_spec.rb
 spec/douban/miniblog_spec.rb
 spec/douban/note_spec.rb
+spec/douban/page_info_spec.rb
 spec/douban/people_spec.rb
 spec/douban/recommendation_comment_spec.rb
 spec/douban/recommendation_spec.rb
 spec/douban/review_spec.rb
+spec/douban/subject_spec.rb
 spec/douban/tag_spec.rb
 spec/douban_spec.rb
 spec/spec_helper.rb

data/Rakefile

@@ -4,10 +4,12 @@ $:.unshift(File.dirname(__FILE__) + "/lib")
 require 'douban'
 
 ENV["SPEC_OPTS"] ||= "-f nested --color -b"
+ENV["RDOC_OPTS"] ||= "-c UTF-8"
 
 Hoe.spec 'douban-ruby' do
-  developer "Hoooopo", "hoooopo@gmail.com"
   developer "LI Daobing", "lidaobing@gmail.com"
+  developer "Hoooopo", "hoooopo@gmail.com"
+  extra_deps << ['oauth']
 end
 
 Hoe.plugin :minitest
@@ -32,3 +34,7 @@ namespace :spec do
     t.rcov_opts = ['--exclude' , 'gems,spec' ]
   end
 end
+
+Rake::RDocTask.new do |rd|
+  rd.options << "--charset" << "UTF-8"
+end

data/examples/example.rb

@@ -1,3 +1,4 @@
+require 'pp'
 require 'rubygems'
 require 'douban'
 
@@ -17,5 +18,6 @@ print "after login, press Enter to continue\n"
 
 gets
 
-douban.auth
-print douban.get_people
+pp douban.auth
+pp douban.access_token
+pp douban.get_people

data/lib/douban.rb

@@ -52,6 +52,6 @@
 require 'douban/authorize'
 
 module Douban
-  VERSION      = "0.0.5"
+  VERSION      = "0.0.6"
 end
 

data/lib/douban/authorize.rb

@@ -10,6 +10,7 @@ require 'douban/collection'
 require 'douban/event'
 require 'douban/mail'
 require 'douban/miniblog'
+require 'douban/miniblog_comments'
 require 'douban/note'
 require 'douban/people'
 require 'douban/recommendation'
@@ -94,7 +95,7 @@ module Douban
         atom=resp.body
         People.new(atom)
       else
-        nil
+        debug(resp)
       end
     end
 
@@ -109,7 +110,7 @@ module Douban
         end
         friends
       else
-        nil
+        debug(resp)
       end
     end
 
@@ -143,12 +144,30 @@ module Douban
         nil
       end
     end
-    def get_book(id="")
-      if id.to_s.size >=10
-        resp=get("/book/subject/isbn/#{u(id.to_s)}")
+    
+    # 获取书籍信息
+    # http://goo.gl/HaG5
+    #
+    # get_book(:isbn => isbn) => Book
+    # get_book(:id => id) => Book
+    # get_book(id) => Book
+    # get_book(Book) => Book (refresh Book)
+    def get_book(id)
+      resp = case id
+      when Book
+        get("/book/subject/#{u id.subject_id}")
+      when Hash
+        if id[:isbn]
+          get("/book/subject/isbn/#{u id[:isbn]}")
+        elsif id[:id]
+          get("/book/subject/#{u id[:id]}")
+        else
+          raise "Hash only support :isbn or :id"
+        end
       else
-        resp=get("/book/subject/#{u(id.to_s)}")
+        get("/book/subject/#{u id}")
       end
+      
       if resp.code=="200"
         atom=resp.body
         Book.new(atom)
@@ -156,12 +175,30 @@ module Douban
         nil
       end
     end
-    def get_movie(id="")
-      if id.to_s=~/^tt\d+/
-        resp=get("/movie/subject/imdb/#{u(id.to_s)}")
+    
+    # 获取电影信息
+    # http://goo.gl/2fZ4
+    #
+    # get_movie(:imdb => imdb) => Movie
+    # get_movie(:id => id) => Movie
+    # get_movie(id) => Movie
+    # get_movie(Movie) => Movie (refresh Movie)
+    def get_movie(id)
+      resp = case id
+      when Movie
+        get("/movie/subject/#{u id.subject_id}")
+      when Hash
+        if id[:imdb]
+          get("/movie/subject/imdb/#{u id[:imdb]}")
+        elsif id[:id]
+          get("/movie/subject/#{u id[:id]}")
+        else
+          raise "Hash only support :imdb or :id"
+        end
       else
-        resp=get("/movie/subject/#{u(id.to_s)}")
+        get("/movie/subject/#{u id}")
       end
+
       if resp.code=="200"
         atom=resp.body
         Movie.new(atom)
@@ -178,8 +215,25 @@ module Douban
         nil
       end
     end
-    def search_book(tag="",option={:start_index=>1,:max_results=>10})
-      resp=get("/book/subjects?tag=#{u(tag.to_s)}&start-index=#{option[:start_index]}&max-results=#{option[:max_results]}")
+    
+    # :call-seq:
+    #   search_book(:q => "search word") => [Book] or nil
+    #   search_book(:tag => "tag name") => [Book] or nil
+    #   search_book("search word") => [Book] or nil
+    #
+    # 搜索书籍
+    #
+    # http://goo.gl/rYDf
+    #
+    # * option
+    #   * q: query string
+    #   * tag: 
+    #   * start_index: 
+    #   * max_results: 
+    def search_book(*args)
+      url = _subject_search_args_to_url(:book, *args)
+
+      resp=get(url)
       if resp.code=="200"
         atom=resp.body
         doc=REXML::Document.new(atom)
@@ -191,10 +245,12 @@ module Douban
       else
         nil
       end
-
     end
-    def search_movie(tag="",option={:start_index=>1,:max_results=>10})
-      resp=get("/movie/subjects?tag=#{u(tag.to_s)}&start-index=#{option[:start_index]}&max-results=#{option[:max_results]}")
+
+    def search_movie(*args)
+      url = _subject_search_args_to_url(:movie, *args)
+
+      resp=get(url)
       if resp.code=="200"
         atom=resp.body
         doc=REXML::Document.new(atom)
@@ -208,7 +264,9 @@ module Douban
       end
     end
     def search_music(tag="",option={:start_index=>1,:max_results=>10})
-      resp=get("/music/subjects?tag=#{u(tag)}&start-index=#{option['start-index']}&max-results=#{option['max-results']}")
+      url = _subject_search_args_to_url(:music, *args)
+
+      resp=get(url)
       if resp.code=="200"
         atom=resp.body
         doc=REXML::Document.new(atom)
@@ -524,6 +582,72 @@ module Douban
         false
       end
     end
+
+    # :call-seq:
+    #   get_miniblog_comments(aMiniblog)     => MiniblogComments or nil
+    #   get_miniblog_comments(obj)           => MiniblogComments or nil
+    #
+    # 获取我说回复 (http://goo.gl/nTZK)
+    def get_miniblog_comments(miniblog)
+      miniblog_id = case miniblog
+                    when Miniblog then miniblog.miniblog_id
+                    else miniblog
+                    end
+
+      resp = get("/miniblog/#{u miniblog_id}/comments")
+      if resp.code == "200"
+        MiniblogComments.new(resp.body)
+      else
+        debug(resp)
+      end
+    end
+
+    # :call-seq:
+    #   create_miniblog_comment(aMiniblog, aString) => MiniblogComment or nil
+    #   create_miniblog_comment(obj, aString) => MiniblogComment or nil
+    #
+    # 回应我说 (http://goo.gl/j43Z)
+    def create_miniblog_comment(miniblog, content)
+      miniblog_id = case miniblog
+                    when Miniblog then miniblog.miniblog_id
+                    else miniblog
+                    end
+      entry = %Q{<?xml version='1.0' encoding='UTF-8'?>
+    <entry>
+        <content>#{h content}</content>
+    </entry>}
+
+      resp = post("/miniblog/#{u miniblog_id}/comments", entry)
+      if resp.code == "201"
+        MiniblogComment.new(resp.body)
+      else
+        debug(resp)
+      end
+    end
+
+    # :call-seq:
+    #   delete_miniblog_comment(aMiniblogComment) => true or false
+    #   delete_miniblog_comment(miniblog_id, comment_id) => true or false
+    # 删除我说
+    def delete_miniblog_comment(*args)
+      if args.size == 1 and args[0].kind_of?(MiniblogComment)
+        miniblog_id = args[0].miniblog_id
+        comment_id = args[0].comment_id
+      elsif args.size == 2
+        miniblog_id = args[0].to_s
+        comment_id = args[1].to_s
+      else
+        raise "unsupported argument error"
+      end
+
+      resp = delete("/miniblog/#{u miniblog_id}/comment/#{u comment_id}")
+      if resp.code == "200"
+        true
+      else
+        debug(resp, false)
+      end
+    end
+
     def get_note(note_id="")
       resp=get("/note/#{u(note_id.to_s)}")
       if resp.code=="200"
@@ -1102,6 +1226,31 @@ module Douban
         debug(resp, false)
       end
     end
+    
+    # 验证Access Token是否可用
+    # http://goo.gl/8v8d
+    def verify_token
+      resp = get("/access_token/#{@access_token.token}")
+      if resp.code == "200"
+        true
+      elsif resp.code == "401"
+        false
+      else
+        debug(resp, false)
+      end
+    end
+    
+    # 注销一个Access Token
+    # http://goo.gl/0JAB
+    def delete_token
+      resp = delete("/access_token/#{@access_token.token}")
+      if resp.code == "200"
+        true
+      else
+        debug(resp, false)
+      end
+    end
+    alias_method :logout, :delete_token
 
     protected
     def new_request_consumer
@@ -1133,10 +1282,12 @@ module Douban
     def get(path,headers={})
       @access_token.get(path,headers)
     end
-    def post(path,data="",headers={})
+    def post(path,data="",headers=nil)
+      headers ||= {"Content-Type" => "application/atom+xml"}
       @access_token.post(path,data,headers)
     end
-    def put(path,body="",headers={})
+    def put(path,body="",headers=nil)
+      headers ||= {"Content-Type" => "application/atom+xml"}
       @access_token.put(path,body,headers)
     end
     def delete(path,headers={})
@@ -1145,6 +1296,35 @@ module Douban
     def head(path,headers={})
       @access_token.head(path,headers)
     end
+
+    def _subject_search_args_to_url(type, *args)
+      arg = args.shift
+
+      option = case arg
+      when String
+        arg2 = args.shift
+        arg2 ||= {}
+        arg2.merge(:q => arg)
+      when Hash
+        arg
+      else
+        raise "unknown type for first arg: #{arg.class}"
+      end
+
+      raise "extra argument" unless args.empty?
+        
+      if option[:q].nil? and option[:tag].nil?
+        raise "you must specify :q or :tag"
+      end
+
+      url = "/#{type}/subjects?"
+      url << "q=#{u option[:q]}&" if option[:q]
+      url << "tag=#{u option[:tag]}&" if option[:tag]
+      url << "start_index=#{u option[:start_index]}&" if option[:start_index]
+      url << "max_results=#{u option[:max_results]}&" if option[:max_results]
+      url.slice!(-1)
+      url
+    end
   end
 end
 

data/lib/douban/miniblog.rb

@@ -4,20 +4,20 @@ require 'douban/author'
 require 'douban/equal'
 
 module Douban
- class Miniblog
-   include Douban::Equal
-   class << self
-     def attr_names
-       [
-        :id,
-        :title,
-        :category,
-        :published,
-        :link,
-        :content,
-        :attribute,
-        :author
-       ]
+  class Miniblog
+    include Douban::Equal
+    class << self
+      def attr_names
+        [
+          :id,
+          :title,
+          :category,
+          :published,
+          :link,
+          :content,
+          :attribute,
+          :author
+        ]
       end
     end
     attr_names.each do |attr|
@@ -54,6 +54,10 @@ module Douban
       author=REXML::XPath.first(doc,"./author")
       @author=Author.new(author.to_s) if author
     end
- end
+
+    def miniblog_id
+      /\/(\d+)$/.match(@id)[1].to_i rescue nil
+    end
+  end
 end
 

data/lib/douban/miniblog_comment.rb

@@ -0,0 +1,42 @@
+require'rexml/document'
+
+require 'douban/author'
+require 'douban/equal'
+
+module Douban
+  class MiniblogComment
+    include Douban::Equal
+    class << self
+      def attr_names
+        [
+          :id,
+          :author,
+          :published,
+          :content
+        ]
+      end
+    end
+    attr_names.each do |attr|
+      attr_accessor attr
+    end
+    def initialize(atom)
+      doc = case atom
+        when REXML::Document then atom.root
+        when REXML::Element then atom
+        else REXML::Document.new(atom).root
+      end
+      @id = REXML::XPath.first(doc, "./id/text()").to_s rescue nil
+      author = REXML::XPath.first(doc, "./author")
+      @author = Author.new(author) if author
+      @published = REXML::XPath.first(doc, "./published/text()").to_s rescue nil
+      @content = REXML::XPath.first(doc, "./content/text()").to_s rescue nil
+    end
+
+    def miniblog_id
+      /miniblog\/(\d+)\/comment/.match(@id)[1].to_i rescue nil
+    end
+    def comment_id
+      /\/(\d+)$/.match(@id)[1].to_i rescue nil
+    end
+  end
+end

data/lib/douban/miniblog_comments.rb

@@ -0,0 +1,31 @@
+require'rexml/document'
+
+require 'douban/author'
+require 'douban/miniblog_comment'
+require 'douban/page_info'
+
+module Douban
+  class MiniblogComments < Struct.new(:title, :author, :comments, :page_info)
+    def initialize(*args)
+      if args.size != 1
+        super(*args)
+        return
+      end
+      
+      atom = args[0]
+      doc = case atom
+        when REXML::Document then atom.root
+        when REXML::Element then atom
+        else REXML::Document.new(atom).root
+      end
+      self.title = REXML::XPath.first(doc, "./title/text()").to_s rescue nil
+      author = REXML::XPath.first(doc, "./author")
+      self.author = Author.new(author) if author
+      self.comments = []
+      REXML::XPath.each(doc, "./entry") do |entry|
+        self.comments << MiniblogComment.new(entry)
+      end
+      self.page_info = PageInfo.new(doc)
+    end
+  end
+end

data/lib/douban/page_info.rb

@@ -0,0 +1,23 @@
+require 'rexml/document'
+
+module Douban
+  class PageInfo < Struct.new(:items_per_page, :start_index, :total_results)
+    def initialize(*args)
+      if args.size != 1
+        super(*args)
+        return
+      end
+
+      atom = args[0]
+      doc = case atom
+            when REXML::Document then atom.root
+            when REXML::Element then atom
+            else REXML::Document.new(atom).root
+            end
+
+      self.items_per_page = REXML::XPath.first(doc, "./openSearch:itemsPerPage/text()").to_s.to_i rescue nil
+      self.start_index = REXML::XPath.first(doc, "./openSearch:startIndex/text()").to_s.to_i rescue nil
+      self.total_results = REXML::XPath.first(doc, "./openSearch:totalResults/text()").to_s.to_i rescue nil
+    end
+  end
+end

data/lib/douban/subject.rb

@@ -1,6 +1,8 @@
 require 'rexml/document'
 require 'douban/tag'
+require 'douban/author'
 require 'douban/equal'
+
 module Douban
   class Subject
     include Douban::Equal
@@ -22,17 +24,23 @@ module Douban
     attr_names.each do |attr|
       attr_accessor attr
     end
-   def initialize(atom='')
-      doc = atom.kind_of?(REXML::Element) ? atom : REXML::Document.new(atom)
-      id=REXML::XPath.first(doc,".//id")
+    def initialize(atom='')
+      doc = case atom
+        when REXML::Document then atom.root
+        when REXML::Element then atom
+        when nil then nil
+        else REXML::Document.new(atom).root
+      end
+
+      id=REXML::XPath.first(doc,"./id")
       @id=id.text if id
-      title=REXML::XPath.first(doc,".//title")
+      title=REXML::XPath.first(doc,"./title")
       @title=title.text if title
       @category={}
-      category=REXML::XPath.first(doc,".//category")
+      category=REXML::XPath.first(doc,"./category")
       @category['term']=category.attributes['term'] if category
       @category['scheme']=category.attributes['scheme'] if category
-      REXML::XPath.each(doc,".//db:tag") do |tag|
+      REXML::XPath.each(doc,"./db:tag") do |tag|
         @tag||=[]
         t=Tag.new
         t.title=tag.attributes['name']
@@ -40,48 +48,72 @@ module Douban
         @tag<< t
       end
       @author||=Author.new
-      name=REXML::XPath.first(doc,".//author/name")
+      name=REXML::XPath.first(doc,"./author/name")
       @author.name=name.text if name
-      uri=REXML::XPath.first(doc,".//author/uri")
+      uri=REXML::XPath.first(doc,"./author/uri")
       @author.uri=uri.text if uri
-      REXML::XPath.each(doc,".//author/link") do |link|
+      REXML::XPath.each(doc,"./author/link") do |link|
         @author.link||={}
         @author.link[link.attributes['rel']]=link.attributes['href']
       end
-      summary=REXML::XPath.first(doc,".//summary")
+      summary=REXML::XPath.first(doc,"./summary")
       @summary=summary.text if summary
-      REXML::XPath.each(doc,".//link") do |link|
+      REXML::XPath.each(doc,"./link") do |link|
         @link||={}
         @link[link.attributes['rel']]=link.attributes['href']
       end
-      REXML::XPath.each(doc,".//db:attribute") do |attribute|
+      REXML::XPath.each(doc,"./db:attribute") do |attribute|
         @attribute||={}
         @attribute[attribute.attributes['name']]=attribute.text
       end
       @rating={}
-      rating=REXML::XPath.first(doc,".//gd:rating")
+      rating=REXML::XPath.first(doc,"./gd:rating")
       if rating
         @rating['min']=rating.attributes['min']
         @rating['numRaters']=rating.attributes['numRaters']
         @rating['average']=rating.attributes['average']
         @rating['max']=rating.attributes['max']
       end
-   end
- end
+    end #initialize
+   
+    def subject_id
+      /\/(\d+)$/.match(@id)[1].to_i rescue nil
+    end 
+   
+  end # class Subject
+  
   class Movie<Subject
     def initialize(atom)
       super(atom)
     end
+    
+    def imdb
+      /(tt\d+)\/$/.match(@attribute["imdb"])[1] rescue nil
+    end
   end
+  
   class Book<Subject
     def initialize(atom)
       super(atom)
     end
+    
+    def isbn10
+      @attribute["isbn10"] rescue nil
+    end
+    
+    def isbn13
+      @attribute["isbn13"] rescue nil
+    end
+    
+    def isbn
+      isbn13 ? isbn13 : isbn10
+    end
   end
+  
   class Music<Subject
     def initialize(atom)
       super(atom)
     end
   end
- end
+end
 

data/spec/douban/authorize_spec.rb

@@ -61,8 +61,9 @@ module Douban
   context "logged in with oauth" do
     before(:each) do
       Authorize.debug = true
-      @access_token = '0306646daca492b609132d4905edb822'
-      @access_secret = '22070cec426cb925'
+      @access_token = 'be84e4bc8d0581d03b8eae35a7108570'
+      @access_secret = '16eeaa7b1053323c'
+      @uid = '43100799'
       @authorize.access_token = OAuth::Token.new(@access_token, @access_secret)
     end
 
@@ -76,7 +77,7 @@ module Douban
         it "should works" do
           people = @authorize.get_people
           people.nil?.should == false
-          people.uid.should == "41502874"
+          people.uid.should == @uid
         end
       end
 
@@ -137,6 +138,22 @@ module Douban
           miniblogs[0].id.should_not == miniblogs[-1].id
         end
       end
+
+      context "get_miniblog_comments" do
+        it "should return [MiniblogComment] with different id" do
+          comments = @authorize.get_miniblog_comments(378744647)
+          comments.comments.size.should >= 2
+          comments.comments[0].id.should_not == comments.comments[-1].id
+        end
+      end
+
+      context "create_miniblog_comment" do 
+        it "should works" do
+          comment = @authorize.create_miniblog_comment(374774226, "单元测试#{rand}")
+          comment.class.should == MiniblogComment
+          @authorize.delete_miniblog_comment(comment).should == true
+        end
+      end
     end
 
     context "recommendation" do
@@ -235,12 +252,12 @@ module Douban
       end
 
       context "event" do
-        context "create_event" do
-          it "should return Event" do
-            event = @authorize.create_event("douban-ruby 单元测试", "event 好像不能自动删除", "大山子798艺术区 IT馆")
-            event.class.should == Douban::Event
-          end
-        end
+        #context "create_event" do
+        #  it "should return Event" do
+        #    event = @authorize.create_event("douban-ruby 单元测试", "event 好像不能自动删除", "大山子798艺术区 IT馆")
+        #    event.class.should == Douban::Event
+        #  end
+        #end
 
         context "get_event_participant_people" do
           it "should return [People] with different id" do
@@ -454,15 +471,62 @@ module Douban
             book = @authorize.get_book(1088840)
             book.class.should == Book
           end
+          
+          it "should support :id => id" do
+            @authorize.get_book(:id => 1088840).should == @authorize.get_book(1088840)
+          end
+          
+          it "should support :isbn => isbn" do
+            @authorize.get_book(:isbn => 9787040048803).should == @authorize.get_book(1088840)
+          end
+          
+          it "should support Book" do
+            book = @authorize.get_book(1088840)
+            @authorize.get_book(book).should == book
+          end
+        end
+        
+        context "get_movie" do
+          it "should return Movie" do
+            movie = @authorize.get_movie(1858711)
+            movie.class.should == Movie
+          end
+          
+          it "should support :id => id" do
+            @authorize.get_movie(:id => 1858711).should == @authorize.get_movie(1858711)
+          end
+          
+          it "should support :imdb => imdb" do
+            @authorize.get_movie(:imdb => 'tt0435761').should == @authorize.get_movie(1858711)
+          end
+          
+          it "should support Movie" do
+            movie = @authorize.get_movie(1858711)
+            @authorize.get_movie(movie).should == movie
+          end
         end
 
         context "search_book" do
-          it "should return [Book] with different id" do
+          it "should support query" do
             books = @authorize.search_book("ruby")
             books.size.should >= 2
             books[0].class.should == Book
             books[0].id.should_not == books[-1].id
           end
+
+          it "should support :q => query" do
+            books = @authorize.search_book(:q => "ruby")
+            books.size.should >= 2
+            books[0].class.should == Book
+            books[0].id.should_not == books[-1].id
+          end
+
+          it "should support :tag => tag" do
+            books = @authorize.search_book(:tag => "ruby")
+            books.size.should >= 2
+            books[0].class.should == Book
+            books[0].id.should_not == books[-1].id
+          end
         end
         context "search_movie" do
           it "should return [Movie] with different id" do
@@ -500,8 +564,12 @@ module Douban
           end
         end
       end
-
-
+      
+      context "verify_token" do
+        it "should return true" do
+          @authorize.verify_token.should == true
+        end
+      end
     end # context "logged in with oauth"
   end #describe
 end #Module

data/spec/douban/miniblog_comment_spec.rb

@@ -0,0 +1,42 @@
+require File.join(File.dirname(__FILE__), '/../spec_helper')
+
+require 'douban/miniblog_comment'
+
+module Douban
+  describe MiniblogComment do
+    before do
+      @s = %Q{<entry>
+                <id>http://api.douban.com/miniblog/378744647/comment/12638415</id>
+                <author>
+                        <link href="http://api.douban.com/people/3918884" rel="self"/>
+                        <link href="http://www.douban.com/people/Ben.Dan/" rel="alternate"/>
+                        <link href="http://t.douban.com/icon/u3918884-8.jpg" rel="icon"/>
+                        <name>積み木</name>
+                        <uri>http://api.douban.com/people/3918884</uri>
+                </author>
+                <published>2010-07-07T03:19:07+08:00</published>
+                <content>都爱远射哈哈</content>
+        </entry>}
+    end
+
+    it "should correct deserialize from string" do
+      comment = MiniblogComment.new(@s)
+      comment.id.should == "http://api.douban.com/miniblog/378744647/comment/12638415"
+      comment.author.class.should == Author
+      comment.published.should == "2010-07-07T03:19:07+08:00"
+      comment.content.should == "都爱远射哈哈"
+      comment.miniblog_id.should == 378744647
+      comment.comment_id.should == 12638415
+    end
+
+    it "should correct deserialize from REXML::Document" do
+      MiniblogComment.new(REXML::Document.new(@s)).should == MiniblogComment.new(@s)
+    end
+
+    it "should correct deserialize from REXML::Element" do
+      MiniblogComment.new(REXML::Document.new(@s).root).should == MiniblogComment.new(@s)
+    end
+  end
+end
+
+

data/spec/douban/miniblog_comments_spec.rb

@@ -0,0 +1,66 @@
+require File.join(File.dirname(__FILE__), '/../spec_helper')
+
+require 'douban/miniblog_comments'
+
+module Douban
+  describe MiniblogComments do
+    before do
+      @s = %Q{<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:db="http://www.douban.com/xmlns/" xmlns:gd="http://schemas.google.com/g/2005" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/" xmlns:opensearch="http://a9.com/-/spec/opensearchrss/1.0/">
+        <title>嗷嗷嗷嗷 的回应</title>
+        <author>
+                <link href="http://api.douban.com/people/1966902" rel="self"/>
+                <link href="http://www.douban.com/people/1966902/" rel="alternate"/>
+                <link href="http://t.douban.com/icon/u1966902-13.jpg" rel="icon"/>
+                <name>戳戳三文鱼</name>
+                <uri>http://api.douban.com/people/1966902</uri>
+        </author>
+        <entry>
+                <id>http://api.douban.com/miniblog/378744647/comment/12638415</id>
+                <author>
+                        <link href="http://api.douban.com/people/3918884" rel="self"/>
+                        <link href="http://www.douban.com/people/Ben.Dan/" rel="alternate"/>
+                        <link href="http://t.douban.com/icon/u3918884-8.jpg" rel="icon"/>
+                        <name>積み木</name>
+                        <uri>http://api.douban.com/people/3918884</uri>
+                </author>
+                <published>2010-07-07T03:19:07+08:00</published>
+                <content>都爱远射哈哈</content>
+        </entry>
+        <entry>
+                <id>http://api.douban.com/miniblog/378744647/comment/12638491</id>
+                <author>
+                        <link href="http://api.douban.com/people/1966902" rel="self"/>
+                        <link href="http://www.douban.com/people/1966902/" rel="alternate"/>
+                        <link href="http://t.douban.com/icon/u1966902-13.jpg" rel="icon"/>
+                        <name>戳戳三文鱼</name>
+                        <uri>http://api.douban.com/people/1966902</uri>
+                </author>
+                <published>2010-07-07T03:20:17+08:00</published>
+                <content>两脚都挺漂亮的，边裁今天不给力啊，吹掉荷兰和乌拉圭的不是越位的“越位”球</content>
+        </entry>
+        <openSearch:itemsPerPage>10</openSearch:itemsPerPage>
+        <openSearch:startIndex>1</openSearch:startIndex>
+        <openSearch:totalResults>2</openSearch:totalResults>
+</feed>}
+    end
+
+    it "should correct deserialize from string" do
+      comments = MiniblogComments.new(@s)
+      comments.title.should == "嗷嗷嗷嗷 的回应"
+      comments.author.class.should == Author
+      comments.comments.size.should == 2
+      comments.comments[0].class.should == MiniblogComment
+      comments.page_info.should == PageInfo.new(10,1,2)
+    end
+
+    it "should correct deserialize from REXML::Document" do
+      MiniblogComments.new(REXML::Document.new(@s)).should == MiniblogComments.new(@s)
+    end
+
+    it "should correct deserialize from REXML::Element" do
+      MiniblogComments.new(REXML::Document.new(@s).root).should == MiniblogComments.new(@s)
+    end
+  end
+end
+

data/spec/douban/miniblog_spec.rb

@@ -27,6 +27,7 @@ eos
     it "should correct deserialize from string" do
       miniblog = Douban::Miniblog.new(@s)
       miniblog.id.should == "http://api.douban.com/miniblog/374100199"
+      miniblog.miniblog_id.should == 374100199
       miniblog.title.should == '<b>单元测试0.921892231299059'
       miniblog.category.should == {"term"=>"http://www.douban.com/2007#miniblog.saying", "scheme"=>"http://www.douban.com/2007#kind"}
       miniblog.published.should == "2010-06-30T19:27:41+08:00"

data/spec/douban/page_info_spec.rb

@@ -0,0 +1,26 @@
+require File.join(File.dirname(__FILE__), '/../spec_helper')
+
+require 'douban/page_info'
+
+module Douban
+  describe PageInfo do
+    before do
+      @s = %Q{<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:db="http://www.douban.com/xmlns/" xmlns:gd="http://schemas.google.com/g/2005" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/" xmlns:opensearch="http://a9.com/-/spec/opensearchrss/1.0/">
+        <openSearch:itemsPerPage>10</openSearch:itemsPerPage>
+        <openSearch:startIndex>1</openSearch:startIndex>
+        <openSearch:totalResults>2</openSearch:totalResults>
+</feed>}
+    end
+
+    it "should correct deserialize from string" do
+      PageInfo.new(@s).should == PageInfo.new(10,1,2)
+    end
+    it "should correct deserialize from REXML::Document" do
+      PageInfo.new(REXML::Document.new(@s)).should == PageInfo.new(10,1,2)
+    end
+    it "should correct deserialize from REXML::Element" do
+      PageInfo.new(REXML::Document.new(@s).root).should == PageInfo.new(10,1,2)
+    end
+  end
+end

data/spec/douban/subject_spec.rb

@@ -0,0 +1,136 @@
+require File.join(File.dirname(__FILE__), '/../spec_helper')
+
+require 'douban/subject'
+
+module Douban
+  describe Subject do
+    before do
+      @s = %Q{<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:db="http://www.douban.com/xmlns/" xmlns:gd="http://schemas.google.com/g/2005" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/" xmlns:opensearch="http://a9.com/-/spec/opensearchrss/1.0/">
+        <id>http://api.douban.com/book/subject/1088840</id>
+        <title>无机化学(下)/高等学校教材</title>
+        <category scheme="http://www.douban.com/2007#kind" term="http://www.douban.com/2007#book"/>
+        <author>
+                <name>武汉大学、吉林大学</name>
+        </author>
+        <link href="http://api.douban.com/book/subject/1088840" rel="self"/>
+        <link href="http://book.douban.com/subject/1088840/" rel="alternate"/>
+        <link href="http://img2.douban.com/spic/s1075910.jpg" rel="image"/>
+        <link href="http://api.douban.com/collection/266907549" rel="collection"/>
+        <db:attribute name="author">武汉大学、吉林大学</db:attribute>
+        <db:attribute name="isbn10">7040048809</db:attribute>
+        <db:attribute name="isbn13">9787040048803</db:attribute>
+        <db:attribute name="title">无机化学(下)/高等学校教材</db:attribute>
+        <db:attribute name="pages">1185</db:attribute>
+        <db:attribute name="price">26.5</db:attribute>
+        <db:attribute name="publisher">高等教育出版社</db:attribute>
+        <db:attribute name="binding">平装</db:attribute>
+        <db:attribute name="pubdate">2005-1-1</db:attribute>
+        <db:tag count="23" name="化学"/>
+        <db:tag count="16" name="无机化学"/>
+        <db:tag count="10" name="教材"/>
+        <db:tag count="6" name="武汉大学"/>
+        <db:tag count="3" name="Chemistry"/>
+        <db:tag count="2" name="科学"/>
+        <db:tag count="2" name="吉林大学"/>
+        <db:tag count="1" name="无机"/>
+        <gd:rating average="8.0" max="10" min="0" numRaters="50"/>
+</entry>}
+    end
+    
+    it "should correct deserialize from string" do
+      subject = Subject.new(@s)
+      subject.id.should == "http://api.douban.com/book/subject/1088840"
+      subject.subject_id.should == 1088840
+      subject.title.should == "无机化学(下)/高等学校教材"
+      subject.category.should == {"term"=>"http://www.douban.com/2007#book", "scheme"=>"http://www.douban.com/2007#kind"}
+      subject.author.class.should == Author
+      subject.link.should == {"self"=>"http://api.douban.com/book/subject/1088840", 
+        "alternate"=>"http://book.douban.com/subject/1088840/", 
+        "image"=>"http://img2.douban.com/spic/s1075910.jpg", 
+        "collection"=>"http://api.douban.com/collection/266907549"}
+      subject.summary.should == nil
+      subject.attribute.should == {"pubdate"=>"2005-1-1", "price"=>"26.5", "isbn10"=>"7040048809", "title"=>"无机化学(下)/高等学校教\346\235\220", "author"=>"武汉大学、吉林大\345\255\246", "isbn13"=>"9787040048803", "publisher"=>"高等教育出版社", 
+        "pages"=>"1185", "binding"=>"平装"}
+      subject.tag.size.should == 8
+      subject.tag[0].class.should == Tag
+      subject.rating.should == {"max"=>"10", "average"=>"8.0", "min"=>"0", "numRaters"=>"50"}
+    end
+    
+    it "should support ==" do
+      Subject.new(@s).should == Subject.new(@s)
+    end
+    
+    it "should correct deserialize from REXML::Document" do
+      Subject.new(REXML::Document.new(@s)).should == Subject.new(@s)
+    end
+
+    it "should correct deserialize from REXML::Element" do
+      Subject.new(REXML::Document.new(@s).root).should == Subject.new(@s)
+    end
+    
+    context "book" do
+      it "should support isbn" do
+        book = Book.new(@s)
+        book.isbn10.should == "7040048809"
+        book.isbn13.should == "9787040048803"
+        book.isbn.should == book.isbn13
+      end
+    end
+    
+    context "movie" do
+      before do
+        @s_movie = %Q{<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:db="http://www.douban.com/xmlns/" xmlns:gd="http://schemas.google.com/g/2005" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/" xmlns:opensearch="http://a9.com/-/spec/opensearchrss/1.0/">
+        <id>http://api.douban.com/movie/subject/1858711</id>
+        <title>Toy Story 3</title>
+        <category scheme="http://www.douban.com/2007#kind" term="http://www.douban.com/2007#movie"/>
+        <author>
+                <name>Lee Unkrich</name>
+        </author>
+        <link href="http://api.douban.com/movie/subject/1858711" rel="self"/>
+        <link href="http://movie.douban.com/subject/1858711/" rel="alternate"/>
+        <link href="http://t.douban.com/spic/s4207957.jpg" rel="image"/>
+        <summary>自从11年前玩具们所经历的大冒险后，玩具们安然无恙的度过了好几个年头。转眼间，玩具们的主人安迪（约翰·莫里斯 John Morris 配音）已经成为一个青少年，也即将离家去展开他的大学生涯。伍迪（汤姆·汉克斯 Tom Hanks 配音）与巴斯（蒂姆·艾伦 Tim Allen 配音）以及其他的玩具们也都人心惶惶，深怕这个他们内心最恐惧被丢弃的一天即将来临。这一天，安迪的妈妈来到安迪的房间，询问他将如何处置这些伴他渡过童年的玩具们，并且要求安迪在离家前要把这些东西处理好，如果没有将要留下的玩具放置阁楼收藏，她就会把这些玩具处理掉。安迪在妈妈的逼迫下，再次打开他的玩具箱，童年回忆涌上心头，他根本舍不得将任何一件玩具丢掉，所以将所有的玩具都放入大黑袋子中，准备将它们放置阁楼，但正要将袋子放入阁楼的同时，安迪被妹妹呼唤去帮忙，就在阴错阳差之下，妈妈误以为黑袋子里的玩具是要丢弃，所以就将玩具们全数捐给阳光托儿所。
+玩具们来到阳光托儿所原本以为来到了天堂，托儿所里有非常好的规划还有更多玩具的新朋友，而且玩具们也都兴奋的期待能够再与小主人一同玩乐。殊不知托儿所的小朋友一抵达教室的时候才是噩梦的开始，被拉扯、被吞食、被支解几乎是天天上演的戏码。另外托儿所还有黑暗的地下组织，玩具们人人自危。
+同时安迪发现珍藏的玩具被不心丢弃了，正心急如焚的寻找，玩具们得知小主人安迪在寻找他们，即将一起展开史上最大规模的逃亡行动，还有更多的冒险等着他们，玩具们是否能成功回到小主人安迪的身边呢？
+本片在视听效果上全面追赶潮流，大规模投放3D版本。此外，本片还成为了杜比7.1版本音响系统第一部应用的影片。</summary>
+        <db:attribute name="country">美国</db:attribute>
+        <db:attribute name="website">http://disney.go.com/toystory/</db:attribute>
+        <db:attribute name="writer">Michael Arndt</db:attribute>
+        <db:attribute name="writer">John Lasseter</db:attribute>
+        <db:attribute name="title">Toy Story 3</db:attribute>
+        <db:attribute name="director">Lee Unkrich</db:attribute>
+        <db:attribute lang="zh_CN" name="aka">玩具总动员3</db:attribute>
+        <db:attribute name="pubdate">2010-06-16 (中国大陆)</db:attribute>
+        <db:attribute name="imdb">http://www.imdb.com/title/tt0435761/</db:attribute>
+        <db:attribute name="language">英语</db:attribute>
+        <db:attribute name="language">西班牙语</db:attribute>
+        <db:attribute name="cast">Tom Hanks</db:attribute>
+        <db:attribute name="cast">Tim Allen</db:attribute>
+        <db:attribute name="cast">Joan Cusack</db:attribute>
+        <db:attribute name="cast">Ned Beatty</db:attribute>
+        <db:attribute name="cast">Don Rickles</db:attribute>
+        <db:attribute name="cast">Michael Keaton</db:attribute>
+        <db:attribute name="aka">反斗奇兵3</db:attribute>
+        <db:attribute name="aka">玩具总动员3</db:attribute>
+        <db:tag count="6515" name="动画"/>
+        <db:tag count="4202" name="Pixar"/>
+        <db:tag count="3054" name="美国"/>
+        <db:tag count="2653" name="3D"/>
+        <db:tag count="2003" name="迪斯尼"/>
+        <db:tag count="1123" name="2010"/>
+        <db:tag count="963" name="成长"/>
+        <db:tag count="879" name="喜剧"/>
+        <gd:rating average="9.1" max="10" min="0" numRaters="18675"/>
+</entry>}
+      end
+      
+      it "should support imdb" do
+        movie = Movie.new(@s_movie)
+        movie.imdb.should == "tt0435761"
+      end
+    end
+  end
+end
+  

metadata

@@ -5,12 +5,12 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
-- Hoooopo
 - LI Daobing
+- Hoooopo
 autorequire: 
 bindir: bin
 cert_chain: 
@@ -36,13 +36,25 @@ cert_chain:
   odexk8E9/2c=
   -----END CERTIFICATE-----
 
-date: 2010-07-05 00:00:00 +08:00
+date: 2010-07-10 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: oauth
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -52,11 +64,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -66,14 +78,14 @@ dependencies:
         - 1
         version: 2.6.1
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: |-
   douban ruby client. including OAuth support. 
   
   Douban API reference: http://www.douban.com/service/apidoc/reference/
 email: 
-- hoooopo@gmail.com
 - lidaobing@gmail.com
+- hoooopo@gmail.com
 executables: []
 
 extensions: []
@@ -96,7 +108,10 @@ files:
 - lib/douban/event.rb
 - lib/douban/mail.rb
 - lib/douban/miniblog.rb
+- lib/douban/miniblog_comment.rb
+- lib/douban/miniblog_comments.rb
 - lib/douban/note.rb
+- lib/douban/page_info.rb
 - lib/douban/people.rb
 - lib/douban/recommendation.rb
 - lib/douban/recommendation_comment.rb
@@ -108,12 +123,16 @@ files:
 - spec/douban/collection_spec.rb
 - spec/douban/event_spec.rb
 - spec/douban/mail_spec.rb
+- spec/douban/miniblog_comment_spec.rb
+- spec/douban/miniblog_comments_spec.rb
 - spec/douban/miniblog_spec.rb
 - spec/douban/note_spec.rb
+- spec/douban/page_info_spec.rb
 - spec/douban/people_spec.rb
 - spec/douban/recommendation_comment_spec.rb
 - spec/douban/recommendation_spec.rb
 - spec/douban/review_spec.rb
+- spec/douban/subject_spec.rb
 - spec/douban/tag_spec.rb
 - spec/douban_spec.rb
 - spec/spec_helper.rb