tablestakes 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4827f9fe7583ab475c276cb8930937e51e7c42
-  data.tar.gz: f27a3196f816a096c8d311e3288d4ab3126005dd
+  metadata.gz: f98f7f613b50b179880e3994802ee92e8f95592d
+  data.tar.gz: 7b68027ba7ad45b2b010db95eebcee1d5d4dedf2
 SHA512:
-  metadata.gz: f3539e569ca9534174250d0f0a697443e3bbc2e8fa3baf19d6d4ea4787f06504b4150b8bdaf0145daf33d1ce77e5b34b0e1b4de25c312852a0b4d22e94e88206
-  data.tar.gz: 6513f7ef2d5ef1dbb3a696b57dae6915ce018f0a6d274b4b1572cd51192df67fd0e92e5cea0e3519339a8e97dccce068207a448d2402283d1f8890af69328990
+  metadata.gz: 08ceccfccfabab0f825192ed075124e1a1a6e301183de4060fb16f9b19fb7ba9d47be29888fe8033bd0c99404356fd4c88571e0f67016987021d008dc88812b7
+  data.tar.gz: 5a9f004ff941df3caf43f7a533fcda9db1c2444f34b4a517694817d285c206bb523a8a675f892234d1e918d514bf43b73b74793b16eff5e7e88fd328010555d0

data/lib/tablestakes.rb

@@ -66,52 +66,102 @@ class Table
   def row(index)    
     Array(get_row(index))
   end
+
+  # Return true if the Table is empty, false otherwise.
+  # 
+  def empty?
+    @headers.length == 0 && @table.length == 0
+  end
   
-  # Add a column to the Table. Returns nil if the column name is already taken 
+  # Add a column to the Table. Raises ArgumentError if the column name is already taken 
   # or there are not the correct number of values.
   #
   # +colname+:: +String+ to identify the name of the column
   # +column_vals+:: +Array+ to hold the column values
-  def add_column(colname, column_vals)
+  # Examples:
+  #     add_column("Header", [e1, e2, e3])
+  #     add_column(array_including_header)
+  #     add_column("Header", "e1", "e2", ...)
+  def add_column(*args)
+    if args.kind_of? Array
+      args = args.flatten
+      colname = args.shift
+      column_vals = args
+    else
+      raise ArgumentError, "Invalid Arguments to add_column"
+    end
     # check arguments
-    return nil if @table.has_key?(colname)
-    return nil unless column_vals.length == @table[@headers.first].length
+    raise ArgumentError, "Duplicate Column Name!" if @table.has_key?(colname)
+    unless self.empty?
+      if column_vals.length != @table[@headers.first].length
+        raise ArgumentError, "Number of elements in column does not match existing table"
+      end
+    end
+    append_col(colname, column_vals)    
+  end
 
-    @headers << colname
-    @table[colname] = Array.new(column_vals)
+  # Add one or more rows to the Table, appending it to the end. Raises ArgumentError if 
+  # there are not the correct number of values.  The first row becomes the table headers
+  # if currently undefined.
+  #
+  # +array_of_rows+:: +Array+ of +Arrays+ to hold the rows values
+  # Examples:
+  #     add_rows([ [e1, e2, e3], [e1, e2, e3] ])
+  def add_rows(array_of_rows)
+    array_of_rows.each do |r|
+      add_row(r.clone)
+    end
+    return self
   end
 
-  # Add a row to the Table, appending it to the end. Returns nil if 
+  # Add a row to the Table, appending it to the end. Raises ArgumentError if 
   # there are not the correct number of values.
   #
-  # +row_vals+:: +Array+ to hold the row values
-  def add_row(row_vals)
-    add_rows([row_vals])
+  # +row+:: +Array+ to hold the row values
+  # Examples:
+  #     add_row([e1, e2, e3])
+  #     add_row("e1", "e2", "e3", ...)
+  def add_row(*row)
+    if row.kind_of? Array
+      row = row.flatten
+    else
+      raise ArgumentError, "Invalid Arguments to add_row"
+    end
+    if @headers.empty?
+        @headers = row
+    else
+      unless row.length == @headers.length
+        raise ArgumentError, "Wrong number of fields in Table input"
+      end
+      append_row(row)
+    end
+    return self
   end
 
-  # Delete a column from the Table. Returns nil if the column name does not exist. 
+  # Delete a column from the Table. Raises ArgumentError if the column name does not exist. 
   #
   # +colname+:: +String+ to identify the name of the column
   def del_column(colname)
     # check arguments
-    return nil unless @table.has_key?(colname)
+    raise ArgumentError, "Column name does not exist!" unless @table.has_key?(colname)
     
     @headers.delete(colname)
     @table.delete(colname)
+    return self
   end
 
-  # Delete a row from the Table. Returns nil if 
+  # Delete a row from the Table. Raises ArgumentError if
   # the row number is not found.
   #
   # +rownum+:: +FixNum+ to hold the row number
   def del_row(rownum)
     # check arguments
-    return nil unless rownum <= @table[@headers.first].length
+    raise ArgumentError, "Row number does not exist!" unless rownum <= @table[@headers.first].length
 
     @headers.each do |col|
       @table[col].delete_at(rownum)
     end
-
+    return self
   end
 
 
@@ -402,23 +452,6 @@ class Table
     end
   end
   
-  def add_rows(array_of_rows)
-    array_of_rows.each do |r|
-      row = r.clone
-      if @headers.empty?
-        @headers = row
-      else
-        unless row.length == @headers.length
-          raise ArgumentError, "Wrong number of fields in Table input"
-        end
-        @headers.each do |col|
-          @table[col] = [] unless @table[col]
-          @table[col] << row.shift
-        end
-      end
-    end
-  end
-    
   def get_row(index)
     result = []
     @headers.each do |col|
