chair 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c4de86a3818d3b96fce864c6bbdc051f57ee86
-  data.tar.gz: bd291bf233af78c5e798155e0ec31ee8d31d6d1c
+  metadata.gz: 415c4dfeb44887b370a98e38d6b9dd0b97b734e2
+  data.tar.gz: 3fb7024b049ee94c0534f1c0e79376992b07d899
 SHA512:
-  metadata.gz: 66005c8cbe09b4edef9d2ffdb7c41d62b9dc13f3221d1a730be1b293165d189fb001832d8aaf622bbbe0cfb6bead63061f8bbf48412706c0bf60fab7dec1993c
-  data.tar.gz: 3e904cdd29fe3265eae4a251bbad08be501f40b361265782bafd56c8942ead50162c50c922f2a53d05dbd34b5e8db787ae5f924c6df62ecf8554f4545ed7daaf
+  metadata.gz: 99d8558f1baa52dfbfb986bdbe5848f37ba8c5210052b71af04fb5d57f89bbab9e5684a19ffbca1bffe8c1cbf26f66d60942dd70c8372c884cb069611f440edd
+  data.tar.gz: 9952115d82340884b0ccb5fdf35f2d2df944e2e6184b312db02cf7042df400a28192af68db21090e70538122558e94233bcce2cd83176d14b4db601e59f15132

data/.travis.yml

@@ -9,4 +9,4 @@ rvm:
 
 addons:
   code_climate:
-    repo_token: e3c6971d651290d13581ade555fc07abb89a8bf956342399f1c9949c51e34c4c
+    repo_token: 0be985c4b01192cc225409eb0adc6d1742064086c9658a2f88000e50c0e20527

data/Gemfile

@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in chairs.gemspec
+# Specify your gem's dependencies in chair.gemspec
 gemspec
 
 group :test do
-  gem "codeclimate-test-reporter", group: :test, require: nil
+  gem "codeclimate-test-reporter", require: nil
+  gem 'simplecov', require: nil
 end

data/README.md

@@ -1,18 +1,19 @@
 # Chair
-[![Build Status](http://img.shields.io/travis/toroidal-code/chairs/master.svg?style=flat)](https://travis-ci.org/toroidal-code/chairs)
-[![Code Climate](https://img.shields.io/codeclimate/github/toroidal-code/chairs.png?style=flat)](https://codeclimate.com/github/toroidal-code/chairs)
-[![Coverage](https://img.shields.io/codeclimate/coverage/github/toroidal-code/chairs.png?style=flat)](https://codeclimate.com/github/toroidal-code/chairs)
+[![Build Status](http://img.shields.io/travis/toroidal-code/chair/master.svg?style=flat)](https://travis-ci.org/toroidal-code/chair)
+[![Code Climate](https://img.shields.io/codeclimate/github/toroidal-code/chair.svg?style=flat)](https://codeclimate.com/github/toroidal-code/chair)
+[![Coverage](https://img.shields.io/codeclimate/coverage/github/toroidal-code/chair.svg?style=flat)](https://codeclimate.com/github/toroidal-code/chair)
+[![Gem Version](http://img.shields.io/gem/v/chair.svg?style=flat)](https://rubygems.org/gems/chair)
 
-> Me: What's the first thing you think of when I say 'Tables'?  
+> Me: What's the first thing you think of when I say 'Table'?  
 > J: 'Chair'.
 
-Chair is a simple Table class for Ruby, with an associated Row class. 
+Chair is a simple table implementation for Ruby, with an associated Row class.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'chairs'
+    gem 'chair'
 
 And then execute:
 
@@ -20,42 +21,40 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install chairs
+    $ gem install chair
 
 ## Usage
 
 ```irb
->> require 'chairs'  
+>> require 'chair'  
 => true
->> t = Table.new :title
-=> #<Table:0x0000000162ee08>
+>> t = Chair.new :title
+=> #<Chair:0x0000000162ee08>
 >> t.set_primary_key! :title
 => :title
 >> t.insert! title: 'Looking for Alaska'
-=> #<Row:0x007feb28035be0>
->> t.find_by_title('Looking for Alaska')
+=> #<Chair::Row:0x007feb28035be0>
+>> t.find_by_title('Looking for Alaska').to_a
 >> ["Looking for Alaska"]
 >> t.add_column! :author
 => true
 >> t.insert! title: 'An Abundance of Katherines', author: 'John Green'
-=> #<Row>
+=> #<Chair::Row>
 >> t.add_index! :author
 => true
->> t.find_by_title('Looking for Alaska')[:author] = 'John Green'
-=> 'John Green'
 >> t.find_by_author('John Green').to_a
 => ["An Abundance of Katherines", "John Green"]
->> t.find_by_title('An Abundance of Katherines')[:author] = 'John Green'
-=> "John Green"
+>> t.find_by_title('Looking for Alaska')[:author] = 'John Green'
+=> 'John Green'
 >> r = t.where_author_is 'John Green'
-=> [#<Row>, #<Row>]
+=> [#<Chair::Row>, #<Chair::Row>]
 >> r.map {|r| r.to_a}
 => [["An Abundance of Katherines", "John Green"], ["Looking for Alaska", "John Green"]]
 ```
 
 ## Contributing
 
-1. Fork it ( https://github.com/toroidal-code/chairs/fork )
+1. Fork it ( https://github.com/toroidal-code/chair/fork )
 2. Create your feature branch (`git checkout -b features/my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin features/my-new-feature`)

data/lib/chair/{table.rb → chair.rb}

@@ -3,7 +3,7 @@ require 'set'
 # @author Katherine Whitlock <toroidalcode@gmail.com>
 # @attr_reader primary_key [Symbol] the primary key of the table
 # @attr_reader indices [Set<Symbol>] the set of indices for the table
-class Table
+class Chair
   attr_reader :primary_key, :indices
 
   # Creates a new Table object
@@ -14,7 +14,7 @@ class Table
     @columns_id_counter = 0
     add_columns!(*columns)
     @primary_key = nil
-    @indices = Set.new
+    @indices = {}
   end
 
   # Add a new column to the table.
@@ -46,6 +46,8 @@ class Table
   end
 
   # Retrieve the current columns
+  # Order is guaranteed to be the order that the columns were inserted in,
+  # i.e., left to right
   # @return [Array<Symbol>] the columns in the table
   def columns
     @columns.keys
@@ -53,56 +55,46 @@ class Table
 
   # Add a new index to the table
   # @param column [Symbol] the column to create the index on
-  # @return [Bool] whether or not we added the index
+  # @return [Symbol] the column name of the index
   def add_index!(column)
-    result = false
-    get_column_id(column)
-    unless instance_variable_defined?("@#{column}_index_map".to_sym)
-      instance_variable_set("@#{column}_index_map".to_sym, {})
-      result ||= true
+    check_column_exists(column)
+    if @indices.include?(column) or instance_variable_defined?("@#{column}_index_map".to_sym)
+      raise ArgumentError, "Column #{column.inspect} is already an index"
     end
 
-    unless @indices.include? column
-      @indices = @indices << column
-      result ||= true
-    end
-
-    build_index column
-    result
+    @indices[column] = "@#{column}_index_map".to_sym
+    instance_variable_set(@indices[column], build_index(column))
+    column
   end
 
   # Remove an index from the table
   # @param column [Symbol] the column to remove the index from
-  # @return [Bool] whether or not the column was successfully removed
+  # @return [Symbol] the column that was removed
   def remove_index!(column)
-    result = false
-    if instance_variable_defined?("@#{column}_index_map".to_sym)
-      remove_instance_variable("@#{column}_index_map")
-      result ||= true
+    check_column_exists(column)
+    unless @indices.include?(column) or instance_variable_defined?("@#{column}_index_map".to_sym)
+      raise ArgumentError, "Column #{column} is not indexed"
     end
-    if @indices.include? column
-      @indices = @indices.delete column
-      result ||= true
-    end
-    result
+    ivar = @indices.delete column
+    remove_instance_variable(ivar) unless ivar.nil?
+    column
   end
 
   # Insert a new row of data into the column
-  # @param args [Hash] the columns to insert
+  # @param args [Hash, Array] the data to insert
   # @return [Row, nil] the row inserted, or nil if the row was empty
-  def insert!(args = {})
-    row = Row.new(self, @table.size)
-    args.each_pair do |col, value|
-      # If there's a primary_key defined
-      if has_primary_key? and columns.include? col and @primary_key == col
-        @pk_map[value] = @table.size
+  def insert!(args)
+    args = process_incoming_data(args)
+    if has_primary_key?
+      if args.include? @primary_key
+        @pk_map[args[@primary_key]] = @table.size
+      else # If our table has a primary key, but can't find it in the data
+        raise ArgumentError, 'Missing primary key in record to be inserted'
       end
-      row[col] = value
-    end
-    unless row.empty?
-      @table << row
-      row
     end
+    row = Row.new(self, @table.size, args)
+    @table << row
+    row
   end
 
   # Method_missing is used to dispatch to find_by_* and where_*_is
@@ -136,6 +128,7 @@ class Table
     else nil
     end
   end
+  alias_method :[], :find
 
   # Search for rows based on given data
   # @param args [Hash<Symbol, Object>] the data to search for
@@ -179,7 +172,7 @@ class Table
   # @return [Array<Row>] the rows found
   def table_scan(args)
     results = @table.to_set
-    options.each_pair do |col, value|
+    args.each_pair do |col, value|
       results = restrict_with_table_scan(col, value, results)
     end
     results.to_a
@@ -192,7 +185,7 @@ class Table
     unless @columns.has_key? column
       return nil
     end
-    @pk_map = {}
+    @pk_map = build_pk_map column
     @primary_key = column
   end
 
@@ -202,17 +195,57 @@ class Table
     not @primary_key.nil?
   end
 
-  protected
-  def get_column_id(name)
-    id = @columns[name]
-    if id.nil?
-      raise ArgumentError, "No such column #{name}"
+  # Merge the table with a map of primary keys to values. There must be a primary key.
+  # @param column [Symbol] the column to insert the values into
+  # @param map [Hash<Object, Object>] a mapping of primary_key values to other values
+  # @param opts [Bool] :overwrite if a value already exists in the row, overwrite it
+  # @param opts [Bool] :create_row if the row doesn't already exist, create it
+  def merge!(column, map, opts = {})
+    unless has_primary_key?
+      raise 'No primary key exists for this table'
+    end
+    # For each key, value
+    map.each_pair do |key, val|
+      unless @pk_map.include? key                      # Check if we have the key in our pk_map. if not,
+        if opts[:create_row]                            # if we can create rows,
+          insert! @primary_key => key, column => val       # create a row
+        else raise "No such row with primary key #{key.inspect} exists" # or raise an error
+        end
+      end
+      # if we do, check if the row has a value in the column
+      row = @table[@pk_map[key]]
+      # if it does, can we overwrite?
+      if row.has_attribute?(column) and not opts[:overwrite]
+        raise "Value already exists in table for primary key #{key.inspect} and column #{column.inspect}"
+      end
+      # if so, overwrite
+      row[column] = val
     end
-    id
+    self
   end
 
+  # Retrieve all rows
+  # @return [Array<Chair::Row>] all of the rows in the table
+  def all
+    @table
+  end
+
+  # Retrieve the first row in the table
+  # @return [Chair::Row] the first row in the table
+  def first
+    @table.first
+  end
+
+  # Retrieve the last row in the table
+  # @return [Chair::Row] the last row in the table
+  def last
+    @table.last
+  end
+
+  protected
+
   def find_valid_indices(cols)
-    @indices.intersection(cols).to_a
+    @indices.keys & cols
   end
 
   def restrict_with_index(key, value, initial=@table.to_set)
@@ -221,10 +254,7 @@ class Table
       return Set.new
     end
     row_idxs = idx_map[value]
-    if row_idxs.nil?
-      return Set.new
-    end
-    rows = @table.values_at *row_idxs
+    rows = @table.values_at *row_idxs # *nil is empty call
     initial.intersection rows
   end
 
@@ -232,27 +262,58 @@ class Table
     initial.keep_if { |row| row[col] == value }
   end
 
-  def select(col, table = @table, &block)
-    col_id = get_column_id(col)
-    table.select do |row|
-      block(col)
-    end
-  end
-
   # Scan the table and add all the rows to the index
   # @param column [Symbol] the column to construct the index for
   def build_index(column)
-    ivar_name = "@#{column}_index_map".to_sym
+    map = {}
     @table.each_with_index do |row, idx|
       val = row[column]
       unless val.nil?
-        if instance_variable_get(ivar_name)[val].nil?
-          instance_variable_get(ivar_name)[val] = Set.new
-        end
-        instance_variable_get(ivar_name)[val] =
-            instance_variable_get(ivar_name)[val] << idx
+        map[val] = Set.new if map[val].nil?
+        map[val] = map[val] << idx
+      end
+    end
+    map
+  end
+
+  def build_pk_map(column)
+    map = {}
+    @table.each_with_index do |row, idx|
+      val = row[column]
+      # if the value is nil, we can't use it
+      if val.nil? or val.empty?
+        raise "Row does not have a value in column #{column.inspect}"
+      end
+
+      #if we already have the value in our map, it's not unique and one-to-one
+      if map.include?(val)
+        raise "Primary key #{val.inspect} is not unique in column #{column.inspect}"
       end
+
+      # otherwise we can assign it
+      map[val] = idx
+    end
+    map
+  end
+
+  # @return [Hash] the data in a :column => 'value' format
+  def process_incoming_data(args)
+    case args
+      when Hash
+        filtered = args.clone.keep_if{|col,_| @columns.include? col }
+        if args != filtered
+          invalid = args.clone.delete_if{|col, _| filtered.include? col }.keys.compact.join(', ')
+          raise ArgumentError, "No such column(s) #{invalid}"
+        end
+        filtered
+      else  # Because we can guarantee the order of @columns, we use this to zip the array into a hash
+        Hash[columns.zip(args.to_a)]
+    end
+  end
+
+  def check_column_exists(column)
+    unless @columns.include?(column)
+      raise ArgumentError, "Column #{column.inspect} does not exist in table"
     end
-    return
   end
 end

data/lib/chair/row.rb

@@ -1,62 +1,108 @@
-class Row
+class Chair::Row
+  include Comparable
 
   # Create a new cell
   # @param table [Table] the table holding this row
-  # @param id [Fixnum] the array index of this row in the interal 2D array
-  def initialize(table, id)
+  # @param id [Fixnum] the array index of this row in the internal 2D array
+  def initialize(table, id, data = {})
     @row_id = id
     @table = table
-    @row = []
+    @attributes = data
+    @attributes.clone.
+        keep_if{ |col, _| @table.indices.include? col }.
+        each_pair{ |col, val| add_to_index(col, val) }
   end
 
   # Get a cell based on the column name
   # @return [Object, nil] the value in the cell, can be nil
-  def [](col)
-    idx = @table.send(:get_column_id, col)
-    @row[idx]
+  def [](column)
+    @attributes[column]
   end
 
   # Assign a new value to one of the cells in the row
-  # @param col [Symbol] the column name to add to
+  # @param column [Symbol] the column name to add to
   # @param value [Object] the value to assign
   # @return [Object] the assigned value
-  def []=(col, value)
-    idx = @table.send(:get_column_id, col)
-    if @table.indices.include? col
-      if @table.instance_variable_get("@#{col}_index_map".to_sym)[value].nil?
-        @table.instance_variable_get("@#{col}_index_map".to_sym)[value] = Set.new
-      end
-      @table.instance_variable_get("@#{col}_index_map")[value] =
-          @table.instance_variable_get("@#{col}_index_map")[value] << @row_id
+  def []=(column, value)
+    if @table.indices.include? column
+      add_to_index(column, value)
     end
-    @row[idx] = value
+    @attributes[column] = value
   end
 
   def empty?
-    @row.empty?
+    @attributes.empty?
   end
 
   # Create a hash of the data based on the columns
   # @return [Hash<Symbol, Object>] the data in the row
   def to_hash
-    map = {}
-    @table.columns.each do |col|
-      idx = @table.send(:get_column_id, col)
-      map[col] = row[idx]
-    end
-    map
+    @attributes
   end
 
   # Convert the row data to an array
   # @return [Array<Object>] the data in the row
   def to_a
-    @row
+    @table.columns.map { |col| @attributes[col] }
   end
 
   # Compare Row instances based on internal representation
   # @param other [Object] the object to compare to
   # @return [Bool] whether or not the objects are the same
-  def eql?(other)
-    @row.eql?(other.instance_variable_get("@row"))
+  def ==(other)
+    case other
+      when Chair::Row
+        @attributes == other.instance_variable_get('@attributes')
+      when Array
+        @attributes.values == other
+      else false
+    end
+  end
+
+  # Compare rows within a table
+  # @param other [Object] the object to compare to
+  def <=>(other)
+    # only be comparable if we're in the same table
+    if @table.equal?(other.instance_variable_get(@table))
+      other_id = other.instance_variable_get('@id')
+      @id <=> other_id
+    else
+      nil
+    end
+  end
+
+  # Returns the contents of the record as a nicely formatted string.
+  def inspect
+    pairs = []
+    # Use the table's column list to order our columns
+    @table.columns.each { |name| pairs << "#{name}: #{@attributes[name].inspect}"}
+    inspection = pairs.compact.join(', ')
+    "#<#{self.class} #{inspection}>"
+  end
+
+  # Looks to see if we have a attribute
+  # @param name [Symbol] the column to look at
+  # @return [Bool] whether or not the value is empty
+  def has_attribute?(name)
+    val = @attributes[name]
+    val.nil? ? false : (not val.empty?)
+  end
+
+  def method_missing(method_sym, *arguments, &block)
+    # the first argument is a Symbol, so you need to_s it if you want to pattern match
+    if method_sym.to_s =~ /^has_(.*)\?$/
+      has_attribute?($1.to_sym)
+    else
+      super
+    end
+  end
+
+  protected
+  def add_to_index(column, value)
+    if @table.instance_variable_get("@#{column}_index_map".to_sym)[value].nil?
+      @table.instance_variable_get("@#{column}_index_map".to_sym)[value] = Set.new
+    end
+    @table.instance_variable_get("@#{column}_index_map")[value] =
+        @table.instance_variable_get("@#{column}_index_map")[value] << @row_id
   end
 end

data/lib/chair/version.rb

@@ -1,3 +1,3 @@
-module Chair
-  VERSION = "1.0.2"
+class Chair
+  VERSION = "1.1.0"
 end

data/lib/chair.rb

@@ -1,3 +1,3 @@
 require 'chair/version'
-require 'chair/table'
+require 'chair/chair'
 require 'chair/row'

data/spec/row_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe Chair::Row do
+  it 'can get value with []' do
+    table = Chair.new :title
+    row = Chair::Row.new table,0, {title: 'War and Peace'}
+    expect(row[:title]).to eq('War and Peace')
+  end
+
+  it 'can set value with []=' do
+    table = Chair.new :title
+    row = Chair::Row.new table, 0, {title: 'War and Peace'}
+    expect{
+      row[:title] = 'The Fault in Our Stars'
+    }.to change{row.instance_variable_get('@attributes')[:title]}.from('War and Peace').to('The Fault in Our Stars')
+  end
+
+  it 'is empty after initialization' do
+    table = Chair.new :title
+    row = Chair::Row.new(table,0)
+    expect(row.empty?).to be(true)
+  end
+
+  it 'is not empty when data is present' do
+    table = Chair.new :title
+    row = Chair::Row.new(table,0, {title: 'Will Grayson, Will Grayson'})
+    expect(row.empty?).to be(false)
+  end
+
+  it 'can be converted to a hash' do
+    table = Chair.new :title, :author
+    row = Chair::Row.new table, 0, {title: 'Will Grayson, Will Grayson', author: 'John Green'}
+    expect(row.to_hash).to eq({title: 'Will Grayson, Will Grayson',
+                               author: 'John Green'})
+  end
+
+  it 'can be converted to an array' do
+    table = Chair.new :title, :author
+    row = Chair::Row.new table, 0, {title: 'Will Grayson, Will Grayson', author: 'John Green'}
+    expect(row.to_a).to eq(['Will Grayson, Will Grayson', 'John Green'])
+  end
+
+
+  it 'can compared against an Array with ==' do
+    table = Chair.new :title, :author
+    row = Chair::Row.new table, 0, {title: 'Will Grayson, Will Grayson', author: 'John Green'}
+    expect(row == ['Will Grayson, Will Grayson', 'John Green']).to be(true)
+  end
+
+  it 'can compared against another Chair::Row with ==' do
+    table = Chair.new :title, :author
+    row = Chair::Row.new table, 0, {title: 'Will Grayson, Will Grayson', author: 'John Green'}
+    other_row = Chair::Row.new table, 1, {title: 'Will Grayson, Will Grayson', author: 'John Green'}
+    expect(row == other_row).to be(true)
+  end
+
+  it 'inspect prints values' do
+    table = Chair.new :title, :author
+    row = Chair::Row.new table, 0, {title: 'Will Grayson, Will Grayson', author: 'John Green'}
+  end
+
+  it 'has attribute is true when present' do
+    table = Chair.new :title, :author
+    row = Chair::Row.new table, 0, {title: 'Will Grayson, Will Grayson'}
+    expect(row.has_attribute? :title).to be(true)
+  end
+
+  it 'has attribute is false when nil' do
+    table = Chair.new :title, :author
+    row = Chair::Row.new table, 0, {title: 'Will Grayson, Will Grayson'}
+    expect(row.has_attribute? :author).to be(false)
+  end
+
+  it 'has attribute is false when empty' do
+    table = Chair.new :title, :author
+    row = Chair::Row.new table, 0, {title: 'Will Grayson, Will Grayson', author: ''}
+    expect(row.has_attribute? :title).to be(true)
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'codeclimate-test-reporter'
 CodeClimate::TestReporter.start
 

data/spec/table_search_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Table do
-  subject(:table) { Table.new :id, :title, :author }
+describe Chair do
+  subject(:table) { Chair.new :id, :title, :author }
 
   describe 'finds by' do
     it 'primary key' do
@@ -61,9 +61,34 @@ describe Table do
       expect(table.where_title_is('War and Peace').first.to_a).to eq([0, 'War and Peace', 'Leo Tolstoy'])
     end
 
-    it 'table scan' do
+    it 'table scan by fallback' do
       table.insert! id: 0, title: 'War and Peace', author: 'Leo Tolstoy'
       expect(table.where_title_is('War and Peace').first.to_a).to eq([0, 'War and Peace', 'Leo Tolstoy'])
     end
+
+    it 'table scan' do
+      table.insert! id: 0, title: 'War and Peace', author: 'Leo Tolstoy'
+      expect(table.table_scan(title: 'War and Peace').first.to_a).to eq([0, 'War and Peace', 'Leo Tolstoy'])
+    end
+  end
+
+  it 'gets all records with #all' do
+    table.insert! id: 0, title: 'Looking for Alaska', author: 'John Green'
+    table.insert! id: 1, title: 'Lost at Sea', author: "Bryan Lee O'Malley"
+    expect(table.all.map{|r| r.to_a}).to eq([[0, 'Looking for Alaska', 'John Green'],
+                                             [1, 'Lost at Sea', "Bryan Lee O'Malley"]])
+  end
+
+  it 'gets the first record' do
+    table.insert! id: 0, title: 'Looking for Alaska', author: 'John Green'
+    table.insert! id: 1, title: 'Lost at Sea', author: "Bryan Lee O'Malley"
+    expect(table.first.to_a).to eq([0, 'Looking for Alaska', 'John Green'])
   end
+
+  it 'gets the last record' do
+    table.insert! id: 0, title: 'Looking for Alaska', author: 'John Green'
+    table.insert! id: 1, title: 'Lost at Sea', author: "Bryan Lee O'Malley"
+    expect(table.last.to_a).to eq([1, 'Lost at Sea', "Bryan Lee O'Malley"])
+  end
+
 end

data/spec/table_spec.rb

@@ -1,94 +1,243 @@
 require 'spec_helper'
 
-describe Table do
+describe Chair do
   describe 'initializes' do
-    it 'with 0 columns by default' do
-      table = Table.new
+    it 'with no columns' do
+      table = Chair.new
       expect(table.columns.count).to eq(0)
     end
 
-    it 'with 0 rows by default' do
-      table = Table.new
+    it 'with no rows' do
+      table = Chair.new
       expect(table.size).to eq(0)
     end
 
-    it 'with columns given' do
-      table = Table.new :title, :author, :isbn
-      expect(table.columns).to eq([:title, :author, :isbn])
-    end
-
     it 'with no primary key' do
-      table = Table.new
+      table = Chair.new
       expect(table.has_primary_key?).to eq(false)
     end
 
     it 'with no indices' do
-      table = Table.new
+      table = Chair.new
       expect(table.indices.size).to eq(0)
     end
+
+    it 'with specified columns' do
+      table = Chair.new :title, :author, :isbn
+      expect(table.columns).to eq([:title, :author, :isbn])
+    end
   end
 
   it 'adds a column' do
-    table = Table.new
+    table = Chair.new
     expect {
       table.add_column!(:title)
     }.to change{ table.columns.count }.by(1)
   end
 
   it 'raises an ArgumentError if the name is not a symbol' do
-    table = Table.new
+    table = Chair.new
     expect{
       table.add_column!('Title')
     }.to raise_error(ArgumentError)
   end
 
-  it 'doesn\'t add column with the same name' do
-    table = Table.new :title
+  it "doesn't add column with the same name" do
+    table = Chair.new :title
     expect {
       table.add_column!(:title)
     }.to_not change{ table.columns.count }
   end
 
   it 'adds multiple columns' do
-    table = Table.new
+    table = Chair.new
     expect {
       table.add_columns! :title, :author
     }.to change {table.columns.count}.by(2)
   end
 
-  it 'inserts a row' do
-    table = Table.new :title
-    expect {
-      table.insert!({title: "Gone with the Wind"})
-    }.to change { table.size }.by(1)
+  describe 'inserts a row' do
+    it 'from a hash' do
+      table = Chair.new :title
+      expect {
+        table.insert!({title: 'Gone with the Wind'})
+      }.to change { table.size }.by(1)
+    end
+
+    it 'from an array' do
+      table = Chair.new :title
+      expect {
+        table.insert!(['Gone with the Wind'])
+      }.to change { table.size }.by(1)
+    end
   end
 
-  it 'sets the primary key' do
-    table = Table.new :title
-    expect {
+  describe 'setting primary key' do
+    it 'with valid params is successful' do
+      table = Chair.new :title
+      expect {
+        table.set_primary_key! :title
+      }.to change {table.primary_key}.from(nil).to(:title)
+    end
+
+    describe 'fails to build index' do
+      it 'when duplicate fields exist' do
+        table = Chair.new :title
+        table.insert! title: 'Looking for Alaska'
+        table.insert! title: 'Looking for Alaska'
+        expect {
+          table.set_primary_key! :title
+        }.to raise_error RuntimeError, 'Primary key "Looking for Alaska" is not unique in column :title'
+      end
+
+      it 'when fields are nil' do
+        table = Chair.new :title
+        table.insert! title: 'Looking for Alaska'
+        table.insert! title: nil
+        expect {
+          table.set_primary_key! :title
+        }.to raise_error RuntimeError, 'Row does not have a value in column :title'
+      end
+
+      it 'when fields are empty' do
+        table = Chair.new :title
+        table.insert! title: 'Looking for Alaska'
+        table.insert! title: ''
+        expect {
+          table.set_primary_key! :title
+        }.to raise_error RuntimeError, 'Row does not have a value in column :title'
+      end
+
+    end
+  end
+
+  it "doesn't set the primary key if it's not a valid column" do
+    table = Chair.new
+    expect{
       table.set_primary_key! :title
-    }.to change {table.primary_key}.from(nil).to(:title)
+    }.not_to change{table.primary_key}.from(nil)
   end
 
-  it "doesn't set the primary key if it's not a column" do
-    table = Table.new
+  it "doesn't set the primary key if there's already a primary key" do
+    table = Chair.new
     expect{
       table.set_primary_key! :title
     }.not_to change{table.primary_key}.from(nil)
   end
 
-  it 'adds an index' do
-    table = Table.new :title
-    expect {
+  describe 'add index' do
+    it 'succeeds with valid params' do
+      table = Chair.new :title
+      expect {
+        table.add_index! :title
+      }.to change {table.indices.size}.by(1)
+    end
+
+    it "should raise ArgumentError when a column doesn't exist" do
+      table = Chair.new
+      expect{table.add_index! :title}.to raise_error(ArgumentError)
+    end
+
+    it 'should raise ArgumentError when a column is already indexed' do
+      table = Chair.new :title
+      table.add_index! :title
+      expect{table.add_index! :title}.to raise_error(ArgumentError)
+    end
+
+  end
+
+  describe 'remove index' do
+    it 'succeeds with valid params' do
+      table = Chair.new :title
       table.add_index! :title
-    }.to change {table.indices.size}.by(1)
+      expect {
+        table.remove_index! :title
+      }.to change {table.indices.size}.by(-1)
+    end
+
+    it "should raise ArgumentError when a column doesn't exist" do
+      table = Chair.new
+      expect{table.remove_index! :title}.to raise_error(ArgumentError)
+    end
+
+    it 'should raise ArgumentError when a column is not indexed' do
+      table = Chair.new :title
+      expect{table.remove_index! :title}.to raise_error(ArgumentError)
+    end
   end
 
-  it 'deletes an index' do
-    table = Table.new :title
+
+  it 'builds an index of existing data' do
+    table = Chair.new :title
+    table.insert! title: 'The Fault in Our Stars'
     table.add_index! :title
+    expect(
+      table.instance_variable_get("@title_index_map").has_key? 'The Fault in Our Stars'
+    ).to eq(true)
+  end
+
+  it 'adds data to the index' do
+    table = Chair.new :title
+    table.add_index! :title
+    expect {
+      table.insert! title: 'The Fault in Our Stars'
+    }.to change{table.instance_variable_get("@title_index_map").size}.by(1)
+  end
+
+  it 'data must have primary key if primary key is defined' do
+    table = Chair.new :title, :author
+    table.set_primary_key! :title
+    expect {
+      table.insert! author: 'John Green'
+    }.to raise_error ArgumentError
+  end
+
+  it 'cannot insert a row if no such column exists' do
+    table = Chair.new :title
     expect {
-      table.remove_index! :title
-    }.to change {table.indices.size}.by(-1)
+      table.insert! title:'The Fault in Our Stars', author: 'John'
+    }.to raise_error ArgumentError
+  end
+
+  describe 'merge' do
+    it 'data into the table' do
+      table = Chair.new :num, :string
+      table.set_primary_key! :num
+      table.insert! num: 123
+      table.insert! num: 456
+      table.merge!(:string, {123 => '123',
+                             456 => '456'})
+      expect(table.find(123)[:string]).to eq('123')
+      expect(table.find(456)[:string]).to eq('456')
+    end
+
+    it 'should raise RuntimeError when no primary key' do
+      table = Chair.new :num, :string
+      expect {
+        table.merge!(:string, {123 => '123',
+                               456 => '456'})
+      }.to raise_error RuntimeError, 'No primary key exists for this table'
+    end
+
+    it 'should raise RuntimeError when no such key exists' do
+      table = Chair.new :num, :string
+      table.set_primary_key! :num
+      expect {
+        table.merge!(:string, {123 => '123',
+                               456 => '456'})
+      }.to raise_error RuntimeError, 'No such row with primary key 123 exists'
+    end
+
+    it 'should raise RuntimeError instead of overwrite data by default' do
+      table = Chair.new :num, :string
+      table.set_primary_key! :num
+      table.insert! num: 123, string: '123'
+      table.insert! num: 456
+      expect {
+        table.merge!(:string, {123 => '123',
+                               456 => '456'})
+      }.to raise_error RuntimeError, 'Value already exists in table for primary key 123 and column :string'
+    end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chair
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Katherine Whitlock
@@ -65,12 +65,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- chairs.gemspec
-- demo.rb
+- chair.gemspec
 - lib/chair.rb
+- lib/chair/chair.rb
 - lib/chair/row.rb
-- lib/chair/table.rb
 - lib/chair/version.rb
+- spec/row_spec.rb
 - spec/spec_helper.rb
 - spec/table_search_spec.rb
 - spec/table_spec.rb
@@ -99,6 +99,7 @@ signing_key:
 specification_version: 4
 summary: Tables!
 test_files:
+- spec/row_spec.rb
 - spec/spec_helper.rb
 - spec/table_search_spec.rb
 - spec/table_spec.rb

data/demo.rb

@@ -1,4 +0,0 @@
-table = Table.new [:title, :author]
-table.where do |row|
-  row[:title]
-end