From 0fc3350c1b724aa18c94ec93fcd7d06a2facfc0e Mon Sep 17 00:00:00 2001
From: Owen Cummings <owen@envoy.com>
Date: Tue, 21 Jan 2025 10:04:31 -0800
Subject: [PATCH] Fix incorrect depenedency declaration

---
 .travis.yml                                 | 14 --------------
 Appraisals                                  |  7 -------
 Rakefile                                    | 18 ------------------
 directory_diff.gemspec                      |  5 +----
 gemfiles/.bundle/config                     |  2 --
 gemfiles/activerecord_5.1.gemfile           |  7 -------
 gemfiles/activerecord_5.2.gemfile           |  7 -------
 lib/directory_diff/transformer/in_memory.rb |  2 ++
 lib/directory_diff/version.rb               |  2 +-
 spec/support/database.yml                   |  4 ----
 spec/support/temping.rb                     | 14 --------------
 11 files changed, 4 insertions(+), 78 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100644 Appraisals
 delete mode 100644 gemfiles/.bundle/config
 delete mode 100644 gemfiles/activerecord_5.1.gemfile
 delete mode 100644 gemfiles/activerecord_5.2.gemfile
 delete mode 100644 spec/support/database.yml
 delete mode 100644 spec/support/temping.rb

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 06ba2eb..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: ruby
-dist: xenial
-addons:
-  postgresql: 9.6
-rvm:
-  - 2.4.4
-  - 2.5.1
-gemfile:
-  - gemfiles/activerecord_5.1.gemfile
-  - gemfiles/activerecord_5.2.gemfile
-before_install: gem install bundler -v 2.4.22
-script:
-  - bundle exec rake db:create
-  - bundle exec rake spec
diff --git a/Appraisals b/Appraisals
deleted file mode 100644
index 2f86f99..0000000
--- a/Appraisals
+++ /dev/null
@@ -1,7 +0,0 @@
-appraise "activerecord-5.1" do
-  gem "activerecord", "~> 5.1.6"
-end
-
-appraise "activerecord-5.2" do
-  gem "activerecord", "~> 5.2.1"
-end
diff --git a/Rakefile b/Rakefile
index 7f90ff3..b7e9ed5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,24 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require "yaml"
-require "active_record"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-
-namespace :db do
-  db_config = YAML::load(File.open("spec/support/database.yml"))
-  db_config_admin = db_config.merge({"database" => "postgres", "schema_search_path" => "public"})
-
-  desc "Create the database"
-  task :create do
-    begin
-      ActiveRecord::Base.establish_connection(db_config_admin)
-      ActiveRecord::Base.connection.create_database(db_config["database"])
-      puts "Database created."
-    rescue ActiveRecord::StatementInvalid
-      puts "Database already exist."
-    end
-  end
-end
diff --git a/directory_diff.gemspec b/directory_diff.gemspec
index 311df2b..0e71aee 100644
--- a/directory_diff.gemspec
+++ b/directory_diff.gemspec
@@ -19,12 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 5.1"
-  spec.add_dependency "pg", "~> 1.1.3"
+  spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "temping", "~> 3.10.0"
-  spec.add_development_dependency "appraisal"
 end
diff --git a/gemfiles/.bundle/config b/gemfiles/.bundle/config
deleted file mode 100644
index c127f80..0000000
--- a/gemfiles/.bundle/config
+++ /dev/null
@@ -1,2 +0,0 @@
----
-BUNDLE_RETRY: "1"
diff --git a/gemfiles/activerecord_5.1.gemfile b/gemfiles/activerecord_5.1.gemfile
deleted file mode 100644
index d9ea58f..0000000
--- a/gemfiles/activerecord_5.1.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.6"
-
-gemspec path: "../"
diff --git a/gemfiles/activerecord_5.2.gemfile b/gemfiles/activerecord_5.2.gemfile
deleted file mode 100644
index c1fd804..0000000
--- a/gemfiles/activerecord_5.2.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.2.1"
-
-gemspec path: "../"
diff --git a/lib/directory_diff/transformer/in_memory.rb b/lib/directory_diff/transformer/in_memory.rb
index c1b72ef..5e813ad 100644
--- a/lib/directory_diff/transformer/in_memory.rb
+++ b/lib/directory_diff/transformer/in_memory.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module DirectoryDiff
   module Transformer
     class InMemory
diff --git a/lib/directory_diff/version.rb b/lib/directory_diff/version.rb
index 0b7fe45..463901a 100644
--- a/lib/directory_diff/version.rb
+++ b/lib/directory_diff/version.rb
@@ -1,3 +1,3 @@
 module DirectoryDiff
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end
diff --git a/spec/support/database.yml b/spec/support/database.yml
deleted file mode 100644
index a1db745..0000000
--- a/spec/support/database.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-host: "localhost"
-adapter: "postgresql"
-encoding: utf-8
-database: "test"
diff --git a/spec/support/temping.rb b/spec/support/temping.rb
deleted file mode 100644
index a655e4e..0000000
--- a/spec/support/temping.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require "temping"
-require "yaml"
-
-RSpec.configure do |config|
-  config.before :suite do
-    yaml = File.join(File.dirname(__FILE__), "database.yml")
-    db_config = YAML::load(File.open(yaml))
-    ActiveRecord::Base.establish_connection(db_config)
-  end
-
-  config.after do
-    Temping.teardown
-  end
-end