combustion 0.7.0 → 0.9.1

data/lib/combustion/database.rb

@@ -1,25 +1,34 @@
+# frozen_string_literal: true
+
 module Combustion
   module Databases
-    #
   end
 
   class Database
+    DEFAULT_OPTIONS = {
+      :database_reset   => true,
+      :load_schema      => true,
+      :database_migrate => true
+    }.freeze
+
     def self.setup(options = {})
-      Combustion::Database::Reset.call if options.fetch(:database_reset, true)
-      Combustion::Database::LoadSchema.call if options.fetch(:load_schema, true)
-      Combustion::Database::Migrate.call if options.fetch(:database_migrate, true)
+      options = DEFAULT_OPTIONS.merge options
+
+      Combustion::Database::Reset.call      if options[:database_reset]
+      Combustion::Database::LoadSchema.call if options[:load_schema]
+      Combustion::Database::Migrate.call    if options[:database_migrate]
     end
   end
 end
 
-require 'combustion/database/load_schema'
-require 'combustion/database/migrate'
-require 'combustion/database/reset'
+require "combustion/databases/base"
+require "combustion/databases/firebird"
+require "combustion/databases/mysql"
+require "combustion/databases/oracle"
+require "combustion/databases/postgresql"
+require "combustion/databases/sql_server"
+require "combustion/databases/sqlite"
 
-require 'combustion/databases/base'
-require 'combustion/databases/firebird'
-require 'combustion/databases/mysql'
-require 'combustion/databases/oracle'
-require 'combustion/databases/postgresql'
-require 'combustion/databases/sql_server'
-require 'combustion/databases/sqlite'
+require "combustion/database/load_schema"
+require "combustion/database/migrate"
+require "combustion/database/reset"

data/lib/combustion/databases/base.rb

@@ -1,4 +1,6 @@
-require 'active_support/core_ext/module/delegation'
+# frozen_string_literal: true
+
+require "active_support/core_ext/module/delegation"
 
 class Combustion::Databases::Base
   def initialize(configuration)
@@ -9,7 +11,7 @@ class Combustion::Databases::Base
     drop
     create
 
-    establish_connection(:test)
+    establish_connection Rails.env.to_sym
   end
 
   private

data/lib/combustion/databases/firebird.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class Combustion::Databases::Firebird < Combustion::Databases::Base
   def reset
-    establish_connection :test
+    establish_connection Rails.env.to_sym
     connection.recreate_database!
   end
 end

data/lib/combustion/databases/mysql.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class Combustion::Databases::MySQL < Combustion::Databases::Base
-  ACCESS_DENIED_ERROR = 10145
+  ACCESS_DENIED_ERROR = 10_145
 
   def reset
-    establish_connection(configuration.merge('database' => nil))
+    establish_connection(configuration.merge("database" => nil))
 
     super
   end
@@ -10,34 +12,36 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   private
 
   def charset
-    configuration['charset'] || ENV['CHARSET'] || 'utf8'
+    configuration["charset"] || ENV["CHARSET"] || "utf8"
+  end
+
+  def charset_error
+    return "" unless config["charset"]
+
+    "(if you set the charset manually, make sure you have a matching collation)"
   end
 
   def collation
-    configuration['collation'] || ENV['COLLATION'] || 'utf8_unicode_ci'
+    configuration["collation"] || ENV["COLLATION"] || "utf8_unicode_ci"
   end
 
   def create
-    connection.create_database configuration['database'], creation_options
+    connection.create_database configuration["database"], creation_options
     establish_connection configuration
   rescue error_class => error
-    if error.errno == ACCESS_DENIED_ERROR
-      create_as_root
-    else
-      $stderr.puts error.error
-      $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{charset}, collation: #{collation}"
-      $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
-    end
+    rescue_create_from error
   end
 
-  def create_as_root
-    print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
-    root_password = $stdin.gets.strip
+  def create_as_root(error)
     establish_connection configuration.merge(
-      'database' => nil, 'username' => 'root', 'password' => root_password
+      "database" => nil,
+      "username" => "root",
+      "password" => request_password(error)
     )
-    connection.create_database config['database'], creation_options
+
+    connection.create_database config["database"], creation_options
     connection.execute grant_statement
+
     establish_connection configuration
   end
 
@@ -46,24 +50,49 @@ class Combustion::Databases::MySQL < Combustion::Databases::Base
   end
 
   def drop
-    connection.drop_database configuration['database']
+    connection.drop_database configuration["database"]
   end
 
   def error_class
