rbpod 0.0.3 → 0.0.4

data/ext/rbpod/track.c

@@ -3,48 +3,121 @@
 #include "rbpod.h"
 #include "track.h"
 
+/*
+ * call-seq:
+ *     transferred?() -> Boolean
+ *
+ * Returns true or false if this track has been transferred to the device.
+ */
 static VALUE rbpod_track_transferred_p(VALUE self)
 {
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return BooleanValue(track->transferred);
 }
 
-static VALUE rbpod_track_ipod_path_get(VALUE self)
+/*
+ * call-seq:
+ *     path() -> String
+ *
+ * Returns the full path to the file backing this track on the device.
+ */
+static VALUE rbpod_track_path_get(VALUE self)
 {
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
-    return rb_str_new2(track->ipod_path);
+    VALUE mount_point, path_parts, file_path, full_path;
+    Itdb_iTunesDB *database = track->itdb;
+    const gchar *ipod_path = NULL;
+
+    /* Never hurts to be careful, right? */
+    if (database == NULL || track->ipod_path == NULL) {
+        return Qnil;
+    }
+
+    /* Skip the prepended directory separator. */
+    ipod_path  = (const gchar *) &track->ipod_path[1];
+
+    /* Extract the iPod mount point from the database pointer. */
+    mount_point = rb_str_new2(itdb_get_mountpoint(database));
+
+    /* Split the track's ipod_path by ':' character. */
+    path_parts = rb_str_split(rb_str_new2(ipod_path), ":");
+
+    /* Use File.join to rejoin the path safely. */
+    file_path = rb_funcall2(rb_cFile, rb_intern("join"), 1, &path_parts);
+
+    /* Retrieve the expanded absolute path name. */
+    full_path = rb_file_expand_path(file_path, mount_point);
+
+    /* Return a Pathname instance for the resolved path. */
+    return rb_class_new_instance(1, &full_path, rb_cPathname);
 }
 
-static VALUE rbpod_track_file_type_get(VALUE self)
+/*
+ * call-seq:
+ *     type() -> String
+ *
+ * Returns a human-readable string describing the content of the track.
+ */
+static VALUE rbpod_track_type_get(VALUE self)
 {
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->filetype);
 }
 
+/*
+ * call-seq:
+ *     artist() -> String
+ *
+ * Returns the artist for the track.
+ */
 static VALUE rbpod_track_artist_get(VALUE self)
 {
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->artist);
 }
 
+/*
+ * call-seq:
+ *     album() -> String
+ *
+ * Returns the album for the track.
+ */
 static VALUE rbpod_track_album_get(VALUE self)
 {
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->album);
 }
 
+/*
+ * call-seq:
+ *     title() -> String
+ *
+ * Returns the title of the track.
+ */
 static VALUE rbpod_track_title_get(VALUE self)
 {
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->title);
 }
 
+/*
+ * call-seq:
+ *     id() -> Fixnum
+ *
+ * Returns the internal ID number for this track. Do not use this method.
+ */
 static VALUE rbpod_track_id_get(VALUE self)
 {
     Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
-    return rb_str_new2(track->filetype);
+    return INT2NUM(track->id);
 }
 
+/*
+ * call-seq:
+ *     initialize() -> RbPod::Track
+ *
+ * Creates a detached track. (Not managed by a database.)
+ */
 static VALUE rbpod_track_initialize(VALUE self)
 {
     return self;
@@ -52,7 +125,13 @@ static VALUE rbpod_track_initialize(VALUE self)
 
 static void rbpod_track_deallocate(void *handle)
 {
-    itdb_track_free((Itdb_Track *) handle);
+    Itdb_Track *track = (Itdb_Track *) handle;
+
+    /* Don't free tracks that are assigned to a playlist/database. */
+    if (track->itdb == NULL || track->id == 0) {
+        itdb_track_free((Itdb_Track *) handle);
+    }
+
     return;
 }
 
@@ -73,12 +152,13 @@ void Init_rbpod_track(void)
 
     rb_define_method(cRbPodTrack, "initialize", rbpod_track_initialize, 0);
 
-    rb_define_method(cRbPodTrack, "id", rbpod_track_id_get, 0);
+    rb_define_private_method(cRbPodTrack, "id", rbpod_track_id_get, 0);
+
     rb_define_method(cRbPodTrack, "title", rbpod_track_title_get, 0);
     rb_define_method(cRbPodTrack, "album", rbpod_track_album_get, 0);
     rb_define_method(cRbPodTrack, "artist", rbpod_track_artist_get, 0);
-    rb_define_method(cRbPodTrack, "file_type", rbpod_track_file_type_get, 0);
-    rb_define_method(cRbPodTrack, "ipod_path", rbpod_track_ipod_path_get, 0);
+    rb_define_method(cRbPodTrack, "type", rbpod_track_type_get, 0);
+    rb_define_method(cRbPodTrack, "path", rbpod_track_path_get, 0);
 
     rb_define_method(cRbPodTrack, "transferred?", rbpod_track_transferred_p, 0);
 

data/ext/rbpod/track_collection.c

@@ -5,17 +5,22 @@
 #include "collection.h"
 #include "track_collection.h"
 
-static VALUE rbpod_track_collection_parent(VALUE self)
+/*
+ * call-seq:
+ *     playlist() -> RbPod::Playlist
+ *
+ * The playlist from which this collection of tracks is attached to.
+ */
+static VALUE rbpod_track_collection_playlist(VALUE self)
 {
-    return rb_iv_get(self, "@parent");
+    return rb_iv_get(self, "@pkaylist");
 }
 
-inline VALUE rbpod_track_collection_create(VALUE parent, GList *items)
+inline VALUE rbpod_track_collection_create(VALUE playlist, GList *items)
 {
     VALUE collection = rbpod_collection_create(items, cRbPodTrack);
     rb_extend_object(collection, mRbPodTrackCollection);
-    rb_extend_object(collection, rb_mComparable);
-    rb_iv_set(collection, "@parent", parent);
+    rb_iv_set(collection, "@playlist", playlist);
     return collection;
 }
 
@@ -24,9 +29,10 @@ void Init_rbpod_track_collection(void)
 #if RDOC_CAN_PARSE_DOCUMENTATION
     mRbPod = rb_define_module("RbPod");
 #endif
+    /* This module extends any collection of tracks at runtime. */
     mRbPodTrackCollection = rb_define_module_under(mRbPod, "TrackCollection");
 
-    rb_define_private_method(mRbPodTrackCollection, "parent", rbpod_track_collection_parent, 0);
+    rb_define_method(mRbPodTrackCollection, "playlist", rbpod_track_collection_playlist, 0);
 
     return;
 }

data/lib/rbpod/version.rb

@@ -1,3 +1,3 @@
-module RbPod
-  VERSION = "0.0.3"
+module RbPod # :nodoc:
+  VERSION = "0.0.4" # :nodoc:
 end

data/spec/collection_spec.rb

@@ -17,8 +17,8 @@ describe RbPod::Collection do
   end
 
   describe '#each' do
-    it 'should yield to a block and return nil' do
-      @collection.each(&@block).should be_nil
+    it 'should yield to a block and return itself' do
+      @collection.each(&@block).should_not be_nil
     end
 
     it 'should return an Enumerator without a block' do

data/spec/database_spec.rb

@@ -52,7 +52,7 @@ describe RbPod::Database do
 
     describe '#mountpoint' do
       it 'should match the mount point it was loaded from' do
-        @database.mountpoint.should == @directory
+        @database.mountpoint.to_s.should == @directory
       end
     end
 
@@ -74,16 +74,6 @@ describe RbPod::Database do
       end
     end
 
-    describe '#tracks' do
-      it 'should return a collection' do
-        @database.tracks.should be_instance_of(RbPod::Collection)
-      end
-
-      it 'should have an empty set of tracks' do
-        @database.tracks.length.should == 0
-      end
-    end
-
     describe '#playlists' do
       it 'should return a collection' do
         @database.playlists.should be_instance_of(RbPod::Collection)
@@ -91,7 +81,7 @@ describe RbPod::Database do
 
       it 'should have a single master playlist' do
         @database.playlists.length.should eq(1)
-        @database.playlists.first.should be_master_playlist
+        @database.playlists.first.is_master_playlist?.should be_true
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbpod
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -447256177
+      hash: 1001961729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -447256177
+      hash: 1001961729
 requirements:
 - libgpod-1.0
 rubyforge_project: