rbpod 0.0.1 → 0.0.2

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 *.rbc
+*.so
+*.swp
 .bundle
 .config
 .yardoc

data/README.md

@@ -54,7 +54,7 @@ Functional for most read-only purposes.
     database.playlists.map(&:name) # => ["iPod", "Podcasts", "Recently Added"]
 
     # Track Listing (also enumerable)
-    database.tracks.count        # => 400
+    database.tracks.length       # => 400
     database.tracks.first.artist # => "Steppenwolf"
     database.tracks.first.title  # => "Born To Be Wild"
 

data/Rakefile

@@ -1 +1,36 @@
-require "bundler/gem_tasks"
+# Bring in rake with rake-compiler's support.
+require 'rake'
+require 'rake/extensiontask'
+
+# Bring in bundler and it's gem tasks.
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+
+# Bring in RSpec's built-in rake task.
+require 'rspec/core/rake_task'
+
+# By default, clean, compile and then test.
+task :default => [ :compile, :test ]
+
+desc "Compile the native extension."
+Rake::ExtensionTask.new do |extension|
+  # Some basic configuration.
+  extension.name     = 'rbpod'
+  extension.ext_dir  = 'ext/rbpod'
+  extension.lib_dir  = 'lib/rbpod'
+
+  # Monitor sources for change tracking.
+  extension.source_pattern = '*.{c,h}'
+end
+
+desc "Run all available RSpec tests."
+RSpec::Core::RakeTask.new(:test) do |task|
+  task.pattern = 'spec/**/*_spec.rb'
+  # Execute ruby with warnings enabled.
+  task.ruby_opts = '-w'
+end
+
+desc "Open a console with rbpod preloaded."
+task :console => [ :compile ] do
+  sh 'bundle console'
+end

data/ext/rbpod/collection.c

@@ -7,14 +7,15 @@ VALUE cRbPodCollection;
 
 struct collection { VALUE klass; GList *list; };
 
