christiank-turntable 0.4 → 0.4.1

data/turntable.rb

@@ -1,23 +1,14 @@
 #
-# turntable v0.4
+# turntable v0.4.1
 # Christian Koch < ckoch002@student.ucr.edu >
 #
 # This is free software. You are permitted to modify, implement, and otherwise
 # use this source code freely (as in beer and freedom).
 #
 
-class Array
-  # Exchanges two elements' positions within an array.
-  def switch index1, index2
-    old_array = self.dup
-    self[index1] = old_array[index2]
-    self[index2] = old_array[index1]
-  end
-end
-
 class Turntable
 
-  @@version = '0.4'
+  @@version = '0.4.1'
   
   # Creates a new Turntable object and database file.
   # Requires a filename and at least one column name.
@@ -111,7 +102,7 @@ class Turntable
   end
   
   # Returns a subset of the table which satisfies given conditions.
-  # TODO: make sure it actually works 
+  # TODO: get compound conditions to work somehow
   def select hash
     result_set = []
     
@@ -146,33 +137,39 @@ class Turntable
     return @table[id]
   end
   
-  # Rearranges the entire database by a specified column
-  def order_by column_name
-    unless @columns.include?(column_name)
-      raise "column \"#{column_name}\" is not declared in this Turntable"
-    end
-    
-    # convert all row-hashes into arrays
-    rearranged_table = @table.collect { |row| row.to_a }
-    
-    # convert all column-name-symbols into strings
-    rearranged_table.each do |row|
-      row.each do |column| 
-        column[0] = column[0].to_s if (column[0].class == Symbol)
+  protected
+    # Marshals the database object to an external file. 
+    def save_to filename
+      if File.exists? filename
+        f = File.open filename, 'w'
+      else
+        f = File.new filename, 'w'
       end
+      
+      Marshal.dump self, f
+      f.close
     end
+end
+
+class Array
+
+  # Rearranges an array of hashes according to a specified column name.
+  # TODO: how to check for @columns, even though it's a Turntable variable?
+  def order_by column_name
+      
+    # Convert all row-hashes into arrays
+    rearranged_table = self.collect { |row| row.to_a }
     
-    # switch the first element of each row with the desired order_by column
-    # (the first element is where sort() looks)
+    # Convert all column-name-symbols into strings, 
+    # then switch the first element of each row the desired order_by column
+    # (because the first element is where sort() looks)
     rearranged_table.each do |row|
+      row.each { |column| column[0] = column[0].to_s if (column[0].class == Symbol) }
       row.switch 0, ( row.index(row.assoc(column_name.to_s)) )
     end
     
-    # properly arrange the table
-    rearranged_table.sort!
-    
-    # convert everything back to hashes and symbols
-    rearranged_table.collect do |row|
+    # Sort everything properly, and convert it back to hashes and symbols
+    rearranged_table.sort.collect do |row|
       this_row_hash = {}
       this_column_hash = {}
           
@@ -185,16 +182,11 @@ class Turntable
     end
   end
   
-  protected
-    # Marshals the database object to an external file. 
-    def save_to filename
-      if File.exists? filename
-        f = File.open filename, 'w'
-      else
-        f = File.new filename, 'w'
-      end
-      
-      Marshal.dump self, f
-      f.close
-    end
-end
+  # Exchanges two elements' positions within an array.
+  def switch index1, index2
+    old_array = self.dup
+    self[index1] = old_array[index2]
+    self[index2] = old_array[index1]
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: christiank-turntable
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: 0.4.1
 platform: ruby
 authors: 
 - Christian Koch