8000 Normalize hash syntax globally · parse/activeadmin@0fb3eff · GitHub
[go: up one dir, main page]
Skip to content

Commit 0fb3eff

Browse files
author
David Rodríguez
committed
Normalize hash syntax globally
1 parent 71db7ef commit 0fb3eff

File tree

7 files changed

+41
-37
lines changed

7 files changed

+41
-37
lines changed

‎.rubocop.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,16 @@ AllCops:
1010
Include:
1111
- "**/*.rake"
1212
- "**/Gemfile"
13+
- "gemfiles/*.gemfile"
1314
- "**/Rakefile"
1415

1516
DisplayCopNames: true
1617

1718
StyleGuideCopsOnly: false
1819

20+
Style/HashSyntax:
21+
Enabled: true
22+
1923
Style/TrailingWhitespace:
2024
Enabled: true
2125

‎gemfiles/rails_42.gemfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,34 @@ gem "rails", "4.2.8"
1212
gem "jquery-ui-rails", "~> 5.0"
1313
gem "devise", "~> 3.5"
1414
gem "draper", "~> 2.1"
15-
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
15+
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
1616

1717
group :development do
1818
gem "better_errors"
19-
gem "binding_of_caller", :platforms => :mri
19+
gem "binding_of_caller", platforms: :mri
2020
gem "rack-mini-profiler"
2121
gem "yard"
22-
gem "redcarpet", :platforms => :mri
23-
gem "kramdown", :platforms => :jruby
24-
gem "appraisal", :require => false
22+
gem "redcarpet", platforms: :mri
23+
gem "kramdown", platforms: :jruby
24+
gem "appraisal", require: false
2525
end
2626

2727
group :test do
2828
gem "capybara"
29-
gem "simplecov", :require => false
30-
gem "codecov", :require => false
31-
gem "cucumber-rails", :require => false
29+
gem "simplecov", require: false
30+
gem "codecov", require: false
31+
gem "cucumber-rails", require: false
3232
gem "cucumber", "1.3.20"
33-
gem "database_cleaner", :git => "https://github.com/DatabaseCleaner/database_cleaner.git"
33+
gem "database_cleaner", git: "https://github.com/DatabaseCleaner/database_cleaner.git"
3434
gem "jasmine"
3535
gem "jslint_on_rails"
3636
gem "launchy"
3737
gem "rails-i18n"
3838
gem "rspec-rails"
3939
gem "i18n-spec"
4040
gem "shoulda-matchers", "<= 2.8.0"
41-
gem "sqlite3", :platforms => :mri
41+
gem "sqlite3", platforms: :mri
4242
gem "poltergeist"
4343
end
4444

45-
gemspec :path => "../"
45+
gemspec path: "../"

‎gemfiles/rails_50.gemfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,34 @@ gem "rails", "5.0.2"
1212
gem "jquery-ui-rails", "~> 5.0"
1313
gem "devise", "> 4.x"
1414
gem "draper", "> 3.x"
15-
gem "activerecord-jdbcsqlite3-adapter", :git => "https://github.com/jruby/activerecord-jdbc-adapter", :branch => "rails-5", :platforms => :jruby
15+
gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
1616

1717
group :development do
1818
gem "better_errors"
19-
gem "binding_of_caller", :platforms => :mri
19+
gem "binding_of_caller", platforms: :mri
2020
gem "rack-mini-profiler"
2121
gem "yard"
22-
gem "redcarpet", :platforms => :mri
23-
gem "kramdown", :platforms => :jruby
24-
gem "appraisal", :require => false
22+
gem "redcarpet", platforms: :mri
23+
gem "kramdown", platforms: :jruby
24+
gem "appraisal", require: false
2525
end
2626