-    if configuration['adapter'] =~ /jdbc/
-      #FIXME After Jdbcmysql gives this class
-      require 'active_record/railties/jdbcmysql_error'
-      error_class = ArJdbcMySQL::Error
+    if configuration["adapter"][/jdbc/]
+      # FIXME: After Jdbcmysql gives this class
+      require "active_record/railties/jdbcmysql_error"
+      ArJdbcMySQL::Error
+    elsif config["adapter"][/mysql2/] && defined?(Mysql2)
+      Mysql2::Error
     else
-      error_class = config['adapter'] =~ /mysql2/ && defined?(Mysql2) ? Mysql2::Error : Mysql::Error
+      Mysql::Error
     end
   end
 
   def grant_statement
     <<-SQL
-GRANT ALL PRIVILEGES ON #{configuration['database']}.*
-TO '#{configuration['username']}'@'localhost'
-IDENTIFIED BY '#{configuration['password']}' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON #{configuration["database"]}.*
+TO '#{configuration["username"]}'@'localhost'
+IDENTIFIED BY '#{configuration["password"]}' WITH GRANT OPTION;
     SQL
   end
+
+  def request_password(error)
+    print <<-TXT.strip
+#{error.error}.
+Please provide the root password for your mysql installation
+>
+    TXT
+
+    $stdin.gets.strip
+  end
+
+  def rescue_create_from(error)
+    if error.errno == ACCESS_DENIED_ERROR
+      create_as_root(error)
+      return
+    end
+
+    warn <<-TXT
+#{error.error}
+Couldn't create database for #{config.inspect}, charset: #{charset}, collation: #{collation}
+#{charset_error}
+    TXT
+  end
 end

data/lib/combustion/databases/oracle.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class Combustion::Databases::Oracle < Combustion::Databases::Base
   def reset
-    establish_connection :test
+    establish_connection Rails.env.to_sym
     connection.structure_drop.split(";\n\n").each do |ddl|
       connection.execute(ddl)
     end

data/lib/combustion/databases/postgresql.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Combustion::Databases::PostgreSQL < Combustion::Databases::Base
   def reset
     base.clear_active_connections!
@@ -10,31 +12,30 @@ class Combustion::Databases::PostgreSQL < Combustion::Databases::Base
 
   def create
     connection.create_database(
-      configuration['database'],
-      configuration.merge('encoding' => encoding)
+      configuration["database"],
+      configuration.merge("encoding" => encoding)
     )
-
-  rescue Exception => error
-    $stderr.puts error, *(error.backtrace)
-    $stderr.puts "Couldn't create database for #{configuration.inspect}"
+  rescue StandardError => error
+    warn error, *error.backtrace
+    warn "Couldn't create database for #{configuration.inspect}"
   end
 
   def drop
-    connection.drop_database(configuration['database'])
+    connection.drop_database(configuration["database"])
   end
 
   def encoding
-    configuration['encoding'] || ENV['CHARSET'] || 'utf8'
+    configuration["encoding"] || ENV["CHARSET"] || "utf8"
   end
 
   def postgres_configuration
     configuration.merge(
-      'database'           => 'postgres',
-      'schema_search_path' => schema_search_path
+      "database"           => "postgres",
+      "schema_search_path" => schema_search_path
     )
   end
 
   def schema_search_path
-    configuration['adapter'][/postgis/] ? 'public, postgis' : 'public'
+    configuration["adapter"][/postgis/] ? "public, postgis" : "public"
   end
 end

data/lib/combustion/databases/sql_server.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class Combustion::Databases::SQLServer < Combustion::Databases::Base
   def reset
-    establish_connection configuration.merge('database' => 'master')
-    connection.recreate_database! configuration['database']
+    establish_connection configuration.merge("database" => "master")
+    connection.recreate_database! configuration["database"]
   end
 end

data/lib/combustion/databases/sqlite.rb

@@ -1,20 +1,22 @@
-require 'fileutils'
-require 'pathname'
+# frozen_string_literal: true
+
+require "fileutils"
+require "pathname"
 
 class Combustion::Databases::SQLite < Combustion::Databases::Base
   private
 
   def create
     if exists?
-      $stderr.puts "#{config['database']} already exists"
+      warn "#{config["database"]} already exists"
       return
     end
 
     establish_connection configuration
     connection
-  rescue Exception => error
-    $stderr.puts error, *(error.backtrace)
-    $stderr.puts "Couldn't create database for #{configuration.inspect}"
+  rescue StandardError => error
+    warn error, *error.backtrace
+    warn "Couldn't create database for #{configuration.inspect}"
   end
 
   def drop
@@ -30,6 +32,6 @@ class Combustion::Databases::SQLite < Combustion::Databases::Base
   end
 
   def path
-    @path ||= Pathname.new configuration['database']
+    @path ||= Pathname.new configuration["database"]
   end
 end

data/lib/combustion/generator.rb

