douban-ruby 0.0.9 → 0.0.10

data/Gemfile.lock

@@ -1,25 +1,31 @@
 PATH
   remote: .
   specs:
-    douban-ruby (0.0.9)
+    douban-ruby (0.0.10)
       oauth
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
+    json (1.6.5)
+    multi_json (1.1.0)
     oauth (0.4.5)
-    rake (0.9.2)
-    rcov (0.9.9)
-    rdoc (3.8)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
@@ -28,6 +34,6 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   douban-ruby!
   rake
-  rcov
   rdoc
   rspec (~> 2.0)
+  simplecov

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 0.0.10 / 2012-03-22
+* Douban::Subject
+  * support multiple attribute (thx to huacnlee)
+  * attribute stores in array
+  * add #aka, #akas method.
+
 === 0.0.9 / 2011-07-13
 * Douban::Authorize
   * access_token, request_token support :as_hash argument.
@@ -35,9 +41,9 @@
 
 === 0.0.4 / 2010-07-03
 * Douban::Authorize
-  * all create_* functions (except create_mail) will return an Object if 
+  * all create_* functions (except create_mail) will return an Object if
     success, otherwise nil, in old version, it will return true or false.
-    create_mail does not work like other functions, it's should be named 
+    create_mail does not work like other functions, it's should be named
     as send_mail.
   * some refactors on the model classes.
 

data/douban-ruby.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency 'rspec', '~> 2.0'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rcov'
+  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rdoc'
 
   s.files        = `git ls-files`.split("\n")

data/lib/douban/subject.rb

@@ -31,6 +31,7 @@ module Douban
         when nil then nil
         else REXML::Document.new(atom).root
       end
+      @doc = doc
 
       id=REXML::XPath.first(doc,"./id")
       @id=id.text if id
@@ -63,8 +64,9 @@ module Douban
         @link[link.attributes['rel']]=link.attributes['href']
       end
       REXML::XPath.each(doc,"./db:attribute") do |attribute|
-        @attribute||={}
-        @attribute[attribute.attributes['name']]=attribute.text
+        @attribute ||= {}
+        @attribute[attribute.attributes['name']] ||= []
+        @attribute[attribute.attributes['name']] << attribute.text
       end
       @rating={}
       rating=REXML::XPath.first(doc,"./gd:rating")
@@ -75,41 +77,59 @@ module Douban
         @rating['max']=rating.attributes['max']
       end
     end #initialize
-   
+
     def subject_id
       /\/(\d+)$/.match(@id)[1].to_i rescue nil
-    end 
-   
+    end
+
+    def akas(lang = nil)
+      if lang.nil?
+        @attribute["aka"]
+      else
+        res = []
+        REXML::XPath.each(@doc,"./db:attribute") do |attribute|
+          if attribute.attributes["name"] == 'aka' and attribute.attributes["lang"] == lang
+            res << attribute.text
+          end
+        end
+        res
+      end
+    end
+
+    def aka(lang)
+      akas(lang).first
+    end
+
   end # class Subject
-  
+
   class Movie<Subject
     def initialize(atom)
       super(atom)
     end
-    
+
     def imdb
-      /(tt\d+)\/$/.match(@attribute["imdb"])[1] rescue nil
+      /(tt\d+)\/$/.match(@attribute["imdb"].first)[1] rescue nil
     end
   end
-  
+
   class Book<Subject
     def initialize(atom)
       super(atom)
     end
-    
+
     def isbn10
-      @attribute["isbn10"] rescue nil
+      @attribute["isbn10"].first rescue nil
     end
-    
+
     def isbn13
-      @attribute["isbn13"] rescue nil
+      @attribute["isbn13"].first rescue nil
     end
-    
+
     def isbn
       isbn13 ? isbn13 : isbn10
     end
   end
-  
+
   class Music<Subject
     def initialize(atom)
       super(atom)

data/lib/douban/version.rb

@@ -1,3 +1,3 @@
 module Douban
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/spec/douban/subject_spec.rb

@@ -38,7 +38,7 @@ module Douban
         <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"
@@ -46,22 +46,30 @@ module Douban
       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", 
+      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.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
@@ -69,16 +77,14 @@ module Douban
     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
+      subject { Book.new(@s) }
+      its(:isbn10) { should == "7040048809" }
+      its(:isbn13) { should == "9787040048803" }
+      specify { subject.isbn.should == subject.isbn13 }
     end
-    
+
     context "movie" do
       before do
         @s_movie = %Q{<?xml version="1.0" encoding="UTF-8"?>
@@ -114,7 +120,6 @@ module Douban
         <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="美国"/>
@@ -126,12 +131,17 @@ module Douban
         <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
+
+      subject { Movie.new(@s_movie) }
+      its(:title) { should == "Toy Story 3" }
+      its(:imdb) { should == "tt0435761" }
+      its(:akas) { should == ["玩具总动员3", "反斗奇兵3"] }
+      specify { subject.akas("zh_CN").should == ["玩具总动员3"] }
+      specify { subject.aka("zh_CN").should == "玩具总动员3" }
+      specify { subject.attribute["language"].should == ["英语","西班牙语"] }
+      specify { subject.attribute["pubdate"].should == ["2010-06-16 (中国大陆)"] }
+      specify { subject.attribute["director"].should == ["Lee Unkrich"] }
     end
   end
 end
-  
+

metadata

@@ -1,123 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: douban-ruby
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+version: !ruby/object:Gem::Version
+  version: 0.0.10
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - LI Daobing
 - Hoooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-13 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: oauth
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &14140020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *14140020
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &14139480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *14139480
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &14138980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *14138980
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &14138600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *14138600
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &14138140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *14138140
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &14137720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: "Douban API reference: http://www.douban.com/service/apidoc/reference/"
-email: 
+  prerelease: false
+  version_requirements: *14137720
+description: ! 'Douban API reference: http://www.douban.com/service/apidoc/reference/'
+email:
 - lidaobing@gmail.com
 - hoooopo@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - History.rdoc
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -165,44 +135,32 @@ files:
 - spec/douban/tag_spec.rb
 - spec/douban_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/douban-ruby
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --charset
 - UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: douban-ruby
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: douban ruby client. including OAuth support.
 test_files: []
-