zhangmen 0.1.1 → 0.2.0

data/Gemfile

@@ -2,16 +2,20 @@ source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
 # Example:
 #   gem 'activesupport', '>= 2.3.5'
-gem 'json'
-gem 'mechanize'
-gem 'nokogiri'
+gem 'curb', '>= 0.8.0'
+gem 'hpricot', '>= 0.8.6'
+gem 'json', '>= 1.0.0', :platform => :ruby_18
+gem 'mechanize', '>= 2.3.0'
+gem 'nokogiri', '>= 1.5.2'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem 'rdoc', '>= 3.6.0'
-  gem 'rspec', '~> 2.6.0'
-  gem 'bundler', '~> 1.0.0'
-  gem 'jeweler', '~> 1.6.2'
-  gem 'rcov', '>= 0'
+  gem 'bundler', '>= 1.1.0'
+  gem 'jeweler', '>= 1.8.3'
+  gem 'minitest', '>= 2.11.2'
+  gem 'mocha', '>= 0.10.5', :require => false
+  gem 'rdoc', '>= 3.12'
+  gem 'simplecov', '>= 0.6.1'
+  gem 'yard', '>= 0.7.5'
 end

data/Gemfile.lock

@@ -1,44 +1,61 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    curb (0.8.0)
+    domain_name (0.5.3)
+      unf (~> 0.0.3)
     git (1.2.5)
-    jeweler (1.6.4)
+    hpricot (0.8.6)
+    jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
     json (1.5.3)
-    mechanize (2.0.1)
+    mechanize (2.3)
+      domain_name (~> 0.5, >= 0.5.1)
+      mime-types (~> 1.17, >= 1.17.2)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (~> 1.8)
+      net-http-persistent (~> 2.5, >= 2.5.2)
       nokogiri (~> 1.4)
+      ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (~> 0.0, >= 0.0.9)
-    net-http-digest_auth (1.1.1)
-    net-http-persistent (1.8)
-    nokogiri (1.5.0)
-    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)
-    webrobots (0.0.10)
-      nokogiri (>= 1.4.4)
+    metaclass (0.0.1)
+    mime-types (1.18)
+    minitest (2.12.0)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.2.0)
+    net-http-digest_auth (1.2)
+    net-http-persistent (2.6)
+    nokogiri (1.5.2)
+    ntlm-http (0.1.1)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    unf (0.0.5)
+      unf_ext
+    unf_ext (0.0.4)
+    webrobots (0.0.13)
+    yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.2)
-  json
-  mechanize
-  nokogiri
-  rcov
-  rdoc (>= 3.6.0)
-  rspec (~> 2.6.0)
+  bundler (>= 1.1.0)
+  curb (>= 0.8.0)
+  hpricot (>= 0.8.6)
+  jeweler (>= 1.8.3)
+  json (>= 1.0.0)
+  mechanize (>= 2.3.0)
+  minitest (>= 2.11.2)
+  mocha (>= 0.10.5)
+  nokogiri (>= 1.5.2)
+  rdoc (>= 3.12)
+  simplecov (>= 0.6.1)
+  yard (>= 0.7.5)

data/README.rdoc

@@ -4,7 +4,7 @@ Fetches music from the Baidu streaming music player.
 
 == Usage
 
-The code currently requires the string encoding support in Ruby 1.9. Use MRI 1.9.2 or Rubinius / Jruby in 1.9 mode.
+The code currently requires the string encoding support in Ruby 1.9. Use MRI 1.9.3 or Rubinius / Jruby in 1.9 mode.
 
     rvm use 1.9.2
 
@@ -19,10 +19,6 @@ Then choose a playlist and download all its songs.
 Or, if you're feeling undecided, grab the entire library.
 
     zhangmen all
-    
-Feeling lazy? Download the entire catalog.
-
-    zhangmen all
 
 The songs will be downloaded in the current directory. One directory will be made for each artist, and all that artist's songs will be saved there.
 
@@ -30,16 +26,17 @@ If you're not in Mainland China, you can use a proxy to get your music fix.
 
     http_proxy=google.for.a.proxy:1234 zhangmen fetch 602
 
