doubapi 0.0.6 → 0.0.7

data/lib/doubapi/version.rb

@@ -1,3 +1,3 @@
 module Doubapi
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/doubapi.rb

@@ -7,8 +7,33 @@ require 'pp'
 module Doubapi
 #return a Nokogiri XML  object
 #use Douban API
-def self.douban_get_xml url
+
+
+Event =  Struct.new :title, :when, :where, :what, :link
+#release_date is in the format of YY-MM-DD
+Album =  Struct.new :author, :title, :release_date,  :link
+
+
+#return Doubapi::Event[]
+def self.search_events_of artist , after_date =  Time.now.strftime("%Y-%m")
+	Douban.search_events_of artist, after_date
+end
+
+
+
+#return Doubapi::Album[]
+def self.search_albums_of artist , after_date = "1900.01"
+	Douban.search_albums_of artist ,after_date
+end
+
+protected 
+class Douban 
+
+#instance method
+class << self
+def douban_get_xml url
 	puts url
+	#I have forgot why i need to specify the user agend
     doc = open(url,'User-Agent' => 'ruby')
     Nokogiri::HTML(doc,nil, "utf-8")
     #Nokogiri::HTML(open(url,:proxy => nil,'User-Agent' => 'ruby'),nil, "utf-8")
@@ -22,15 +47,21 @@ end
 
 #return Atom
 #Douban search : will return results that does not match 
-def self.search_event key_chinese, location = "shanghai"
+def search_event key_chinese, location = "shanghai" ,max=20
+
+  if (key_chinese.downcase == "all")
+	uri="http://api.douban.com/event/location/#{location}?type=music&start-index=1&max-results=#{max}"
+  else
   keywords= "%" + key_chinese.each_byte.map {|c| c.to_s(16)}.join("%")
-  uri="http://api.douban.com/events?q=#{keywords}&location=#{location}&start-index=1&max-results=5"
+  uri="http://api.douban.com/events?q=#{keywords}&location=#{location}&start-index=1&max-results=#{max}"
+  end
+
   #Let's grab it slowly to avoid being baned...	
   sleep(7) 	
   douban_get_xml(uri)
 end
 
-def self.search_ablum artist_chinese ,max=10
+def search_ablum artist_chinese ,max=10
   keywords= "%" + artist_chinese.each_byte.map {|c| c.to_s(16)}.join("%")
   uri="http://api.douban.com/music/subjects?tag=#{keywords}&start-index=1&max-results=#{max}"
   #Let's grab it slowly to avoid being baned...	
@@ -38,21 +69,20 @@ def self.search_ablum artist_chinese ,max=10
   douban_get_xml(uri)
 end
 
-Douban_Event =  Struct.new :title, :when, :where, :what, :link
-
-#
-#release_date is in the format of YY-MM-DD
-Douban_Album =  Struct.new :author, :title, :release_date,  :link
-
 
 #TODO
-def self.looks_like_a_live_show? e, artist
+def looks_like_a_live_show? e, artist
 
 	#check e.when should happen
 	#2010-08-13F21:30:00+08:00
 	_,_,_,hour = e.when.scan(/\d{1,4}/);
 
-	return true if hour.to_i > 18 and e.what.include?(artist)
+	if artist.downcase == "all"
+		return true if hour.to_i > 18
+	else
+		return true if hour.to_i > 18 and e.what.include?(artist) 
+	end
+
 	return false
 end
 
@@ -63,13 +93,13 @@ end
 #2010#1
 #2010-1
 #2010年1
-def self.compare_date a , b
+def compare_date a , b
 	ya, ma = a.scan(/\d{1,4}/)
 	yb, mb = b.scan(/\d{1,4}/)
 	return true if (ya.to_i * 12 + ma.to_i ) >= (yb.to_i*12+mb.to_i)
 end
 
-def self.search_albums_of artist , after_date = "1900.01"
+def search_albums_of artist , after_date = "1900.01"
 	doc = search_ablum artist
 	albums=[]
 
@@ -102,13 +132,25 @@ def self.search_albums_of artist , after_date = "1900.01"
 		formated_release_day = "#{y}-#{m}-#{d}" 
 		#check the release date
 		if compare_date release_date, after_date			
-			albums << Douban_Album.new(author, title, formated_release_day, link)
+			albums << Doubapi::Album.new(author, title, formated_release_day, link)
 		end
 	end
 	albums
 end
 
-def self.search_events_of artist
+
+  #return Time object
+  #date format is
+  #"时间：2010年8月13日 周五 21:30 -  23:55"
+  #or
+  #2010-08-13F21:30:00+08:00
+  def parse_date date
+    year, month , day = date.scan(/\d{1,4}/)
+    Time.local(year,month,day)
+  end
+
+def search_events_of artist , after_date =  Time.now.strftime("%Y-%m")
+
   doc = search_event artist
   events=[]
   doc.xpath("//entry").each do |entry|
@@ -120,29 +162,18 @@ def self.search_events_of artist
     where = entry.at_xpath('.//where')["valuestring"]
     link =  entry.at_xpath(".//link[@rel='alternate']")["href"]
     what = entry.at_xpath(".//content").text
-    events << Douban_Event.new(title, start_time, where, what, link)
+
+	#check the date
+	if parse_date(start_time) > parse_date(after_date)
+	    events << Doubapi::Event.new(title, start_time, where, what, link)
+    end
   end
 	
   #filtering of the results
   events.select{|e| looks_like_a_live_show?(e,artist)}
 end
 
-
-
-if __FILE__== $0
-#should use Artist Model
-#File.read("./app/controllers/artists.txt").split("\n").each {|artist| Artist.new(:name=>artist,:intro=>"no").save}
-#Artist.all.each {|a| puts a.name}
-File.read("artists.txt").split("\n").each do |artist|
-	puts artist
-	e = search_events_of artist
-  	e.each do |event|
-    	puts event.title
-  		puts event.when
-  		puts event.where
-        puts event.what
-  end
-end
-end
+end #self,instance method end
+end #Class Douban
 
 end #Module  

data/spec/doubapi_spec.rb

@@ -58,4 +58,27 @@ describe Doubapi do
 
 	end
 
+
+   it "should be able to search all the shows in 育音堂 and the event.when should later than the time when the search happened if after_date has not specified" do
+		key = "育音堂"
+		Doubapi.search_events_of(key).each do |event|
+				event.what.should be_include(key)
+				puts event.title
+				puts event.when
+				puts event.where
+				puts event.link
+		end	
+   end
+
+	it "should search all the music events if no artist is specified" do 
+
+		Doubapi.search_events_of("all").each do |event|
+				puts event.title
+				puts event.when
+				puts event.where
+				puts event.link
+		end	
+
+    end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: doubapi
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - pierr chen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 +08:00
+date: 2011-01-07 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency