fat_core 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f9197b29ac69c96409642ef86bb5a5bf3fdace
-  data.tar.gz: 6aeb17344e346ebfc21030523929036934eee6a4
+  metadata.gz: f6d9999db399e323a385070ca59d15deb692d65d
+  data.tar.gz: 5bb8ade666435e0c67afeaa293e236082cb19906
 SHA512:
-  metadata.gz: 3800832b0339a3c9deca6450bece102d33dc0a7912b18e9a0c743b85b438ba076bf1b290f70b0bd3a8d0fb48f65780be8375175d54aa50bd48fdf8dee89b05b3
-  data.tar.gz: 914b7895346e3a07422027e54b3ae11bdd5bed6297b3281488a93bd3e9a8d2b29efd7550b6510f32ec47c2bd5cd174762595f3f22b055ea0245f63de1de9d065
+  metadata.gz: 806ba3e817c5899bd5cb3ffa7a13069d8710c2a29406ae9b6060cf2d30e5d28cc3fc1b983d8b8b3aa9beafc6ceab505695a218c39e8e605ec811bc0c671a3bf7
+  data.tar.gz: e11602a00d01b81bd201092b4bf3cbe8780435d2da3bd3f708f83b2e94677e43a2993b0fc4066fdf8d5d45b258e2516c928c72790e93e84dc77f64714b202f59

data/lib/fat_core/table.rb

@@ -227,21 +227,99 @@ module FatCore
       result
     end
 
-    # Return a Table that combines this table with another table. The headers of
-    # this table are used in the result. There must be the same number of
-    # columns of the same type in the two tables, or an exception will be
-    # thrown. Unlike in SQL, no duplicates are eliminated from the result.
+    # Return this table with all duplicate rows eliminated.
+    def distinct
+      result = Table.new
+      uniq_rows = rows.uniq
+      uniq_rows.each do |row|
+        result << row
+      end
+      result
+    end
+
+    def uniq
+      distinct
+    end
+
+    # Return a Table that combines this table with another table. In other
+    # words, return the union of this table with the other. The headers of this
+    # table are used in the result. There must be the same number of columns of
+    # the same type in the two tables, or an exception will be thrown.
+    # Duplicates are eliminated from the result.
     def union(other)
+      set_operation(other, :+, true)
+    end
+
+    # Return a Table that combines this table with another table. In other
+    # words, return the union of this table with the other. The headers of this
+    # table are used in the result. There must be the same number of columns of
+    # the same type in the two tables, or an exception will be thrown.
+    # Duplicates are not eliminated from the result.
+    def union_all(other)
+      set_operation(other, :+, false)
+    end
+
+    # Return a Table that includes the rows that appear in this table and in
+    # another table. In other words, return the intersection of this table with
+    # the other. The headers of this table are used in the result. There must be
+    # the same number of columns of the same type in the two tables, or an
+    # exception will be thrown. Duplicates are eliminated from the result.
+    def intersect(other)
+      set_operation(other, :intersect, true)
+    end
+
+    # Return a Table that includes the rows that appear in this table and in
+    # another table. In other words, return the intersection of this table with
+    # the other. The headers of this table are used in the result. There must be
+    # the same number of columns of the same type in the two tables, or an
+    # exception will be thrown. Duplicates are not eliminated from the result.
+    def intersect_all(other)
+      set_operation(other, :intersect, false)
+    end
+
+    # Return a Table that includes the rows of this table except for any rows
+    # that are the same as those in another table. In other words, return the
+    # set difference between this table an the other. The headers of this table
+    # are used in the result. There must be the same number of columns of the
+    # same type in the two tables, or an exception will be thrown. Duplicates
+    # are eliminated from the result.
+    def except(other)
+      set_operation(other, :difference, true)
+    end
+
+    # Return a Table that includes the rows of this table except for any rows
+    # that are the same as those in another table. In other words, return the
+    # set difference between this table an the other. The headers of this table
+    # are used in the result. There must be the same number of columns of the
+    # same type in the two tables, or an exception will be thrown. Duplicates
+    # are not eliminated from the result.
+    def except_all(other)
+      set_operation(other, :difference, false)
+    end
+
+    private
+
+    # Apply the set operation given by op between this table and the other table
+    # given in the first argument.  If distinct is true, eliminate duplicates
+    # from the result.
+    def set_operation(other, op = :+, distinct = true)
       unless columns.size == other.columns.size
-        raise 'Cannot apply union to tables with a different number of columns.'
+        raise 'Cannot apply a set operation to tables with a different number of columns.'
+      end
+      unless columns.map(&:type) == other.columns.map(&:type)
+        raise 'Cannot apply a set operation to tables with different column types.'
       end
+      other_rows = other.rows.map { |r| r.replace_keys(headers) }
       result = Table.new
-      columns.each_with_index do |col, k|
-        result.add_column(col + other.columns[k])
+      new_rows = rows.send(op, other_rows)
+      new_rows.each do |row|
+        result << row
       end
-      result
+      distinct ? result.distinct : result
     end
 
+    public
+
     # Return a table that joins this table to another based on one or more join
     # expressions. There are several possibilities for the join expressions:
     #

data/lib/fat_core/version.rb

@@ -1,7 +1,7 @@
 module FatCore
   MAJOR = 1
   MINOR = 5
-  PATCH = 0
+  PATCH = 1
 
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')
 end

data/spec/lib/table_spec.rb

@@ -519,6 +519,61 @@ EOS
       end
     end
 
+    describe 'union' do
+      it 'should be able to union with a compatible table' do
+        aoh = [
+          { a: '5', 'Two words' => '20', c: '3,123', d: 'apple' },
+          { a: '4', 'Two words' => '5', c: 6412, d: 'orange' },
+          { a: '7', 'Two words' => '8', c: '$1,888', d: 'apple' }
+        ]
+        tab1 = Table.new(aoh)
+        aoh2 = [
+          { t: '8', 'Two worlds' => '65', s: '5,143', u: 'kiwi' },
+          { t: '87', 'Two worlds' => '12', s: 412, u: 'banana' },
+          { t: '13', 'Two worlds' => '11', s: '$1,821', u: 'grape' }
+        ]
+        tab2 = Table.new(aoh2)
+        utab = tab1.union(tab2)
+        expect(utab.rows.size).to eq(6)
+      end
+
+      it 'should throw an exception for union with different sized tables' do
+        aoh = [
+          { a: '5', 'Two words' => '20', c: '3,123' },
+          { a: '4', 'Two words' => '5', c: 6412 },
+          { a: '7', 'Two words' => '8', c: '$1,888' }
+        ]
+        tab1 = Table.new(aoh)
+        aoh2 = [
+          { t: '8', 'Two worlds' => '65', s: '5,143', u: 'kiwi' },
+          { t: '87', 'Two worlds' => '12', s: 412, u: 'banana' },
+          { t: '13', 'Two worlds' => '11', s: '$1,821', u: 'grape' }
+        ]
+        tab2 = Table.new(aoh2)
+        expect {
+          tab1.union(tab2)
+        }.to raise_error(/different number of columns/)
+      end
+
+      it 'should throw an exception for union with different types' do
+        aoh = [
+          { a: '5', 'Two words' => '20', s: '5143',  c: '3123' },
+          { a: '4', 'Two words' => '5',  s: 412,     c: 6412 },
+          { a: '7', 'Two words' => '8',  s: '$1821', c: '$1888' }
+        ]
+        tab1 = Table.new(aoh)
+        aoh2 = [
+          { t: '8',  'Two worlds' => '65', s: '2016-01-17',   u: 'kiwi' },
+          { t: '87', 'Two worlds' => '12', s: Date.today,     u: 'banana' },
+          { t: '13', 'Two worlds' => '11', s: '[2015-05-21]', u: 'grape' }
+        ]
+        tab2 = Table.new(aoh2)
+        expect {
+          tab1.union(tab2)
+        }.to raise_error(/different column types/)
+      end
+    end
+
     describe 'select' do
       it 'should be able to select by column names' do
         aoh = [
@@ -715,93 +770,6 @@ EOS
       end
     end
 
-    describe 'set operations' do
-      before :all do
-        aoh = [
-          { a: '5', 'Two words' => '20', c: '3,123', d: 'apple' },
-          { a: '4', 'Two words' => '5', c: 6412, d: 'orange' },
-          { a: '4', 'Two words' => '5', c: 6412, d: 'orange' },
-          { a: '7', 'Two words' => '8', c: '$1,888', d: 'apple' }
-        ]
-        @tab1 = Table.new(aoh)
-        aoh2 = [
-          { t: '8', 'Two worlds' => '65', s: '5,143', u: 'kiwi' },
-          { t: '87', 'Two worlds' => '12', s: 412, u: 'banana' },
-          { t: '4', 'Two worlds' => '5', s: 6412, u: 'orange' },
-          { t: '4', 'Two worlds' => '5', s: 6412, u: 'orange' },
-          { t: '4', 'Two worlds' => '5', s: 6412, u: 'orange' },
-          { t: '13', 'Two worlds' => '11', s: '$1,821', u: 'grape' }
-        ]
-        @tab2 = Table.new(aoh2)
-        aoh2e = [
-          { t: '8', 'Two worlds' => '65', s: '5,143', u: 'kiwi' },
-          { t: '87', 'Two worlds' => '12', s: 412, u: 'banana' },
-          { t: '4', 'Two worlds' => '5', s: 6412, u: 'orange' },
-          { t: '4', 'Two worlds' => '5', s: 6412, u: 'orange' },
-          { t: '4', 'Two worlds' => '5', s: 6412, u: 'orange' },
-          { t: '4', 'Two worlds' => '5', s: 6412, u: 'orange' },
-          { t: '13', 'Two worlds' => '11', s: '$1,821', u: 'grape' }
-        ]
-        @tab2e = Table.new(aoh2e)
-        # Fewer columns
-        aoh3 = [
-          { a: '5', 'Two words' => '20', c: '3,123' },
-          { a: '4', 'Two words' => '5', c: 6412 },
-          { a: '7', 'Two words' => '8', c: '$1,888' }
-        ]
-        @tab3 = Table.new(aoh3)
-        # Different types
-        aoh4 = [
-          { t: '8',  'Two worlds' => '65', s: '2016-01-17',   u: 'kiwi' },
-          { t: '87', 'Two worlds' => '12', s: Date.today,     u: 'banana' },
-          { t: '13', 'Two worlds' => '11', s: '[2015-05-21]', u: 'grape' }
-        ]
-        @tab4 = Table.new(aoh4)
-      end
-
-      it 'union' do
-        utab = @tab1.union(@tab2)
-        expect(utab.size).to eq(6)
-      end
-
-      it 'union_all' do
-        utab = @tab1.union_all(@tab2)
-        expect(utab.size).to eq(10)
-      end
-
-      it 'intersect' do
-        utab = @tab1.intersect(@tab2)
-        expect(utab.size).to eq(1)
-      end
-
-      it 'intersect_all' do
-        utab = @tab1.intersect_all(@tab2)
-        expect(utab.size).to eq(2)
-      end
-
-      it 'except' do
-        utab = @tab2.except(@tab1)
-        expect(utab.size).to eq(4)
-      end
-
-      it 'except_all' do
-        utab = @tab2e.except_all(@tab1)
-        expect(utab.size).to eq(5)
-      end
-
-      it 'should throw an exception for union with different sized tables' do
-        expect {
-          @tab1.union(@tab3)
-        }.to raise_error(/different number of columns/)
-      end
-
-      it 'should throw an exception for union with different types' do
-        expect {
-          @tab1.union(@tab4)
-        }.to raise_error(/different column types/)
-      end
-    end
-
     describe 'output' do
       it 'should be able to return itself as an array of arrays' do
         aoh = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov