Updated Ameba and more (#1114)

* Upgraded Ameba. Fixing ameba issues. Set min Crystal version to 1.15 and make sure 1.17 works

* ignore the TODOs for now. Not ready to deal with them yet

* Fixing some compilation errors

Author: jwoertink

.ameba.yml

@@ -0,0 +1,30 @@
+# This configuration file was generated by `ameba --gen-config`
+# on 2025-07-16 22:49:09 UTC using Ameba version 1.6.4.
+# The point is for the user to remove these configuration records
+# one by one as the reported problems are removed from the code base.
+
+# Problems found: 452
+# Run `ameba --only Lint/UselessAssign` for details
+Lint/UselessAssign:
+  Description: Disallows useless variable assignments
+  ExcludeTypeDeclarations: true
+  Enabled: true
+  Severity: Warning
+
+# Problems found: 30
+# Run `ameba --only Naming/BlockParameterName` for details
+Naming/BlockParameterName:
+  Description: Disallows non-descriptive block parameter names
+  MinNameLength: 3
+  AllowNamesEndingInNumbers: true
+  AllowedNames:
+  - db
+  - io
+  - id
+  ForbiddenNames: []
+  Enabled: true
+  Severity: Convention
+
+Documentation/DocumentationAdmonition:
+  Description: Disallows leaving TODO comments
+  Enabled: false

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
           - 14
           - 16
         crystal_version:
-          - 1.10.0
+          - 1.15.1
           - latest
         experimental:
           - false

shard.yml

@@ -1,7 +1,7 @@
 name: avram
 version: 1.4.2
 
-crystal: ">= 1.10.0"
+crystal: ">= 1.15.1"
 
 license: MIT
 
@@ -46,7 +46,7 @@ dependencies:
 development_dependencies:
   ameba:
     github: crystal-ameba/ameba
-    version: ~> 1.5.0
+    version: ~> 1.6.4
   lucky:
     github: luckyframework/lucky
     branch: main

spec/avram/json_column_spec.cr

@@ -49,10 +49,10 @@ describe "JSON Columns" do
     form1 = SaveBlob.new
     form1.set_doc_from_param(%w[a b c])
     form1.set_metadata_from_param(BlobMetadata.from_json("{}"))
-    form1.doc.value.should eq %w[a b c].map { |v| JSON::Any.new(v) }
+    form1.doc.value.should eq %w[a b c].map { |value| JSON::Any.new(value) }
     form1.save!
     blob1 = BlobQuery.new.last
-    blob1.doc.should eq %w[a b c].map { |v| JSON::Any.new(v) }
+    blob1.doc.should eq %w[a b c].map { |value| JSON::Any.new(value) }
 
     form2 = SaveBlob.new
     form2.set_doc_from_param({"foo" => {"bar" => "baz"}})

spec/avram/operations/define_attribute_spec.cr

@@ -175,8 +175,8 @@ describe "attribute in operations" do
       operation.terms_of_service.value.should be_nil
       post.should_not be_nil
 
-      SaveOperationWithAttributes.update(post.as(Post), best_kind_of_bear: "koala bear") do |op, _post|
-        op.best_kind_of_bear.value.should eq("koala bear")
+      SaveOperationWithAttributes.update(post.as(Post), best_kind_of_bear: "koala bear") do |inner_operation, _post|
+        inner_operation.best_kind_of_bear.value.should eq("koala bear")
       end
     end
   end

spec/avram/operations/operation_errors_spec.cr

@@ -28,34 +28,34 @@ end
 
 describe Avram::OperationErrors do
   it "sets a custom error for Operation" do
-    op = FailedOperation.new(failure: true)
-    op.add_error(:fail, "Not valid")
-    op.valid?.should eq false
-    op.errors[:fail].should eq ["Not valid"]
+    operation = FailedOperation.new(failure: true)
+    operation.add_error(:fail, "Not valid")
+    operation.valid?.should eq false
+    operation.errors[:fail].should eq ["Not valid"]
   end
 
   it "returns a nil value when there's a custom error on Operation" do
-    FailedOperation.run(failure: true) do |op, value|
+    FailedOperation.run(failure: true) do |operation, value|
       value.should eq nil
-      op.valid?.should eq false
-      op.errors[:oops].should eq ["this didn't work"]
-      op.errors[:failure].should eq ["move right along"]
+      operation.valid?.should eq false
+      operation.errors[:oops].should eq ["this didn't work"]
+      operation.errors[:failure].should eq ["move right along"]
     end
   end
 
   it "sets a custom error for SaveOperation" do
-    op = SaveUserButNotReally.new(failure: true)
-    op.add_error(:fail, "User did not save")
-    op.valid?.should eq false
-    op.errors[:fail].should eq ["User did not save"]
+    operation = SaveUserButNotReally.new(failure: true)
+    operation.add_error(:fail, "User did not save")
+    operation.valid?.should eq false
+    operation.errors[:fail].should eq ["User did not save"]
   end
 
   it "returns a failed save status for SaveOperation" do
-    SaveUserButNotReally.create(failure: true) do |op, value|
+    SaveUserButNotReally.create(failure: true) do |operation, value|
       value.should eq nil
-      op.valid?.should eq false
-      op.errors[:failure].should eq ["This failed quick", "Like, really quick"]
-      op.save_status.should eq SaveUserButNotReally::OperationStatus::SaveFailed
+      operation.valid?.should eq false
+      operation.errors[:failure].should eq ["This failed quick", "Like, really quick"]
+      operation.save_status.should eq SaveUserButNotReally::OperationStatus::SaveFailed
     end
   end
 end

spec/avram/operations/save_operation_spec.cr

@@ -117,10 +117,10 @@ end
 
 describe "Avram::SaveOperation" do
   it "calls the default validations after the before_save" do
-    UserWithDefaultValidations.create(name: "TestName", nickname: "TestNickname", joined_at: Time.utc, age: 400) do |op, u|
-      op.starts_nil.should eq("not nil!")
-      u.should_not be_nil
-      u.as(User).nickname.should eq("TestNickname")
+    UserWithDefaultValidations.create(name: "TestName", nickname: "TestNickname", joined_at: Time.utc, age: 400) do |operation, user|
+      operation.starts_nil.should eq("not nil!")
+      user.should_not be_nil
+      user.as(User).nickname.should eq("TestNickname")
     end
   end
 
@@ -241,8 +241,8 @@ describe "Avram::SaveOperation" do
       it "updates the record using the same default value" do
         TokenFactory.create(&.name("special").scopes(["name"]).next_id(4))
 
-        UpsertToken.upsert(next_id: 4, name: "Secret", scopes: ["red", "blue"]) do |op, token|
-          op.valid?.should eq(true)
+        UpsertToken.upsert(next_id: 4, name: "Secret", scopes: ["red", "blue"]) do |operation, token|
+          operation.valid?.should eq(true)
           token.should_not eq(nil)
           token.as(Token).name.should eq("Secret")
           token.as(Token).scopes.should eq(["red", "blue"])
@@ -542,9 +542,9 @@ describe "Avram::SaveOperation" do
     it "has inherited attributes" do
       user = UserFactory.create &.nickname("taco shop")
 
-      RenameUser.update(user, should_not_override_permitted_columns: "yo") do |op, u|
-        u.nickname.should eq("The 'taco shop'")
-        op.should_not_override_permitted_columns.value.should eq("yo")
+      RenameUser.update(user, should_not_override_permitted_columns: "yo") do |operation, updated_user|
+        updated_user.nickname.should eq("The 'taco shop'")
+        operation.should_not_override_permitted_columns.value.should eq("yo")
       end
     end
   end
@@ -684,8 +684,8 @@ describe "Avram::SaveOperation" do
 
     context "with bytes" do
       it "saves the byte column" do
-        Beat::SaveOperation.create(hash: "boots and pants".to_slice) do |op, beat|
-          op.saved?.should eq(true)
+        Beat::SaveOperation.create(hash: "boots and pants".to_slice) do |operation, beat|
+          operation.saved?.should eq(true)
           beat.should_not be_nil
           beat.as(Beat).hash.blank?.should eq(false)
           beat.as(Beat).hash.should eq(Bytes[98, 111, 111, 116, 115, 32, 97, 110, 100, 32, 112, 97, 110, 116, 115])
@@ -698,8 +698,8 @@ describe "Avram::SaveOperation" do
       it "creates the JSON value from params" do
         params = build_params(%({"blob": {"doc": {"sort": "desc"}, "metadata": {"name": "filter", "code": 4}}}), content_type: "application/json")
 
-        ReturnOfTheBlob.create(params) do |op, blob|
-          op.valid?.should eq(true)
+        ReturnOfTheBlob.create(params) do |operation, blob|
+          operation.valid?.should eq(true)
           blob.should_not eq(nil)
           blob.as(Blob).doc.as(JSON::Any)["sort"].as_s.should eq("desc")
           blob.as(Blob).metadata.name.should eq("filter")
@@ -853,8 +853,8 @@ describe "Avram::SaveOperation" do
         slime = BlobFactory.new.doc(JSON::Any.new({"sort" => JSON::Any.new("desc")})).create
         params = build_params(%({"blob": {"doc": {"sort": "asc"}}}), content_type: "application/json")
 
-        ReturnOfTheBlob.update(slime, params) do |op, blob|
-          op.valid?.should eq(true)
+        ReturnOfTheBlob.update(slime, params) do |operation, blob|
+          operation.valid?.should eq(true)
           blob.should_not eq(nil)
           blob.as(Blob).doc.as(JSON::Any)["sort"].as_s.should eq("asc")
         end
@@ -984,25 +984,25 @@ describe "Avram::SaveOperation" do
   describe "skip_default_validations" do
     it "allows blank strings to be saved" do
       post = PostFactory.create
-      AllowBlankComment.create(post_id: post.id, body: "") do |op, new_comment|
-        op.valid?.should be_true
+      AllowBlankComment.create(post_id: post.id, body: "") do |operation, new_comment|
+        operation.valid?.should be_true
         comment = new_comment.as(Comment)
         comment.body.should eq("")
       end
     end
     it "allows blank strings from params" do
       post = PostFactory.create
       params = build_params({comment: {post_id: post.id, body: ""}}.to_json, content_type: "application/json")
-      AllowBlankComment.create(params) do |op, new_comment|
-        op.valid?.should be_true
+      AllowBlankComment.create(params) do |operation, new_comment|
+        operation.valid?.should be_true
         comment = new_comment.as(Comment)
         comment.body.should eq("")
       end
     end
     it "still allows normal data to be saved" do
       post = PostFactory.create
-      AllowBlankComment.create(post_id: post.id, body: "not blank") do |op, new_comment|
-        op.valid?.should be_true
+      AllowBlankComment.create(post_id: post.id, body: "not blank") do |operation, new_comment|
+        operation.valid?.should be_true
         comment = new_comment.as(Comment)
         comment.body.should eq("not blank")
       end
@@ -1027,9 +1027,9 @@ describe "Avram::SaveOperation" do
   describe "#database" do
     it "has access to the database via a helper method" do
       post = PostFactory.create
-      AllowBlankComment.create(post_id: post.id, body: "") do |op, _new_comment|
+      AllowBlankComment.create(post_id: post.id, body: "") do |operation, _new_comment|
         expect_raises(Avram::Rollback) do
-          op.database.rollback
+          operation.database.rollback
         end
       end
     end

spec/avram/polymorphic_spec.cr

@@ -39,9 +39,9 @@ end
 
 describe "polymorphic belongs to" do
   it "allows you to set the association before save" do
-    TestPolymorphicSave.create do |op, tp|
-      op.valid?.should eq(true)
-      tp.should_not be_nil
+    TestPolymorphicSave.create do |operation, poly|
+      operation.valid?.should eq(true)
+      poly.should_not be_nil
     end
   end
 

spec/avram/queryable_spec.cr

@@ -484,13 +484,13 @@ describe Avram::Queryable do
 
     it "wraps complex queries" do
       query = UserQuery.new.where { |user_q|
-        user_q.where { |q|
-          q.age(25).or(&.age(26))
-        }.where { |q|
-          q.name("Billy").or(&.name("Tommy"))
+        user_q.where { |scope|
+          scope.age(25).or(&.age(26))
+        }.where { |scope|
+          scope.name("Billy").or(&.name("Tommy"))
         }
-      }.or { |q|
-        q.nickname("Strange")
+      }.or { |scope|
+        scope.nickname("Strange")
       }.query
 
       query.statement.should eq %(SELECT #{User::COLUMN_SQL} FROM users WHERE ( ( "users"."age" = $1 OR "users"."age" = $2 ) AND ( "users"."name" = $3 OR "users"."name" = $4 ) ) OR "users"."nickname" = $5)
@@ -507,12 +507,12 @@ describe Avram::Queryable do
     end
 
     it "doesn't add parenthesis when query to wrap is provided" do
-      query = UserQuery.new.name("Susan").where do |q|
+      query = UserQuery.new.name("Susan").where do |scope|
         some_condition = false
         if some_condition
-          q.name("john")
+          scope.name("john")
         else
-          q
+          scope
         end
       end.age(25).query
 

spec/lucky/support/context_helper.cr

@@ -1,3 +1,4 @@
+# ameba:disable Lint/SpecFilename
 module ContextHelper
   extend self