+Or, if you're feeling lazy, let the code try to pick a proxy for you.
+
+    http_proxy=auto zhangmen fetch 602
+
+
 == Testing
 
 The tests are written in RSpec. Run them like this.
 
    rake spec
 
-If you're not in Mainland China, set http_proxy so the downloading tests pass.
-
-    http_proxy=google.for.a.proxy:1234 rake spec
-
 == Known Issues
 
 Some songs might not download. The Flash player skips over those songs too, so it seems to be a server issue.

data/Rakefile

@@ -25,25 +25,14 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
+task :default => :test
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "zhangmen #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/zhangmen.rb

@@ -5,3 +5,4 @@ end  # namespace Zhangmen
 
 require 'zhangmen/client.rb'
 require 'zhangmen/cli.rb'
+require 'zhangmen/proxy.rb'

data/lib/zhangmen/cli.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'logger'
 require 'yaml'
 
 # :nodoc: namespace
@@ -11,22 +12,16 @@ class Cli
     empty_categories = 0
     
     loop do
-      begin
-        playlists = @client.category category_id
-        save_client_cache
-        if playlists.empty?
-          empty_categories += 1
-          break if empty_categories == 5
-        else
-          empty_categories = 0
-          yield category_id, playlists
-        end
-        category_id += 1
-      rescue Exception => e
-        puts "#{e.class.name}: #{e}"
-        puts e.backtrace.join("\n")
-        break
+      playlists = @client.category category_id
+      save_client_cache
+      if playlists.empty?
+        empty_categories += 1
+        break if empty_categories == 5
+      else
+        empty_categories = 0
+        yield category_id, playlists
       end
+      category_id += 1
     end
     category_id
   end
@@ -93,6 +88,7 @@ class Cli
       end
     rescue ArgumentError => e
       # Encoding error; bummer, can't cache
+      # puts "#{e.class.name}: #{e}"
     end
   end
   
@@ -107,16 +103,22 @@ class Cli
     if proxy_server = ENV['http_proxy'] || ENV['all_proxy']
       options[:proxy] = proxy_server
     end
+    @logger = Logger.new STDERR
+    options[:logger] = @logger
     @client = Zhangmen::Client.new options
     @client.cache = client_cache
-    
-    case args[0]
-    when 'list'
-      categories
-    when 'fetch'
-      args[1..-1].each { |arg| playlist arg }
-    when 'all'
-      all
+
+    begin
+      case args[0]
+      when 'list'
+        categories
+      when 'fetch'
+        args[1..-1].each { |arg| playlist arg }
+      when 'all'
+        all
+      end
+    rescue Exception => e
+      @logger.error "#{e.class.name}: #{e}\n#{e.backtrace.join("\n")}\n"
     end
   end
 end  # class Zhangmen::Cli

data/lib/zhangmen/client.rb

@@ -1,5 +1,8 @@
 require 'cgi'
+require 'logger'
 
+require 'curb'
+require 'hpricot'
 require 'mechanize'
 require 'nokogiri'
 
@@ -10,11 +13,24 @@ module Zhangmen
 class Client
   # New client session.
   #
-  # The options hash accepts the following keys:
-  #   :proxy:: "host:port" string
+  # @option options [String] proxy "host:port" string, "auto" to have a proxy
+  #     discovered automatically, or nil / false to use direct requests
+  # @option options [Integer] cache_ttl validity of cached requests, in seconds
+  # @option options [Integer] log_level severity treshold (e.g., Logger::ERROR)
+  # @option options [Logger] logger receiver of logging info
   def initialize(options = {})
+    if options[:proxy] == 'auto'
+      options[:proxy] = Zhangmen::Proxy.fetch
+    end
+    
     @mech = mechanizer options
+    @curb = curber options
     @cache = {}
+    @cache_ttl = options[:cache_ttl] || (24 * 60 * 60)  # 1 day
+    log_level = options[:log_level] || Logger::WARN
+    @logger = options[:logger] || Logger.new(STDERR)
+    @logger.level = log_level
+    @parser = options[:use_hpricot] ? :hpricot : :nokogiri
   end
   
   # Cache of HTTP requests / responses.
@@ -31,11 +47,11 @@ class Client
   # Returns an array of playlists.
   def category(category_id)
     result = op 3, :list_cat => category_id
-    result.css('data').map do |playlist_node|
+    result.search('data').map do |playlist_node|
       {
-        :id => playlist_node.css('id').inner_text,
-        :name => playlist_node.css('name').inner_text.encode('UTF-8'),
-        :song_count => playlist_node.css('tcount').inner_text.to_i
+        :id => playlist_node.search('id').inner_text,
+        :name => playlist_node.search('name').inner_text.encode('UTF-8'),
+        :song_count => playlist_node.search('tcount').inner_text.to_i
       }
     end
   end
@@ -48,11 +64,10 @@ class Client
   # Returns an array of songs.
   def playlist(list)
     result = op 22, :listid => list[:id]
-    native_encoding = result.document.encoding
     
-    count = result.css('count').inner_text.to_i
-    result.css('data').map do |song_node|
-      raw_name = song_node.css('name').inner_text
+    count = result.search('count').inner_text.to_i
+    result.search('data').map do |song_node|
+      raw_name = song_node.search('name').inner_text
       if match = /^(.*)\$\$(.*)\$\$\$\$/.match(raw_name)
         title = match[1].encode('UTF-8')
         author = match[2].encode('UTF-8')
@@ -60,10 +75,16 @@ class Client
         author = title = raw_name.encode('UTF-8')
       end
       
+      if @parser == :nokogiri
+        native_encoding = result.document.encoding
+      else
+        native_encoding = raw_name.encoding
+      end
       {
-        :raw_name => raw_name.encode(native_encoding),
+        :raw_name => raw_name.encode('UTF-8'),
+        :raw_encoding => native_encoding,
         :title => title, :author => author,
-        :id => song_node.css('id').inner_text
+        :id => song_node.search('id').inner_text
       }
     end
   end
@@ -78,21 +99,49 @@ class Client
     song_sources(entry).each do |src|
       3.times do
         begin
-          result = @mech.get src[:url]
-          next unless result.kind_of?(Mechanize::File)
-          bits = result.body
+          @curb.url = src[:url]
+          begin
+            @curb.perform
+          rescue Curl::Err::PartialFileError
+            got = @curb.body_str.length
+            expected = @curb.downloaded_content_length.to_i
+            if got < expected
+              @logger.warn do
+                "Server hangup fetching #{src[:url]}; got #{got} bytes, " +
+                "expected #{expected}"
+              end
+              # Server gave us fewer bytes than promised in Content-Length.
+              # Try again in case the error is temporary.
+              sleep 1
+              next
+            end
+          end
+          next unless @curb.response_code >= 200 && @curb.response_code < 300
+          bits = @curb.body_str
           if bits[-256, 3] == 'TAG' || bits[0, 3] == 'ID3'
             return bits
           else
             break
           end
-        rescue EOFError
-          # Server hung up on us. Try again in case the error is temporary.
+        rescue Curl::Err::GotNothingError
+          @logger.warn do
+            "Server hangup fetching #{src[:url]}; got no HTTP response"
+          end
+          # Try again in case the error is temporary.
+          sleep 1
+        rescue Curl::Err::RecvError
+          @logger.warn do
+            "TCP error fetching #{src[:url]}"
+          end
+          # Try again in case the error is temporary.
+          sleep 1
         rescue Timeout::Error
-          # Server hung up on us. Try again in case the error is temporary.
-        rescue Mechanize::ResponseCodeError
-          # 500-ish response. Try again in case the error is temporary.
-        end 
+          @logger.warn do
+            "Timeout while downloading #{src[:url]}"
+          end
+          # Try again in case the error is temporary.
+          sleep 1
+        end
       end
     end
     nil
@@ -105,17 +154,18 @@ class Client
   #
   # Returns
   def song_sources(entry)
