ituner 0.0.2 → 0.0.3

data/lib/ituner/itunes.rb

@@ -43,7 +43,7 @@ module ITuner
       nil
     end
 
-    collection :sources
+    has_many :sources
 
     def library
       sources["Library"]

data/lib/ituner/model.rb

@@ -29,7 +29,15 @@ module ITuner
         end
       end
 
-      def collection(name, app_name = name, &block)
+      def belongs_to(name, app_name)
+        define_method(name) do
+          parent_class = ITuner.const_get(name.to_s.capitalize)
+          app_parent = app_object.send(app_name).get
+          parent_class.new(app_parent) if app_parent
+        end
+      end
+      
+      def has_many(name, app_name = name, &block)
         item_type = name.to_s.sub(/s$/,'').to_sym
         item_class = ITuner.const_get(item_type.to_s.capitalize)
         define_method(name) do

data/lib/ituner/playlist.rb

@@ -1,13 +1,16 @@
 require 'ituner/model'
 require 'ituner/track'
+require 'ituner/playlist'
 
 module ITuner
   
   class Playlist < Model
     
-    property :name
+    belongs_to :source, :container
     
-    collection :tracks do
+    property :name
+
+    has_many :tracks do
 
       def clear
         app_collection.delete

data/lib/ituner/source.rb

@@ -6,8 +6,8 @@ module ITuner
   class Source < Model
     
     property :name
-    
-    collection :playlists do
+
+    has_many :playlists do
       
       def find_or_create(name)
         get(name) || create(:name => name)
@@ -15,7 +15,15 @@ module ITuner
       
     end
     
-    collection :tracks
+    def main_playlist
+      playlists.detect { |playlist| playlist.name == self.name }
+    end
+    
+    def search(*args)
+      main_playlist.search(*args)
+    end
+    
+    has_many :tracks
 
     def music
       playlists["Music"]

data/lib/ituner/track.rb

@@ -4,6 +4,8 @@ module ITuner
 
   class Track < Model
 
+    belongs_to :playlist, :container
+
     property :name
     property :artist
     property :album

data/lib/ituner/version.rb

@@ -1,3 +1,3 @@
 module ITuner
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/ituner/playlist_spec.rb

@@ -14,6 +14,15 @@ describe ITuner::Playlist do
     @playlist.tracks.should be_kind_of(ITuner::Collection)
   end
   
+  describe "#source" do
+    
+    it "returns the parent source" do
+      @playlist.source.should be_kind_of(ITuner::Source)
+      @playlist.source.name.should == "Library"
+    end
+    
+  end
+  
   describe "#search" do
     
     it "returns matching tracks" do

data/spec/ituner/source_spec.rb

@@ -45,4 +45,21 @@ describe ITuner::Source do
     
   end
 
+  describe "#main_playlist" do
+    
+    it "returns the main playlist" do
+      @source.main_playlist.should be_kind_of(ITuner::Playlist)
+      @source.main_playlist.name.should == @source.name
+    end
+    
+  end
+  
+  describe "#search" do
+
+    it "returns matching tracks" do
+      @source.search("Nirvana").map(&:name).should include("Smells Like Teen Spirit")
+    end
+
+  end
+
 end

data/spec/ituner/track_spec.rb

@@ -22,7 +22,15 @@ describe ITuner::Track do
   it "has a uid" do
     @track.uid.should be_kind_of(Fixnum)
   end
-  
+
+  describe "#playlist" do
+    
+    it "returns the containing playlist" do
+      @track.playlist.should be_kind_of(ITuner::Playlist)
+    end
+    
+  end
+
   it "can be played" do
     @track.play
   end

metadata

@@ -2,7 +2,7 @@
 name: ituner
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mike Williams
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +11:00
+date: 2011-03-31 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency