doubapi 0.0.8 → 0.0.9

data/lib/doubapi/version.rb

@@ -1,3 +1,3 @@
 module Doubapi
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/doubapi.rb

@@ -1,4 +1,4 @@
-require 'rubygems'  #a hack to require failure for nokogiri
+require 'RUBYgems'  #a hack to require failure for nokogiri
 require 'open-uri'
 require 'nokogiri'
 require 'pp'
@@ -13,17 +13,17 @@ 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
 
-
+#input:{key => "all/singer_name", :location => "shanghai", :start_index => 16,:max_result => 15}
 #return Doubapi::Event[]
-def self.search_events_of artist , after_date =  Time.now.strftime("%Y-%m")
-	Douban.search_events_of artist, after_date
+def self.search_events_of h
+	Douban.search_events_of h
 end
 
 
-
+#input {:singer,:since}
 #return Doubapi::Album[]
-def self.search_albums_of artist , after_date = "1900.01"
-	Douban.search_albums_of artist ,after_date
+def self.search_albums_of h 
+	Douban.search_albums_of h 
 end
 
 protected 
@@ -47,13 +47,19 @@ end
 
 #return Atom
 #Douban search : will return results that does not match 
-def search_event key_chinese, location = "shanghai" ,max=20
+def search_event h
+  puts h.inspect
+
+  key_chinese = h[:key]
+  location    = h[:location] || "shanghai"
+  start_index = h[:start_index] || 1
+  max         = h[:max_result]|| 20
 
   if (key_chinese.downcase == "all")
-	uri="http://api.douban.com/event/location/#{location}?type=music&start-index=1&max-results=#{max}"
+	uri="http://api.douban.com/event/location/#{location}?type=music&start-index=#{start_index}&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=#{max}"
+  uri="http://api.douban.com/events?q=#{keywords}&location=#{location}&start-index=#{start_index}&max-results=#{max}"
   end
 
   #Let's grab it slowly to avoid being baned...	
@@ -61,7 +67,9 @@ def search_event key_chinese, location = "shanghai" ,max=20
   douban_get_xml(uri)
 end
 
-def search_ablum artist_chinese ,max=10
+def search_ablum h
+  artist_chinese = h[:singer]
+  max=h[:max_result]||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...	
@@ -99,8 +107,10 @@ def compare_date a , b
 	return true if (ya.to_i * 12 + ma.to_i ) >= (yb.to_i*12+mb.to_i)
 end
 
-def search_albums_of artist , after_date = "1900.01"
-	doc = search_ablum artist
+def search_albums_of h 
+  artist = h[:singer]
+  after_date = h[:since]||"1900.01"
+	doc = search_ablum h
 	albums=[]
 
 	doc.xpath("//entry").each do |entry|
@@ -149,9 +159,12 @@ end
     Time.local(year,month,day)
   end
 
-def search_events_of artist , after_date =  Time.now.strftime("%Y-%m")
-
-  doc = search_event artist
+def search_events_of(h={})
+  
+  puts h.inspect
+  artist = h[:key]
+  after_date =  h[:after_date]||Time.now.strftime("%Y-%m")
+  doc = search_event h
   events=[]
   doc.xpath("//entry").each do |entry|
     #pp entry

data/lib/test.rb

@@ -0,0 +1,62 @@
+#encoding: utf-8
+
+#use local lib instead of the Gem installed
+require './doubapi'
+
+
+def test1
+  key = "许巍" 
+  Doubapi.search_events_of(:key=>key).each do |event|
+    event.what.should be_include(key)
+    puts event.title
+    puts event.when
+    puts event.where
+    puts event.link
+  end	
+
+end
+
+
+def test2
+  author = "李志"
+  Doubapi.search_albums_of(:singer=>author,:since=>"2010-05").each do |album|
+    puts album.author	
+    puts album.release_date	
+    puts album.title	
+    puts album.link	
+  end
+end 
+
+
+
+def test3
+  
+  puts "1-30"
+  Doubapi.search_events_of(:key => "all", :location => "shanghai", :start_index => 1,:max_result => 30).each do |event|
+    puts "#{event.when} #{event.title}"
+    #puts event.where
+    #puts event.link
+  end
+  
+  puts "1-15"
+  
+  Doubapi.search_events_of(:key => "all", :location => "shanghai", :start_index => 1,:max_result => 15).each do |event|
+    puts "#{event.when} #{event.title}"
+    #puts event.where
+    #puts event.link
+  end
+  
+  puts "16-30"
+  
+  Doubapi.search_events_of(:key => "all", :location => "shanghai", :start_index => 16,:max_result => 15).each do |event|
+    puts "#{event.when} #{event.title}"
+    #puts event.where
+    #puts event.link
+  end
+end
+
+
+#test3
+#test1
+test2
+

data/spec/doubapi_spec.rb

@@ -1,4 +1,5 @@
-require 'lib/doubapi'
+#encoding: utf-8
+require 'doubapi'
 describe Doubapi do 
 
 	it "should be able to search 许巍 " do 

metadata

@@ -1,65 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: doubapi
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
+version: !ruby/object:Gem::Version
+  version: 0.0.9
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - pierr chen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-10 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 62196431
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 22
+      - !ruby/object:Gem::Version
         version: 2.0.0.beta.22
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta.22
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: douban API gems
-email: 
+email:
 - pierr.chen@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README
@@ -67,41 +57,33 @@ files:
 - doubapi.gemspec
 - lib/doubapi.rb
 - lib/doubapi/version.rb
+- lib/test.rb
 - spec/doubapi_spec.rb
 - spec/sample_album
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-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: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: doubapi
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: douban API gems
-test_files: []
-
+test_files:
+- spec/doubapi_spec.rb
+- spec/sample_album