-static inline struct collection *rbpod_collection_unwrap(VALUE self) {
-    struct collection *collection = NULL;
-    Data_Get_Struct(self, struct collection, collection);
-    return collection;
+inline VALUE rbpod_collection_create(GList *list, VALUE type) {
+    struct collection *collection = ALLOC(struct collection);
+    collection->list  = list;
+    collection->klass = type;
+    return Data_Wrap_Struct(cRbPodCollection, NULL, NULL, (void *) collection);
 }
 
 static VALUE rbpod_collection_get(VALUE self, VALUE key) {
-    struct collection *collection = rbpod_collection_unwrap(self);
+    struct collection *collection = TYPED_DATA_PTR(self, struct collection);
     GList *current = NULL;
 
     if (FIXNUM_P(key) == FALSE)
@@ -22,42 +23,41 @@ static VALUE rbpod_collection_get(VALUE self, VALUE key) {
 
     current = g_list_nth(collection->list, FIX2INT(key));
 
-    return Data_Wrap_Struct(collection->klass, NULL, NULL, (void *) current->data);;
+    return Data_Wrap_Struct(collection->klass, NULL, NULL, (void *) current->data);
 }
 
 static VALUE rbpod_collection_last(VALUE self) {
-    struct collection *collection = rbpod_collection_unwrap(self);
+    struct collection *collection = TYPED_DATA_PTR(self, struct collection);
     GList *current = g_list_last(collection->list);
     return Data_Wrap_Struct(collection->klass, NULL, NULL, (void *) current->data);
 }
 
 static VALUE rbpod_collection_first(VALUE self) {
-    struct collection *collection = rbpod_collection_unwrap(self);
+    struct collection *collection = TYPED_DATA_PTR(self, struct collection);
     GList *current = g_list_first(collection->list);
     return Data_Wrap_Struct(collection->klass, NULL, NULL, (void *) current->data);
 }
 
-static VALUE rbpod_collection_count(VALUE self) {
-    struct collection *collection = rbpod_collection_unwrap(self);
+static VALUE rbpod_collection_length(VALUE self) {
+    struct collection *collection = TYPED_DATA_PTR(self, struct collection);
     return INT2NUM(g_list_length(collection->list));
 }
 
 static VALUE rbpod_collection_each(VALUE self) {
-    struct collection *collection = rbpod_collection_unwrap(self);
+    struct collection *collection = TYPED_DATA_PTR(self, struct collection);
     GList *current = NULL;
     VALUE item;
 
-    if (rb_block_given_p() == TRUE) {
-        /* If we were supplied a block, enumerate the entire list. */
-        for (current = collection->list; current != NULL; current = current->next) {
-            item = Data_Wrap_Struct(collection->klass, NULL, NULL, (void *) current->data);
-            rb_yield(item);
-        }
-        return Qnil;
-    } else {
-        /* Otherwise return an enumerator from this method to the caller. */
+    if (rb_block_given_p() == FALSE)
         return rb_funcall(self, rb_intern("enum_for"), 1, ID2SYM(rb_intern("each")));
+
+    /* If we were supplied a block, enumerate the entire list. */
+    for (current = collection->list; current != NULL; current = current->next) {
+        item = Data_Wrap_Struct(collection->klass, NULL, NULL, (void *) current->data);
+        rb_yield(item);
     }
+
+    return Qnil;
 }
 
 static VALUE rbpod_collection_initialize(VALUE self) {
@@ -74,15 +74,11 @@ static void rbpod_collection_deallocate(void *handle) {
     return;
 }
 
-inline VALUE rbpod_collection_wrap(GList *list, VALUE type, gboolean freeable) {
-    struct collection *collection = ALLOC(struct collection);
-    collection->list  = list;
-    collection->klass = type;
-    return Data_Wrap_Struct(cRbPodCollection, NULL, freeable ? rbpod_collection_deallocate : NULL, (void *) collection);
-}
-
 static VALUE rbpod_collection_allocate(VALUE self) {
-    return rbpod_collection_wrap(g_list_alloc(), Qnil, TRUE);
+    struct collection *collection = ALLOC(struct collection);
+    collection->list = NULL;
+    collection->klass = Qnil;
+    return Data_Wrap_Struct(cRbPodCollection, NULL, rbpod_collection_deallocate, (void *) collection);
 }
 
 void Init_rbpod_collection(void) {
@@ -95,7 +91,10 @@ void Init_rbpod_collection(void) {
     rb_define_method(cRbPodCollection, "initialize", rbpod_collection_initialize, 0);
 
     rb_define_method(cRbPodCollection, "each", rbpod_collection_each, 0);
-    rb_define_method(cRbPodCollection, "count", rbpod_collection_count, 0);
+
+    rb_define_method(cRbPodCollection, "length", rbpod_collection_length, 0);
+
+    rb_define_alias(cRbPodCollection,  "size", "length");
 
     rb_define_method(cRbPodCollection, "first", rbpod_collection_first, 0);
     rb_define_method(cRbPodCollection, "last", rbpod_collection_last, 0);

data/ext/rbpod/collection.h

@@ -7,6 +7,6 @@ extern VALUE cRbPodCollection;
 
 void Init_rbpod_collection(void);
 
-inline VALUE rbpod_collection_wrap(GList *list, VALUE type, gboolean freeable);
+inline VALUE rbpod_collection_create(GList *list, VALUE type);
 
 #endif /* RBPOD_COLLECTION_H */

data/ext/rbpod/database.c

@@ -7,84 +7,72 @@
 #include "database.h"
 #include "collection.h"
 
-/*
- * Although libgpod has an itdb_new(), itdb_parse() also returns a pointer to a
- * newly allocated Itdb_iTunesDB structure. Since overwriting the data pointer from
- * Data_Get_Struct() at runtime is dangerous, we use a double-pointer to wrap the
- * Itdb_iTunesDB handle, so as not to confuse the Ruby implementation internals.
- */
-
 VALUE cRbPodDatabase;
 
-static inline Itdb_iTunesDB *rbpod_database_unwrap(VALUE self) {
-    Itdb_iTunesDB **database = NULL;
-    Data_Get_Struct(self, Itdb_iTunesDB *, database);
-    return *database;
-}
-
 static VALUE rbpod_database_write(VALUE self) {
-    Itdb_iTunesDB *database = rbpod_database_unwrap(self);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
     gboolean success = itdb_write(database, NULL); /* TODO: Improve error handling. */
     return BooleanValue(success);
 }
 
 static VALUE rbpod_database_is_synchronized(VALUE self) {
-    Itdb_iTunesDB *database = rbpod_database_unwrap(self);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
     guint32 nontransferred = itdb_tracks_number_nontransferred(database);
     return BooleanValue(nontransferred == 0);
 }
 
 static VALUE rbpod_database_playlists_get(VALUE self) {
-    Itdb_iTunesDB *database = rbpod_database_unwrap(self);
-    return rbpod_collection_wrap(database->playlists, cRbPodPlaylist, FALSE);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
+    return rbpod_playlist_collection_create(self, database->playlists);
 }
 
 static VALUE rbpod_database_tracks_get(VALUE self) {
-    Itdb_iTunesDB *database = rbpod_database_unwrap(self);
-    return rbpod_collection_wrap(database->tracks, cRbPodTrack, FALSE);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
+    Itdb_Playlist *playlist = itdb_playlist_mpl(database);
+    /* Use the master playlist as the parent for the master track list. */
+    VALUE parent = Data_Wrap_Struct(cRbPodPlaylist, NULL, NULL, (void *) playlist);
+    return rbpod_track_collection_create(parent, database->tracks);
 }
 
 static VALUE rbpod_database_device_get(VALUE self) {
-    Itdb_iTunesDB *database = rbpod_database_unwrap(self);
-    return rbpod_device_wrap(database->device, FALSE);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
+    return rbpod_device_create(database->device);
 }
 
 static VALUE rbpod_database_filename_get(VALUE self) {
-    Itdb_iTunesDB *database = rbpod_database_unwrap(self);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
     return rb_str_new2(database->filename);
 }
 
 static VALUE rbpod_database_version_get(VALUE self) {
-    Itdb_iTunesDB *database = rbpod_database_unwrap(self);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
     return INT2NUM(database->version);
 }
 
 static VALUE rbpod_database_id_get(VALUE self) {
-    Itdb_iTunesDB *database = rbpod_database_unwrap(self);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
     return INT2NUM(database->id);
 }
 
 static VALUE rbpod_database_mountpoint_get(VALUE self) {
-    Itdb_iTunesDB *database = rbpod_database_unwrap(self);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
     return rb_str_new2(itdb_get_mountpoint(database));
 }
 
 static VALUE rbpod_database_mountpoint_set(VALUE self, VALUE path) {
-    Itdb_iTunesDB *database = rbpod_database_unwrap(self);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
     itdb_set_mountpoint(database, StringValueCStr(path));
     return rbpod_database_mountpoint_get(self);
 }
 
 static void rbpod_database_deallocate(void *handle) {
-    Itdb_iTunesDB **database = (Itdb_iTunesDB **) handle;
-    itdb_free(*database);
-    xfree(handle);
+    itdb_free((Itdb_iTunesDB *) handle);
     return;
 }
 
 static VALUE rbpod_database_create(VALUE self, VALUE device_name, VALUE mount_point, VALUE model_number) {
-    Itdb_iTunesDB **database = ALLOC(Itdb_iTunesDB *);
     gchar *_mount_point, *_model_number, *_device_name;
+    Itdb_iTunesDB *database = NULL;
 
     _device_name  = StringValueCStr(device_name);
     _mount_point  = StringValueCStr(mount_point);
@@ -95,55 +83,44 @@ static VALUE rbpod_database_create(VALUE self, VALUE device_name, VALUE mount_po
     /* Initialize the iPod at this mount point, with this device name and model number. */
     /* TODO: Improve error handling. */
     if (itdb_init_ipod(_mount_point, _model_number, _device_name, NULL) == FALSE) {
-        free(database);
-        rb_raise(rb_eRuntimeError, "Unable to format this iPod.");
+        rb_raise(eRbPodError, "Unable to format this iPod.");
         return Qfalse;
     }
 
     /* Parse the newly created database. */
     /* TODO: Improve error handling. */
-    *database = itdb_parse(_mount_point, NULL);
+    database = itdb_parse(_mount_point, NULL);
 
-    if (*database == NULL) {
-        free(database);
-        rb_raise(rb_eRuntimeError, "Not an iPod mount point.");
+    if (database == NULL) {
+        rb_raise(eRbPodError, "Not an iPod mount point.");
         return Qnil;
     }
 
     /* Return an instance of this class using the newly created database. */
-    return Data_Wrap_Struct(self, NULL, rbpod_database_deallocate, (void *) database);
+    return Data_Wrap_Struct(cRbPodDatabase, NULL, rbpod_database_deallocate, (void *) database);
 }
 
 static VALUE rbpod_database_initialize(VALUE self, VALUE mount_point) {
-    Itdb_iTunesDB **database;
-
-    /* Extract the wrapper from the class itself. */
-    Data_Get_Struct(self, Itdb_iTunesDB *, database);
+    Itdb_iTunesDB *database = TYPED_DATA_PTR(self, Itdb_iTunesDB);
 
     /* Try to parse the database from the given mount point. */
     /* TODO: Improve error handling. */
-    *database = itdb_parse(StringValueCStr(mount_point), NULL);
+    database = itdb_parse(StringValueCStr(mount_point), NULL);
 
     /* The given mount point was not an iPod mount point. */
-    if (*database == NULL) {
-        rb_raise(rb_eRuntimeError, "Not an iPod mount point.");
+    if (database == NULL) {
+        rb_raise(eRbPodError, "This is not an iPod mount point.");
         return Qnil;
     }
 
-    return self;
-}
+    DATA_PTR(self) = database;
 
-inline VALUE rbpod_database_wrap(Itdb_iTunesDB **database, gboolean freeable) {
-    return Data_Wrap_Struct(cRbPodDatabase, NULL, freeable ? rbpod_database_deallocate : NULL, (void *) database);
+    return self;
 }
 
 static VALUE rbpod_database_allocate(VALUE self) {
-    Itdb_iTunesDB **database = ALLOC(Itdb_iTunesDB *);
-
-    /* Initialize a new, empty database. */
-    *database = itdb_new();
-
-    return rbpod_database_wrap(database, TRUE);
+    Itdb_iTunesDB *database = itdb_new();
+    return Data_Wrap_Struct(cRbPodDatabase, NULL, rbpod_database_deallocate, (void *) database);
 }
 
 void Init_rbpod_database(void) {

data/ext/rbpod/database.h

@@ -7,6 +7,4 @@ extern VALUE cRbPodDatabase;
 
 void Init_rbpod_database(void);
 
-inline VALUE rbpod_database_wrap(Itdb_iTunesDB **database, gboolean freeable);
-
 #endif /* RBPOD_DATABASE_H */

data/ext/rbpod/device.c

@@ -5,63 +5,66 @@
 
 VALUE cRbPodDevice;
 
-static inline Itdb_Device *rbpod_device_unwrap(VALUE self) {
-    Itdb_Device *device = NULL;
-    Data_Get_Struct(self, Itdb_Device, device);
-    return device;
+inline VALUE rbpod_device_create(Itdb_Device *device) {
+    return Data_Wrap_Struct(cRbPodDevice, NULL, NULL, (void *) device);
 }
 
 static VALUE rbpod_device_has_chapter_image_support(VALUE self) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     return BooleanValue(itdb_device_supports_chapter_image(device));
 }
 
 static VALUE rbpod_device_has_podcast_support(VALUE self) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     return BooleanValue(itdb_device_supports_podcast(device));
 }
 
 static VALUE rbpod_device_has_artwork_support(VALUE self) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     return BooleanValue(itdb_device_supports_artwork(device));
 }
 
 static VALUE rbpod_device_has_video_support(VALUE self) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     return BooleanValue(itdb_device_supports_video(device));
 }
 
 static VALUE rbpod_device_has_photo_support(VALUE self) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     return BooleanValue(itdb_device_supports_photo(device));
 }
 
 static VALUE rbpod_device_model_name_get(VALUE self) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
-    Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
+    const Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
     return rb_str_new2(itdb_info_get_ipod_model_name_string(info->ipod_model));
 }
 
 static VALUE rbpod_device_model_number_get(VALUE self) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
-    Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
+    const Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
     return rb_str_new2(info->model_number);
 }
 
 static VALUE rbpod_device_generation_get(VALUE self) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     const Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
     return rb_str_new2(itdb_info_get_ipod_generation_string(info->ipod_generation));
 }
 
 static VALUE rbpod_device_capacity_get(VALUE self) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     const Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
     return DBL2NUM(info->capacity);
 }
 
+static VALUE rbpod_device_uuid_get(VALUE self) {
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
+    return rb_str_new2(itdb_device_get_uuid(device));
+}
+
 static VALUE rbpod_device_sysinfo_get(VALUE self, VALUE key) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     gchar *value = NULL;
     VALUE result;
 
@@ -74,7 +77,7 @@ static VALUE rbpod_device_sysinfo_get(VALUE self, VALUE key) {
 }
 
 static VALUE rbpod_device_sysinfo_set(VALUE self, VALUE key, VALUE value) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     gchar *_value, *_key;
 
     _key   = StringValueCStr(key);
@@ -82,17 +85,17 @@ static VALUE rbpod_device_sysinfo_set(VALUE self, VALUE key, VALUE value) {
 
     itdb_device_set_sysinfo(device, _key, _value);
 
-    return rbpod_device_sysinfo_get(self, _key);
+    return rbpod_device_sysinfo_get(self, key);
 }
 
 static VALUE rbpod_device_sysinfo_write(VALUE self) {
-    Itdb_Device *device = rbpod_device_unwrap(self);
+    Itdb_Device *device = TYPED_DATA_PTR(self, Itdb_Device);
     /* TODO: Improve error handling. */
     return BooleanValue(itdb_device_write_sysinfo(device, NULL));
 }
 
 static VALUE rbpod_device_initialize(VALUE self) {
-    /* Private. */
+    /* Private method, no setup required yet. */
     return self;
 }
 
@@ -100,12 +103,8 @@ static void rbpod_device_deallocate(void *handle) {
     itdb_device_free((Itdb_Device *) handle);
 }
 
-inline VALUE rbpod_device_wrap(Itdb_Device *device, gboolean freeable) {
-    return Data_Wrap_Struct(cRbPodDevice, NULL, freeable ? rbpod_device_deallocate : NULL, (void *) device);
-}
-
 static VALUE rbpod_device_allocate(VALUE self) {
-    return rbpod_device_wrap(itdb_device_new(), TRUE);
+    return Data_Wrap_Struct(cRbPodDevice, NULL, rbpod_device_deallocate, (void *) itdb_device_new());
 }
 
 void Init_rbpod_device(void) {
@@ -120,6 +119,7 @@ void Init_rbpod_device(void) {
     rb_define_method(cRbPodDevice, "[]=", rbpod_device_sysinfo_set, 2);
     rb_define_method(cRbPodDevice, "save!", rbpod_device_sysinfo_write, 0);
 
+    rb_define_method(cRbPodDevice, "uuid", rbpod_device_uuid_get, 0);
     rb_define_method(cRbPodDevice, "capacity", rbpod_device_capacity_get, 0);
     rb_define_method(cRbPodDevice, "generation", rbpod_device_generation_get, 0);
     rb_define_method(cRbPodDevice, "model_name", rbpod_device_model_name_get, 0);

data/ext/rbpod/device.h

@@ -7,6 +7,6 @@ extern VALUE cRbPodDevice;
 
 void Init_rbpod_device(void);
 
-inline VALUE rbpod_device_wrap(Itdb_Device *device, gboolean freeable);
+inline VALUE rbpod_device_create(Itdb_Device *device);
 
 #endif /* RBPOD_DEVICE_H */

data/ext/rbpod/playlist.c

@@ -3,51 +3,66 @@
 #include "rbpod.h"
 #include "track.h"
 #include "playlist.h"
+#include "collection.h"
 
 VALUE cRbPodPlaylist;
+VALUE mRbPodPlaylistCollection;
 
-static inline Itdb_Playlist *rbpod_playlist_unwrap(VALUE self) {
-    Itdb_Playlist *playlist = NULL;
-    Data_Get_Struct(self, Itdb_Playlist, playlist);
-    return playlist;
+inline VALUE rbpod_playlist_collection_create(VALUE parent, GList *items) {
+    VALUE collection = rbpod_collection_create(items, cRbPodPlaylist);
+    rb_extend_object(collection, mRbPodPlaylistCollection);
+    rb_iv_set(collection, "@parent", parent);
+    return collection;
 }
 
 static VALUE rbpod_playlist_is_podcast(VALUE self) {
-    Itdb_Playlist *playlist = rbpod_playlist_unwrap(self);
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return BooleanValue(itdb_playlist_is_podcasts(playlist));
 }
 
 static VALUE rbpod_playlist_is_master(VALUE self) {
-    Itdb_Playlist *playlist = rbpod_playlist_unwrap(self);
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return BooleanValue(itdb_playlist_is_mpl(playlist));
 }
 
 static VALUE rbpod_playlist_is_smart(VALUE self) {
-    Itdb_Playlist *playlist = rbpod_playlist_unwrap(self);
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return BooleanValue(playlist->is_spl);
 }
 
+static VALUE rbpod_playlist_timestamp_get(VALUE self) {
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
+    return rb_funcall(rb_cTime, rb_intern("at"), 1, INT2NUM(playlist->timestamp));
+}
+
+static VALUE rbpod_playlist_shuffle(VALUE self) {
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
+    itdb_playlist_randomize(playlist);
+    return Qnil;
+}
+
 static VALUE rbpod_playlist_tracks_get(VALUE self) {
-    Itdb_Playlist *playlist = rbpod_playlist_unwrap(self);
-    return rbpod_collection_wrap(playlist->members, cRbPodTrack, FALSE);
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
+    return rbpod_track_collection_create(self, playlist->members);
 }
 
 static VALUE rbpod_playlist_length_get(VALUE self) {
-    Itdb_Playlist *playlist = rbpod_playlist_unwrap(self);
-    return INT2NUM(playlist->num);
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
+    return INT2NUM(itdb_playlist_tracks_number(playlist));
 }
 
 static VALUE rbpod_playlist_name_get(VALUE self) {
-    Itdb_Playlist *playlist = rbpod_playlist_unwrap(self);
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
     return rb_str_new2(playlist->name);
 }
 
 static VALUE rbpod_playlist_id_get(VALUE self) {
-    Itdb_Playlist *playlist = rbpod_playlist_unwrap(self);
-    return INT2FIX(playlist->id);
+    Itdb_Playlist *playlist = TYPED_DATA_PTR(self, Itdb_Playlist);
+    return INT2NUM(playlist->id);
 }
 
 static VALUE rbpod_playlist_initialize(VALUE self) {
+    /* Nothing to intiialize, yet. */
     return self;
 }
 
@@ -55,13 +70,9 @@ static void rbpod_playlist_deallocate(void *handle) {
     itdb_playlist_free((Itdb_Playlist *) handle);
 }
 
-inline VALUE rbpod_playlist_wrap(Itdb_Playlist *playlist, gboolean freeable) {
-    return Data_Wrap_Struct(cRbPodPlaylist, NULL, freeable ? rbpod_playlist_deallocate : NULL, (void *) playlist);
-}
-
 static VALUE rbpod_playlist_allocate(VALUE self) {
     Itdb_Playlist *playlist = itdb_playlist_new("Untitled Playlist", FALSE);
-    return rbpod_playlist_wrap(playlist, TRUE);
+    return Data_Wrap_Struct(cRbPodPlaylist, NULL, rbpod_playlist_deallocate, (void *) playlist);
 }
 
 void Init_rbpod_playlist(void) {
@@ -75,11 +86,15 @@ void Init_rbpod_playlist(void) {
     rb_define_method(cRbPodPlaylist, "name", rbpod_playlist_name_get, 0);
     rb_define_method(cRbPodPlaylist, "length", rbpod_playlist_length_get, 0);
     rb_define_method(cRbPodPlaylist, "tracks", rbpod_playlist_tracks_get, 0);
+    rb_define_method(cRbPodPlaylist, "shuffle!", rbpod_playlist_shuffle, 0);
+    rb_define_method(cRbPodPlaylist, "created_on", rbpod_playlist_timestamp_get, 0);
 
     rb_define_method(cRbPodPlaylist, "smart_playlist?", rbpod_playlist_is_smart, 0);
     rb_define_method(cRbPodPlaylist, "master_playlist?", rbpod_playlist_is_master, 0);
     rb_define_method(cRbPodPlaylist, "podcast_playlist?", rbpod_playlist_is_podcast, 0);
 
+    mRbPodPlaylistCollection = rb_define_module_under(cRbPodPlaylist, "Collection");
+
     return;
 }
 

data/ext/rbpod/playlist.h

@@ -4,9 +4,10 @@
 #define RBPOD_PLAYLIST_H
 
 extern VALUE cRbPodPlaylist;
+extern VALUE mRbPodPlaylistCollection;
 
 void Init_rbpod_playlist(void);
 
-inline VALUE rbpod_playlist_wrap(Itdb_Playlist *playlist, gboolean freeable);
+inline VALUE rbpod_playlist_collection_create(VALUE parent, GList *items);
 
 #endif /* RBPOD_PLAYLIST_H */

data/ext/rbpod/rbpod.c

@@ -8,11 +8,15 @@
 #include "collection.h"
 
 VALUE mRbPod;
+VALUE eRbPodError;
 
 void Init_rbpod(void) {
     /* Set up the top-level RbPod module. */
     mRbPod = rb_define_module("RbPod");
 
+    /* Subclass RuntimeError for ourselves. */
+    eRbPodError = rb_define_class_under(mRbPod, "Error", rb_eRuntimeError);
+
     /* Set up the RbPod::Database class. */
     Init_rbpod_database();
 

data/ext/rbpod/rbpod.h

@@ -8,6 +8,9 @@
 
 #define BooleanValue(value) (value) ? Qtrue : Qfalse
 
+#define TYPED_DATA_PTR(self, type) ((type *) DATA_PTR(self))
+
 extern VALUE mRbPod;
+extern VALUE eRbPodError;
 
 #endif /* RBPOD_H */

data/ext/rbpod/track.c

@@ -2,47 +2,50 @@
 
 #include "rbpod.h"
 #include "track.h"
+#include "collection.h"
 
 VALUE cRbPodTrack;
+VALUE mRbPodTrackCollection;
 
-static inline Itdb_Track *rbpod_track_unwrap(VALUE self) {
-    Itdb_Track *track = NULL;
-    Data_Get_Struct(self, Itdb_Track, track);
-    return track;
+inline VALUE rbpod_track_collection_create(VALUE parent, GList *items) {
+    VALUE collection = rbpod_collection_create(items, cRbPodTrack);
+    rb_extend_object(collection, mRbPodTrackCollection);
+    rb_iv_set(collection, "@parent", parent);
+    return collection;
 }
 
 static VALUE rbpod_track_is_transferred(VALUE self) {
-    Itdb_Track *track = rbpod_track_unwrap(self);
+    Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return BooleanValue(track->transferred);
 }
 
 static VALUE rbpod_track_ipod_path_get(VALUE self) {
-    Itdb_Track *track = rbpod_track_unwrap(self);
+    Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->ipod_path);
 }
 
 static VALUE rbpod_track_file_type_get(VALUE self) {
-    Itdb_Track *track = rbpod_track_unwrap(self);
+    Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->filetype);
 }
 
 static VALUE rbpod_track_artist_get(VALUE self) {
-    Itdb_Track *track = rbpod_track_unwrap(self);
+    Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->artist);
 }
 
 static VALUE rbpod_track_album_get(VALUE self) {
-    Itdb_Track *track = rbpod_track_unwrap(self);
+    Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->album);
 }
 
 static VALUE rbpod_track_title_get(VALUE self) {
-    Itdb_Track *track = rbpod_track_unwrap(self);
+    Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->title);
 }
 
 static VALUE rbpod_track_id_get(VALUE self) {
-    Itdb_Track *track = rbpod_track_unwrap(self);
+    Itdb_Track *track = TYPED_DATA_PTR(self, Itdb_Track);
     return rb_str_new2(track->filetype);
 }
 
@@ -55,12 +58,9 @@ static void rbpod_track_deallocate(void *handle) {
     return;
 }
 
-inline VALUE rbpod_track_wrap(Itdb_Track *track, gboolean freeable) {
-    return Data_Wrap_Struct(cRbPodTrack, NULL, freeable ? rbpod_track_deallocate : NULL, (void *) track);
-}
-
 static VALUE rbpod_track_allocate(VALUE self) {
-    return rbpod_track_wrap(itdb_track_new(), TRUE);
+    Itdb_Track *track = itdb_track_new();
+    return Data_Wrap_Struct(cRbPodTrack, NULL, rbpod_track_deallocate, (void *) track);
 }
 
 void Init_rbpod_track(void) {
@@ -79,6 +79,8 @@ void Init_rbpod_track(void) {
 
     rb_define_method(cRbPodTrack, "transferred?", rbpod_track_is_transferred, 0);
 
+    mRbPodTrackCollection = rb_define_module_under(cRbPodTrack, "Collection");
+
     return;
 }
 

data/ext/rbpod/track.h

@@ -4,9 +4,10 @@
 #define RBPOD_TRACK_H
 
 extern VALUE cRbPodTrack;
+extern VALUE mRbPodTrackCollection;
 
 void Init_rbpod_track(void);
 
-inline VALUE rbpod_track_wrap(Itdb_Track *track, gboolean freeable);
+inline VALUE rbpod_track_collection_create(VALUE parent, GList *items);
 
 #endif /* RBPOD_TRACK_H */

data/lib/rbpod/version.rb

@@ -1,3 +1,3 @@
 module RbPod
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/rbpod.gemspec

@@ -23,6 +23,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rspec', '~> 2.14'
+
+  spec.add_development_dependency 'rake-compiler', '~> 0.8'
   spec.add_development_dependency 'rake'
 
   spec.add_dependency 'trollop', '~> 2.0'

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+require 'rspec'
+require 'rbpod'
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.formatter     = 'documentation'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbpod
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -27,6 +27,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +122,7 @@ files:
 - lib/rbpod.rb
 - lib/rbpod/version.rb
 - rbpod.gemspec
+- spec/spec_helper.rb
 homepage: https://github.com/jmkeyes/rbpod
 licenses:
 - MIT
@@ -103,12 +136,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 658402081
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 658402081
 requirements:
 - libgpod-1.0
 rubyforge_project: 
@@ -116,4 +155,5 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby bindings to the libgpod library.
-test_files: []
+test_files:
+- spec/spec_helper.rb