Use kwargs

teoljungberg · teoljungberg · commit 6e350cb9ebf8 · 2025-12-09T11:18:42.000+01:00
diff --git a/lib/generators/fx/function/function_generator.rb b/lib/generators/fx/function/function_generator.rb
@@ -34,10 +34,10 @@ def create_migration_file
         return if migration_helper.skip_creation?
 
         template_info = migration_helper.migration_template_info(
-          :function,
-          file_name,
-          version_helper.updating_existing?,
-          version_helper.current_version
+          object_type: :function,
+          file_name: file_name,
+          updating_existing: version_helper.updating_existing?,
+          version: version_helper.current_version
         )
 
         migration_template(
@@ -62,9 +62,9 @@ def version
         def migration_class_name
           if version_helper.updating_existing?
             migration_helper.update_migration_class_name(
-              :function,
-              class_name,
-              version
+              object_type: :function,
+              class_name: class_name,
+              version: version
             )
           else
             super
@@ -88,8 +88,8 @@ def function_definition_path
 
       def version_helper
         @_version_helper ||= Fx::Generators::VersionHelper.new(
-          file_name,
-          function_definition_path
+          file_name: file_name,
+          definition_path: function_definition_path
         )
       end
 
@@ -98,11 +98,11 @@ def migration_helper
       end
 
       def definition
-        version_helper.definition_for_version(version, :function)
+        version_helper.definition_for_version(version: version, type: :function)
       end
 
       def previous_definition
-        version_helper.definition_for_version(previous_version, :function)
+        version_helper.definition_for_version(version: previous_version, type: :function)
       end
 
       def updating_existing_function?
diff --git a/lib/generators/fx/migration_helper.rb b/lib/generators/fx/migration_helper.rb
@@ -18,15 +18,15 @@ def active_record_migration_class
         end
       end
 
-      def update_migration_class_name(object_type, class_name, version)
+      def update_migration_class_name(object_type:, class_name:, version:)
         "Update#{object_type.capitalize}#{class_name}ToVersion#{version}"
       end
 
       def migration_template_info(
-        object_type,
-        file_name,
-        updating_existing,
-        version
+        object_type:,
+        file_name:,
+        updating_existing:,
+        version:
       )
         if updating_existing
           {
diff --git a/lib/generators/fx/trigger/trigger_generator.rb b/lib/generators/fx/trigger/trigger_generator.rb
@@ -31,10 +31,10 @@ def create_migration_file
         return if migration_helper.skip_creation?
 
         template_info = migration_helper.migration_template_info(
-          :trigger,
-          file_name,
-          version_helper.updating_existing?,
-          version_helper.current_version
+          object_type: :trigger,
+          file_name: file_name,
+          updating_existing: version_helper.updating_existing?,
+          version: version_helper.current_version
         )
 
         migration_template(template_info[:template], template_info[:filename])
@@ -56,9 +56,9 @@ def version
         def migration_class_name
           if version_helper.updating_existing?
             migration_helper.update_migration_class_name(
-              :trigger,
-              class_name,
-              version
+              object_type: :trigger,
+              class_name: class_name,
+              version: version
             )
           else
             super
@@ -86,8 +86,8 @@ def trigger_definition_path
 
       def version_helper
         @_version_helper ||= Fx::Generators::VersionHelper.new(
-          file_name,
-          trigger_definition_path
+          file_name: file_name,
+          definition_path: trigger_definition_path
         )
       end
 
@@ -96,7 +96,7 @@ def migration_helper
       end
 
       def definition
-        version_helper.definition_for_version(version, :trigger)
+        version_helper.definition_for_version(version: version, type: :trigger)
       end
 
       def updating_existing_trigger?
diff --git a/lib/generators/fx/version_helper.rb b/lib/generators/fx/version_helper.rb
@@ -2,7 +2,7 @@ module Fx
   module Generators
     # @api private
     class VersionHelper
-      def initialize(file_name, definition_path)
+      def initialize(file_name:, definition_path:)
         @file_name = file_name
         @definition_path = definition_path
       end
@@ -23,7 +23,7 @@ def creating_new?
         previous_version == 0
       end
 
-      def definition_for_version(version, type)
+      def definition_for_version(version:, type:)
         case type
         when :function
           Fx::Definition.function(name: file_name, version: version)
diff --git a/spec/generators/fx/migration_helper_spec.rb b/spec/generators/fx/migration_helper_spec.rb
@@ -45,15 +45,23 @@
     it "generates correct class name for functions" do
       helper = described_class.new({})
 
-      result = helper.update_migration_class_name(:function, "TestFunction", 3)
+      result = helper.update_migration_class_name(
+        object_type: :function,
+        class_name: "TestFunction",
+        version: 3
+      )
 
       expect(result).to eq("UpdateFunctionTestFunctionToVersion3")
     end
 
     it "generates correct class name for triggers" do
       helper = described_class.new({})
 
-      result = helper.update_migration_class_name(:trigger, "TestTrigger", 2)
+      result = helper.update_migration_class_name(
+        object_type: :trigger,
+        class_name: "TestTrigger",
+        version: 2
+      )
 
       expect(result).to eq("UpdateTriggerTestTriggerToVersion2")
     end
@@ -63,7 +71,12 @@
     it "returns create template info for new objects" do
       helper = described_class.new({})
 
-      result = helper.migration_template_info(:function, "test_func", false, 1)
+      result = helper.migration_template_info(
+        object_type: :function,
+        file_name: "test_func",
+        updating_existing: false,
+        version: 1
+      )
 
       expect(result).to eq({
         template: "db/migrate/create_function.erb",
@@ -74,7 +87,12 @@
     it "returns update template info for existing objects" do
       helper = described_class.new({})
 
-      result = helper.migration_template_info(:trigger, "test_trigger", true, 3)
+      result = helper.migration_template_info(
+        object_type: :trigger,
+        file_name: "test_trigger",
+        updating_existing: true,
+        version: 3
+      )
 
       expect(result).to eq({
         template: "db/migrate/update_trigger.erb",
@@ -86,16 +104,16 @@
       helper = described_class.new({})
 
       function_result = helper.migration_template_info(
-        :function,
-        "my_function",
-        true,
-        2
+        object_type: :function,
+        file_name: "my_function",
+        updating_existing: true,
+        version: 2
       )
       trigger_result = helper.migration_template_info(
-        :trigger,
-        "my_trigger",
-        true,
-        2
+        object_type: :trigger,
+        file_name: "my_trigger",
+        updating_existing: true,
+        version: 2
       )
 
       expect(function_result.fetch(:template)).to eq(
diff --git a/spec/generators/fx/version_helper_spec.rb b/spec/generators/fx/version_helper_spec.rb
@@ -5,7 +5,7 @@
   describe "#previous_version" do
     it "returns 0 when no existing versions found" do
       temp_dir = create_temp_directory
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
 
       expect(helper.previous_version).to eq(0)
     end
@@ -16,7 +16,7 @@
       create_version_file(temp_dir, "test_function", 3)
       create_version_file(temp_dir, "test_function", 2)
 
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
 
       expect(helper.previous_version).to eq(3)
     end
@@ -27,7 +27,7 @@
       FileUtils.touch(temp_dir.join("other_function_v3.sql"))
       FileUtils.touch(temp_dir.join("test_function.sql"))
 
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
 
       expect(helper.previous_version).to eq(2)
     end
@@ -38,14 +38,14 @@
       temp_dir = create_temp_directory
       create_version_file(temp_dir, "test_function", 5)
 
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
 
       expect(helper.current_version).to eq(6)
     end
 
     it "returns 1 when no previous versions exist" do
       temp_dir = create_temp_directory
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
 
       expect(helper.current_version).to eq(1)
     end
@@ -54,7 +54,7 @@
   describe "#updating_existing?" do
     it "returns false when no previous versions exist" do
       temp_dir = create_temp_directory
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
 
       expect(helper.updating_existing?).to be false
     end
@@ -63,7 +63,7 @@
       temp_dir = create_temp_directory
       create_version_file(temp_dir, "test_function", 1)
 
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
 
       expect(helper.updating_existing?).to be true
     end
@@ -72,7 +72,7 @@
   describe "#creating_new?" do
     it "returns true when no previous versions exist" do
       temp_dir = create_temp_directory
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
 
       expect(helper.creating_new?).to be true
     end
@@ -81,7 +81,7 @@
       temp_dir = create_temp_directory
       create_version_file(temp_dir, "test_function", 1)
 
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
 
       expect(helper.creating_new?).to be false
     end
@@ -90,11 +90,11 @@
   describe "#definition_for_version" do
     it "returns function definition for function type" do
       temp_dir = create_temp_directory
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
       allow(Fx::Definition).to receive(:function)
         .and_return("function_definition")
 
-      result = helper.definition_for_version(2, :function)
+      result = helper.definition_for_version(version: 2, type: :function)
 
       expect(result).to eq("function_definition")
       expect(Fx::Definition).to have_received(:function).with(
@@ -105,11 +105,11 @@
 
     it "returns trigger definition for trigger type" do
       temp_dir = create_temp_directory
-      helper = described_class.new("test_trigger", temp_dir)
+      helper = described_class.new(file_name: "test_trigger", definition_path: temp_dir)
       allow(Fx::Definition).to receive(:trigger)
         .and_return("trigger_definition")
 
-      result = helper.definition_for_version(3, :trigger)
+      result = helper.definition_for_version(version: 3, type: :trigger)
 
       expect(result).to eq("trigger_definition")
       expect(Fx::Definition).to have_received(:trigger).with(
@@ -120,10 +120,10 @@
 
     it "raises error for unknown type" do
       temp_dir = create_temp_directory
-      helper = described_class.new("test_function", temp_dir)
+      helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
 
       expect {
-        helper.definition_for_version(1, :unknown)
+        helper.definition_for_version(version: 1, type: :unknown)
       }.to raise_error(
         ArgumentError,
         "Unknown type: unknown. Must be :function or :trigger"
