fx 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c933b484808a6a2a99f4a0faf84a20ea685f17bf
-  data.tar.gz: 6f38a705c1017b72f0930310f7a2dd9d3e273813
+SHA256:
+  metadata.gz: 4b2ed07756db1d26e35994559994635b2e5bc1e807eda6eb4b132442a3b561ea
+  data.tar.gz: c5d60d5200347b5fc5cdf5b18d232b0662b2f92926cfb816f4bb4a36206c9bb3
 SHA512:
-  metadata.gz: '018b13261d9eabe7f6e79e36bcf4cf765956d409789d6d1c37255976c883a8f9fb4f4a2c5be960ebb283d5d436f9ea0e651309e635f531c0b74b9e88041cb6cd'
-  data.tar.gz: 12a8a67b11f91f717c75d4fe7a6a98b400501bf5f3914dc8088ecc8abf07ab2a08f45c012eba6578cd9f97cf32cf106a0add7db2fdfcc8d816e705cfcd445187
+  metadata.gz: ac363c781155605fc98eac9649d5e49fc3e5a0412ef50f4195e8fa37dcf7bf58d9ac89625e7dd8e482e4ebafc0fbcdc447f7a3d5c97cb2813c6d1a60727e2f1a
+  data.tar.gz: db5c222c9de3b758dbdd21f725cd5740b8ecfe1571ee761de7385cb4e73ec77f8f02284c95b2b115dbf62906d2fa2d6613c6f39535cdef3e62cf1d3419c36765

data/README.md

