fx 0.9.0 → 0.10.1

data/spec/generators/fx/name_helper_spec.rb

@@ -0,0 +1,114 @@
+require "spec_helper"
+require "generators/fx/name_helper"
+
+RSpec.describe Fx::Generators::NameHelper do
+  describe ".format_for_migration" do
+    it "returns symbol format for simple names" do
+      result = described_class.format_for_migration("simple_name")
+
+      expect(result).to eq(":simple_name")
+    end
+
+    it "returns quoted string format for schema-qualified names" do
+      result = described_class.format_for_migration("schema.function_name")
+
+      expect(result).to eq("\"schema.function_name\"")
+    end
+
+    it "handles names with multiple dots" do
+      result = described_class.format_for_migration("db.schema.function")
+
+      expect(result).to eq("\"db.schema.function\"")
+    end
+
+    it "handles empty names" do
+      result = described_class.format_for_migration("")
+
+      expect(result).to eq(":")
+    end
+  end
+
+  describe ".format_table_name_from_hash" do
+    it "formats table_name key correctly" do
+      table_hash = {"table_name" => "users"}
+
+      result = described_class.format_table_name_from_hash(table_hash)
+
+      expect(result).to eq(":users")
+    end
+
+    it "formats on key correctly" do
+      table_hash = {"on" => "posts"}
+
+      result = described_class.format_table_name_from_hash(table_hash)
+
+      expect(result).to eq(":posts")
+    end
+
+    it "prefers table_name over on when both are present" do
+      table_hash = {"table_name" => "users", "on" => "posts"}
+
+      result = described_class.format_table_name_from_hash(table_hash)
+
+      expect(result).to eq(":users")
+    end
+
+    it "handles schema-qualified table names" do
+      table_hash = {"table_name" => "public.users"}
+
+      result = described_class.format_table_name_from_hash(table_hash)
+
+      expect(result).to eq("\"public.users\"")
+    end
+
+    it "raises error when neither key is present" do
+      table_hash = {"something_else" => "value"}
+
+      expect {
+        described_class.format_table_name_from_hash(table_hash)
+      }.to raise_error(
+        ArgumentError,
+        "Either `table_name:NAME` or `on:NAME` must be specified"
+      )
+    end
+
+    it "raises error when both keys have nil values" do
+      table_hash = {"table_name" => nil, "on" => nil}
+
+      expect {
+        described_class.format_table_name_from_hash(table_hash)
+      }.to raise_error(
+        ArgumentError,
+        "Either `table_name:NAME` or `on:NAME` must be specified"
+      )
+    end
+
+    it "uses on key when table_name is nil" do
+      table_hash = {"table_name" => nil, "on" => "comments"}
+
+      result = described_class.format_table_name_from_hash(table_hash)
+
+      expect(result).to eq(":comments")
+    end
+  end
+
+  describe ".validate_and_format" do
+    it "formats valid names correctly" do
+      result = described_class.validate_and_format("test_function")
+
+      expect(result).to eq(":test_function")
+    end
+
+    it "formats schema-qualified names correctly" do
+      result = described_class.validate_and_format("schema.test")
+
+      expect(result).to eq("\"schema.test\"")
+    end
+
+    it "raises error for blank names" do
+      expect {
+        described_class.validate_and_format("")
+      }.to raise_error(ArgumentError, "Name cannot be blank")
+    end
+  end
+end

data/spec/generators/fx/trigger/trigger_generator_spec.rb

@@ -6,12 +6,15 @@ RSpec.describe Fx::Generators::TriggerGenerator, :generator do
     migration = file("db/migrate/create_trigger_test.rb")
     trigger_definition = file("db/triggers/test_v01.sql")
 
-    run_generator ["test", "table_name" => "some_table"]
+    run_generator(
+      described_class,
+      ["test", {"table_name" => "some_table"}]
+    )
 
     expect(trigger_definition).to exist
-    expect(migration).to be_a_migration
-    expect(migration_file(migration)).to contain("CreateTriggerTest")
-    expect(migration_file(migration)).to contain("on: :some_table")
+    expect_to_be_a_migration(migration)
+    expect(migration_content(migration)).to include("CreateTriggerTest")
+    expect(migration_content(migration)).to include("on: :some_table")
   end
 
   context "when passed --no-migration" do
@@ -19,10 +22,14 @@ RSpec.describe Fx::Generators::TriggerGenerator, :generator do
       migration = file("db/migrate/create_trigger_test.rb")
       trigger_definition = file("db/triggers/test_v01.sql")
 
-      run_generator ["test", {"table_name" => "some_table"}, "--no-migration"]
+      run_generator(
+        described_class,
+        ["test", {"table_name" => "some_table"}],
+        {migration: false}
+      )
 
       expect(trigger_definition).to exist
-      expect(Pathname.new(migration_file(migration))).not_to exist
+      expect(migration).not_to exist
     end
   end
 
@@ -30,30 +37,46 @@ RSpec.describe Fx::Generators::TriggerGenerator, :generator do
     migration = file("db/migrate/create_trigger_test.rb")
     trigger_definition = file("db/triggers/test_v01.sql")
 
-    run_generator ["test", "on" => "some_table"]
+    run_generator(
+      described_class,
+      ["test", {"on" => "some_table"}]
+    )
 
     expect(trigger_definition).to exist
-    expect(migration).to be_a_migration
-    expect(migration_file(migration)).to contain("CreateTriggerTest")
-    expect(migration_file(migration)).to contain("on: :some_table")
+    expect_to_be_a_migration(migration)
+    expect(migration_content(migration)).to include("CreateTriggerTest")
+    expect(migration_content(migration)).to include("on: :some_table")
   end
 
   it "requires `table_name` or `on` to be specified" do
     expect do
-      run_generator ["test", "foo" => "some_table"]
+      run_generator(
+        described_class,
+        ["test", {"foo" => "some_table"}]
+      )
     end.to raise_error(ArgumentError)
   end
 
   it "updates an existing trigger" do
-    allow(Dir).to receive(:entries).and_return(["test_v01.sql"])
-    migration = file("db/migrate/update_trigger_test_to_version_2.rb")
-    trigger_definition = file("db/triggers/test_v02.sql")
+    with_trigger_definition(
+      name: "test",
+      version: 1,
+      sql_definition: "hello"
+    ) do
+      migration = file("db/migrate/update_trigger_test_to_version_2.rb")
+      trigger_definition = file("db/triggers/test_v02.sql")
 
-    run_generator ["test", "table_name" => "some_table"]
+      run_generator(
+        described_class,
+        ["test", {"table_name" => "some_table"}]
+      )
 
-    expect(trigger_definition).to exist
-    expect(migration).to be_a_migration
-    expect(migration_file(migration)).to contain("UpdateTriggerTestToVersion2")
-    expect(migration_file(migration)).to contain("on: :some_table")
+      expect(trigger_definition).to exist
+      expect_to_be_a_migration(migration)
+      expect(migration_content(migration)).to include(
+        "UpdateTriggerTestToVersion2"
+      )
+      expect(migration_content(migration)).to include("on: :some_table")
+    end
   end
 end

data/spec/generators/fx/version_helper_spec.rb

@@ -0,0 +1,157 @@
+require "spec_helper"
+require "generators/fx/version_helper"
+
+RSpec.describe Fx::Generators::VersionHelper do
+  describe "#previous_version" do
+    it "returns 0 when no existing versions found" do
+      with_temp_directory do |temp_dir|
+        helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
+
+        expect(helper.previous_version).to eq(0)
+      end
+    end
+
+    it "returns highest version number from existing files" do
+      with_temp_directory do |temp_dir|
+        create_version_file(temp_dir, "test_function", 1)
+        create_version_file(temp_dir, "test_function", 3)
+        create_version_file(temp_dir, "test_function", 2)
+
+        helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
+
+        expect(helper.previous_version).to eq(3)
+      end
+    end
+
+    it "ignores files that don't match the pattern" do
+      with_temp_directory do |temp_dir|
+        create_version_file(temp_dir, "test_function", 2)
+        FileUtils.touch(temp_dir.join("other_function_v3.sql"))
+        FileUtils.touch(temp_dir.join("test_function.sql"))
+
+        helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
+
+        expect(helper.previous_version).to eq(2)
+      end
+    end
+  end
+
+  describe "#current_version" do
+    it "returns previous version + 1" do
+      with_temp_directory do |temp_dir|
+        create_version_file(temp_dir, "test_function", 5)
+
+        helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
+
+        expect(helper.current_version).to eq(6)
+      end
+    end
+
+    it "returns 1 when no previous versions exist" do
+      with_temp_directory do |temp_dir|
+        helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
+
+        expect(helper.current_version).to eq(1)
+      end
+    end
+  end
+
+  describe "#updating_existing?" do
+    it "returns false when no previous versions exist" do
+      with_temp_directory do |temp_dir|
+        helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
+
+        expect(helper.updating_existing?).to be false
+      end
+    end
+
+    it "returns true when previous versions exist" do
+      with_temp_directory do |temp_dir|
+        create_version_file(temp_dir, "test_function", 1)
+
+        helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
+
+        expect(helper.updating_existing?).to be true
+      end
+    end
+  end
+
+  describe "#creating_new?" do
+    it "returns true when no previous versions exist" do
+      with_temp_directory do |temp_dir|
+        helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
+
+        expect(helper.creating_new?).to be true
+      end
+    end
+
+    it "returns false when previous versions exist" do
+      with_temp_directory do |temp_dir|
+        create_version_file(temp_dir, "test_function", 1)
+
+        helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
+
+        expect(helper.creating_new?).to be false
+      end
+    end
+  end
+
+  describe "#definition_for_version" do
+    it "returns function definition for function type" do
+      with_temp_directory do |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(version: 2, type: :function)
+
+        expect(result).to eq("function_definition")
+        expect(Fx::Definition).to have_received(:function).with(
+          name: "test_function",
+          version: 2
+        )
+      end
+    end
+
+    it "returns trigger definition for trigger type" do
+      with_temp_directory do |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(version: 3, type: :trigger)
+
+        expect(result).to eq("trigger_definition")
+        expect(Fx::Definition).to have_received(:trigger).with(
+          name: "test_trigger",
+          version: 3
+        )
+      end
+    end
+
+    it "raises error for unknown type" do
+      with_temp_directory do |temp_dir|
+        helper = described_class.new(file_name: "test_function", definition_path: temp_dir)
+
+        expect {
+          helper.definition_for_version(version: 1, type: :unknown)
+        }.to raise_error(
+          ArgumentError,
+          "Unknown type: unknown. Must be :function or :trigger"
+        )
+      end
+    end
+  end
+
+  private
+
+  def with_temp_directory
+    Dir.mktmpdir do |path|
+      yield Pathname.new(path)
+    end
+  end
+
+  def create_version_file(dir, name, version)
+    FileUtils.touch(dir.join("#{name}_v#{version}.sql"))
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 ENV["RAILS_ENV"] = "test"
-require "database_cleaner"
 
 require File.expand_path("../dummy/config/environment", __FILE__)
 Dir["spec/support/**/*.rb"].sort.each { |file| load file }
@@ -11,12 +10,20 @@ RSpec.configure do |config|
   config.order = "random"
   config.disable_monkey_patching!
 
-  DatabaseCleaner.strategy = :transaction
+  config.define_derived_metadata(file_path: %r{spec/(fx|features)/}) do |metadata|
+    metadata[:db] = true
+  end
+
+  config.before(:suite) do
+    DatabaseReset.call
+  end
 
   config.around(:each, db: true) do |example|
-    DatabaseCleaner.start
+    DatabaseReset.call
+
     example.run
-    DatabaseCleaner.clean
+
+    DatabaseReset.call
   end
 
   unless defined?(silence_stream)

data/spec/support/database_reset.rb

@@ -0,0 +1,24 @@
+module DatabaseReset
+  def self.call
+    connection = ActiveRecord::Base.connection
+    connection.execute("SET search_path TO DEFAULT;")
+
+    connection.execute <<~SQL
+      DO $$
+      DECLARE
+        schema_name TEXT;
+      BEGIN
+        FOR schema_name IN
+          SELECT nspname FROM pg_namespace
+          WHERE nspname NOT LIKE 'pg_%'
+            AND nspname != 'information_schema'
+        LOOP
+          EXECUTE format('DROP SCHEMA IF EXISTS %I CASCADE', schema_name);
+        END LOOP;
+      END $$;
+    SQL
+
+    connection.execute("CREATE SCHEMA public;")
+    connection.schema_search_path = "public"
+  end
+end

data/spec/support/generator_setup.rb

@@ -1,11 +1,52 @@
-require "ammeter/init"
+module GeneratorSetup
+  RAILS_ROOT = Pathname.new(File.expand_path("../../../tmp/dummy", __dir__)).freeze
+  MIGRATION_TIMESTAMP_PATTERN = /\A\d{14}_/
+
+  def run_generator(generator_class, args = [], options = {})
+    allow(Rails).to receive(:root).and_return(RAILS_ROOT)
+    generator = generator_class.new(args, options, destination_root: RAILS_ROOT)
+
+    silence_stream($stdout) do
+      generator.invoke_all
+    end
+  end
+
+  def file(relative_path)
+    RAILS_ROOT.join(relative_path)
+  end
+
+  def migration_content(file_path)
+    migration_path = find_migration_files(file_path).first
+    return if migration_path.nil?
+
+    Pathname.new(migration_path).read
+  end
+
+  def find_migration_files(file_path)
+    directory = File.dirname(file_path)
+    basename = File.basename(file_path, ".rb")
+    Dir.glob(File.join(directory, "*#{basename}.rb"))
+  end
+
+  def expect_to_be_a_migration(pathname)
+    migration_files = find_migration_files(pathname)
+
+    expect(migration_files).to be_present,
+      "expected #{pathname} to be a migration file"
+    first_migration = migration_files.first
+    migration_basename = File.basename(first_migration)
+    expect(migration_basename).to match(MIGRATION_TIMESTAMP_PATTERN),
+      "expected #{migration_basename} to have timestamp prefix (format: YYYYMMDDHHMMSS_)"
+  end
+end
 
 RSpec.configure do |config|
+  config.include GeneratorSetup, :generator
+
   config.before(:each, :generator) do
-    fake_rails_root = File.expand_path("../../../tmp/dummy", __FILE__)
-    allow(Rails).to receive(:root).and_return(Pathname.new(fake_rails_root))
+    FileUtils.rm_rf(GeneratorSetup::RAILS_ROOT) if File.exist?(GeneratorSetup::RAILS_ROOT)
+    FileUtils.mkdir_p(GeneratorSetup::RAILS_ROOT)
 
-    destination fake_rails_root
-    prepare_destination
+    allow(Rails).to receive(:root).and_return(Pathname.new(GeneratorSetup::RAILS_ROOT))
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fx
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Teo Ljungberg
-autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +15,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.2'
 description: |
   Adds methods to ActiveRecord::Migration to create and manage database functions
   and triggers in Rails
@@ -69,6 +80,7 @@ files:
 - lib/fx/adapters/postgres.rb
 - lib/fx/adapters/postgres/connection.rb
 - lib/fx/adapters/postgres/functions.rb
+- lib/fx/adapters/postgres/query_executor.rb
 - lib/fx/adapters/postgres/triggers.rb
 - lib/fx/command_recorder.rb
 - lib/fx/configuration.rb
@@ -84,10 +96,13 @@ files:
 - lib/generators/fx/function/function_generator.rb
 - lib/generators/fx/function/templates/db/migrate/create_function.erb
 - lib/generators/fx/function/templates/db/migrate/update_function.erb
+- lib/generators/fx/migration_helper.rb
+- lib/generators/fx/name_helper.rb
 - lib/generators/fx/trigger/USAGE
 - lib/generators/fx/trigger/templates/db/migrate/create_trigger.erb
 - lib/generators/fx/trigger/templates/db/migrate/update_trigger.erb
 - lib/generators/fx/trigger/trigger_generator.rb
+- lib/generators/fx/version_helper.rb
 - spec/acceptance/user_manages_functions_spec.rb
 - spec/acceptance/user_manages_triggers_spec.rb
 - spec/acceptance_helper.rb
@@ -107,6 +122,7 @@ files:
 - spec/features/triggers/migrations_spec.rb
 - spec/features/triggers/revert_spec.rb
 - spec/fx/adapters/postgres/functions_spec.rb
+- spec/fx/adapters/postgres/query_executor_spec.rb
 - spec/fx/adapters/postgres/triggers_spec.rb
 - spec/fx/adapters/postgres_spec.rb
 - spec/fx/command_recorder_spec.rb
@@ -118,8 +134,12 @@ files:
 - spec/fx/trigger_spec.rb
 - spec/fx_spec.rb
 - spec/generators/fx/function/function_generator_spec.rb
+- spec/generators/fx/migration_helper_spec.rb
+- spec/generators/fx/name_helper_spec.rb
 - spec/generators/fx/trigger/trigger_generator_spec.rb
+- spec/generators/fx/version_helper_spec.rb
 - spec/spec_helper.rb
+- spec/support/database_reset.rb
 - spec/support/definition_helpers.rb
 - spec/support/generator_setup.rb
 - spec/support/migration_helpers.rb
@@ -129,10 +149,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/teoljungberg/fx/issues
-  changelog_uri: https://github.com/teoljungberg/fx/blob/v0.9.0/CHANGELOG.md
+  changelog_uri: https://github.com/teoljungberg/fx/blob/v0.10.1/CHANGELOG.md
   homepage_uri: https://github.com/teoljungberg/fx
   source_code_uri: https://github.com/teoljungberg/fx
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,15 +159,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Support for database functions and triggers in Rails migrations
 test_files: []