doubapi 0.1.3 → 0.1.4

data/lib/doubapi/version.rb

@@ -1,3 +1,3 @@
 module Doubapi
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/doubapi.rb

@@ -26,6 +26,7 @@ require 'open-uri'
 require 'nokogiri'
 require 'pp'
 
+require 'json'
 
 #useful information:
 #when accessing the the Nokogiri parsed result, all the name are downcase-d
@@ -41,7 +42,10 @@ module Doubapi
 #use Douban API
 Event =  Struct.new :title, :when, :where, :what,:link,:poster_mobile,:bar_icon
 #release_date is in the format of YY-MM-DD
-Album =  Struct.new :author, :title, :release_date, :link,:cover_thumbnail,:cover_big,:publisher,:mobile_site,:rating
+Album =  Struct.new :author, :title, :release_date, :link,:cover_thumbnail,:cover_big,:publisher,:mobile_site,:rating,:tracks
+
+Track = Struct.new :title
+
 
 #input:{key => "all/singer_name", :location => "shanghai", :start_index => 16,:max_result => 15}
 #return total number of events satisfying the search criterion 
@@ -63,7 +67,7 @@ end
 #return total number of events satisfying the search criterion 
 #return Doubapi::Album[]
 def self.search_albums_of h ,&block
- totalResult, returnedResult =	Douban.search_albums_of h 
+ totalResult, returnedResult =	Douban.search_albums_of_v2 h 
  if block_given?
    returnedResult.each {|album| block.call(album) }
    return totalResult;
@@ -176,6 +180,49 @@ def formate_release_date release_date
 end
 
 
+
+# use doubapi v2 where json result was returned 
+def search_albums_of_v2 h
+
+  artist_chinese = h[:singer]
+  max=h[:max_result]||10
+  keywords= "%" + artist_chinese.each_byte.map {|c| c.to_s(16)}.join("%")
+	url="https://api.douban.com/v2/music/search?q=#{keywords}"
+ 	#uri="http://api.douban.com/music/subjects?tag=#{keywords}&start-index=1&max-results=#{max}"
+
+	puts "requeset url #{url}"
+	#issue http request 
+  doc = open(url, :proxy => nil, 'User-Agent' => 'ruby')
+
+	#parse result
+	albums = []
+	response = JSON.parse(File.read(doc))
+	response["musics"].each do |item|
+		#select only whose singer eqls artist_chinese
+		if item["attrs"]["singer"].include?(artist_chinese)
+			m = item["attrs"]
+			author = artist_chinese
+			title = m["title"].first
+			formated_release_day = m["pubdate"].first
+			link = mobile_site = item['mobile_link']
+			cover_thumnail = cover_big = item['image']
+			publisher = m['publisher']
+			rating = item['rating']['average']
+			tracks=[]
+			m['tracks'].first.split('\n').each do |t|
+				tracks << Doubapi::Track.new(t)
+			end
+
+  		albums << Doubapi::Album.new(author, title, formated_release_day, link, 
+																	 cover_thumnail,cover_big ,publisher,mobile_site,rating,
+																	tracks)
+		end 
+	end
+	[albums.size,albums]
+end
+
+
+
 #
 #search albums tagged with h[:singer]. It is not quite accurate. I have seen some irrevlant result are returned.
 #

data/lib/test.rb

@@ -33,6 +33,10 @@ def test2
     puts album.link	
     puts album.mobile_site
     puts album.rating
+
+		album.tracks.each do |track|
+			puts track.title
+		end
   end
   
   #rating decending

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doubapi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec