fx 0.8.0 → 0.9.0

data/spec/fx_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+RSpec.describe Fx do
+  it "has a version number" do
+    expect(Fx::VERSION).to be_present
+  end
+
+  it "loads fx into ActiveRecord" do
+    expect(ActiveRecord::Migration::CommandRecorder).to include(Fx::CommandRecorder)
+    expect(ActiveRecord::ConnectionAdapters::AbstractAdapter).to include(Fx::Statements)
+    expect(ActiveRecord::SchemaDumper).to include(Fx::SchemaDumper)
+    expect(Fx.load).to eq(true)
+  end
+
+  it "allows configuration" do
+    adapter = double("Fx Adapter")
+
+    Fx.configure do |config|
+      config.database = adapter
+      config.dump_functions_at_beginning_of_schema = true
+    end
+
+    expect(Fx.configuration.database).to eq(adapter)
+    expect(Fx.configuration.dump_functions_at_beginning_of_schema).to eq(true)
+
+    Fx.configuration = nil
+  end
+end

data/spec/generators/fx/function/function_generator_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "generators/fx/function/function_generator"
 
-describe Fx::Generators::FunctionGenerator, :generator do
+RSpec.describe Fx::Generators::FunctionGenerator, :generator do
   it "creates a function definition file, and a migration" do
     migration = file("db/migrate/create_function_test.rb")
     function_definition = file("db/functions/test_v01.sql")
@@ -10,7 +10,7 @@ describe Fx::Generators::FunctionGenerator, :generator do
 
     expect(function_definition).to exist
     expect(migration).to be_a_migration
-    expect(migration_file(migration)).to contain "CreateFunctionTest"
+    expect(migration_file(migration)).to contain("CreateFunctionTest")
   end
 
   context "when passed --no-migration" do
@@ -21,7 +21,7 @@ describe Fx::Generators::FunctionGenerator, :generator do
       run_generator ["test", "--no-migration"]
 
       expect(function_definition).to exist
-      expect(migration_file(migration)).not_to exist
+      expect(Pathname.new(migration_file(migration))).not_to exist
     end
   end
 

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "generators/fx/trigger/trigger_generator"
 
-describe Fx::Generators::TriggerGenerator, :generator do
+RSpec.describe Fx::Generators::TriggerGenerator, :generator do
   it "creates a trigger definition file, and a migration" do
     migration = file("db/migrate/create_trigger_test.rb")
     trigger_definition = file("db/triggers/test_v01.sql")
@@ -10,8 +10,8 @@ describe Fx::Generators::TriggerGenerator, :generator do
 
     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(migration_file(migration)).to contain("CreateTriggerTest")
+    expect(migration_file(migration)).to contain("on: :some_table")
   end
 
   context "when passed --no-migration" do
@@ -22,7 +22,7 @@ describe Fx::Generators::TriggerGenerator, :generator do
       run_generator ["test", {"table_name" => "some_table"}, "--no-migration"]
 
       expect(trigger_definition).to exist
-      expect(migration_file(migration)).not_to exist
+      expect(Pathname.new(migration_file(migration))).not_to exist
     end
   end
 
@@ -34,14 +34,14 @@ describe Fx::Generators::TriggerGenerator, :generator do
 
     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(migration_file(migration)).to contain("CreateTriggerTest")
+    expect(migration_file(migration)).to contain("on: :some_table")
   end
 
   it "requires `table_name` or `on` to be specified" do
-    expect {
+    expect do
       run_generator ["test", "foo" => "some_table"]
-    }.to raise_error ArgumentError
+    end.to raise_error(ArgumentError)
   end
 
   it "updates an existing trigger" do
@@ -53,7 +53,7 @@ describe Fx::Generators::TriggerGenerator, :generator do
 
     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(migration_file(migration)).to contain("UpdateTriggerTestToVersion2")
+    expect(migration_file(migration)).to contain("on: :some_table")
   end
 end

data/spec/spec_helper.rb

@@ -4,8 +4,13 @@ require "database_cleaner"
 require File.expand_path("../dummy/config/environment", __FILE__)
 Dir["spec/support/**/*.rb"].sort.each { |file| load file }
 
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+require "fx"
+
 RSpec.configure do |config|
   config.order = "random"
+  config.disable_monkey_patching!
+
   DatabaseCleaner.strategy = :transaction
 
   config.around(:each, db: true) do |example|

data/spec/support/definition_helpers.rb

@@ -1,6 +1,6 @@
 module DefinitionHelpers
   def with_function_definition(name:, sql_definition:, version: 1, &block)
-    definition = Fx::Definition.new(name: name, version: version)
+    definition = Fx::Definition.function(name: name, version: version)
 
     with_definition(
       definition: definition,
@@ -10,11 +10,7 @@ module DefinitionHelpers
   end
 
   def with_trigger_definition(name:, sql_definition:, version: 1, &block)
-    definition = Fx::Definition.new(
-      name: name,
-      version: version,
-      type: "trigger"
-    )
+    definition = Fx::Definition.trigger(name: name, version: version)
 
     with_definition(
       definition: definition,

data/spec/support/warning_helper.rb

@@ -0,0 +1,5 @@
+require "warning"
+
+Warning.process do |_|
+  :raise
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fx
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Teo Ljungberg
@@ -10,177 +10,37 @@ bindir: bin
 cert_chain: []
 date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ammeter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: standardrb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
-description: |2
-      Adds methods to ActiveRecord::Migration to create and manage database functions
-      and triggers in Rails
+        version: '7.0'
+description: |
+  Adds methods to ActiveRecord::Migration to create and manage database functions
+  and triggers in Rails
 email:
 - teo@teoljungberg.com
 executables: []
@@ -192,6 +52,7 @@ files:
 - ".rspec"
 - ".standard.yml"
 - ".yardopts"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -201,6 +62,7 @@ files:
 - bin/rake
 - bin/rspec
 - bin/setup
+- bin/standardrb
 - bin/yard
 - fx.gemspec
 - lib/fx.rb
@@ -209,19 +71,12 @@ files:
 - lib/fx/adapters/postgres/functions.rb
 - lib/fx/adapters/postgres/triggers.rb
 - lib/fx/command_recorder.rb
-- lib/fx/command_recorder/arguments.rb
-- lib/fx/command_recorder/function.rb
-- lib/fx/command_recorder/trigger.rb
 - lib/fx/configuration.rb
 - lib/fx/definition.rb
 - lib/fx/function.rb
 - lib/fx/railtie.rb
 - lib/fx/schema_dumper.rb
-- lib/fx/schema_dumper/function.rb
-- lib/fx/schema_dumper/trigger.rb
 - lib/fx/statements.rb
-- lib/fx/statements/function.rb
-- lib/fx/statements/trigger.rb
 - lib/fx/trigger.rb
 - lib/fx/version.rb
 - lib/generators.rb
@@ -254,26 +109,29 @@ files:
 - spec/fx/adapters/postgres/functions_spec.rb
 - spec/fx/adapters/postgres/triggers_spec.rb
 - spec/fx/adapters/postgres_spec.rb
-- spec/fx/command_recorder/arguments_spec.rb
 - spec/fx/command_recorder_spec.rb
 - spec/fx/configuration_spec.rb
 - spec/fx/definition_spec.rb
 - spec/fx/function_spec.rb
-- spec/fx/schema_dumper/function_spec.rb
-- spec/fx/schema_dumper/trigger_spec.rb
-- spec/fx/statements/function_spec.rb
-- spec/fx/statements/trigger_spec.rb
+- spec/fx/schema_dumper_spec.rb
+- spec/fx/statements_spec.rb
 - spec/fx/trigger_spec.rb
+- spec/fx_spec.rb
 - spec/generators/fx/function/function_generator_spec.rb
 - spec/generators/fx/trigger/trigger_generator_spec.rb
 - spec/spec_helper.rb
 - spec/support/definition_helpers.rb
 - spec/support/generator_setup.rb
 - spec/support/migration_helpers.rb
+- spec/support/warning_helper.rb
 homepage: https://github.com/teoljungberg/fx
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/teoljungberg/fx/issues
+  changelog_uri: https://github.com/teoljungberg/fx/blob/v0.9.0/CHANGELOG.md
+  homepage_uri: https://github.com/teoljungberg/fx
+  source_code_uri: https://github.com/teoljungberg/fx
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -282,14 +140,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Support for database functions and triggers in Rails migrations

data/lib/fx/command_recorder/arguments.rb

@@ -1,43 +0,0 @@
-module Fx
-  module CommandRecorder
-    # @api private
-    class Arguments
-      def initialize(args)
-        @args = args.freeze
-      end
-
-      def function
-        @args[0]
-      end
-
-      def version
-        options[:version]
-      end
-
-      def revert_to_version
-        options[:revert_to_version]
-      end
-
-      def invert_version
-        Arguments.new([function, options_for_revert])
-      end
-
-      def to_a
-        @args.to_a
-      end
-
-      private
-
-      def options
-        @options ||= @args[1] || {}
-      end
-
-      def options_for_revert
-        options.clone.tap do |revert_options|
-          revert_options[:version] = revert_to_version
-          revert_options.delete(:revert_to_version)
-        end
-      end
-    end
-  end
-end

data/lib/fx/command_recorder/function.rb

@@ -1,30 +0,0 @@
-module Fx
-  module CommandRecorder
-    # @api private
-    module Function
-      def create_function(*args)
-        record(:create_function, args)
-      end
-
-      def drop_function(*args)
-        record(:drop_function, args)
-      end
-
-      def update_function(*args)
-        record(:update_function, args)
-      end
-
-      def invert_create_function(args)
-        [:drop_function, args]
-      end
-
-      def invert_drop_function(args)
-        perform_inversion(:create_function, args)
-      end
-
-      def invert_update_function(args)
-        perform_inversion(:update_function, args)
-      end
-    end
-  end
-end

data/lib/fx/command_recorder/trigger.rb

@@ -1,30 +0,0 @@
-module Fx
-  module CommandRecorder
-    # @api private
-    module Trigger
-      def create_trigger(*args)
-        record(:create_trigger, args)
-      end
-
-      def drop_trigger(*args)
-        record(:drop_trigger, args)
-      end
-
-      def update_trigger(*args)
-        record(:update_trigger, args)
-      end
-
-      def invert_create_trigger(args)
-        [:drop_trigger, args]
-      end
-
-      def invert_drop_trigger(args)
-        perform_inversion(:create_trigger, args)
-      end
-
-      def invert_update_trigger(args)
-        perform_inversion(:update_trigger, args)
-      end
-    end
-  end
-end

data/lib/fx/schema_dumper/function.rb

@@ -1,38 +0,0 @@
-require "rails"
-
-module Fx
-  module SchemaDumper
-    # @api private
-    module Function
-      def tables(stream)
-        if Fx.configuration.dump_functions_at_beginning_of_schema
-          functions(stream)
-          empty_line(stream)
-        end
-
-        super
-
-        unless Fx.configuration.dump_functions_at_beginning_of_schema
-          functions(stream)
-          empty_line(stream)
-        end
-      end
-
-      def empty_line(stream)
-        stream.puts if dumpable_functions_in_database.any?
-      end
-
-      def functions(stream)
-        dumpable_functions_in_database.each do |function|
-          stream.puts(function.to_schema)
-        end
-      end
-
-      private
-
-      def dumpable_functions_in_database
-        @_dumpable_functions_in_database ||= Fx.database.functions
-      end
-    end
-  end
-end

data/lib/fx/schema_dumper/trigger.rb

@@ -1,29 +0,0 @@
-require "rails"
-
-module Fx
-  module SchemaDumper
-    # @api private
-    module Trigger
-      def tables(stream)
-        super
-        triggers(stream)
-      end
-
-      def triggers(stream)
-        if dumpable_triggers_in_database.any?
-          stream.puts
-        end
-
-        dumpable_triggers_in_database.each do |trigger|
-          stream.puts(trigger.to_schema)
-        end
-      end
-
-      private
-
-      def dumpable_triggers_in_database
-        @_dumpable_triggers_in_database ||= Fx.database.triggers
-      end
-    end
-  end
-end