@@ -427,11 +460,23 @@ class Table
     return result
   end
   
+  def append_row(row)
+    @headers.each do |col|
+      @table[col] = [] unless @table[col]
+      @table[col] << row.shift
+    end
+  end  
+
   def get_col(colname)
-    result = []
-    @table[colname].each {|e| result << e }
+    Array.new(@table[colname])
   end
   
+  def append_col(colname, column_vals)
+    @headers << colname
+    @table[colname] = Array.new(column_vals)
+    return self
+  end
+
   def copy
     result = []
     result << @headers

data/spec/table_spec.rb

@@ -9,13 +9,13 @@ describe "Table" do
   
   describe ".new" do
     let(:t) { Table.new('test.tab') }
-    let(:s) { Table.new() }
+    let(:empty) { Table.new() }
     
     it "reads a file and create a table" do
       expect(t).to be_a(Table)
     end
     it "creates a table if no file was given" do
-      expect(s).to be_a(Table)
+      expect(empty).to be_a(Table)
     end
     it "errors when the file is not found" do
       expect{Table.new('sillyfile.txt')}.to raise_error(Errno::ENOENT)
@@ -23,6 +23,108 @@ describe "Table" do
 
   end
   
+  describe ".empty?" do
+    let(:test) { Table.new('test.tab') }
+    let(:empty) { Table.new() }
+    
+    it "recognizes an empty table" do
+      expect(empty).to be_empty()
+    end
+    it "recognizes a populated table" do
+      expect(test).not_to be_empty()
+    end
+  end
+
+  describe ".add_column" do
+    let(:test) { FactoryGirl.build(:table) }
+    let(:newcol) { ["A", "B", "C"] }
+    let(:headercol) { ["TestCol", "A", "B", "C"] }
+    let(:empty) { Table.new() }
+
+    it "returns a Table" do
+      expect(test.add_column("TestCol", newcol)).to be_a(Table)
+    end
+    it "adds a column to an empty table" do
+      expect(empty.add_column("TestCol", newcol).headers[0]).to eq("TestCol")
+    end
+    it "adds a column to a populated table" do
+      expect(test.add_column("TestCol", newcol).headers).to include("TestCol")
+    end
+    it "raises an ArgumentError when given a duplicate header" do
+      expect { test.add_column("Name", newcol) }.to raise_error(ArgumentError)
+    end
+    it "raises an ArgumentError when given a column with the wrong length" do
+      expect { test.add_column("Name", newcol << "D") }.to raise_error(ArgumentError)
+    end
+    it "adds a column when given an Array" do
+      expect(test.add_column(headercol).headers).to include("TestCol")      
+    end
+  end
+
+  describe ".del_column" do
+    let(:test) { FactoryGirl.build(:table) }
+    let(:empty) { Table.new() }
+    let(:remaining_headers) { ["Address", "Phone", "Records"] }
+
+    it "returns a Table" do
+      expect(test.del_column("Name")).to be_a(Table)
+    end
+    it "removes the correct column from the Table" do
+      expect(test.del_column("Name").headers).not_to include("Name")
+    end
+    it "retains the other columns from the Table" do
+      expect(test.del_column("Name").headers - remaining_headers).to be_empty
+    end
+    it "raises an ArgumentError when given an invalid header" do
+      expect { test.del_column("Silly") }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe ".add_row(s)" do
+    let(:test) { FactoryGirl.build(:table) }
+    let(:empty) { Table.new() }
+    let(:newheaders) { ["Name", "Address", "Phone", "Records"]}
+    let(:newrow) { ["Phil", "567 Vine", "567-432-1234", "3"] }
+    let(:newrow2) { ["Harry", "57 Maple", "567-555-4321", "2"] }
+
+    it "returns a Table" do
+      expect(test.add_row(newrow)).to be_a(Table)
+    end
+    it "adds a row to a populated table" do
+      expect(test.add_row(newrow).count).to eq(4)
+    end
+    it "adds headers to an empty table" do
+      expect(test.add_row(newheaders).headers.length).to eq(4)
+    end
+    it "raises an ArgumentError when given a row with the wrong length" do
+      expect { test.add_row(newrow << "extra") }.to raise_error(ArgumentError)
+    end
+    it "adds a header and row to an empty table" do
+      expect(empty.add_rows([newheaders] << newrow).headers.length).to eq(4)
+    end
+    it "adds row elements with specified headers to a populated table" do
+      expect(test.add_rows([newrow] << newrow2).count).to eq(5)
+    end
+  end
+
+  describe ".del_row" do
+    let(:test) { FactoryGirl.build(:table) }
+    let(:empty) { Table.new() }
+
+    it "returns a Table" do
+      expect(test.del_row(0)).to be_a(Table)
+    end
+    it "removes the correct row from the Table" do
+      expect(test.del_row(0).column("Name")).not_to include("John")
+    end
+    it "retains the other rows from the Table" do
+      expect(test.del_row(0).column("Name")).to include("Jerry")
+    end
+    it "raises an ArgumentError when given an index that is out of bounds" do
+      expect { test.del_row(10) }.to raise_error(ArgumentError)
+    end
+  end
+
   describe ".count" do
     let(:t) { FactoryGirl.build(:table) }
     
@@ -159,7 +261,7 @@ describe "Table" do
   end
   
   describe ".intersect" do
-    let (:cities) { Table.new('cities.txt') }
+    let(:cities) { Table.new('cities.txt') }
     let(:capitals)  { Table.new('capitals.txt') }
     
     it "returns an instance of Array" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tablestakes
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - J.B. Folkerts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec