Skip to content

Commit 84831e6

Browse files
authored
Use standardrb for code formatting (#1300)
1 parent 01239aa commit 84831e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1204
-1084
lines changed

Diff for: .github/workflows/ci.yml

+24
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,27 @@ jobs:
3333

3434
- name: Run tests
3535
run: docker compose run ci
36+
37+
38+
standardrb:
39+
name: Code linting and formatting
40+
runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-latest' when https://github.com/microsoft/mssql-docker/issues/899 resolved.
41+
42+
env:
43+
COMPOSE_FILE: compose.ci.yaml
44+
45+
strategy:
46+
fail-fast: false
47+
matrix:
48+
ruby:
49+
- 3.4.1
50+
51+
steps:
52+
- name: Checkout code
53+
uses: actions/checkout@v2
54+
55+
- name: Build docker images
56+
run: docker compose build --build-arg TARGET_VERSION=${{ matrix.ruby }}
57+
58+
- name: Run standardrb
59+
run: docker compose run standardrb

Diff for: Gemfile

+6-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
77
gemspec
88

99
gem "bcrypt"
10-
gem "pg", ">= 0.18.0"
10+
gem "pg", ">= 0.18.0"
1111
gem "sqlite3", ">= 1.6.6"
1212
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
1313
gem "benchmark-ips"
@@ -27,14 +27,14 @@ else
2727
require "net/http"
2828
require "yaml"
2929

30-
spec = eval(File.read("activerecord-sqlserver-adapter.gemspec"))
31-
ver = spec.dependencies.detect { |d| d.name == "activerecord" }.requirement.requirements.first.last.version
30+
spec = Gem::Specification.load("activerecord-sqlserver-adapter.gemspec")
31+
ver = spec.dependencies.detect { |d| d.name == "activerecord" }.requirement.requirements.first.last.version
3232
major, minor, _tiny, pre = ver.split(".")
3333

3434
if pre
3535
ver
3636
else
37-
uri = URI.parse("https://rubygems.org/api/v1/versions/activerecord.yaml")
37+
uri = URI.parse("https://rubygems.org/api/v1/versions/activerecord.yaml")
3838
http = Net::HTTP.new(uri.host, uri.port)
3939
http.use_ssl = true
4040
http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -68,9 +68,7 @@ end
6868
group :guard do
6969
gem "guard"
7070
gem "guard-minitest"
71-
gem "terminal-notifier-guard" if RbConfig::CONFIG["host_os"] =~ /darwin/
71+
gem "terminal-notifier-guard" if /darwin/.match?(RbConfig::CONFIG["host_os"])
7272
end
7373

74-
group :rubocop do
75-
gem "rubocop", require: false
76-
end
74+
gem "standard", require: false

Diff for: Guardfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ clearing :on
66
notification :terminal_notifier if defined?(TerminalNotifier)
77
ignore %r{debug\.log}
88

9-
ar_lib = File.join ARTest::SQLServer.root_activerecord, "lib"
9+
ar_lib = File.join ARTest::SQLServer.root_activerecord, "lib"
1010
ar_test = File.join ARTest::SQLServer.root_activerecord, "test"
1111

1212
guard :minitest, {
@@ -24,7 +24,7 @@ guard :minitest, {
2424
else
2525
watch(%r{^test/cases/\w+_test_sqlserver\.rb$})
2626
watch(%r{^test/cases/coerced_tests\.rb$}) { "test/cases/coerced_tests.rb" }
27-
watch(%r{^lib/active_record/connection_adapters/sqlserver/([^/]+)\.rb$}) { |m| "test/cases/#{m[1]}_test_sqlserver.rb" }
27+
watch(%r{^lib/active_record/connection_adapters/sqlserver/([^/]+)\.rb$}) { |m| "test/cases/#{m[1]}_test_sqlserver.rb" }
2828
watch(%r{^test/cases/helper_sqlserver\.rb$}) { "test" }
2929
end
3030
end

Diff for: Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ task default: [:test]
1111
namespace :test do
1212
ENV["ARCONN"] = "sqlserver"
1313

14-
%w(dblib).each do |mode|
14+
%w[dblib].each do |mode|
1515
Rake::TestTask.new(mode) do |t|
1616
t.libs = ARTest::SQLServer.test_load_paths
1717
t.test_files = test_files

Diff for: activerecord-sqlserver-adapter.gemspec

+13-14
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,27 @@
33
version = File.read(File.expand_path("VERSION", __dir__)).strip
44

55
Gem::Specification.new do |spec|
6-
spec.name = "activerecord-sqlserver-adapter"
7-
spec.platform = Gem::Platform::RUBY
8-
spec.version = version
6+
spec.name = "activerecord-sqlserver-adapter"
7+
spec.platform = Gem::Platform::RUBY
8+
spec.version = version
99

1010
spec.required_ruby_version = ">= 3.2.0"
1111

12-
spec.license = "MIT"
13-
spec.authors = ["Ken Collins", "Anna Carey", "Will Bond", "Murray Steele", "Shawn Balestracci", "Joe Rafaniello", "Tom Ward", "Aidan Haran"]
14-
15-
spec.homepage = "http://github.com/rails-sqlserver/activerecord-sqlserver-adapter"
16-
spec.summary = "ActiveRecord SQL Server Adapter."
17-
spec.description = "ActiveRecord SQL Server Adapter. SQL Server 2012 and upward."
12+
spec.license = "MIT"
13+
spec.authors = ["Ken Collins", "Anna Carey", "Will Bond", "Murray Steele", "Shawn Balestracci", "Joe Rafaniello", "Tom Ward", "Aidan Haran"]
14+
15+
spec.homepage = "http://github.com/rails-sqlserver/activerecord-sqlserver-adapter"
16+
spec.summary = "ActiveRecord SQL Server Adapter."
17+
spec.description = "ActiveRecord SQL Server Adapter. SQL Server 2012 and upward."
1818

19-
spec.metadata = {
19+
spec.metadata = {
2020
"bug_tracker_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues",
2121
"changelog_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v#{version}/CHANGELOG.md",
22-
"source_code_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v#{version}",
22+
"source_code_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v#{version}"
2323
}
2424

25-
spec.files = `git ls-files -z`.split("\x0")
26-
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
27-
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
25+
spec.files = `git ls-files -z`.split("\x0")
26+
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
2827
spec.require_paths = ["lib"]
2928

3029
spec.add_dependency "activerecord", "~> 8.1.0.alpha"

Diff for: compose.ci.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,10 @@ services:
1212
command: wait-for sqlserver:1433 -- bundle exec rake test
1313
depends_on:
1414
- "sqlserver"
15+
standardrb:
16+
environment:
17+
- RAILS_BRANCH=main
18+
build:
19+
context: .
20+
dockerfile: Dockerfile.ci
21+
command: bundle exec standardrb

Diff for: lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def attributes_for_update(attribute_names)
1515

1616
super(attribute_names).reject do |name|
1717
column = self.class.columns_hash[name]
18-
column && column.respond_to?(:is_identity?) && column.is_identity?
18+
column&.respond_to?(:is_identity?) && column.is_identity?
1919
end
2020
end
2121
end

Diff for: lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ def unprepare_sqlserver_statement(sql, binds)
3232
executesql = executesql.match(SQLSERVER_STATEMENT_REGEXP).to_a[1]
3333

3434
binds.each_with_index do |bind, index|
35-
36-
value = if bind.is_a?(::ActiveModel::Attribute) then
35+
value = if bind.is_a?(::ActiveModel::Attribute)
3736
connection.quote(bind.value_for_database)
3837
else
3938
connection.quote(bind)

Diff for: lib/active_record/connection_adapters/sqlserver/core_ext/finder_methods.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ def construct_relation_for_exists(conditions)
2424
def _construct_relation_for_exists(conditions)
2525
conditions = sanitize_forbidden_attributes(conditions)
2626

27-
if distinct_value && offset_value
27+
relation = if distinct_value && offset_value
2828
# Start of monkey-patch
2929
if select_values.present?
30-
relation = order(*select_values).limit!(1)
30+
order(*select_values).limit!(1)
3131
else
32-
relation = except(:order).limit!(1)
32+
except(:order).limit!(1)
3333
end
3434
# End of monkey-patch
3535
else
36-
relation = except(:select, :distinct, :order)._select!(Arel.sql(::ActiveRecord::FinderMethods::ONE_AS_ONE, retryable: true)).limit!(1)
36+
except(:select, :distinct, :order)._select!(Arel.sql(::ActiveRecord::FinderMethods::ONE_AS_ONE, retryable: true)).limit!(1)
3737
end
3838

3939
case conditions

0 commit comments

Comments
 (0)