2727
group :test do
2828
gem "capybara"
29-
gem "simplecov", :require => false
30-
gem "codecov", :require => false
31-
gem "cucumber-rails", :require => false
29+
gem "simplecov", require: false
30+
gem "codecov", require: false
31+
gem "cucumber-rails", require: false
3232
gem "cucumber", "1.3.20"
33-
gem "database_cleaner", :git => "https://github.com/DatabaseCleaner/database_cleaner.git"
33+
gem "database_cleaner", git: "https://github.com/DatabaseCleaner/database_cleaner.git"
3434
gem "jasmine"
3535
gem "jslint_on_rails"
3636
gem "launchy"
3737
gem "rails-i18n"
3838
gem "rspec-rails"
3939
gem "i18n-spec"
4040
gem "shoulda-matchers", "<= 2.8.0"
41-
gem "sqlite3", :platforms => :mri
41+
gem "sqlite3", platforms: :mri
4242
gem "poltergeist"
4343
end
4444

45-
gemspec :path => "../"
45+
gemspec path: "../"

‎gemfiles/rails_51.gemfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,34 @@ gem "rails", "~> 5.1.x"
1212
gem "jquery-ui-rails", "~> 5.0"
1313
gem "devise", "> 4.x"
1414
gem "draper", "> 3.x"
15-
gem "activerecord-jdbcsqlite3-adapter", :git => "https://github.com/jruby/activerecord-jdbc-adapter", :branch => "rails-5", :platforms => :jruby
15+
gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
1616

1717
group :development do
1818
gem "better_errors"
19-
gem "binding_of_caller", :platforms => :mri
19+
gem "binding_of_caller", platforms: :mri
2020
gem "rack-mini-profiler"
2121
gem "yard"
22-
gem "redcarpet", :platforms => :mri
23-
gem "kramdown", :platforms => :jruby
24-
gem "appraisal", :require => false
22+
gem "redcarpet", platforms: :mri
23+
gem "kramdown", platforms: :jruby
24+
gem "appraisal", require: false
2525
end
2626

2727
group :test do
2828
gem "capybara"
29-
gem "simplecov", :require => false
30-
gem "codecov", :require => false
31-
gem "cucumber-rails", :require => false
29+
gem "simplecov", require: false
30+
gem "codecov", require: false
31+
gem "cucumber-rails", require: false
3232
gem "cucumber", "1.3.20"
33-
gem "database_cleaner", :git => "https://github.com/DatabaseCleaner/database_cleaner.git"
33+
gem "database_cleaner", git: "https://github.com/DatabaseCleaner/database_cleaner.git"
3434
gem "jasmine"
3535
gem "jslint_on_rails"
3636
gem "launchy"
3737
gem "rails-i18n"
3838
gem "rspec-rails"
3939
gem "i18n-spec"
4040
gem "shoulda-matchers", "<= 2.8.0"
41-
gem "sqlite3", :platforms => :mri
41+
gem "sqlite3", platforms: :mri
4242
gem "poltergeist"
4343
end
4444

45-
gemspec :path => "../"
45+
gemspec path: "../"

‎lib/active_admin/inputs/filters/text_input.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ class TextInput < ::Formtastic::Inputs::TextInput
77

88
def input_html_options
99
{
10-
:cols => builder.default_text_area_width,
11-
:rows => builder.default_text_area_height
10+
cols: builder.default_text_area_width,
11+
rows: builder.default_text_area_height
1212
}.merge(super)
1313
end
1414

‎spec/unit/filters/filter_form_builder_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def filter(name, options = {})
150150

151151
it "should remove original ordering to prevent PostgreSQL error" do
152152
expect(scope.object.klass).to receive(:reorder).with('title asc') {
153-
m = double :distinct => double(pluck: ['A Title'])
153+
m = double distinct: double(pluck: ['A Title'])
154154
expect(m.distinct).to receive(:pluck).with :title
155155
m
156156
}

‎spec/unit/namespace/register_page_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
context "when optional" do
8888
before do
8989
namespace.register_page "Reports" do
90-
belongs_to :author, :optional => true
90+
belongs_to :author, optional: true
9191
end
9292
end
9393

0 commit comments

Comments
 (0)
0