fat_core 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b85c4931e6e06fcb0b7bf0359f67242fa06034b0
-  data.tar.gz: fc263e3393af22aae09423a94430461f1c07d476
+  metadata.gz: d8f9197b29ac69c96409642ef86bb5a5bf3fdace
+  data.tar.gz: 6aeb17344e346ebfc21030523929036934eee6a4
 SHA512:
-  metadata.gz: a69a5d129cc9135c87b628f45e1ca32869fca906bab23986ac4b0e93fb2bc75d52aaaf7b1da93828971b7d9fc9a5b8606c6daf45b22bcf3de976c5e68c90b639
-  data.tar.gz: 15f2a2de60a73586a8c6c0b60f919a66dfd523f58a72adf55a995d93e2b13b52427b190e21a76ad3002567e47167ca44b88d162c04371c0a6f8613bbaafa60a1
+  metadata.gz: 3800832b0339a3c9deca6450bece102d33dc0a7912b18e9a0c743b85b438ba076bf1b290f70b0bd3a8d0fb48f65780be8375175d54aa50bd48fdf8dee89b05b3
+  data.tar.gz: 914b7895346e3a07422027e54b3ae11bdd5bed6297b3281488a93bd3e9a8d2b29efd7550b6510f32ec47c2bd5cd174762595f3f22b055ea0245f63de1de9d065

data/TODO.org

@@ -1,10 +1,19 @@
 * Conversion to Spreadsheets
 This is a [[https://github.com/westonganger/spreadsheet_architect][gem]] that I can include into the Table model to convert a table into
 a spread-sheet, or even a sheet in a multi-sheet spreadsheet file.
+
 * Formatters
 Need to think about ways to define formatters for Table for different output
 types, including tty, color-tty, latex, csv, spreadsheet?
+
 * Add a Group Boundary concept
 If I want a table to perform sub-totals at various break points, need to have a
 way for a table to record its grouping boundaries. Maybe an array of row
 numbers?  Automatically injected by the group-by method?
+
+* DONE Add uniq method and set operations
+CLOSED: [2017-03-02 Thu 15:54]
+- State "WAIT"       from "TODO"       [2017-03-02 Thu 15:54]
+- State "TODO"       from              [2017-03-02 Thu 15:54]
+  For tables, add a method that eliminates any duplicate rows. Perhaps just
+  apply Array#uniq to the columns?

data/lib/fat_core/array.rb

@@ -2,4 +2,26 @@ class Array
   def last_i
     self.size - 1
   end
+
+  # Return a new array that is the intersection of this Array with other, but
+  # without removing duplicates as the :& method does.
+  def intersect(other)
+    result = []
+    each do |itm|
+      result << itm if other.include?(itm)
+    end
+    result
+  end
+
+  # Return an array that is the difference between this Array and the other, but
+  # without removing duplicates as the :- method does.
+  def difference(other)
+    result = deep_dup
+    other.each do |itm|
+      if (k = result.index(itm))
+        result.delete_at(k)
+      end
+    end
+    result
+  end
 end

data/lib/fat_core/hash.rb

@@ -20,6 +20,7 @@ class Hash
     self
   end
 
+  # Change each key of this Hash to its value in key_map
   def remap_keys(key_map = {})
     new_hash = {}
     each_pair do |key, val|
@@ -31,4 +32,12 @@ class Hash
     end
     new_hash
   end
+
+  # Change the keys of this Hash to new_keys, an array of keys
+  def replace_keys(new_keys)
+    unless keys.size == new_keys.size
+      raise ArgumentError, 'replace_keys: new keys size differs from key size'
+    end
+    to_a.each_with_index.map { |(_k, v), i| [new_keys[i], v] }.to_h
+  end
 end

data/lib/fat_core/table.rb

@@ -304,7 +304,7 @@ module FatCore
     #      have N and M rows respectively, the joined table will have N * M
     #      rows.
     #
-    JOIN_TYPES = [ :inner, :left, :right, :full, :cross ]
+    JOIN_TYPES = [:inner, :left, :right, :full, :cross]
 
     def join(other, *exps, join_type: :inner)
       raise ArgumentError, 'need other table as first argument to join' unless other.is_a?(Table)

data/lib/fat_core/version.rb

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

data/spec/lib/array_spec.rb

@@ -5,4 +5,20 @@ describe Array do
     letters = ('a'..'z').to_a
     expect(letters.last_i).to eq(25)
   end
+
+  it 'intersection' do
+    expect(%w(A A B A C A B).intersect(%w(A B A))).to eq(%w(A A B A A B))
+    expect(%w(A A B A C A B).intersect(%w(A B))).to eq(%w(A A B A A B))
+    expect(%w(A A B A C A B).intersect(%w(A))).to eq(%w(A A A A))
+    expect(%w(A A B A C A B).intersect(%w(B))).to eq(%w(B B))
+    expect(%w(A A B A C A B).intersect(%w(C))).to eq(%w(C))
+  end
+
+  it 'difference' do
+    expect(%w(A A B A C A B).difference(%w(A B A))).to eq(%w(A C A B))
+    expect(%w(A A B A C A B).difference(%w(A B))).to eq(%w(A A C A B))
+    expect(%w(A A B A C A B).difference(%w(A))).to eq(%w(A B A C A B))
+    expect(%w(A A B A C A B).difference(%w(B))).to eq(%w(A A A C A B))
+    expect(%w(A A B A C A B).difference(%w(C))).to eq(%w(A A B A A B))
+  end
 end

data/spec/lib/table_spec.rb

@@ -519,61 +519,6 @@ 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 types/)
-      end
-    end
-
     describe 'select' do
       it 'should be able to select by column names' do
         aoh = [
@@ -669,6 +614,7 @@ EOS
     end
 
     describe 'join' do
+      # These tests are taken from https://www.tutorialspoint.com/postgresql/postgresql_using_joins.htm
       before :all do
         @tab_a = Table.new([
           { id: 1, name: 'Paul', age: 32, address: 'California', salary: 20000, join_date: '2001-07-13' },
@@ -769,6 +715,93 @@ 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Daniel E. Doherty