chair 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415c4dfeb44887b370a98e38d6b9dd0b97b734e2
-  data.tar.gz: 3fb7024b049ee94c0534f1c0e79376992b07d899
+  metadata.gz: 708b6c777ef65da883a84fea3b82efc0fab65d04
+  data.tar.gz: 6487ea6b33e0a3580ed3dee015e3dee76ef84bf0
 SHA512:
-  metadata.gz: 99d8558f1baa52dfbfb986bdbe5848f37ba8c5210052b71af04fb5d57f89bbab9e5684a19ffbca1bffe8c1cbf26f66d60942dd70c8372c884cb069611f440edd
-  data.tar.gz: 9952115d82340884b0ccb5fdf35f2d2df944e2e6184b312db02cf7042df400a28192af68db21090e70538122558e94233bcce2cd83176d14b4db601e59f15132
+  metadata.gz: ad6141ebfb731b5c310b0f6f3180ad84881418de08e5d5b78d928aa3702c9cdbeacdc39142443cfc7696c74d61bf587be10a37d74e9ee0f24f5e0b9db84b10a0
+  data.tar.gz: f53d8948344d3dff2afa298c0501b74084590d03301720c94d87ef49e66d0e933380b3c37858bcaf7a73a6c7b494fe508e467c0e9c3b39d2ebef45f6682db355

data/lib/chair/chair.rb

@@ -4,7 +4,7 @@ require 'set'
 # @attr_reader primary_key [Symbol] the primary key of the table
 # @attr_reader indices [Set<Symbol>] the set of indices for the table
 class Chair
-  attr_reader :primary_key, :indices
+  attr_reader :primary_key
 
   # Creates a new Table object
   # @param columns [Symbol] columns to insert into the table at initialization
@@ -118,6 +118,10 @@ class Chair
 
   alias_method :count, :size
 
+  def indices
+    @indices.keys
+  end
+
   # Finds a row by searching based on primary key
   # @param pk [Object] The primary key to look up using
   # @return [Row,nil] The row that matches
@@ -182,11 +186,12 @@ class Chair
   # @param column [Symbol] the column to be primary key
   # @return [Symbol, nil] the primary key assigned. can be nil if the column doesn't exist
   def set_primary_key!(column)
-    unless @columns.has_key? column
-      return nil
+    unless has_primary_key?
+      check_column_exists column
+      remove_index!(column) if indices.include? column
+      @pk_map = build_pk_map column
+      @primary_key = column
     end
-    @pk_map = build_pk_map column
-    @primary_key = column
   end
 
   # Does this table have a primary key?
@@ -242,8 +247,20 @@ class Chair
     @table.last
   end
 
-  protected
+  def inspect
+    # Use the table's column list to order our columns
+    inspection = []
+    inspection << "primary_key: #{@primary_key.inspect}" if has_primary_key?
+    inspection << "indices: #{@indices.keys.inspect}" unless @indices.empty?
+    inspection << "columns: #{@columns.keys.inspect}" unless @columns.empty?
+    inspection = inspection.compact.join(', ')
+    unless inspection.empty?
+      inspection.insert 0, ' '
+    end
+    "#<#{self.class}#{inspection}>"
+  end
 
+  protected
   def find_valid_indices(cols)
     @indices.keys & cols
   end

data/lib/chair/version.rb

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

data/spec/table_search_spec.rb

@@ -66,7 +66,7 @@ describe Chair 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 choice' 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

data/spec/table_spec.rb

@@ -80,6 +80,21 @@ describe Chair do
       }.to change {table.primary_key}.from(nil).to(:title)
     end
 
+    it "should raise an ArgumentError if it's not an existing column" do
+      table = Chair.new
+      expect{
+        table.set_primary_key! :title
+      }.to raise_error ArgumentError, "Column :title does not exist in table"
+    end
+
+    it "fails if there's already a primary key" do
+      table = Chair.new :title, :author
+      table.set_primary_key! :title
+      expect{
+        table.set_primary_key! :author
+      }.not_to change{table.primary_key}.from(:title)
+    end
+
     describe 'fails to build index' do
       it 'when duplicate fields exist' do
         table = Chair.new :title
@@ -107,22 +122,15 @@ describe Chair do
           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
-    }.not_to change{table.primary_key}.from(nil)
-  end
 
-  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)
+    it 'removes index on column' do
+      table = Chair.new :title
+      table.add_index! :title
+      expect {
+        table.set_primary_key! :title
+      }.to change {table.indices}.from([:title]).to([])
+    end
   end
 
   describe 'add index' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chair
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Katherine Whitlock