daapclient 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.2.1
+
+* Added support for DAAP server passwords
+* Made Song, Album, and Artist Comparable so they can be sorted more easily
+
 == 0.2.0
 
 * Added artists and albums objects

data/EXAMPLES

@@ -21,6 +21,21 @@
     end
   end
 
+== Simple example using a password
+  require 'net/daap'
+  require 'fileutils'
+  
+  daap = Net::DAAP::Client.new('localhost', :password => 'something')
+  
+  daap.connect do |dsn|
+    daap.databases.each do |db|
+      puts "list all artists"
+      db.artists.each do |artist|
+        puts "#{artist.name}"
+      end
+    end
+  end
+
 == Longer example
   require 'rubygems'
   require 'net/daap'

data/lib/net/daap.rb

@@ -54,9 +54,11 @@ module Net
       attr_reader :dmap
 
 # Create a new Client and pass in the host where the client will connect.
-      def initialize(server_host)
+      def initialize(server_host, parameters = {})
+        params = { :port => 3689, :password => nil }.merge(parameters)
         @server_host = server_host
-        @server_port = 3689
+        @server_port = params[:port]
+        @password    = params[:password]
         @validator   = nil
         @log         = Logger.new(nil)
         @session_id  = nil
@@ -118,7 +120,19 @@ module Net
         #end
         @log.debug("Fetching url: #{url}")
 
-        res = @http_client.get(url, request_headers(url), nil, &block)
+        req = Net::HTTP::Get.new(url, request_headers(url))
+        req.basic_auth('iTunes_4.6', @password) if ! @password.nil?
+        res = @http_client.request(req) do |response|
+          response.read_body &block
+        end
+
+        case res
+        when Net::HTTPSuccess
+        else
+          @log.error("This DAAP Server requires a password")
+          res.error!
+        end
+
         @log.debug("Done Fetching url: #{url}")
 
         content_type = res.header['content-type']

data/lib/net/daap/album.rb

@@ -2,6 +2,7 @@ module Net
   module DAAP
 # This class contains album information returned from the DAAP server.
     class Album
+      include Comparable
       attr_reader :name, :artist, :songs
 
       alias :to_s :name
@@ -11,6 +12,10 @@ module Net
         @artist = args[:artist]
         @songs  = []
       end
+
+      def <=>(other)
+        name <=> other.name
+      end
     end
   end
 end

data/lib/net/daap/artist.rb

@@ -2,6 +2,7 @@ module Net
   module DAAP
 # This class contains artist information returned from the DAAP server.
     class Artist
+      include Comparable
       attr_reader :name, :albums, :songs
 
       alias :to_s :name
@@ -11,6 +12,10 @@ module Net
         @albums = []
         @songs  = []
       end
+
+      def <=>(other)
+        name <=> other.name
+      end
     end
   end
 end

data/lib/net/daap/daap_version.rb

@@ -2,6 +2,6 @@
 # This file is auto-generated by build scripts
 module Net
   module DAAP
-    Version = '0.2.0'
+    Version = '0.2.1'
   end
 end

data/lib/net/daap/song.rb

@@ -2,6 +2,7 @@ module Net
   module DAAP
 # This class contains song information returned from the DAAP server.
     class Song
+      include Comparable
       attr_reader :size, :album, :name, :artist, :format, :persistentid, :id
 
       alias :to_s :name
@@ -24,6 +25,10 @@ module Net
         filename = "#{@id}.#{@format}"
         @daap.get_song("databases/#{@db.id}/items/#{filename}", &block)
       end
+
+      def <=>(other)
+        name <=> other.name
+      end
     end
   end
 end

data/test/mock_server.rb

@@ -14,7 +14,7 @@ File.open("#{FILE_DIR}/song_data.txt", 'r') { |f| FILE_DATA = f.read }
 SERVER = 'localhost'
 
 module Net
-  class Container
+  class HTTPSuccess
     attr_reader :header, :body
 
     def initialize(args)
@@ -35,6 +35,10 @@ module Net
       Net::HTTP.new
     end
 
+    def request(req, &block)
+      get(req.url, block)
+    end
+
     def get(*args, &block)
       md5 = Digest::MD5.new(args[0])
       contents = nil
@@ -47,10 +51,18 @@ module Net
       File::open(dir + md5.to_s + ".txt" , "r") do |file|
         contents = file.read
       end
-      Container.new(:body => contents, :header => {
+      HTTPSuccess.new(:body => contents, :header => {
                                                     'content-type' => 'dmap',
                                                     'daap-server'  => 'mock'
                                                   })
     end
   end
+
+  class HTTP::Get
+    attr_reader :url
+
+    def initialize(url, headers = {})
+      @url = url
+    end
+  end
 end

data/test/ts_daap.rb

@@ -4,6 +4,7 @@ $:.unshift File.join(File.dirname(__FILE__), "..", "test")
 require 'yaml'
 
 
+require 'rubygems'
 require 'test/unit'
 require 'tc_client'
 require 'tc_protocol'

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: daapclient
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-05-11 00:00:00 -07:00
+  version: 0.2.1
+date: 2006-07-09 00:00:00 -07:00
 summary: Net::DAAP::Client is an iTunes share client.
 require_paths: 
   - lib
@@ -26,6 +26,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
   - Aaron Patterson
 files: 
@@ -84,4 +85,14 @@ extra_rdoc_files:
 executables: []
 extensions: []
 requirements: []
-dependencies: []
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: digest-m4p
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.0.1
+      version: