Merge f6e11e9 into be399b2

railsadminteam · Feb 24, 2020 · c199237 · c199237
2 parents be399b2 + f6e11e9
commit c199237
Show file tree

Hide file tree

Showing 141 changed files with 890 additions and 1,052 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-12-10 17:46:01 +0900 using RuboCop version 0.68.1.
+# on 2020-02-25 02:51:32 +0900 using RuboCop version 0.68.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 35
+# Offense count: 38
 # Cop supports --auto-correct.
 # Configuration parameters: TreatCommentsAsGroupSeparators, Include.
 # Include: **/*.gemfile, **/Gemfile, **/gems.rb
@@ -27,35 +27,6 @@ Gemspec/OrderedDependencies:
   Exclude:
     - 'rails_admin.gemspec'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Layout/ClosingHeredocIndentation:
-  Exclude:
-    - 'lib/rails_admin/adapters/mongoid/abstract_object.rb'
-
-# Offense count: 53
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Enabled: false
-
-# Offense count: 5
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'lib/rails_admin/support/csv_converter.rb'
-    - 'rails_admin.gemspec'
-    - 'spec/controllers/rails_admin/main_controller_spec.rb'
-    - 'spec/dummy_app/app/active_record/carrierwave_uploader.rb'
-    - 'spec/dummy_app/app/mongoid/carrierwave_uploader.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
-  Exclude:
-    - 'lib/rails_admin/engine.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.
@@ -64,21 +35,6 @@ Layout/IndentationWidth:
     - 'lib/rails_admin/adapters/mongoid.rb'
     - 'spec/spec_helper.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/LeadingBlankLines:
-  Exclude:
-    - 'lib/rails_admin/extension.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceBeforeBlockBraces:
-  Exclude:
-    - 'spec/rails_admin/install_generator_spec.rb'
-
 # Offense count: 1
 Lint/AmbiguousBlockAssociation:
   Exclude:
@@ -109,24 +65,13 @@ Lint/DuplicateMethods:
   Exclude:
     - 'lib/rails_admin/config.rb'
 
-# Offense count: 1
-Lint/ReturnInVoidContext:
-  Exclude:
-    - 'lib/rails_admin/support/csv_converter.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Lint/ScriptPermission:
   Exclude:
     - 'spec/dummy_app/Rakefile'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Lint/UnneededSplatExpansion:
-  Exclude:
-    - 'spec/rails_admin/adapters/active_record/association_spec.rb'
-
-# Offense count: 198
+# Offense count: 199
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
@@ -140,15 +85,14 @@ Naming/AccessorMethodName:
     - 'lib/rails_admin/abstract_model.rb'
     - 'lib/rails_admin/adapters/active_record/abstract_object.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Configuration parameters: Blacklist.
 # Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'app/controllers/rails_admin/main_controller.rb'
     - 'lib/rails_admin/adapters/mongoid.rb'
     - 'lib/rails_admin/config/fields/base.rb'
-    - 'lib/rails_admin/engine.rb'
     - 'lib/rails_admin/extensions/paper_trail/auditing_adapter.rb'
     - 'spec/factories.rb'
 
@@ -160,13 +104,12 @@ Naming/MemoizedInstanceVariableName:
     - 'app/controllers/rails_admin/application_controller.rb'
     - 'lib/rails_admin/config/has_description.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: io, id, to, by, on, in, at, ip, db
 Naming/UncommunicativeMethodParamName:
   Exclude:
     - 'lib/rails_admin/abstract_model.rb'
-    - 'lib/rails_admin/config/model.rb'
     - 'spec/rails_admin/adapters/mongoid/property_spec.rb'
 
 # Offense count: 1
@@ -195,67 +138,6 @@ Style/EvalWithLocation:
   Exclude:
     - 'lib/rails_admin/config/actions.rb'
 
-# Offense count: 15
-# Cop supports --auto-correct.
-Style/ExpandPathArguments:
-  Exclude:
-    - 'lib/generators/rails_admin/install_generator.rb'
-    - 'rails_admin.gemspec'
-    - 'spec/dummy_app/Rakefile'
-    - 'spec/dummy_app/config/application.rb'
-    - 'spec/dummy_app/config/boot.rb'
-    - 'spec/dummy_app/config/environment.rb'
-    - 'spec/integration/fields/multiple_carrierwave_spec.rb'
-    - 'spec/orm/active_record.rb'
-    - 'spec/rails_admin/active_record_extension_spec.rb'
-    - 'spec/rails_admin/install_generator_spec.rb'
-    - 'spec/spec_helper.rb'
-
-# Offense count: 9
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/rails_admin.rb'
-    - 'lib/rails_admin/adapters/active_record.rb'
-    - 'lib/rails_admin/bootstrap-sass.rb'
-    - 'lib/rails_admin/config.rb'
-    - 'lib/rails_admin/config/actions.rb'
-    - 'lib/rails_admin/config/fields/types/polymorphic_association.rb'
-    - 'lib/rails_admin/config/inspectable.rb'
-    - 'lib/rails_admin/config/sections/list.rb'
-    - 'lib/rails_admin/extension.rb'
-
-# Offense count: 2
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'spec/integration/authorization/cancancan_spec.rb'
-
-# Offense count: 17
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'config/initializers/haml.rb'
-    - 'lib/rails_admin/adapters/active_record.rb'
-    - 'lib/rails_admin/adapters/mongoid.rb'
-    - 'lib/rails_admin/bootstrap-sass.rb'
-    - 'lib/rails_admin/config/actions/index.rb'
-    - 'lib/rails_admin/config/fields/types/active_storage.rb'
-    - 'lib/rails_admin/config/fields/types/multiple_active_storage.rb'
-    - 'lib/rails_admin/config/inspectable.rb'
-    - 'lib/rails_admin/extension.rb'
-    - 'lib/rails_admin/extensions/history/history.rb'
-    - 'lib/rails_admin/extensions/pundit/authorization_adapter.rb'
-    - 'lib/rails_admin/support/csv_converter.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: InverseMethods, InverseBlocks.
-Style/InverseMethods:
-  Exclude:
-    - 'lib/rails_admin/config/fields.rb'
-    - 'lib/rails_admin/config/fields/types/enum.rb'
-    - 'lib/rails_admin/config/fields/types/polymorphic_association.rb'
-
 # Offense count: 4
 Style/MethodMissingSuper:
   Exclude:
@@ -276,123 +158,3 @@ Style/MissingRespondToMissing:
 Style/MixinUsage:
   Exclude:
     - 'spec/controllers/rails_admin/main_controller_spec.rb'
