Merge branch 'master' into ruby-head

Author: teoljungberg

lib/fx.rb

@@ -28,7 +28,7 @@ def self.load
 
   # @return [Fx::Configuration] F(x)'s current configuration
   def self.configuration
-    @_configuration ||= Configuration.new
+    @_configuration ||= Fx::Configuration.new
   end
 
   # Set F(x)'s configuration

lib/fx/adapters/postgres.rb

@@ -47,7 +47,7 @@ def initialize(connectable = ActiveRecord::Base)
       #
       # @return [Array<Fx::Function>]
       def functions
-        Functions.all(connection)
+        Fx::Adapters::Postgres::Functions.all(connection)
       end
 
       # Returns an array of triggers in the database.
@@ -57,7 +57,7 @@ def functions
       #
       # @return [Array<Fx::Trigger>]
       def triggers
-        Triggers.all(connection)
+        Fx::Adapters::Postgres::Triggers.all(connection)
       end
 
       # Creates a function in the database.
@@ -152,7 +152,7 @@ def drop_trigger(name, on:)
       delegate :execute, to: :connection
 
       def connection
-        Connection.new(connectable.connection)
+        Fx::Adapters::Postgres::Connection.new(connectable.connection)
       end
     end
   end

lib/fx/adapters/postgres/functions.rb

@@ -30,7 +30,7 @@ class Functions
         #
         # @return [Array<Fx::Function>]
         def self.all(connection)
-          QueryExecutor.call(
+          Fx::Adapters::Postgres::QueryExecutor.call(
             connection: connection,
             query: FUNCTIONS_WITH_DEFINITIONS_QUERY,
             model_class: Fx::Function

lib/fx/adapters/postgres/triggers.rb

@@ -30,7 +30,7 @@ class Triggers
         #
         # @return [Array<Fx::Trigger>]
         def self.all(connection)
-          QueryExecutor.call(
+          Fx::Adapters::Postgres::QueryExecutor.call(
             connection: connection,
             query: TRIGGERS_WITH_DEFINITIONS_QUERY,
             model_class: Fx::Trigger

lib/fx/command_recorder.rb

@@ -68,7 +68,7 @@ def initialize(args)
       end
 
       def function
-        @args[0]
+        args[0]
       end
 
       def version
@@ -84,13 +84,15 @@ def invert_version
       end
 
       def to_a
-        @args.to_a
+        args.to_a
       end
 
       private
 
+      attr_reader :args
+
       def options
-        @options ||= @args[1] || {}
+        @options ||= args[1] || {}
       end
 
       def options_for_revert

lib/fx/definition.rb

@@ -14,13 +14,13 @@ def self.trigger(name:, version:)
 
     def initialize(name:, version:, type:)
       @name = name
-      @version = version.to_i
+      @version_number = version.to_i
       @type = type
     end
 
     def to_sql
       content = File.read(find_file || full_path)
-      raise "Define #{@type} in #{path} before migrating." if content.empty?
+      raise "Define #{type} in #{path} before migrating." if content.empty?
 
       content
     end
@@ -30,17 +30,19 @@ def full_path
     end
 
     def path
-      @_path ||= File.join("db", @type.pluralize, filename)
+      @_path ||= File.join("db", type.pluralize, filename)
     end
 
     def version
-      @version.to_s.rjust(2, "0")
+      version_number.to_s.rjust(2, "0")
     end
 
     private
 
+    attr_reader :name, :version_number, :type
+
     def filename
-      @_filename ||= "#{@name}_v#{version}.sql"
+      @_filename ||= "#{name}_v#{version}.sql"
     end
 
     def find_file

lib/generators/fx/function/function_generator.rb

@@ -72,7 +72,7 @@ def migration_class_name
         end
 
         def formatted_name
-          NameHelper.format_for_migration(singular_name)
+          Fx::Generators::NameHelper.format_for_migration(singular_name)
         end
       end
 

lib/generators/fx/trigger/trigger_generator.rb

@@ -66,11 +66,11 @@ def migration_class_name
         end
 
         def formatted_name
-          NameHelper.format_for_migration(singular_name)
+          Fx::Generators::NameHelper.format_for_migration(singular_name)
         end
 
         def formatted_table_name
-          NameHelper.format_table_name_from_hash(table_name)
+          Fx::Generators::NameHelper.format_table_name_from_hash(table_name)
         end
       end