christiank-turntable 0.7 → 0.7.1

data/turntable.rb

@@ -1,5 +1,5 @@
 #
-# turntable v0.7
+# turntable v0.7.1
 # Christian Koch <ckoch002@student.ucr.edu>
 #
 
@@ -8,44 +8,25 @@ require 'ostruct'
 
 class Turntable < Array
 
-  @@version = 'v0.7'
-
-  @@insert_proc = %q(
-    if args.length != @columns.length
-      raise ArgumentError, "wrong number of arguments (#{args.length} for #{@columns.length})"
-    end
-
-    if @types
-      test_types = @types.dup
-      args.each do |arg|
-        type_should_be = test_types.shift
-        raise TypeError, "expected #{type_should_be} instead of #{arg.class}" unless arg.is_a?(type_should_be)
-      end
-    end
-
-    row = Row.new
-    self.empty? ? (row.id = 0) : (row.id = self.last.id + 1)
-    @columns.each { |column| eval "row.#{column} = args.shift" }
-    self.push row
-    self.save_to @filename
-    row
-  )
+  @@version = 'v0.7.1'
 
   # Creates a new Turntable database. Accepts either a list of column names, or
-  # an array of symbols which contain the same thing.
+  # an array of symbols which contain the same thing. Requires at least 2
+  # column names.
   def initialize filename, *columns
-    if columns.empty?
-      raise ArgumentError, 'Turntable.new() requires a filename and at least one column name'
-    end
-
-    if columns.length == 1 and columns[0].is_a?(Array) and columns[0][0].is_a?(Symbol)
-      @columns = columns[0]
+    if columns.length == 1
+      if columns[0].is_a?(Array) and (columns.all? { |c| c.is_a?(Symbol) })
+        @columns = columns[0]
+      else
+        raise ArgumentError, 'Turntable.new() requires a filename and at least two column names'
+      end
+    elsif columns.empty?
+      raise ArgumentError, 'Turntable.new() requires a filename and at least two column names'
     else
       @columns = columns
     end
 
     @filename = File.expand_path(filename)
-    @types    = nil
 
     self.save_to @filename
   end
@@ -69,34 +50,13 @@ class Turntable < Array
 
   # Reader methods for this Turntable's metadata.
   def Turntable.version; @@version; end
-  attr_reader :filename, :columns, :types
-
-  # Inserts a new column to the database. If the table is strictly typed, then
-  # all the preexisting rows are filled with new objects of that class. If the
-  # class is numeric, then the rows are filled with the appropriate form of 0. 
-  # Otherwise, they're filled with just nil. Returns the new columns list.
-  def add_column column_name, column_type=nil
-    if @types
-      raise ArgumentError, 'expecting a class name' unless column_type.is_a?(Class)
-      @columns.push column_name
-      @types.push column_type
-
-      # For some reason you can't switch through classes, but you can if
-      # it's a string
-      case column_type.inspect
-      when 'Fixnum', 'Integer'
-        what_to_add = "0"
-      when 'Float'
-        what_to_add = "0.0"
-      else
-        what_to_add = "#{column_type}.new"
-      end
+  attr_reader :filename, :columns
 
-      self.each { |row| eval "row.#{column_name} = #{what_to_add}" }
-    else
-      @columns.push column_name
-      self.each { |row| eval "row.#{column_name} = nil" }
-    end
+  # Inserts a new column to the database. All preexisting rows are filled with
+  # nil. Returns the new columns list.
+  def add_column column_name
+    @columns.push column_name
+    self.each { |row| eval "row.#{column_name} = nil" }
 
     self.save_to @filename
     self.columns
@@ -118,24 +78,23 @@ class Turntable < Array
     result.any?
   end
 
-  # Pushes self with a new row. Returns the newly created row. Requires the
-  # number of arguments passed in equal the number of columns in the database,
-  # or it can accept calls from Turntable#insert_array.
+  # Pushes self with a new row. It accepts a list of values to be inserted, or
+  # one array which contains the same thing. Returns the newly created row.
   def insert *args
-    eval @@insert_proc
-  end
+    args = one_array_or_list(args, @columns)
 
-  # Same as Turntable#insert, except this method accepts only one array filled
-  # with values.
-  # TODO: this isn't necessary
-  def insert_array args
-    raise ArgumentError, 'Turntable#insert_array requires one array' unless args.is_a?(Array)
-    eval @@insert_proc
-  end
+    row = Row.new
+    self.empty? ? (row.id = 0) : (row.id = self.last.id + 1)
+    @columns.each { |column| eval "row.#{column} = args.shift" }
+    self.push row
 
+    self.save_to @filename
+    row
+  end
+  
   # Custom inspect() makes working in IRB much cleaner.
   def inspect
-    "#<#{self.class}:#{self.object_id} @filename=#{self.filename.inspect}, @columns=#{self.columns.inspect}, @types=#{self.types.inspect}>"
+    "#<#{self.class}:#{self.object_id} @filename=#{self.filename.inspect}, @columns=#{self.columns.inspect}>"
   end
 
   # Prints the entire database to STDOUT. It's just a wrapper for
@@ -151,33 +110,27 @@ class Turntable < Array
     self.save_to @filename
     what_happened
   end
-  
-  # Causes self to become strictly typed. Accepts either a list of classes, or
-  # one array which contains the same thing.
-  def use_strict_typing! *args
-    if args.length == 1
-      unless args[0].is_a?(Array) and (args[0].length == @columns.length)
-        raise ArgumentError, "wrong number of elements (#{args.length} for #{@columns.length})"
-      end
-      args = args[0]
-    else
-      if args.length != @columns.length
-        raise ArgumentError, "wrong number of arguments (#{args.length} for #{@columns.length})"
-      end
-    end
 
-    # All arguments must be classes.
-    if args.select { |arg| arg.is_a?(Class) } == args
-      @types = args
-    else
-      raise TypeError, "use_strict_typing!() requires a list of classes"
-    end
+  protected
+    # Users shouldn't reassign @filename themselves.
+    attr_writer :filename
 
-    self.save_to @filename
-    @types
-  end
+    # Checks whether the user provided one array of values, or a list which
+    # contains the same thing.
+    def one_array_or_list args, columns
+      if args.length == 1
+        unless args[0].is_a?(Array) and (args[0].length == columns.length)
+          raise ArgumentError, "wrong number of elements (#{args.length} for #{columns.length})"
+        end
+        return args[0]
+      else
+        if args.length != @columns.length
+          raise ArgumentError, "wrong number of arguments (#{args.length} for #{columns.length})"
+        end
+        return args
+      end
+    end
 
-  protected
     # Saves self to an external file.
     def save_to filename
       f = File.new filename, 'w'
@@ -185,9 +138,6 @@ class Turntable < Array
       f.close
     end
 
-    # Users shouldn't reassign @filename themselves.
-    attr_writer :filename
-
 end
 
 class Array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: christiank-turntable
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: 0.7.1
 platform: ruby
 authors: 
 - Christian Koch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-01 00:00:00 -07:00
+date: 2009-07-07 00:00:00 -07:00
 default_executable: 
 dependencies: []