christiank-turntable 0.6.4.3 → 0.7

data/bin/sqlite3-to-turntable

@@ -10,16 +10,17 @@ require 'turntable'
 
 # There must be 2 arguments
 if ARGV.length != 2
-  puts 'Usage: sqlite3-to-turntable [sqlite3 database] [column name]'
+  puts 'Usage: sqlite3-to-turntable [sqlite3 database] [table name]'
   exit 1
 end
 
-# Find out about the SQLite3 database
-db_filename    = ARGV[0].split('.').first
-sqlite_db      = SQLite3::Database.new ARGV[0]
+db_name    = ARGV[0]
+table_name = ARGV[1]
 
-sqlite_db_columns = sqlite_db.query("select * from #{ARGV[1]}") { |result| result.columns }.dup
-sqlite_db_rows    = sqlite_db.execute "select * from #{ARGV[1]}"
+# Find out about the SQLite3 database
+sqlite_db         = SQLite3::Database.new db_name if File.file?(db_name)
+sqlite_db_columns = sqlite_db.query("select * from #{table_name}") { |result| result.columns }.dup
+sqlite_db_rows    = sqlite_db.execute "select * from #{table_name}"
 
 p sqlite_db_columns
 
@@ -31,10 +32,8 @@ end
 # Convert the remaining column names to symbols
 sqlite_db_columns.collect! { |column| column.to_sym }
 
-# Create the new Turntable
-turntable_db = Turntable.new "#{ARGV[1]}.turn", sqlite_db_columns
-
-# Fill up the Turntable
+# Create the new Turntable and fill it up
+turntable_db = Turntable.new "#{table_name}.turn", sqlite_db_columns
 sqlite_db_rows.each { |row| turntable_db.insert_array row }
 
 puts "Created #{turntable_db.filename}"

data/turntable.rb

@@ -1,5 +1,5 @@
 #
-# turntable v0.6.4.3
+# turntable v0.7
 # Christian Koch <ckoch002@student.ucr.edu>
 #
 
@@ -8,12 +8,21 @@ require 'ostruct'
 
 class Turntable < Array
 
-  @@version = 'v0.6.4.3'
+  @@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" }
@@ -36,6 +45,7 @@ class Turntable < Array
     end
 
     @filename = File.expand_path(filename)
+    @types    = nil
 
     self.save_to @filename
   end
@@ -59,15 +69,37 @@ class Turntable < Array
 
   # Reader methods for this Turntable's metadata.
   def Turntable.version; @@version; end
-  attr_reader :filename, :columns
+  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
+
+      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. Fills all the pre-existing rows with
-  # nil. Returns the new database.
-  def add_column column_name
-    @columns.push column_name
-    self.each { |row| eval "row.#{column_name} = nil" }
     self.save_to @filename
-    self
+    self.columns
   end
 
   # Removes a specific row. Returns the deleted row.
@@ -95,6 +127,7 @@ class Turntable < Array
 
   # 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
@@ -102,7 +135,7 @@ class Turntable < Array
 
   # Custom inspect() makes working in IRB much cleaner.
   def inspect
-    "#<#{self.class}:#{self.object_id} @filename=#{self.filename.inspect}, @columns=#{self.columns.inspect}>"
+    "#<#{self.class}:#{self.object_id} @filename=#{self.filename.inspect}, @columns=#{self.columns.inspect}, @types=#{self.types.inspect}>"
   end
 
   # Prints the entire database to STDOUT. It's just a wrapper for
@@ -111,13 +144,38 @@ class Turntable < Array
     self.to_a.to_stdout
   end
 
-  # Since []= is too much of a pain to implement with structs, we'll just
-  # provide a PStore-style kind of transaction.
+  # Changes to preexisting rows must occur inside an update() block. It's sort
+  # of like PStore#transaction.
   def update
     what_happened = yield
     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
+
+    self.save_to @filename
+    @types
+  end
 
   protected
     # Saves self to an external file.
@@ -136,16 +194,16 @@ class Array
 
   # Returns an array of rows in a HTML-formatted table.
   def to_html
-    string = '<table>'
+    string = "<table>\n"
 
-    string += '<tr>'
-    self.first.table.each_key { |column| string += "<th>#{column}</th>" }
-    string += '</tr>'
+    string += "\t<tr>\n"
+    self.first.table.each_key { |column| string += "\t\t<th>#{column}</th>\n" }
+    string += "\t</tr>\n"
 
     self.each do |row|
-      string += '<tr>'
-      row.table.each_value { |value| string += "<td>#{value}</td>" }
-      string += '</tr>'
+      string += "\t<tr>\n"
+      row.table.each_value { |value| string += "\t\t<td>#{value}</td>\n" }
+      string += "\t</tr>\n"
     end
     string += '</table>'
   end

metadata

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