-
-# Offense count: 14
-# Cop supports --auto-correct.
-Style/MultilineIfModifier:
-  Exclude:
-    - 'app/helpers/rails_admin/main_helper.rb'
-    - 'lib/rails_admin/extensions/pundit/authorization_adapter.rb'
-    - 'spec/controllers/rails_admin/main_controller_spec.rb'
-    - 'spec/integration/fields/action_text_spec.rb'
-    - 'spec/rails_admin/config/fields/types/action_text_spec.rb'
-    - 'spec/rails_admin/config/fields/types/active_storage_spec.rb'
-    - 'spec/rails_admin/config/fields/types/file_upload_spec.rb'
-    - 'spec/rails_admin/config/fields/types/multiple_active_storage_spec.rb'
-    - 'spec/rails_admin/config/fields/types/multiple_file_upload_spec.rb'
-    - 'spec/rails_admin/config/fields/types/shrine_spec.rb'
-    - 'spec/rails_admin/config_spec.rb'
-
-# Offense count: 1
-Style/MultipleComparison:
-  Exclude:
-    - 'lib/rails_admin/abstract_model.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/rails_admin/config.rb'
-    - 'lib/rails_admin/config/fields/types/string.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/OrAssignment:
-  Exclude:
-    - 'lib/rails_admin/config/sections.rb'
-
-# Offense count: 70
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Exclude:
-    - 'lib/rails_admin/config/fields/base.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-Style/RescueModifier:
-  Exclude:
-    - 'app/helpers/rails_admin/application_helper.rb'
-    - 'lib/rails_admin/abstract_model.rb'
-    - 'lib/rails_admin/adapters/mongoid/association.rb'
-    - 'lib/rails_admin/config/actions/show_in_app.rb'
-    - 'lib/rails_admin/extensions/paper_trail/auditing_adapter.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    - 'lib/rails_admin/adapters/mongoid.rb'
-    - 'lib/rails_admin/adapters/mongoid/bson.rb'
-    - 'lib/rails_admin/support/i18n.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/StderrPuts:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 528
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Enabled: false
-
-# Offense count: 93
-# Cop supports --auto-correct.
-# Configuration parameters: .
-# SupportedStyles: percent, brackets
-Style/SymbolArray:
-  EnforcedStyle: percent
-  MinSize: 12
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, MinSize, WordRegex.
-# SupportedStyles: percent, brackets
-Style/WordArray:
-  Exclude:
-    - 'lib/rails_admin/adapters/active_record.rb'
-    - 'lib/rails_admin/support/datetime.rb'
-    - 'lib/rails_admin/support/i18n.rb'
-    - 'spec/rails_admin/abstract_model_spec.rb'
-    - 'spec/rails_admin/adapters/active_record_spec.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: forbid_for_all_comparison_operators, forbid_for_equality_operators_only, require_for_all_comparison_operators, require_for_equality_operators_only
-Style/YodaCondition:
-  Exclude:
-    - 'lib/rails_admin/config/fields/base.rb'
-    - 'lib/rails_admin/config/hideable.rb'
-    - 'lib/tasks/rails_admin.rake'
diff --git a/Appraisals b/Appraisals
@@ -1,4 +1,4 @@
-appraise "rails-5.0" do
+appraise 'rails-5.0' do
   gem 'rails', '~> 5.0.0'
   gem 'sassc-rails', '~> 2.1'
   gem 'devise', '~> 4.0'
@@ -31,7 +31,7 @@ appraise "rails-5.0" do
   end
 end
 
-appraise "rails-5.1" do
+appraise 'rails-5.1' do
   gem 'rails', '~> 5.1.0'
   gem 'sassc-rails', '~> 2.1'
   gem 'devise', '~> 4.0'
@@ -61,7 +61,7 @@ appraise "rails-5.1" do
   end
 end
 
-appraise "rails-5.2" do
+appraise 'rails-5.2' do
   gem 'rails', '~> 5.2.0'
   gem 'sassc-rails', '~> 2.1'
   gem 'devise', '~> 4.4'
@@ -91,7 +91,7 @@ appraise "rails-5.2" do
   end
 end
 
-appraise "rails-6.0" do
+appraise 'rails-6.0' do
   gem 'rails', '~> 6.0.0'
   gem 'haml'
   gem 'sassc-rails', '~> 2.1'

diff --git a/Gemfile b/Gemfile
@@ -46,7 +46,7 @@ group :test do
   end
 
   # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-  gem 'tzinfo-data', platforms: %i(mingw mswin x64_mingw jruby)
+  gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 end
 
 gemspec
diff --git a/Rakefile b/Rakefile
@@ -17,8 +17,8 @@ begin
 rescue LoadError
   desc 'Run RuboCop'
   task :rubocop do
-    $stderr.puts 'Rubocop is disabled'
+    warn 'Rubocop is disabled'
   end
 end
 
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]
diff --git a/app/controllers/rails_admin/application_controller.rb b/app/controllers/rails_admin/application_controller.rb
@@ -27,6 +27,7 @@ def get_model
       @model_name = to_model_name(params[:model_name])
       raise(RailsAdmin::ModelNotFound) unless (@abstract_model = RailsAdmin::AbstractModel.new(@model_name))
       raise(RailsAdmin::ModelNotFound) if (@model_config = @abstract_model.config).excluded?
+
       @properties = @abstract_model.properties
     end