@@ -21,18 +21,29 @@ F(x) ships with support for PostgreSQL. The adapter is configurable (see
 
 ## Great, how do I create a trigger and a function?
 
-You've got this great idea for a trigger you'd like to call
+You've got this great idea for a function you'd like to call
 `uppercase_users_name`. You can create the migration and the corresponding
 definition file with the following command:
 
 ```sh
-% rails generate fx:trigger uppercase_users_name
+% rails generate fx:function uppercase_users_name
+      create  db/functions/uppercase_users_name_v01.sql
+      create  db/migrate/[TIMESTAMP]_create_function_uppercase_users_name.rb
+```
+
+Edit the `db/functions/uppercase_users_name_v01.sql` file with the SQL statement
+that defines your function.
+
+Next, let's add a trigger called `uppercase_users_name` to call our new
+function each time we `INSERT` on the `users` table.
+
+```sh
+% rails generate fx:trigger uppercase_users_name table_name:users
       create  db/triggers/uppercase_users_name_v01.sql
       create  db/migrate/[TIMESTAMP]_create_trigger_uppercase_users_name.rb
 ```
 
-Edit the `db/triggers/uppercase_users_name_v01.sql` file with the SQL statement
-that defines your trigger. In our example, this might look something like this:
+In our example, this might look something like this:
 
 ```sql
 CREATE TRIGGER uppercase_users_name
@@ -41,15 +52,6 @@ CREATE TRIGGER uppercase_users_name
     EXECUTE PROCEDURE uppercase_users_name();
 ```
 
-As you see, we execute a function called `uppercase_users_name` before each
-`INSERT` on the `users` table, which is a function we don't have yet.
-
-```sh
-% rails generate fx:function uppercase_users_name
-      create  db/functions/uppercase_users_name_v01.sql
-      create  db/migrate/[TIMESTAMP]_create_function_uppercase_users_name.rb
-```
-
 The generated migrations contains `create_function` and `create_trigger`
 statements. The migration is reversible and the schema will be dumped into your
 `schema.rb` file.

data/gemfiles/rails40.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "activerecord", "~> 4.0.0"
 gem "railties", "~> 4.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails40.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    fx (0.3.0)
+    fx (0.4.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
 
@@ -108,4 +108,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.14.2
+   1.17.3

data/gemfiles/rails41.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "activerecord", "~> 4.1.0"
 gem "railties", "~> 4.1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails41.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    fx (0.3.0)
+    fx (0.4.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
 
@@ -110,4 +110,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.14.2
+   1.17.3

data/gemfiles/rails42.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "activerecord", "~> 4.2.0"
 gem "railties", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails42.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    fx (0.3.0)
+    fx (0.4.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
 
@@ -127,4 +127,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.14.2
+   1.17.3

data/gemfiles/rails50.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "activerecord", "~> 5.0"
 gem "railties", "~> 5.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails50.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    fx (0.3.0)
+    fx (0.4.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
 
@@ -123,4 +123,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.14.2
+   1.17.3

data/gemfiles/rails_edge.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", :github => "rails/rails"
-gem "arel", :github => "rails/arel"
+gem "rails", github: "rails/rails"
+gem "arel", github: "rails/arel"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_edge.gemfile.lock

@@ -67,7 +67,7 @@ GIT
 PATH
   remote: ..
   specs:
-    fx (0.3.0)
+    fx (0.4.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
 
@@ -176,4 +176,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.14.2
+   1.17.3

data/lib/fx/definition.rb

@@ -8,7 +8,7 @@ module Fx
     end
 
     def to_sql
-      File.read(full_path).tap do |content|
+      File.read(find_file || full_path).tap do |content|
         if content.empty?
           raise "Define #{@type} in #{path} before migrating."
         end
@@ -20,7 +20,7 @@ module Fx
     end
 
     def path
-      File.join("db", @type.pluralize, filename)
+      @_path ||= File.join("db", @type.pluralize, filename)
     end
 
     def version
@@ -30,7 +30,17 @@ module Fx
     private
 
     def filename
-      "#{@name}_v#{version}.sql"
+      @_filename ||= "#{@name}_v#{version}.sql"
+    end
+
+    def find_file
+      migration_paths.lazy
+        .map { |migration_path| File.expand_path(File.join("..", "..", path), migration_path) }
+        .find { |definition_path| File.exist?(definition_path) }
+    end
+
+    def migration_paths
+      Rails.application.config.paths["db/migrate"].expanded
     end
   end
 end

data/lib/fx/version.rb

@@ -1,4 +1,4 @@
 module Fx
   # @api private
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/fx/adapters/postgres/triggers_spec.rb

@@ -34,9 +34,10 @@ module Fx
           first = triggers.first
           expect(triggers.size).to eq 1
           expect(first.name).to eq "uppercase_users_name"
-          expect(first.definition).to eq <<-EOS.strip_heredoc.strip
-            CREATE TRIGGER uppercase_users_name BEFORE INSERT ON users FOR EACH ROW EXECUTE PROCEDURE uppercase_users_name()
-          EOS
+          expect(first.definition).to include("BEFORE INSERT")
+          expect(first.definition).to match(/ON [public\.users|users]/)
+          expect(first.definition).to include("FOR EACH ROW")
+          expect(first.definition).to include("EXECUTE PROCEDURE uppercase_users_name()")
         end
       end
     end

data/spec/fx/definition_spec.rb

@@ -28,6 +28,29 @@ describe Fx::Definition do
           %r(Define function in db/functions/test_v01.sql before migrating),
         )
       end
+
+      context "when definition is at Rails engine" do
+        it "returns the content of a function definition" do
+          sql_definition = <<-EOS
+            CREATE OR REPLACE FUNCTION test()
+            RETURNS text AS $$
+            BEGIN
+                RETURN 'test';
+            END;
+            $$ LANGUAGE plpgsql;
+          EOS
+          engine_path = Rails.root.join("tmp", "engine")
+          FileUtils.mkdir_p(engine_path.join("db", "functions"))
+          File.write(engine_path.join("db", "functions", "custom_test_v01.sql"), sql_definition)
+          Rails.application.config.paths["db/migrate"].push(engine_path.join("db", "migrate"))
+
+          definition = Fx::Definition.new(name: "custom_test", version: 1)
+
+          expect(definition.to_sql).to eq sql_definition
+
+          FileUtils.rm_rf(engine_path)
+        end
+      end
     end
 
     context "representing a trigger definition" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fx
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Teo Ljungberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -191,7 +191,6 @@ files:
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
@@ -301,8 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Support for database functions and triggers in Rails migrations

data/.ruby-version

@@ -1 +0,0 @@
-2.3