From e90bfd50cef5a8f72dda3f86a743bc8e292efb6f Mon Sep 17 00:00:00 2001
From: Wanderson Policarpo <wpolicarpo@gmail.com>
Date: Thu, 14 May 2020 17:26:34 +0100
Subject: [PATCH 1/2] Tidy up Gemfile

---
 Gemfile | 76 ++++++++++++++++++++++++++-------------------------------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/Gemfile b/Gemfile
index 38e71be06..2b094d3cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,69 +1,63 @@
 # frozen_string_literal: true
 
-require 'openssl'
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
+gem "bcrypt"
+gem "pg",      ">= 0.18.0"
 gem "sqlite3", "~> 1.4"
-gem "pg", ">= 0.18.0"
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'bcrypt'
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-if RbConfig::CONFIG["host_os"] =~ /darwin/
-  gem 'terminal-notifier-guard'
-end
-
-if ENV['RAILS_SOURCE']
-  gemspec path: ENV['RAILS_SOURCE']
+if ENV["RAILS_SOURCE"]
+  gemspec path: ENV["RAILS_SOURCE"]
 else
   # Need to get rails source because the gem doesn't include tests
-  version = ENV['RAILS_VERSION'] || begin
-    require 'net/http'
-    require 'yaml'
-    spec = eval(File.read('activerecord-sqlserver-adapter.gemspec'))
-    ver = spec.dependencies.detect{ |d|d.name == 'activerecord' }.requirement.requirements.first.last.version
-    major, minor, tiny, pre = ver.split('.')
-    if !pre
-      uri = URI.parse "https://rubygems.org/api/v1/versions/activerecord.yaml"
+  version = ENV["RAILS_VERSION"] || begin
+    require "openssl"
+    require "net/http"
+    require "yaml"
+
+    spec = eval(File.read("activerecord-sqlserver-adapter.gemspec"))
+    ver  = spec.dependencies.detect{ |d|d.name == "activerecord" }.requirement.requirements.first.last.version
+    major, minor, tiny, pre = ver.split(".")
+
+    if pre
+      ver
+    else
+      uri  = URI.parse("https://rubygems.org/api/v1/versions/activerecord.yaml")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      YAML.load(http.request(Net::HTTP::Get.new(uri.request_uri)).body).select do |data|
-        a, b, c = data['number'].split('.')
-        !data['prerelease'] && major == a && (minor.nil? || minor == b)
-      end.first['number']
-    else
-      ver
+      YAML.load(http.request(Net::HTTP::Get.new(uri.request_uri)).body).find do |data|
+        a, b, c = data["number"].split(".")
+        !data["prerelease"] && major == a && (minor.nil? || minor == b)
+      end["number"]
     end
   end
-  gem 'rails', github: "rails/rails", tag: "v#{version}"
-end
-
-if ENV['AREL']
-  gem 'arel', path: ENV['AREL']
+  gem "rails", github: "rails/rails", tag: "v#{version}"
 end
 
 group :tinytds do
-  if ENV['TINYTDS_SOURCE']
-    gem 'tiny_tds', path: ENV['TINYTDS_SOURCE']
-  elsif ENV['TINYTDS_VERSION']
-    gem 'tiny_tds', ENV['TINYTDS_VERSION']
+  if ENV["TINYTDS_SOURCE"]
+    gem "tiny_tds", path: ENV["TINYTDS_SOURCE"]
+  elsif ENV["TINYTDS_VERSION"]
+    gem "tiny_tds", ENV["TINYTDS_VERSION"]
   else
-    gem 'tiny_tds'
+    gem "tiny_tds"
   end
 end
 
 group :development do
-  gem 'byebug', platform: [:mri, :mingw, :x64_mingw]
-  gem 'mocha'
-  gem 'minitest-spec-rails'
+  gem "pry-byebug", platform: [:mri, :mingw, :x64_mingw]
+  gem "mocha"
+  gem "minitest-spec-rails"
 end
 
 group :guard do
-  gem 'guard'
-  gem 'guard-minitest'
+  gem "guard"
+  gem "guard-minitest"
+  gem "terminal-notifier-guard" if RbConfig::CONFIG["host_os"] =~ /darwin/
 end

From 3a4231bf34a25d686d21244fc5cadd8cb07e7236 Mon Sep 17 00:00:00 2001
From: Wanderson Policarpo <wpolicarpo@gmail.com>
Date: Thu, 14 May 2020 17:26:54 +0100
Subject: [PATCH 2/2] Add .editorconfig

---
 .editorconfig | 9 +++++++++
 CHANGELOG.md  | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..c6c8b3621
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c592d5e4..21a74c0c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 #### Fixed
 
-- [#690](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/690) Rails 6 support 
+- [#690](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/690) Rails 6 support
 - [#805](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/805) Rails 6: Fix database tasks tests for SQL Server
 - [#807](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/807) Rails 6: Skip binary fixtures test on Windows
 - [#809](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/809) Rails 6: Coerce reaper test using fork
@@ -19,6 +19,7 @@
 - [#821](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/821) Enable frozen strings - part 1
 - [#822](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/822) Enable frozen strings - part 2
 - [#823](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/823) Enable frozen strings - final
+- [#824](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/824) Tidy up Gemfile
 
 #### Added