metasploit-erd 3.0.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 734f972ac50cadb23d37c83099d61132ec43e01c4af6872531be3aa5c063b4a8
-  data.tar.gz: 34cbc519ee6d107e64b9a4e18f9b9e2d84563f987be6747469a3736953f16461
+  metadata.gz: 0cbc0c8942a56262c657c4999b6a41aef1c8d98178398e58c395340fb0572094
+  data.tar.gz: 911e2e4a3f8300a70ed7a89743d774c694f25b360009d63f8969ee8911e0430d
 SHA512:
-  metadata.gz: ec97c2af7fe26753ca39bb8738ca762a5a314ea8649641c0a8f7de90c6b392634806aaa321f04ce0fb531b54d5ca12aeb3cf0e06d6d221d4d0dd0a3b58d0c4d4
-  data.tar.gz: d6d090cc84609d9bffa881af8ba150674baa7af3ed0debc09056e132bf7de6242f6e03ac744d0edc47a99416a43f7d1a65f434b01e8a6d2c2cc2d657247e5e1b
+  metadata.gz: 9aff92fe3185e89966f4f7ddda211704a12740f6abec91d4d2afe25417486b627a53d987f848583f48095eed355e03f86435348aa8bb4c2c066987a9e63207ef
+  data.tar.gz: bb38953c08d8ffd8a74355c71b464c0fd4a093e9d110e1356b77686dfea7f0751c271a60586cff1438f1acb9475bf2091673338d088db9a3437373a37d7a50c3

data/Gemfile

@@ -12,8 +12,6 @@ group :development do
 end
 
 group :test do
-  # blank?
-  gem 'activesupport', '~> 5.2.2'
   # code coverage of tests
   gem 'simplecov', :require => false
   # in-memory database for ActiveRecord association traversal

data/lib/metasploit/erd/entity/namespace.rb

@@ -31,7 +31,7 @@ class Metasploit::ERD::Entity::Namespace
   # @return [Array<Class<ActiveRecord::Base>
   def classes
     ActiveRecord::Base.descendants.select { |klass|
-      klass.parents.any? { |parent|
+      klass.module_parents.any? { |parent|
         parent.name == namespace_name
       }
     }
@@ -63,4 +63,4 @@ class Metasploit::ERD::Entity::Namespace
 
     super(super_options)
   end
-end
+end

data/lib/metasploit/erd/version.rb

@@ -1,7 +1,7 @@
 module Metasploit
   module ERD
     # VERSION is managed by GemRelease
-    VERSION = '3.0.2'
+    VERSION = '4.0.0'
 
     # @return [String]
     #

data/metasploit-erd.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 
-  spec.add_runtime_dependency 'activerecord', '~> 5.2.2'
-  spec.add_runtime_dependency 'activesupport', '~> 5.2.2'
+  spec.add_runtime_dependency 'activerecord', '~> 6.0'
+  spec.add_runtime_dependency 'activesupport', '~> 6.0'
   spec.add_runtime_dependency 'rails-erd'
 end

data/spec/metasploit/erd/relationship_spec.rb

@@ -124,13 +124,10 @@ RSpec.describe Metasploit::ERD::Relationship do
 
           ActiveRecord::Migration.create_table :owners do |t|
             t.references :thing
-
-            t.timestamp
           end
 
           things.each do |thing|
             ActiveRecord::Migration.create_table thing.table_name do |t|
-              t.timestamp
             end
           end
         end
@@ -210,8 +207,6 @@ RSpec.describe Metasploit::ERD::Relationship do
         group_names.each do |group_name|
           t.references group_name.underscore.to_sym
         end
-
-        t.timestamp
       end
 
       polymorphics_by_group_name.each do |group_name, polymorphics|
@@ -241,4 +236,4 @@ RSpec.describe Metasploit::ERD::Relationship do
       end
     end
   end
-end
+end

data/spec/support/shared/contexts/active_record_base_connection.rb

@@ -7,6 +7,6 @@ RSpec.shared_context 'ActiveRecord::Base connection' do
   end
 
   after(:example) do
-    ActiveRecord::Base.connection.disconnect!
+    ActiveRecord::Base.connection.disconnect! rescue nil
   end
-end
+end

data/spec/support/shared/contexts/active_record_base_descendants_cleaner.rb

@@ -6,6 +6,12 @@ RSpec.shared_context 'ActiveRecord::Base.descendants cleaner' do
   after(:example) do
     # `ActiveSupport::DescendantsTracker.clear` will not clear ActiveRecord::Base subclasses because
     # ActiveSupport::Dependencies is loaded
-    ActiveRecord::Base.direct_descendants.clear
+    if ActiveRecord.version >= Gem::Version.new("6.0.0.rc1")
+      cv = ActiveSupport::DescendantsTracker.class_variable_get(:@@direct_descendants)
+      cv.delete(ActiveRecord::Base)
+      ActiveSupport::DescendantsTracker.class_variable_set(:@@direct_descendants, cv)
+    else
+      ActiveRecord::Base.direct_descendants.clear
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-erd
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -143,28 +143,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rails-erd
   requirement: !ruby/object:Gem::Requirement