@@ -1,29 +1,31 @@
-require 'thor/group'
+# frozen_string_literal: true
+
+require "thor/group"
 
 module Combustion
   class Generator < Thor::Group
     include Thor::Actions
 
     def self.source_root
-      File.expand_path File.join(File.dirname(__FILE__), '..', '..')
+      File.expand_path File.join(File.dirname(__FILE__), "..", "..")
     end
 
     def create_directories
-      empty_directory 'spec/internal'
-      empty_directory 'spec/internal/config'
-      empty_directory 'spec/internal/db'
-      empty_directory 'spec/internal/log'
-      empty_directory 'spec/internal/public'
+      empty_directory "spec/internal"
+      empty_directory "spec/internal/config"
+      empty_directory "spec/internal/db"
+      empty_directory "spec/internal/log"
+      empty_directory "spec/internal/public"
     end
 
     def create_files
-      template 'templates/routes.rb',    'spec/internal/config/routes.rb'
-      template 'templates/database.yml', 'spec/internal/config/database.yml'
-      template 'templates/schema.rb',    'spec/internal/db/schema.rb'
-      template 'templates/config.ru',    'config.ru'
-      create_file                        'spec/internal/public/favicon.ico'
-      create_file                        'spec/internal/log/.gitignore' do
-        '*.log'
+      template "templates/routes.rb",    "spec/internal/config/routes.rb"
+      template "templates/database.yml", "spec/internal/config/database.yml"
+      template "templates/schema.rb",    "spec/internal/db/schema.rb"
+      template "templates/config.ru",    "config.ru"
+      create_file                        "spec/internal/public/favicon.ico"
+      create_file                        "spec/internal/log/.gitignore" do
+        "*.log"
       end
     end
   end

data/lib/combustion.rb

@@ -1,38 +1,48 @@
-require 'rails'
-require 'active_support/dependencies'
+# frozen_string_literal: true
+
+require "rails"
+require "active_support/dependencies"
 
 module Combustion
-  mattr_accessor :path, :schema_format
-  mattr_reader :setup_environment
+  module Configurations
+  end
+
+  mattr_accessor :path, :schema_format, :setup_environment
 
-  self.path          = '/spec/internal'
+  self.path          = "/spec/internal"
   self.schema_format = :ruby
 
-  if Rails.version.to_s > '3.1'
-    Modules = %w( active_record action_controller action_view action_mailer
-      sprockets )
+  MODULES = if Rails.version.to_f >= 3.1
+    %w[ active_record action_controller action_view action_mailer sprockets ]
   else
-    Modules = %w( active_record action_controller action_view action_mailer )
+    %w[ active_record action_controller action_view action_mailer ]
   end
 
   def self.initialize!(*modules, &block)
-    @@setup_environment = block if block_given?
+    self.setup_environment = block if block_given?
 
     options = modules.extract_options!
-    modules = Modules if modules == [:all]
+    modules = MODULES if modules == [:all]
     modules.each { |mod| require "#{mod}/railtie" }
 
     Bundler.require :default, Rails.env
 
     Combustion::Application.configure_for_combustion
+    include_database modules, options
+    Combustion::Application.initialize!
+    include_rspec
+  end
 
-    if modules.map(&:to_s).include? 'active_record'
-      Combustion::Application.config.to_prepare do
-        Combustion::Database.setup(options)
-      end
+  def self.include_database(modules, options)
+    return unless modules.map(&:to_s).include? "active_record"
+
+    Combustion::Application.config.to_prepare do
+      Combustion::Database.setup(options)
     end
+  end
 
-    Combustion::Application.initialize!
+  def self.include_rspec
+    return unless defined?(RSpec) && RSpec.respond_to?(:configure)
 
     RSpec.configure do |config|
       include_capybara_into config
@@ -41,7 +51,7 @@ module Combustion
       if Combustion::Application.routes.respond_to?(:mounted_helpers)
         config.include Combustion::Application.routes.mounted_helpers
       end
-    end if defined?(RSpec) && RSpec.respond_to?(:configure)
+    end
   end
 
   def self.include_capybara_into(config)
@@ -49,12 +59,14 @@ module Combustion
 
     config.include Capybara::RSpecMatchers if defined?(Capybara::RSpecMatchers)
     config.include Capybara::DSL           if defined?(Capybara::DSL)
+    return if defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
 
-    unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
-      config.include Capybara
-    end
+    config.include Capybara
   end
 end
 
-require 'combustion/application'
-require 'combustion/database'
+require "combustion/application"
+require "combustion/configurations/action_controller"
+require "combustion/configurations/action_mailer"
+require "combustion/configurations/active_record"
+require "combustion/database"

data/spec/database_spec.rb

@@ -1,28 +1,32 @@
+# frozen_string_literal: true
+
 module Combustion
   describe Database do
     before(:all) do
-      Dir.chdir(File.expand_path('../dummy', __FILE__)) do
+      Dir.chdir(File.expand_path("dummy", __dir__)) do
         Combustion.initialize! :active_record
       end
     end
 
-    it 'creates dummy table from migration in base database' do
-      expect(Model.connection.table_exists?('dummy_table')).to eq true
-      expect(Model.connection.table_exists?('dummy_in_another_db')).to eq false
+    it "creates dummy table from migration in base database" do
+      expect(Model.connection.table_exists?("dummy_table")).to eq true
+      expect(Model.connection.table_exists?("dummy_in_another_db")).to eq false
     end
 
-    it 'creates another dummy table from another database' do
-      expect(ModelInAnotherDb.connection.table_exists?('dummy_table')).to eq false
-      expect(ModelInAnotherDb.connection.table_exists?('dummy_in_another_db')).to eq true
-
+    it "creates another dummy table from another database" do
+      expect(ModelInAnotherDb.connection.table_exists?("dummy_table")).
+        to eq false
+      expect(ModelInAnotherDb.connection.table_exists?("dummy_in_another_db")).
+        to eq true
     end
 
-    it 'returns test databse for model with default connection' do
-      expect(Model.connection_config[:database]).to match /test/
+    it "returns test database for model with default connection" do
+      expect(Model.connection_config[:database]).to match(/test/)
     end
 
-    it 'returns test_another databse for model with connection to second database' do
-      expect(ModelInAnotherDb.connection_config[:database]).to match /test_another/
+    it "returns test_another for model with connection to second database" do
+      expect(ModelInAnotherDb.connection_config[:database]).
+        to match(/test_another/)
     end
   end
 end

data/spec/dummy/db/migrate/20150717075542_create_dummy_test_table.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 superclass = ActiveRecord::VERSION::MAJOR < 5 ?
   ActiveRecord::Migration : ActiveRecord::Migration[4.2]
 class CreateDummyTestTable < superclass
   def change
-    create_table 'dummy_table'
+    create_table "dummy_table"
   end
 end

data/spec/dummy/db/migrate/20150717075543_create_dummy_test_table_in_another_db.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 superclass = ActiveRecord::VERSION::MAJOR < 5 ?
   ActiveRecord::Migration : ActiveRecord::Migration[4.2]
 class CreateDummyTestTableInAnotherDb < superclass
   def change
-    create_table 'dummy_in_another_db'
+    create_table "dummy_in_another_db"
   end
 
   def connection

data/spec/dummy/lib/engine.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Dummy
   class Engine < ::Rails::Engine
-    initializer :dummy,  before: :load_init_rb do |app|
+    initializer :dummy,  :before => :load_init_rb do |app|
       app.config.paths["db/migrate"].concat(config.paths["db/migrate"].expanded)
     end
   end

data/spec/dummy/spec/internal/app/models/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Model < ActiveRecord::Base
-  self.table_name = 'dummy_table'
+  self.table_name = "dummy_table"
 end

data/spec/dummy/spec/internal/app/models/model_in_another_db.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class ModelInAnotherDb < ActiveRecord::Base
-  self.table_name = 'dummy_in_another_db'
+  self.table_name = "dummy_in_another_db"
 
   establish_connection :test_another
 end

data/spec/dummy/spec/internal/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
-  #
+  # Add your own routes here, or remove this file if you don't have need for it.
 end

data/spec/dummy/spec/internal/db/schema.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
-  #
+  # Set up any tables you need to exist for your test suite that don't belong
+  # in migrations.
 end

data/spec/spec_helper.rb

@@ -1,14 +1,15 @@
-# coding: utf-8
-require 'bundler/setup'
-require 'combustion'
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "combustion"
 
 if Rails::VERSION::STRING.to_f < 4.1
-  require 'active_record'
-  require 'active_record/connection_adapters/mysql2_adapter'
+  require "active_record"
+  require "active_record/connection_adapters/mysql2_adapter"
 
   class ActiveRecord::ConnectionAdapters::Mysql2Adapter
     NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
   end
 end
 
-require File.expand_path("../dummy/lib/engine.rb", __FILE__)
+require File.expand_path("dummy/lib/engine.rb", __dir__)

data/templates/config.ru

@@ -1,5 +1,7 @@
-require 'rubygems'
-require 'bundler'
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
 
 Bundler.require :default, :development
 

data/templates/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
-  #
+  # Add your own routes here, or remove this file if you don't have need for it.
 end

data/templates/schema.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
-  #
+  # Set up any tables you need to exist for your test suite that don't belong
+  # in migrations.
 end