christiank-turntable 0.6.1 → 0.6.2

data/turntable.rb

@@ -1,5 +1,5 @@
 #
-# turntable v0.6.1
+# turntable v0.6.2
 # Christian Koch <ckoch002@student.ucr.edu>
 #
 
@@ -8,7 +8,7 @@ require 'ostruct'
 
 class Turntable < Array
 
-  @@version = 'v0.6.1'
+  @@version = 'v0.6.2'
 
   # Creates a new Turntable database.
   def initialize filename, *columns
@@ -22,18 +22,26 @@ class Turntable < Array
     self.save_to @filename
   end
 
-  # Loads an existing Turntable.
-  # TODO: @filename isn't being set to the new filename because it's
-  # Marshalling back the old @filename.
+  # Loads an existing Turntable. You can't just Marshal.load() the database
+  # because that also marshals back the old @filename, in case the database is
+  # moved or renamed. Instead, we load the old database and then reassign
+  # its @filename. However, I don't want @filename to be writeable by the user. 
+  # So, I'm exploiting the Object#send hack, which may or may not be a good
+  # idea. There's got to be a non-controversial way of doing this.
   def Turntable.load filename
     @filename = File.expand_path(filename)
+
     f = File.open @filename
-    Marshal.load f
+    turn = Marshal.load f
+    f.close
+
+    turn.send :filename=, @filename
+    turn
   end
 
   # Reader methods for this Turntable's metadata.
   def Turntable.version; @@version; end
-  attr_reader :filename, :columns
+  attr_reader :columns, :filename
 
   # Inserts a new column to the database. Fills all the pre-existing rows with
   # nil. Returns the new database.
@@ -49,7 +57,7 @@ class Turntable < Array
     before_table = self.dup
     what_wasnt_deleted = self.delete_if { |row| row.id == id }
     self.save_to @filename
-    return (before_table - what_wasnt_deleted).first
+    (before_table - what_wasnt_deleted).first
   end
 
   # Pushes self with a new row. Returns the newly created row. Requires the
@@ -66,7 +74,7 @@ class Turntable < Array
 
     self.push row
     self.save_to @filename
-    return row
+    row
   end
 
   # Prints the entire database to STDOUT. It's just a wrapper for
@@ -91,6 +99,9 @@ class Turntable < Array
       f.close
     end
 
+    # Users can't reassign @filename themselves.
+    attr_writer :filename
+
 end
 
 class Array
@@ -103,7 +114,7 @@ class Array
       end
       puts '|'
     end
-    return nil
+    nil
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: christiank-turntable
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Christian Koch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 -07:00
+date: 2009-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: []