aaf-gumboot 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6c408fe802e23bb7398729d35834e150e5a28a6143f1faf575803c321651886
-  data.tar.gz: 0a4e63e2d3f43f18d3ff2ec17b2b6885c5ff88a8f2d605d4b861eb0959e2e5dc
+  metadata.gz: d7d7a66b77330de30409c7b8a6211434a01ca12740c2cfd816b1c117f20b5f99
+  data.tar.gz: ea60dc9eda92d1da09a5d4b48e095a10ead77a11ffd4fe5df33b852e13b11d3c
 SHA512:
-  metadata.gz: 15fc9d9a88af07dd164aa5213d31e9a95513aa969db8ee721939b8212f720c3b9a4f8ecf651960e970cdb4bb969ae0a873a37daecb464383788aa6d4c9e27de2
-  data.tar.gz: 25732e97b7610edea1fe8a08c6e7d34041da49c571c9822d2faae059f0d3c0a8afa1d665d84fce1bbd98750abb978de229dd192f43138a7b24ad2347eafd470a
+  metadata.gz: ca01dcff935e36875ddf1a9fe396cfafc91fe13cdb5fadb89524b3a4fce4720850bd69ed7a7e1ae51b9cd5b79f80ba7891ea744cfa9a5213041ae611208e667a
+  data.tar.gz: e0c1440bc96f66089d95cbc846465f7b1d2833ee352bcc6d9318691fabe249b115a02252cea05eb331d1129f5f12ceed639418213eeec2a8cc2e260528a60510

data/lib/gumboot/shared_examples/database_schema.rb

@@ -2,11 +2,11 @@
 
 RSpec.shared_examples 'Database Schema' do
   context 'AAF shared implementation' do
-    RSpec::Matchers.define :have_collation do |expected, name|
-      match { |actual| actual[:Collation] == expected }
+    RSpec::Matchers.define :have_collations do |expected, name|
+      match { |actual| expected.include?[actual[:Collation]] }
 
       failure_message do |actual|
-        "expected #{name} to use collation #{expected}, but was " \
+        "expected #{name} to use collation #{expected.join(' or ')}, but was " \
           "#{actual[:Collation]}"
       end
     end
@@ -35,7 +35,9 @@ RSpec.shared_examples 'Database Schema' do
       query('SHOW TABLE STATUS').each do |table|
         table_name = table[:Name]
         next if table_name == 'schema_migrations'
-        expect(table).to have_collation('utf8_bin', "`#{table_name}`")
+        expect(table).to(
+          have_collations(%w[utf8_bin utf8mb4_bin], "`#{table_name}`")
+        )
 
         query("SHOW FULL COLUMNS FROM #{table_name}").each do |column|
           next unless column[:Collation]
@@ -46,8 +48,8 @@ RSpec.shared_examples 'Database Schema' do
                     end
                   end
           expect(column)
-            .to have_collation('utf8_bin',
-                               " `#{table_name}`.`#{column[:Field]}`")
+            .to have_collations(%w[utf8_bin utf8mb4_bin],
+                                " `#{table_name}`.`#{column[:Field]}`")
         end
       end
     end

data/lib/gumboot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gumboot
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aaf-gumboot
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Bradley Beddoes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: accession