rtunesu 0.2.4 → 0.3.5

data/.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+pkg/*.*
+*.gemspec

data/History.txt

@@ -1,5 +0,0 @@
-
-Pre 0.2.3 2008-09-12
-
-* 1 major enhancement:
-  * Initial release

data/README.txt

@@ -3,10 +3,10 @@
 == DESCRIPTION:
 RTunesU is a ruby library for accessing Apple's iTunes U Webservices to integrate your education institutions iTunes U account into ruby applications. iTunes U's Webservices interface is fairly primitive by today's standards for XML based APIs.  Some known flaws of iTunes U
  * No arbitrary search
- * Queries for missing objects return an XML document representing the entire institution instead of returning an error
+ * Queries for missing objects may return an XML document representing the entire institution instead of returning an error (rdar://7253913)
+ * No ability to directly find Tracks (rdar://7254419)
  * Does not follow REST principles
  * Does not use HTTP status codes meaningfully
- * Collections not contained in an outer element
 
 == FEATURES/PROBLEMS:
  - TODO: file uploading

data/Rakefile

@@ -1,4 +1,17 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+require 'rubygems'
+require 'rake'
+require 'jeweler'
+
+Jeweler::Tasks.new do |gemspec|
+  gemspec.name = 'rtunesu'
+  gemspec.summary = "A library for using Apple's iTunes U Webservices API"
+  gemspec.description = "A library for using Apple's iTunes U Webservices API"
+  gemspec.email = 'pietrekg@umich.edu'
+  gemspec.authors = ['Trek Glowacki']
+  gemspec.add_dependency('hpricot', '>= 0.6.164')
+  gemspec.add_dependency('builder', '>= 2.0')
+  gemspec.add_dependency('ruby-hmac', '>= 0.3.1')
+end
+Jeweler::GemcutterTasks.new
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }

data/VERSION

@@ -0,0 +1 @@
+0.3.5

data/lib/rtunesu/connection.rb

@@ -4,12 +4,14 @@ require 'hmac'
 require 'hmac-sha2'
 require 'digest'
 require 'net/https'
-require 'net/http/post/multipart'
+require 'mime/types'
 require 'uri'
-require 'timeout'
 
 module RTunesU
-  # Connection is a class for opening and using a connection to the iTunes U Webservices system.  To open a connection to iTunes U, you first need to create a RTunesU::User object using the administrator data you received from Apple when they created your iTunes U site.
+  class LocationNotFound < StandardError; end
+  # Connection is a class for opening and using a connection to the iTunes U Webservices system.  
+  # To open a connection to iTunes U, you first need to create a RTunesU::User object using the 
+  # administrator data you received from Apple when they created your iTunes U site.
   # === Creating a Connection
   # include RTunesU
   # # create a new admin user from our Institution's login information
@@ -20,26 +22,79 @@ module RTunesU
   # connection = Connection.new(:user => user, :site => 'example.edu', :shared_secret => 'STRINGOFTHIRTYLETTERSORNUMBERS')
   # 
   # === Using a Connection
-  # A Connection object is needed for operations that communicate with Apple's iTunes U Webservices.  For example, calls to .save, .create, .update, and .delete on Entity objects take a Connection object as their only argument.
-  # To communicate with the iTunes U Service, a Connection object will generate proper authentication data, hash your request, and (if neccessary) send XML data to iTunes U.
+  # A Connection object is needed for operations that communicate with Apple's iTunes U Webservices.
+  # Connection objects can be used two ways:
+  # First, you can set a base connection object for all entities with
+  # Entity.set_base_connection(connection_object)
+  # This Connection and its associated user will be used for all iTunes U interaction.  This is useful if
+  # you are generally using RTunesU as a utility libray for a learning managemnet system.
+  # This methodology will allow you to use methods that communicate with iTunes U without having to 
+  # specify a connection object for each request. e.g.:
+  #   Course.find(11234567)
+  #   group.save
+  #   division.delete
+  # 
+  # Secondly, you supply a new connection objec to be used instead of the class connection object. This is useful for
+  # generating login urls for users, or allowing iTunes U's included permissions system to limit what a specfic user can do
+  # Pass this custom connection object as the only arguemnt to method calls that interact with iTunes U and it will
+  # be used instead of the classes base connection object.
+  # For example, calls to .save, .create, .update, and .delete on Entity objects take a Connection object as 
+  # their only argument.
+  # 
+  #   Course.find(11234567, custom_connection_object_with_limited_permissions)
+  #   group.save(custom_connection_object_with_limited_permissions)
+  #   division.delete(custom_connection_object_with_limited_permissions)
+  # 
+  # To communicate with the iTunes U Service, a Connection object will generate proper authentication data, 
+  # hash your request, and (if neccessary) send XML data to iTunes U.
   # For more inforamtion about this processs see: http://deimos.apple.com/rsrc/doc/iTunesUAdministratorsGuide/IntegratingAuthenticationandAuthorizationServices/chapter_3_section_3.html
-  # === Scaling tips
-  # Because the you will likely only need a single unchanging Connection object for your application you may wish to initialize a single Connection object for the admin credentials at application start time and assign it to a constant. This is especially beneficial for long running applications like web applications.
-  class Connection
-    TIMEOUT = 240
-    
+  class Connection    
     attr_accessor :user, :options
     
     def initialize(options = {})
       self.user, self.options = options[:user], options
     end
     
-    # iTunes U requires all request to include an authorization token that includes a User's credentials, indetifiying information, and the time of the request.  This data is hashed against your institution's shared secret (provider by Apple with your iTunes U account information). Because tokens are valid only for 90 seconds they are generated for each request attempt.
+    # Generates HTTP mulitpart/form-data body and headers.
+    def http_multipart_data(params) #:nodoc:
+      crlf = "\r\n"
+      body    = ""
+      headers = {}
+      
+      boundary = "x" + Time.now.to_i.to_s(16)
+      
+      headers["Content-Type"] = "multipart/form-data; boundary=#{boundary}"
+      headers["User-Agent"] = "RTunesU/#{RTunesU::VERSION::STRING}"
+      params.each do |key,value|
+        esc_key = key.to_s
+        body << "--#{boundary}#{crlf}"
+        
+        if value.respond_to?(:read)
+          mime_type = MIME::Types.type_for(value.path)[0] || MIME::Types["application/octet-stream"][0]
+          body << "Content-Disposition: form-data; name=\"#{esc_key}\"; filename=\"#{File.basename(value.path)}\"#{crlf}"
+          body << "Content-Type: #{mime_type.simplified}#{crlf*2}"
+          body << value.read
+          value.rewind
+        else
+          body << "Content-Disposition: form-data; name=\"#{esc_key}\"#{crlf*2}#{value}"
+        end
+      end
+      
+      body << "#{crlf}--#{boundary}--#{crlf*2}"
+      headers["Content-Length"] = body.size.to_s
+      
+      return [ body, headers ]
+    end
+    
+    # iTunes U requires all request to include an authorization token that includes a User's credentials, indetifiying information, 
+    # and the time of the request.  This data is hashed against your institution's shared secret (provided by Apple 
+    # with your iTunes U account information). Because tokens are valid only for 90 seconds they are generated for each 
+    # request attempt.
     def generate_authorization_token
-    	# create the token that contains the necessary elements to authorize the user	
-    	# using a nested array because the alphabetical order must be maintained
-    	token = [['credentials', self.user.to_credential_string,], ['identity', self.user.to_identity_string], ['time', Time.now.to_i.to_s]]
-    	encoded_parms = token.collect {|pair| pair[1] = CGI.escape(pair[1]); pair.join('=')}.join('&')
+      # create the token that contains the necessary elements to authorize the user	
+      # using a nested array because the alphabetical order must be maintained
+      token = [['credentials', self.user.to_credential_string,], ['identity', self.user.to_identity_string], ['time', Time.now.to_i.to_s]]
+      encoded_parms = token.collect {|pair| pair[1] = CGI.escape(pair[1]); pair.join('=')}.join('&')
 
       digest = Digest::SHA2.new
       digest.update(encoded_parms)
@@ -50,10 +105,10 @@ module RTunesU
       # add the hashed digital signature to the end of the query parameters
       encoded_parms += "&signature=#{hmac.hexdigest}"
     end
-        
-    def upload_url_for_location(location)
-      url_string = "#{API_URL}/GetUploadURL/#{self.options[:site]}.#{location.Handle}?#{self.generate_authorization_token}"
-      puts url_string
+    
+    # Sends a request to iTunes U for a valid upload location for a file.
+    def upload_url_for_location(location) #:nodoc:
+      url_string = "#{API_URL}/GetUploadURL/#{self.options[:site]}.#{location}?#{self.generate_authorization_token}&type=XMLControlFile"
       url = URI.parse(url_string)
       http = Net::HTTP.new(url.host, url.port)
       http.use_ssl = true
@@ -61,58 +116,101 @@ module RTunesU
       response = http.start {|http| 
         http.request(Net::HTTP::Get.new(url.path + '?' + url.query))
       }
+      raise LocationNotFound if response.kind_of?(Net::HTTPNotFound)
       response.body
     end
     
-    # The URL that receives all iTunes U webservices requests.  This is different for each institution and inclues your site name provided by Apple.
+    # The URL that receives all iTunes U webservices requests.
+    # This is different for each institution and inclues your site name provided by Apple.
     def webservices_url
       "#{API_URL}/ProcessWebServicesDocument/#{options[:site]}?#{self.generate_authorization_token}"
     end
     
-    # 
+    # The URL users should be redirected to access the iTunes U site.
     def browse_url
       "#{BROWSE_URL}/#{options[:site]}?#{self.generate_authorization_token}"
     end
     
-    def show_tree
+    def show_tree(handle = nil, xml = nil)
       url = URI.parse("#{SHOW_TREE_URL}/#{options[:site]}?#{self.generate_authorization_token}")
-        http = Net::HTTP.new(url.host, url.port)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        http.start {
-          request = Net::HTTP::Post.new(url.to_s)
-          response = http.request(request)
-          response.body
-        }
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http.start {
+        request = Net::HTTP::Post.new(url.to_s)
+        response = http.request(request)
+        response.body
+      }
     end
     
-    #  Sends a string of XML data to iTunes U's webservices url for processing.  Returns the iTunes U response XML. Used by Entity objects to send generated XML to iTunes U. 
-    def process(xml)
-      timeout(TIMEOUT) do
-        url = URI.parse(webservices_url)
-          http = Net::HTTP.new(url.host, url.port)
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          http.start {
-            request = Net::HTTP::Post.new(url.to_s)
-            request.body = xml
-            response = http.request(request)
-            response.body
-          }
-      end
+    # Sends a string of XML data to iTunes U's webservices url for processing.  Returns the iTunes U response XML. 
+    # Used by Entity objects to send generated XML to iTunes U. 
+    def process(xml, options = {})
+      url = URI.parse(webservices_url)
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http.start {
+        request = Net::HTTP::Post.new(url.to_s)
+        request.body = xml
+        response = http.request(request)
+        response.body
+      }
+    end
+    
+    def upload_file(file, handle)
+      upload_url = upload_url_for_location(handle)
+      
+      url = URI.parse(upload_url)
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http.start {
+        request = Net::HTTP::Post.new(url.path)
+        body, headers = http_multipart_data({:file => file})
+        request.body = body
+        request.initialize_http_header(headers)
+        response = http.request(request)
+        response.body
+      }
     end
     
-    # Uploads a file from the local system to iTunes U.
-    def upload_file(file_path, itunes_location)
-      # url = URI.parse(self.upload_url_for_location(itunes_location))
-      # req = Net::HTTP::Post::Multipart.new(url.path, {"file" => UploadIO.new(file_path, "image/jpeg")})
-      # res = Net::HTTP.start(url.host, url.port) do |http|
-      #   http.request(req)
-      # end
-          
-      IO::popen('-') do |c|
-        exec "curl -q -F 'file=@#{file.path}' '#{upload_url_for_location(itunes_location)}'"
+    # Retrieves and parses iTunesU usage logs.
+    # Options: 
+    # * +:from+:: Specifies the date to retrieve logs from. Defaults to +Date.today+
+    # * +:to+:: (optional) Specifies the ending date of a date range: (:from)..(:to).
+    # * +:parse+:: Controls whether logs are parsed or returned raw.
+    #
+    # Example:
+    #   connection.get_logs  # Retrieves and parses logs from today
+    #   connection.get_logs :from => Date.today-1  # Retrieves and parses logs from yesterday
+    #   connection.get_logs :parse => false        # Retrieves raw logs
+    #   connection.get_logs :from => "2004-05-13", :to => "2004-06-12"
+    def get_logs(opt={})
+      opt[:from] ||= Date.today
+      #opt[:to] ||= Date.today - 1
+      opt[:parse] = opt[:parse].nil? ? true : opt[:parse]
+      
+      #raise ":from date must preceed :to date." if opt[:to] && opt[:to] < opt[:from]
+      
+      uri_str = "#{API_URL}/GetDailyReportLogs/#{options[:site]}?#{self.generate_authorization_token}"
+      uri_str << "&StartDate=#{opt[:from]}"
+      uri_str << "&EndDate=#{opt[:to]}" if opt[:to]
+      url = URI.parse uri_str
+      
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      resp = http.start {
+        request = Net::HTTP::Get.new(url.to_s)
+        response = http.request(request)
+        response.body
+      }
+      if resp =~ /No.*?log data found/
+        return opt[:parse] ? [] : resp
       end
+      
+      return opt[:parse] ? Log.parse(resp) : resp
     end
   end
 end

data/lib/rtunesu/document.rb

@@ -1,13 +1,15 @@
 require 'builder'
 
 module RTunesU
-  # Document is a class that generates the neccessary XML to interact with iTunes U.  Documents are generated and sent when calling .save, .create, .update, and .delete on an specific Entity object.  Classes in the Document:: namespace aren't intended for direct use.
+  # Document is a class for generating the neccessary XML to interact with iTunes U.
+  # Documents are generated and sent when calling .save, .create, .update, and .delete on
+  # specific Entity instances.  Classes in the Document:: namespace aren't intended for direct use.
   # For example:
-  # c = Course.find(12345, itunes_connection_object)
-  # c.Name # "Exemple Course"
-  # c.Name = 'Example Course'
-  # c.save(itunes_connection_object) # genertes and sends a Document::Merge object with the Course data.
-  module Document
+  # c = Course.find(12345)
+  # c.name # "exemple course"
+  # c.name = 'Example Course'
+  # c.save # genertes and sends a Document::Merge object with the Course data.
+  module Document # :nodoc:
     class Base
       INDENT = 2
       attr_accessor :builder, :source, :options, :xml
@@ -26,30 +28,35 @@ module RTunesU
         self
       end
 
-      # Implemented in each of the subclasses of Document::Base. Adds the particular action you would like to take (AddFoo, MergeFoo, DeleteFoo) to the Source class.
-      # For example, if the source Entity is of the type Track and you are creating a Document::Add the ITunesUDocument element will have a child element of <AddTrack>...</AddTrack>
-      # tag_action is called from inside Document::Base.new and is based the initializer's builder object so that proper nesting is maintained.
       private
+        # Implemented in each of the subclasses of Document::Base. Adds the particular action you would 
+        # like to take (AddFoo, MergeFoo, DeleteFoo) to the Source class.
+        # For example, if the source Entity is of the type Track and you are creating a 
+        # Document::Add the ITunesUDocument element will have a child element of <AddTrack>...</AddTrack>
+        # tag_action is called from inside Document::Base.new and is based the initializer's builder
+        # object so that proper nesting is maintained.
         def tag_action(xml_builder)
           return
         end 
     end
       
-    # Creates an XML document that comforms to iTunes U's specification for adding an entity.  This class is used internally by Entity classes when saving.
+    # Creates an XML document that comforms to iTunes U's specification for adding an entity. 
+    # This class is used internally by Entity classes when saving.
     class Add < Base
       private
         def tag_action(xml_builder)
           raise MissingParent if source.parent_handle.nil?
           xml_builder.tag!("Add#{source.class_name}") {
             xml_builder.tag!('ParentHandle', source.parent_handle)
-            # The existance of ParentPath is required for iTunesU documents, but can be blank
+            # The existance of ParentPath is required for iTunes U to validate a document, but it can be blank
             xml_builder.tag!('ParentPath', '')
             source.to_xml(xml_builder)
           }
         end
     end
         
-    # Creates an XML document that comforms to iTunes U's specification for updating an entity.  This class is used internally by Entity classes when saving.
+    # Creates an XML document that comforms to iTunes U's specification for updating an entity.
+    # This class is used internally by Entity classes when saving.
     class Merge < Base
       private
         def tag_action(xml_builder)
@@ -60,7 +67,8 @@ module RTunesU
       end
     end
   
-    # Creates an XML document that comforms to iTunes U's specification for deleting an entity.  This class is used internally by Entity classes when saving.
+    # Creates an XML document that comforms to iTunes U's specification for deleting an entity.
+    # This class is used internally by Entity classes when saving.
     class Delete < Base
       private
         def tag_action(xml_builder)
@@ -70,18 +78,5 @@ module RTunesU
           }
         end
     end
-    
-    # Shows the hierarchy tree for a portion of your iTunes U site.  If the source object has no handle, the tree for your entire site is shown.
-    # ShowTree.new can take an option options hash. The possible values for this hash are
-    # :key_group.  They iTunes U 'KeyGroup' that defines the amount of data returned from the ShowTree action. Possible values are 'minimal','most','maximal'.  
-    class ShowTree < Base
-      private
-        def tag_action(xml_builder)
-          xml_builder.tag!('ShowTree') {
-            xml_builder.tag!('Handle', self.source.handle) if self.source.handle
-            xml_builder.tag!('KeyGroup', options[:key_group] || 'most')
-          }
-        end
-    end
   end
 end

data/lib/rtunesu/entities/course.rb

@@ -1,19 +1,10 @@
 module RTunesU
   # A Course in iTunes U.
-  # == Attributes
-  # Name
-  # Handle
-  # Instructor
-  # Description
-  # Identifier
-  # ThemeHandle
-  # ShortName
-  
-  # == Nested Entities
-  # Permission
-  # Group
 
+  # ? LinkedFolderHandle
   class Course < Entity
-     
+    composed_of :name, :instructor, :description, :identifier, :theme_handle, :short_name, :allow_subscription
+    composed_of :aggregate_file_size, :readonly => true
+    has_n :permissions, :groups
   end
 end

data/lib/rtunesu/entities/division.rb

@@ -1,16 +1,9 @@
 module RTunesU
-  # A Division in iTunes U is a seperate nested area of your iTunes U Site.  It is different than a Section which is expressed in iTunes a a seperate area on a single page.
-  # == Attributes
-  # Handle
-  # Name
-  # ShortName
-  # AggregateFileSize (read only)
-  # Identifier
-  # 
-  #
-  # == Nested Entities
-  # Permission
-  # Section
+  # A Division in iTunes U is a seperate nested area of your iTunes U Site.  
+  # It is different than a Section which is expressed in iTunes a a seperate area on a single page.
   class Division < Entity
+    composed_of :name, :short_name, :identifier, :allow_subscription, :theme_handle, :description
+    composed_of :aggregate_file_size, :readonly => true
+    has_n :permissions, :sections
   end
 end

data/lib/rtunesu/entities/external_feed.rb

@@ -0,0 +1,14 @@
+module RTunesU
+  class ExternalFeed < Entity
+    composed_of :polling_interval, :owner_email, :security_type, :signature_type, :basic_auth_username, :basic_auth_password
+    composed_of :url, :as => 'URL'
+    validates!  :polling_interval, [:never, :daily]
+    validates!  :security_type,  [:none, 'Basic Authentication']
+    
+    # As an entirely nested entity ExternalFeed instances don't have a parent handle. However, something 'truthy' needs
+    # to be presnet for proper XML document genration.
+    def parent_handle # :nodoc:
+      ""
+    end
+  end
+end

data/lib/rtunesu/entities/group.rb

@@ -1,20 +1,11 @@
 module RTunesU
   # A Group in iTunes U. A Group is expressed as a tab in the iTunes interface.
-  # == Attributes
-  # Name
-  # Handle
-  # GroupType
-  # ShortName
-  # AggregateFileSize
-  # AllowSubscription
-  # 
-  #
-  # == Nested Entities
-  # Permission
-  # Track
-  # SharedObjects
-  # ExternalFeed
   
   class Group < Entity
+    composed_of :name, :group_type, :short_name, :allow_subscription, :explicit
+    composed_of :aggregate_file_size, :readonly => true
+    validates! :group_type, [:simple, :smart, :feed]
+    has_a :external_feed
+    has_n :permissions, :tracks, :shared_objects
   end
 end

data/lib/rtunesu/entities/permission.rb

@@ -1,10 +1,6 @@
 module RTunesU
   # A Permission in iTunes U.
-  # == Attributes
-  # Credential
-  # Access
-  # 
-  # == Nested Entities
   class Permission < Entity
+    composed_of :credential, :access
   end
 end

data/lib/rtunesu/entities/section.rb

@@ -1,15 +1,19 @@
 module RTunesU
-  # A Section in iTunes U.  A Section is expressed in the iTunes interface as a visually seperate area on a single page.  This is different than a Division which is a seperate nested area of iTunes U.
-  # == Attributes
-  # Handle
-  # Name
-  # AllowSubscription
-  # AggregateFileSize
-  # 
-  # == Nested Entities
-  # Permission
-  # Course
-  # Division
+  # A Section in iTunes U.  A Section is expressed in the iTunes interface as a visually 
+  # seperate area on a single page.  This is different than a Division which is a 
+  # seperate nested area of iTunes U.
   class Section < Entity
+    composed_of :name
+    has_n :courses
+    
+    # Sections have additional required attributes for updating. These attributes *must* appear
+    # in a specific order.
+    # see http://deimos.apple.com/rsrc/doc/iTunesUAdministratorsGuide/iTunesUWebServices/chapter_17_section_12.html
+    def to_xml(xml_builder = Builder::XmlMarkup.new)
+      xml_builder.tag!("SectionPath", '')
+      xml_builder.tag!("MergeByHandle", "false")
+      xml_builder.tag!("Destructive", "false")
+      super
+    end
   end
 end

data/lib/rtunesu/entities/site.rb

@@ -1,18 +1,11 @@
 module RTunesU
   # A Site in iTunes U.
-  # == Attributes
-  # Name
-  # Handle
-  # AllowSubscription
-  # AggregateFileSize
-  # ThemeHandle
-  # LoginURL
+  class Site < Entity
+    composed_of :name, :theme_handle, :allow_subscription
+    has_n :permissions, :sections, :templates
+  end
   
-  # == Nested Entities
-  # Permission
-  # Theme
-  # LinkCollectionSet
-  # Section
-  class Site
+  def delete(connection)
+    raise "You cannot delete your entire site"
   end
 end

data/lib/rtunesu/entities/template.rb

@@ -0,0 +1,4 @@
+module RTunesU
+  class Tempalte < Entity
+  end
+end

data/lib/rtunesu/entities/theme.rb

@@ -1,20 +1,8 @@
 module RTunesU
   # A visual theme for iTunesU pages. Color values are in 6 digit hex (e.g. #ffffff)
-  # == Attributes
-  # Name
-  # Handle
-  # BackgroundColor
-  # LineColor
-  # LinkArrowColor
-  # LinkBackgroundColor
-  # LinkBackgroundColorAlpha
-  # LinkBoxColor
-  # LinkTextColor
-  # LinkTitleColor
-  # RegularTextColor
-  # TitleTextColor
-  # TimeFormat
-  # DateFormat
   class Theme < Entity
+    composed_of :background_color, :line_color, :link_arrow_color, :link_background_color,
+                :link_background_color_alpha, :link_box_color, :link_text_color, :link_title_color,
+                :regular_text_color, :title_text_color, :time_format, :date_format
   end
 end

data/lib/rtunesu/entities/track.rb

@@ -1,33 +1,18 @@
 module RTunesU
-  # A Track in iTunes U.
-  # == Attributes
-  # Name
-  # Handle
-  # Kind
-  # TrackNumber
-  # DiscNumber
-  # DurationMilliseconds
-  # AlbumName
-  # ArtistName
-  # GenreName
-  # DownloadURL
-  # Comment
   class Track < Entity
-    # Tracks can only be found from within their Course. There is currently no way to find a Track separete from its Course in iTunes U.
-    def self.find(handle, course_handle, connection)
-      entity = self.new(:handle => handle)
+    composed_of :name, :kind, :disc_number, :album_name, :arist_name, :category_code, :explicit
+    composed_of :duration_in_milliseconds, :readonly => true
+    composed_of :downloadURL, :as => 'DownloadURL'
+    
+    # Tracks can only be found from within their Course. 
+    # There is currently (v1.1.3) no way to find a Track separete from its Course in iTunes U.
+    def self.find(handle, course_handle, connection = nil)
+      connection ||= self.base_connection
+      
+      entity = self.new
+      entity.instance_variable_set('@handle', handle)
       entity.source_xml = Course.find(course_handle, connection).source_xml.at("Handle[text()=#{entity.handle}]..")
       entity
     end
-    
-    # Duration in millseconds is the one attribute in plural form that is not a collection 
-    def DurationMilliseconds
-      self.value_from_edits_or_store('DurationMilliseconds')
-    end
-    
-    # Duration in millseconds is the one attribute in plural form that is not a collection 
-    def DurationMilliseconds=(duration)
-      self.edits['DurationMilliseconds'] = duration
-    end
   end
-end
+end