christiank-turntable 1.1.0 → 1.1.1

data/turntable.rb

@@ -1,5 +1,5 @@
 #
-# Turntable v1.1.0
+# Turntable
 # Christian Koch <ckoch002@student.ucr.edu>
 #
 # Turntable is an alternative relational database for Ruby. A Turntable object
@@ -13,7 +13,7 @@ require 'ostruct'
 
 class Turntable
 
-  VERSION = 'v1.1.0'
+  VERSION = 'v1.1.1'
 
   include Enumerable
   def each
@@ -125,38 +125,13 @@ class Turntable
     @pushing = true
     self.update
     row
-  end 
-
-  # Returns a string ready for HTML.
-  def to_html
-    string = "<table>\n"
-
-    string += "\t<tr>\n"
-    @table[:columns].each { |column| string += "\t\t<th>#{column}</th>\n" }
-    string += "\t</tr>\n"
-
-    self.each do |row|
-      string += "\t<tr>\n"
-      row.table.each_value { |value| string += "\t\t<td>#{value}</td>\n" }
-      string += "\t</tr>\n"
-    end
-
-    string += '</table>'
   end
 
-  # Returns a string ready for Textile.
-  def to_textile
-    string = ''
+  # Just a wrapper for Array#to_html.
+  def to_html; self.to_a.to_html; end
 
-    @table[:columns].each { |column| string += "|_.#{column}" }
-    string += "|\n"
-    self.each do |row|
-      row.table.each_value { |value| string += "|#{value}" }
-      string += "|\n"
-    end
-
-    string
-  end
+  # Just a wrapper for Array#to_textile.
+  def to_textile; self.to_a.to_textile; end
 
   # Any changes to the external file must occur within this block. If something
   # goes wrong (like trying to push a Proc object) then no changes are made.
@@ -188,6 +163,45 @@ class Row < OpenStruct
   public :table
 end
 
+class Array
+
+  # Takes an array of Row objects and returns a HTML-table-fomatted string.
+  def to_html
+    string = "<table>\n"
+
+    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 += "\t<tr>\n"
+      row.table.each_value { |value| string += "\t\t<td>#{value}</td>\n" }
+      string += "\t</tr>\n"
+    end
+
+    string += '</table>'
+  end
+  
+  # Writes the output of any query to STDOUT.
+  def to_stdout; puts self.to_textile; end
+
+  # Takes an array of Row objects and returns a Textile-table-formatted string.
+  # Could be used in conjunction with RedCloth.
+  def to_textile
+    string = ''
+
+    self.first.table.each_key { |column| string += "|_.#{column}" }
+    string += "|\n"
+    self.each do |row|
+      row.table.each_value { |value| string += "|#{value}" }
+      string += "|\n"
+    end
+
+    string
+  end
+
+end
+
 class Object
 
   # Turn off Object#id warnings.

metadata

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