-    result = op 12, :count => 1, :mtype => 1, :title => entry[:raw_name],
-                    :url => '', :listenreelect => 0
-    result.css('url').map do |url_node|
-      filename = url_node.css('decode').inner_text
-      encoded_url = url_node.css('encode').inner_text
+    title = entry[:raw_name].encode(entry[:raw_encoding])
+    result = op 12, :count => 1, :mtype => 1, :title => title, :url => '',
+                    :listenreelect => 0
+    result.search('url').map do |url_node|
+      filename = url_node.search('decode').inner_text
+      encoded_url = url_node.search('encode').inner_text
       url = File.join File.dirname(encoded_url), filename
       {
         :url => url,
-        :type => url_node.css('type').inner_text.to_i,
-        :lyrics_id => url_node.css('lrid').inner_text.to_i,
-        :flag => url_node.css('flag').inner_text
+        :type => url_node.search('type').inner_text.to_i,
+        :lyrics_id => url_node.search('lrid').inner_text.to_i,
+        :flag => url_node.search('flag').inner_text
       }
     end
   end
@@ -128,13 +178,45 @@ class Client
   #
   # Returns a Nokogiri root node.
   def op(opcode, args)
-    url = op_url(opcode, args)
-    cache_key = url.to_s
-    @cache[cache_key] ||= @mech.get(url).body
-    Nokogiri.XML(@cache[cache_key]).root
+    @logger.debug { "XML op #{opcode} with #{args.inspect}" }
+    cache_key = op_cache_key opcode, args
+    if @cache[cache_key] && Time.now.to_f - @cache[cache_key][:at] < @cache_ttl
+      xml = @cache[cache_key][:xml]
+      @logger.debug { "Cached response\n#{xml}" }
+    else
+      xml = op_xml_without_cache opcode, args
+      @cache[cache_key] = { :at => Time.now.to_f, :xml => xml }
+      @logger.debug { "Live response\n#{xml}" }
+    end
+    
+    if @parser == :nokogiri
+      Nokogiri.XML(xml).root
+    else
+      Hpricot(xml)
+    end
+  end
+  
+  # Performs a numbered operation, returning the raw XML.
+  #
+  # Accepts the same arguments as Client#op.
+  #
+  # Does not perform any caching.
+  def op_xml_without_cache(opcode, args)
+    @mech.get(op_url(opcode, args)).body
+  end
+  
+  # A string suitable as a key for caching a numbered operation's result.
+  #
+  # Accepts the same arguments as Client#op.
+  def op_cache_key(opcode, args)
+    { :op => opcode }.merge(args).
+        map { |k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.
+        sort.join('&')
   end
   
   # The fetch URL for an XML opcode.
+  #
+  # Accepts the same arguments as Client#op.
   def op_url(opcode, args)
     query = { :op => opcode }.merge(args).
         map { |k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.
@@ -150,7 +232,7 @@ class Client
   # Mechanize instance customized to maximize fetch success.
   def mechanizer(options = {})
     mech = Mechanize.new
-    mech.user_agent_alias = 'Linux Firefox'
+    mech.user_agent = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.124 Safari/534.30'
     if options[:proxy]
       host, _, port_str = *options[:proxy].rpartition(':')
       port_str ||= 80
@@ -158,6 +240,20 @@ class Client
     end
     mech
   end
+  
+  # Curl::Easy instance customized to maximize download success.
+  def curber(options = {})
+    curb = Curl::Easy.new
+    curb.enable_cookies = true
+    curb.follow_location = true
+    curb.useragent = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.124 Safari/534.30'
+    if options[:proxy]
+      curb.proxy_url = options[:proxy]
+    else
+      curb.proxy_url = nil
+    end
+    curb
+  end
 end  # class Zhangmen::Client
   
 end  # namespace Zhangmen

data/lib/zhangmen/proxy.rb

@@ -0,0 +1,32 @@
+# :nodoc: namespace
+module Zhangmen
+  
+# Finds a HTTP proxy that will help bypass Baidu's region check.
+module Proxy
+  # Fresh information for a HTTP proxy in China.
+  #
+  # @return [String] proxy information that can be passed into the :proxy option
+  #     of Zhangmen::Client#initialize
+  def self.fetch
+    list_url = 'http://www.xroxy.com/proxylist.php?type=Anonymous&country=CN'
+    agent = Mechanize.new { |a| a.user_agent_alias = 'Linux Firefox' }
+    html = agent.get_file list_url
+    doc = Nokogiri.HTML html
+    doc.css('table tr').each do |row|
+      cells = row.css('td').map { |td| td.inner_text }
+      cells.each_with_index do |cell, index|
+        next unless match_data = /(\d{1,3}\.){3}\d{1,3}/.match(cell)
+        ip = match_data[0]
+        next unless match_data = /\d{2,5}/.match(cells[index + 1])
+        port = match_data[0].to_i
+        next unless match_data = /(false)|(true)/.match(cells[index + 3])
+        ssl = match_data[0] == 'true'
+        next if ssl
+        
+        return "#{ip}:#{port}"
+      end
+    end
+  end
+end  # module Zhangmen::Proxy
+  
+end  # namespace Zhangmen

data/test/helper.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'minitest/unit'
+require 'minitest/spec'
+require 'mocha'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'zhangmen'
+
+class MiniTest::Unit::TestCase
+end
+
+MiniTest::Unit.autorun

data/test/zhangmen/client_test.rb

@@ -0,0 +1,163 @@
+require File.expand_path('../helper.rb', File.dirname(__FILE__))
+
+describe Zhangmen::Client do
+  describe 'mechanizer' do
+    let(:empty_client) { Zhangmen::Client.new }
+    
+    it 'returns a Mechanize instance' do
+      empty_client.mechanizer.must_be_kind_of Mechanize
+    end
+    
+    describe 'with a proxy option' do
+      let(:mech) do
+        empty_client.mechanizer :proxy => '127.0.0.1:3306'
+      end
+      
+      it 'parses the address correctly' do
+        mech.proxy_addr.must_equal '127.0.0.1'
+      end
+      
+      it 'parses the port correctly' do
+        mech.proxy_port.must_equal 3306
+      end
+    end
+  end
+
+  let(:client) { Zhangmen::Client.new :proxy => ENV['http_proxy'] || 'auto' }
+  
+  describe 'op_url' do
+    it 'encodes everything correctly' do
+      Kernel.stubs(:rand).returns(0.42)
+      client.op_url(22, :listid => 600).to_s.must_equal(
+          'http://box.zhangmen.baidu.com/x?op=22&listid=600&.r=0.42' + '0' * 14)
+    end
+  end
+  
+  describe 'op_cache_key' do
+    it 'encodes arguments correctly' do
+      client.op_cache_key(22, :listid => 600).must_equal 'listid=600&op=22'
+    end
+  end
+  
+  describe 'cache' do
+    it 'behaves like a Hash' do
+      client.cache.must_respond_to(:has_key?)
+      client.cache.must_respond_to(:[])
+      client.cache.must_respond_to(:[]=)
+    end
+  end
+  
+  describe 'op' do
+    describe 'with good known arguments' do
+      let(:key) { client.op_cache_key(22, :listid => 600) }
+      let(:result) { client.op 22, :listid => 600 }
+      
+      it 'returns a Nokogiri root node' do
+        result.must_be_kind_of Nokogiri::XML::Element
+      end
+      
+      it 'returns a <result> root node' do
+        result.name.must_equal 'result'
+      end
+      
+      it 'caches the request' do
+        result.wont_be_nil  # Make sure the request is performed
+        client.cache.must_be :has_key?, key
+        client.cache[key].must_be :has_key?, :at
+        client.cache[key].must_be :has_key?, :xml
+      end
+      
+      describe 'repeated with same arguments' do
+        it 'uses the cache' do
+          result.wont_be_nil # Make sure the request is performed.
+          class <<client
+            def op_xml_without_cache(*args)
+              raise 'Cacheable request invoking un-cached code path'
+            end
+          end
+          client.op(22, :listid => 600).wont_be_nil
+        end
+      end
+    end
+  end
+  
+  describe 'category' do
+    describe '1' do
+      let(:category) { client.category 1 }
+      
+      it 'has a non-trivial number of playlists' do
+        category.length.must_be :>, 10
+      end
+      
+      it 'has a non-empty name for each playlist' do
+        category.map { |pl| pl[:name] }.any?(&:empty?).must_equal false
+      end
+
+      it 'has a non-empty download id for each playlist' do
+        category.map { |pl| pl[:id] }.any?(&:empty?).must_equal false
+      end
+
+      it 'has a non-empty song count for each playlist' do
+        category.map { |pl| pl[:song_count] }.any? { |count| count <= 0 }.
+                 must_equal false
+      end
+    end
+  end
+  
+  describe 'playlist' do
+    describe 'first one in category 1' do
+      let(:playlist) { client.playlist client.category(1).first }
+      
+      it 'has a non-trivial number of songs' do
+        playlist.length.must_be :>, 10
+      end
+      
+      it 'has a non-empty raw name in each song' do
+        playlist.map { |song| song[:raw_name] }.any?(&:empty?).must_equal false
+      end
+
+      it 'has a non-empty author in each song' do
+        playlist.map { |song| song[:author] }.any?(&:empty?).must_equal false
+      end
+
+      it 'has a non-empty title in each song' do
+        playlist.map { |song| song[:title] }.any?(&:empty?).must_equal false
+      end
+
+      it 'has a non-empty download id in each song' do
+        playlist.map { |song| song[:id] }.any?(&:empty?).must_equal false
+      end
+    end
+  end
+  
+  describe 'song_sources' do
+    describe 'first song in first playlits in category 1' do
+      let(:sources) do
+        client.song_sources client.playlist(client.category(1).first)[0]
+      end
+      
+      it 'has a positive number of sources' do
+        sources.length.must_be :>, 0
+      end
+      
+      it 'has a url key in each source' do
+        sources.map { |src| src[:url] }.any?(&:empty?).must_equal false
+      end
+    end
+  end
+  
+  describe 'song' do
+    describe 'some popular song' do
+      let(:entry) { client.playlist(client.category(5).first).first }
+      let(:bits) { client.song entry }
+      
+      it 'is a string' do
+        bits.must_respond_to :to_str
+      end
+      
+      it 'is more than 1Mb in size' do
+        bits.length.must_be :>=, 2 ** 20
+      end
+    end
+  end
+end

data/test/zhangmen/proxy_test.rb

@@ -0,0 +1,12 @@
+require File.expand_path('../helper.rb', File.dirname(__FILE__))
+
+describe Zhangmen::Proxy do
+  describe 'fetch' do
+    let(:result) { Zhangmen::Proxy.fetch }
+    
+    it 'matches the Zhangmen::Client :proxy format' do
+      proxy_regexp = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\:\d{2,4}/
+      result.must_match proxy_regexp 
+    end
+  end
+end

data/zhangmen.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{zhangmen}
-  s.version = "0.1.1"
+  s.name = "zhangmen"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2011-07-17}
-  s.default_executable = %q{zhangmen}
-  s.description = %q{CLI and library for downloading music from Baidu}
-  s.email = %q{victor@costan.us}
+  s.date = "2012-04-06"
+  s.description = "CLI and library for downloading music from Baidu"
+  s.email = "victor@costan.us"
   s.executables = ["zhangmen"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -32,48 +31,61 @@ Gem::Specification.new do |s|
     "lib/zhangmen.rb",
     "lib/zhangmen/cli.rb",
     "lib/zhangmen/client.rb",
-    "spec/spec_helper.rb",
-    "spec/zhangmen/client_spec.rb",
-    "spec/zhangmen_spec.rb",
+    "lib/zhangmen/proxy.rb",
+    "test/helper.rb",
+    "test/zhangmen/client_test.rb",
+    "test/zhangmen/proxy_test.rb",
     "zhangmen.gemspec"
   ]
-  s.homepage = %q{http://github.com/pwnall/zhangmen}
+  s.homepage = "http://github.com/pwnall/zhangmen"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{CLI and library for downloading music from Baidu}
+  s.rubygems_version = "1.8.21"
+  s.summary = "CLI and library for downloading music from Baidu"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<mechanize>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 3.6.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<curb>, [">= 0.8.0"])
+      s.add_runtime_dependency(%q<hpricot>, [">= 0.8.6"])
+      s.add_runtime_dependency(%q<json>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<mechanize>, [">= 2.3.0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.5.2"])
+      s.add_development_dependency(%q<bundler>, [">= 1.1.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
+      s.add_development_dependency(%q<minitest>, [">= 2.11.2"])
+      s.add_development_dependency(%q<mocha>, [">= 0.10.5"])
+      s.add_development_dependency(%q<rdoc>, [">= 3.12"])
+      s.add_development_dependency(%q<simplecov>, [">= 0.6.1"])
+      s.add_development_dependency(%q<yard>, [">= 0.7.5"])
     else
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<mechanize>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 3.6.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<curb>, [">= 0.8.0"])
+      s.add_dependency(%q<hpricot>, [">= 0.8.6"])
+      s.add_dependency(%q<json>, [">= 1.0.0"])
+      s.add_dependency(%q<mechanize>, [">= 2.3.0"])
+      s.add_dependency(%q<nokogiri>, [">= 1.5.2"])
+      s.add_dependency(%q<bundler>, [">= 1.1.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.3"])
+      s.add_dependency(%q<minitest>, [">= 2.11.2"])
+      s.add_dependency(%q<mocha>, [">= 0.10.5"])
+      s.add_dependency(%q<rdoc>, [">= 3.12"])
+      s.add_dependency(%q<simplecov>, [">= 0.6.1"])
+      s.add_dependency(%q<yard>, [">= 0.7.5"])
     end
   else
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<mechanize>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 3.6.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<curb>, [">= 0.8.0"])
+    s.add_dependency(%q<hpricot>, [">= 0.8.6"])
+    s.add_dependency(%q<json>, [">= 1.0.0"])
+    s.add_dependency(%q<mechanize>, [">= 2.3.0"])
+    s.add_dependency(%q<nokogiri>, [">= 1.5.2"])
+    s.add_dependency(%q<bundler>, [">= 1.1.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.3"])
+    s.add_dependency(%q<minitest>, [">= 2.11.2"])
+    s.add_dependency(%q<mocha>, [">= 0.10.5"])
+    s.add_dependency(%q<rdoc>, [">= 3.12"])
+    s.add_dependency(%q<simplecov>, [">= 0.6.1"])
+    s.add_dependency(%q<yard>, [">= 0.7.5"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zhangmen
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,97 +9,200 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-17 00:00:00.000000000 -04:00
-default_executable: zhangmen
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &23012660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *23012660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &23012160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *23012160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &23011680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *23011680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &23011200 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *23011200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &23010720 !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.11.2
   type: :development
   prerelease: false
-  version_requirements: *23010720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.2
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &23010240 !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.10.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.5
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *23010240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &23009740 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *23009740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &23009220 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *23009220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
 description: CLI and library for downloading music from Baidu
 email: victor@costan.us
 executables:
@@ -122,11 +225,11 @@ files:
 - lib/zhangmen.rb
 - lib/zhangmen/cli.rb
 - lib/zhangmen/client.rb
-- spec/spec_helper.rb
-- spec/zhangmen/client_spec.rb
-- spec/zhangmen_spec.rb
+- lib/zhangmen/proxy.rb
+- test/helper.rb
+- test/zhangmen/client_test.rb
+- test/zhangmen/proxy_test.rb
 - zhangmen.gemspec
-has_rdoc: true
 homepage: http://github.com/pwnall/zhangmen
 licenses:
 - MIT
@@ -142,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1826109697642044863
+      hash: -4108129830385981857
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: CLI and library for downloading music from Baidu

data/spec/spec_helper.rb

@@ -1,12 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'zhangmen'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  
-end

data/spec/zhangmen/client_spec.rb

@@ -1,130 +0,0 @@
-# :encoding: UTF-8
-require File.expand_path('../../spec_helper', __FILE__)
-
-describe Zhangmen::Client do
-  describe 'mechanizer' do
-    let(:empty_client) { Zhangmen::Client.new }
-    
-    it 'returns a Mechanize instance' do
-      empty_client.mechanizer.should be_kind_of(Mechanize)
-    end
-    
-    describe 'with a proxy option' do
-      let(:mech) do
-        empty_client.mechanizer :proxy => '127.0.0.1:3306'
-      end
-      
-      it 'parses the address correctly' do
-        mech.proxy_addr.should == '127.0.0.1'
-      end
-      
-      it 'parses the port correctly' do
-        mech.proxy_port.should == 3306
-      end
-    end
-  end
-
-  let(:client) { Zhangmen::Client.new :proxy => ENV['http_proxy'] }
-  
-  describe 'op_url' do
-    it 'encodes everything correctly' do
-      Kernel.should_receive(:rand).and_return(0.42)
-      client.op_url(22, :listid => 600).to_s.should ==
-          'http://box.zhangmen.baidu.com/x?op=22&listid=600&.r=0.42' + '0' * 14
-    end
-  end
-  
-  describe 'op' do
-    describe 'with good known arguments' do
-      let(:result) { client.op 22, :listid => 600 }
-      
-      it 'returns a Nokogiri root node' do
-        result.should be_kind_of(Nokogiri::XML::Element)
-      end
-      
-      it 'returns a <result> root node' do
-        result.name.should == 'result'
-      end
-    end
-  end
-  
-  describe 'category' do
-    describe '1' do
-      let(:category) { client.category 1 }
-      
-      it 'should have a non-trivial number of playlists' do
-        category.length.should > 10
-      end
-      
-      it 'should have a non-empty name for each playlist' do
-        category.map { |pl| pl[:name] }.any?(&:empty?).should be_false
-      end
-
-      it 'should have a non-empty download id for each playlist' do
-        category.map { |pl| pl[:id] }.any?(&:empty?).should be_false
-      end
-
-      it 'should have a non-empty song count for each playlist' do
-        category.map { |pl| pl[:song_count] }.any? { |count| count <= 0 }.
-                 should be_false
-      end
-    end
-  end
-  
-  describe 'playlist' do
-    describe 'first one in category 1' do
-      let(:playlist) { client.playlist client.category(1).first }
-      
-      it 'should have a non-trivial number of songs' do
-        playlist.length.should > 10
-      end
-      
-      it 'should have a non-empty raw name in each song' do
-        playlist.map { |song| song[:raw_name] }.any?(&:empty?).should be_false
-      end
-
-      it 'should have a non-empty author in each song' do
-        playlist.map { |song| song[:author] }.any?(&:empty?).should be_false
-      end
-
-      it 'should have a non-empty title in each song' do
-        playlist.map { |song| song[:title] }.any?(&:empty?).should be_false
-      end
-
-      it 'should have a non-empty download id in each song' do
-        playlist.map { |song| song[:id] }.any?(&:empty?).should be_false
-      end
-    end
-  end
-  
-  describe 'song_sources' do
-    describe 'first song in first playlits in category 1' do
-      let(:sources) do
-        client.song_sources client.playlist(client.category(1).first)[0]
-      end
-      
-      it 'should have a positive number of sources' do
-        sources.length.should > 0
-      end
-      
-      it 'should have a url key in each source' do
-        sources.map { |src| src[:url] }.any?(&:empty?).should be_false
-      end
-    end
-  end
-  
-  describe 'song' do
-    describe 'some popular song' do
-      let(:entry) { client.playlist(client.category(5).first).first }
-      let(:bits) { client.song entry }
-      
-      it 'should be a string' do
-        bits.should respond_to(:to_str)
-      end
-      
-      it 'should be more than 1Mb in size' do
-        bits.length.should >= 2 ** 20
-      end
-    end
-  end
-end

data/spec/zhangmen_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Zhangmen do
-  pending "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end