bug fix & improvements

Author: jasl

.rubocop.yml

@@ -1,23 +1,37 @@
 require: rubocop-performance
 
-inherit_gem:
-  rubocop-rails_config:
-    - config/rails.yml
-
 AllCops:
   TargetRubyVersion: 2.5
   Exclude:
     - bin/**/*
     - test/dummy/bin/**/*
     - test/dummy/db/schema.rb
 
+Performance:
+  Exclude:
+    - 'test/**/*'
+
+Rails:
+  Enabled: true
+
 Metrics/LineLength:
   Max: 150
 
-# frozen_string_literal: true
-Style/FrozenStringLiteralComment:
-  Enabled: true
-  EnforcedStyle: when_needed
+Style/GuardClause:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+# Prefer assert_not over assert !
+Rails/AssertNot:
+  Include:
+    - 'test/**/*'
+
+# Prefer assert_not_x over refute_x
+Rails/RefuteMethods:
+  Include:
+    - 'test/**/*'
 
 # Prefer &&/|| over and/or.
 Style/AndOr:
@@ -27,6 +41,7 @@ Style/AndOr:
 # method call.
 Style/BracesAroundHashParameters:
   Enabled: true
+  EnforcedStyle: context_dependent
 
 # Align `when` with `case`.
 Layout/CaseIndentation:
@@ -36,8 +51,20 @@ Layout/CaseIndentation:
 Layout/CommentIndentation:
   Enabled: true
 
-# No extra empty lines.
-Layout/EmptyLines:
+Layout/ElseAlignment:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+  AutoCorrect: true
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: true
+
+Layout/EmptyLinesAroundBlockBody:
   Enabled: true
 
 # In a regular class definition, no empty lines around the body.
@@ -52,26 +79,35 @@ Layout/EmptyLinesAroundMethodBody:
 Layout/EmptyLinesAroundModuleBody:
   Enabled: true
 
-# Use Ruby >= 1.9 syntax for hashes. Prefer {a: :b} over { :a => :b }.
+Layout/IndentFirstArgument:
+  Enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
 Style/HashSyntax:
   Enabled: true
 
 # Method definitions after `private` or `protected` isolated calls need one
 # extra level of indentation.
 Layout/IndentationConsistency:
   Enabled: true
-  EnforcedStyle: normal
+  EnforcedStyle: rails
 
 # Two spaces, no tabs (for indentation).
 Layout/IndentationWidth:
   Enabled: true
 
+Layout/LeadingCommentSpace:
+  Enabled: true
+
 Layout/SpaceAfterColon:
   Enabled: true
 
 Layout/SpaceAfterComma:
   Enabled: true
 
+Layout/SpaceAfterSemicolon:
+  Enabled: true
+
 Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: true
 
@@ -81,24 +117,38 @@ Layout/SpaceAroundKeyword:
 Layout/SpaceAroundOperators:
   Enabled: true
 
+Layout/SpaceBeforeComma:
+  Enabled: true
+
 Layout/SpaceBeforeFirstArg:
   Enabled: true
 
+Style/DefWithParentheses:
+  Enabled: true
+
 # Defining a method with parameters needs parentheses.
 Style/MethodDefParentheses:
   Enabled: true
 
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
+
+Style/RedundantFreeze:
+  Enabled: true
+
 # Use `foo {}` not `foo{}`.
 Layout/SpaceBeforeBlockBraces:
   Enabled: true
 
 # Use `foo { bar }` not `foo {bar}`.
 Layout/SpaceInsideBlockBraces:
   Enabled: true
+  EnforcedStyleForEmptyBraces: space
 
-# Use `{a: 1}` not `{ a:1 }`.
+# Use `{ a: 1 }` not `{a:1}`.
 Layout/SpaceInsideHashLiteralBraces:
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceInsideParens:
   Enabled: true
@@ -124,45 +174,72 @@ Layout/TrailingWhitespace:
 Style/UnneededPercentQ:
   Enabled: true
 
-# Align `end` with the matching keyword or starting expression except for
-# assignments, where it should be aligned with the LHS.
-Layout/EndAlignment:
+Lint/AmbiguousOperator:
+  Enabled: true
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: true
+
+Lint/ErbNewArguments:
   Enabled: true
-  EnforcedStyleAlignWith: variable
 
 # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
 Lint/RequireParentheses:
   Enabled: true
 
-Style/Documentation:
-  Enabled: false
+Lint/ShadowingOuterLocalVariable:
+  Enabled: true
 
-Metrics/MethodLength:
-  Enabled: false
+Lint/StringConversionInInterpolation:
+  Enabled: true
 
-Metrics/AbcSize:
-  Enabled: false
+Lint/UriEscapeUnescape:
+  Enabled: true
 
-Metrics/ParameterLists:
-  Enabled: false
+Lint/UselessAssignment:
+  Enabled: true
 
-Metrics/BlockLength:
-  Enabled: false
+Lint/DeprecatedClassMethods:
+  Enabled: true
 
-Lint/HandleExceptions:
-  Enabled: false
+Style/ParenthesesAroundCondition:
+  Enabled: true
 
-Metrics/ClassLength:
-  Enabled: false
+Style/RedundantBegin:
+  Enabled: true
 
-Layout/EmptyLinesAroundArguments:
-  Enabled: false
+Style/RedundantReturn:
+  Enabled: true
+  AllowMultipleReturnValues: true
 
-Style/ClassAndModuleChildren:
-  Enabled: false
+Style/Semicolon:
+  Enabled: true
+  AllowAsExpressionSeparator: true
 
-Naming/UncommunicativeMethodParamName:
-  Enabled: false
+# Prefer Foo.method over Foo::method
+Style/ColonMethodCall:
+  Enabled: true
 
-Style/IfUnlessModifier:
-  Enabled: false
+Style/TrivialAccessors:
+  Enabled: true
+
+Performance/FlatMap:
+  Enabled: true
+
+Performance/RedundantMerge:
+  Enabled: true
+
+Performance/StartWith:
+  Enabled: true
+
+Performance/EndWith:
+  Enabled: true
+
+Performance/RegexpMatch:
+  Enabled: true
+
+Performance/ReverseEach:
+  Enabled: true
+
+Performance/UnfreezeString:
+  Enabled: true

Gemfile

@@ -53,5 +53,4 @@ gem "acts_as_list"
 gem "cocoon"
 
 gem "rubocop"
-gem "rubocop-rails_config"
 gem "rubocop-performance"

Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     form_core (0.1.1)
-      activeentity (>= 0.0.1.beta5)
+      activeentity (>= 0.0.1.beta7)
       rails (>= 6.0.0.rc1, < 7)
 
 GEM
@@ -44,7 +44,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activeentity (0.0.1.beta5)
+    activeentity (0.0.1.beta7)
       activemodel (>= 6.0.0.beta3, < 7.0)
       activesupport (>= 6.0.0.beta3, < 7.0)
     activejob (6.0.0.rc1)
@@ -121,7 +121,7 @@ GEM
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     parallel (1.17.0)
-    parser (2.6.2.1)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -131,7 +131,6 @@ GEM
       pry (~> 0.10)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    psych (3.1.0)
     puma (3.12.1)
     rack (2.0.7)
     rack-test (1.1.0)
@@ -167,19 +166,15 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rubocop (0.67.2)
+    rubocop (0.68.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.6)
-    rubocop-performance (1.1.0)
-      rubocop (>= 0.67.0)
-    rubocop-rails_config (0.5.1)
-      railties (>= 3.0)
-      rubocop (~> 0.60)
+    rubocop-performance (1.2.0)
+      rubocop (>= 0.68.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     sass (3.7.4)
@@ -204,7 +199,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.0)
+    sqlite3 (1.4.1)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)
@@ -222,15 +217,15 @@ GEM
     unicode-display_width (1.5.0)
     validates_timeliness (5.0.0.alpha4)
       timeliness (>= 0.3.10, < 1)
-    web-console (3.7.0)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
+    web-console (4.0.0)
+      actionview (>= 6.0.0.a)
+      activemodel (>= 6.0.0.a)
       bindex (>= 0.4.0)
-      railties (>= 5.0)
+      railties (>= 6.0.0.a)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    zeitwerk (2.1.5)
+    zeitwerk (2.1.6)
 
 PLATFORMS
   ruby
@@ -250,7 +245,6 @@ DEPENDENCIES
   puma
   rubocop
   rubocop-performance
-  rubocop-rails_config
   sassc-rails
   selectize-rails
   sprockets (~> 4.0.0.beta5)

form_core.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
 
-  s.add_dependency "activeentity", ">= 0.0.1.beta5"
+  s.add_dependency "activeentity", ">= 0.0.1.beta7"
   s.add_dependency "rails", ">= 6.0.0.rc1", "< 7"
 end

test/dummy/app/presenters/fields/multiple_resource_field_presenter.rb

@@ -10,6 +10,7 @@ def include_blank?
 
     def value_for_preview
       return unless @model.collection
+      return if @model.collection.none?
 
       collection
         .where(@model.data_source.value_method => value)

test/dummy/app/presenters/fields/resource_field_presenter.rb

@@ -4,6 +4,7 @@ module Fields
   class ResourceFieldPresenter < FieldPresenter
     def value_for_preview
       return unless @model.collection
+      return if @model.collection.none?
 
       id = value
       return unless id.present?

test/dummy/app/views/_form_core/fields/_multiple_nested_form_field.html.erb

@@ -3,7 +3,7 @@
 
   <%= tag.div id: field.name, class: "collection" do %>
     <%= f.fields_for field.name do |ff| %>
-      <%= render "_form_core/fields/nested_form", f: ff, field: field, form: field.nested_form %>
+      <%= render "_form_core/fields/nested_form", f: ff, field: field, form: field.nested_form, nesting: false %>
     <% end %>
 
     <div class="links">
@@ -12,7 +12,7 @@
                                     class: "button is-small",
                                     partial: "_form_core/fields/nested_form",
                                     render_options: {
-                                      locals: {field: field, form: field.nested_form}
+                                      locals: {field: field, form: field.nested_form, nesting: true}
                                     } %>
       <% end %>
       <% if field.hint.present? %>