combustion 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adee1390f356a9707415fc7b73ee772c98013820
-  data.tar.gz: 82d9808d3817693cac00fad905c14358b9f3b30b
+  metadata.gz: 3267619b0496c3956bfa0bd994939298763e4aed
+  data.tar.gz: ef5c03a4638db69326a76bd2aa949a20f321ab84
 SHA512:
-  metadata.gz: 326878f655959ee100820d57b3fd7ba9628b02b685f025875120ae9e209ceeeabdfbd5b19e0b9dd4f95508410b784c0a15648d63beab3bf973de969bac32f402
-  data.tar.gz: 17984826025904c80d93ea41323a8b966917aaa7ce3c23ad2496714c730623c702c42b2ebb6ee990b9fafc47650fd9f32ec18c5856b3e25fed4a4a3910e3dbe6
+  metadata.gz: 14fa5db249addbd51fee818b3bc8954ba455313e93388e8e9b044a931d9d9c1276605dfb50b59fe4f603e3a180a8b6533fdbface66ff247d94a64d886ca63cb3
+  data.tar.gz: 43b4c7cc7b9e35c5a2e1d8d772c5924b54e732580ab6b7cba5cddc1771d0124ce6f668bf9cca68f744c7d6b30f8d7edcbf512239d6e3698d0079163b73e719dc

data/README.md

@@ -10,25 +10,27 @@ Get the gem into either your gemspec or your Gemfile, depending on how you manag
 
 ```ruby
 # gemspec
-gem.add_development_dependency 'combustion', '~> 0.5.4'
+gem.add_development_dependency 'combustion', '~> 0.5.5'
 
 # Gemfile
-gem 'combustion', '~> 0.5.4', :group => :test
+gem 'combustion', '~> 0.5.5', :group => :test
 ```
 
 In your `spec_helper.rb`, get Combustion to set itself up - which has to happen before you introduce `rspec/rails` and - if being used - `capybara/rails`. Here's an example within context:
 
 ```ruby
-require 'rubygems'
-require 'bundler/setup'
+require 'bundler'
 
-require 'combustion'
-require 'capybara/rspec'
+Bundler.require :default, :development
 
+# If you're using all parts of Rails:
 Combustion.initialize! :all
+# Or, load just what you need:
+# Combustion.initialize! :active_record, :action_controller
 
 require 'rspec/rails'
-require 'capybara/rails'
+# If you're using Capybara:
+# require 'capybara/rails'
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true

data/combustion.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'combustion'
-  s.version     = '0.5.4'
+  s.version     = '0.5.5'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'https://github.com/pat/combustion'

data/lib/combustion/database.rb

@@ -1,186 +1,25 @@
 module Combustion
-  class Database
-    def self.setup
-      reset_database
-      load_schema
-      migrate
-    end
-
-    def self.reset_database
-      ActiveRecord::Base.configurations = YAML.load(ERB.new(File.read("#{Rails.root}/config/database.yml")).result)
-      abcs = ActiveRecord::Base.configurations
-      case abcs['test']['adapter']
-      when /mysql/
-        drop_database(abcs['test']['database'])
-        create_database(abcs['test'])
-        ActiveRecord::Base.establish_connection(:test)
-      when /postgresql/
-        ActiveRecord::Base.clear_active_connections!
-        drop_database(abcs['test'])
-        create_database(abcs['test'])
-      when /sqlite/
-        drop_database(abcs['test'])
-        create_database(abcs['test'])
-      when 'sqlserver'
-        test = abcs.deep_dup['test']
-        test_database = test['database']
-        test['database'] = 'master'
-        ActiveRecord::Base.establish_connection(test)
-        ActiveRecord::Base.connection.recreate_database!(test_database)
-      when "oci", "oracle"
-        ActiveRecord::Base.establish_connection(:test)
-        ActiveRecord::Base.connection.structure_drop.split(";\n\n").each do |ddl|
-          ActiveRecord::Base.connection.execute(ddl)
-        end
-      when 'firebird'
-        ActiveRecord::Base.establish_connection(:test)
-        ActiveRecord::Base.connection.recreate_database!
-      else
-        raise "Cannot reset databases for '#{abcs['test']['adapter']}'"
-      end
-    end
-
-    def self.load_schema
-      case Combustion.schema_format
-      when :ruby
-        load Rails.root.join('db', 'schema.rb')
-      when :sql
-        ActiveRecord::Base.connection.execute(
-          File.read(Rails.root.join('db', 'structure.sql'))
-        )
-      else
-        raise "Unknown schema format: #{Combustion.schema_format}"
-      end
-    end
-
-    def self.migrate
-      migrator = ActiveRecord::Migrator
-      engine_path = Rails.application.root.sub(::Combustion.path, '')
-      engine_migration_paths = Rails.application.paths['db/migrate'].to_a
-
-      if engine_migration_paths.include?(engine_path.join('db/migrate').to_s)
-        paths = []
-      else
-        paths = base_migration_paths
-      end
-
-      paths += engine_migration_paths
-      paths.uniq!
-
-      # Append the migrations inside the internal app's db/migrate directory
-      paths << File.join(Rails.root, 'db/migrate')
-
-      if ActiveRecord::VERSION::STRING >= '3.1.0'
-        migrator.migrate paths, nil
-      else
-        paths.each { |path| migrator.migrate path, nil }
-      end
-    end
-
-    private
-
-    def self.base_migration_paths
-      if ActiveRecord::Migrator.respond_to?(:migrations_paths)
-        ActiveRecord::Migrator.migrations_paths
-      else
-        Array('db/migrate/')
-      end
-    end
-
-    def self.create_database(config)
-      begin
-        if config['adapter'] =~ /sqlite/
-          if File.exist?(config['database'])
-            $stderr.puts "#{config['database']} already exists"
-          else
-            begin
-              # Create the SQLite database
-              ActiveRecord::Base.establish_connection(config)
-              ActiveRecord::Base.connection
-            rescue Exception => e
-              $stderr.puts e, *(e.backtrace)
-              $stderr.puts "Couldn't create database for #{config.inspect}"
-            end
-          end
-          return # Skip the else clause of begin/rescue
-        else
-          ActiveRecord::Base.establish_connection(config)
-          ActiveRecord::Base.connection
-        end
-      rescue
-        case config['adapter']
-        when /^(jdbc)?mysql/
-          if config['adapter'] =~ /jdbc/
-            #FIXME After Jdbcmysql gives this class
-            require 'active_record/railties/jdbcmysql_error'
-            error_class = ArJdbcMySQL::Error
-          else
-            error_class = config['adapter'] =~ /mysql2/ && defined?(Mysql2) ? Mysql2::Error : Mysql::Error
-          end
-          access_denied_error = 1045
-          begin
-            ActiveRecord::Base.establish_connection(config.merge('database' => nil))
-            ActiveRecord::Base.connection.create_database(config['database'], mysql_creation_options(config))
-            ActiveRecord::Base.establish_connection(config)
-          rescue error_class => sqlerr
-            if sqlerr.errno == access_denied_error
-              print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
-              root_password = $stdin.gets.strip
-              grant_statement = "GRANT ALL PRIVILEGES ON #{config['database']}.* " \
-                "TO '#{config['username']}'@'localhost' " \
-                "IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;"
-              ActiveRecord::Base.establish_connection(config.merge(
-                  'database' => nil, 'username' => 'root', 'password' => root_password))
-              ActiveRecord::Base.connection.create_database(config['database'], mysql_creation_options(config))
-              ActiveRecord::Base.connection.execute grant_statement
-              ActiveRecord::Base.establish_connection(config)
-            else
-              $stderr.puts sqlerr.error
-              $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['charset'] || @charset}, collation: #{config['collation'] || @collation}"
-              $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
-            end
-          end
-        when /^(jdbc)?postgresql$/
-          @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8'
-          begin
-            ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-            ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
-            ActiveRecord::Base.establish_connection(config)
-          rescue Exception => e
-            $stderr.puts e, *(e.backtrace)
-            $stderr.puts "Couldn't create database for #{config.inspect}"
-          end
-        end
-      else
-        $stderr.puts "#{config['database']} already exists"
-      end
-    end
-
-    def self.drop_database(config)
-      case config['adapter']
-      when /^(jdbc)?mysql/
-        ActiveRecord::Base.establish_connection(config)
-        ActiveRecord::Base.connection.drop_database config['database']
-      when /^(jdbc)?sqlite/
-        require 'pathname'
-        path = Pathname.new(config['database'])
-        file = path.absolute? ? path.to_s : File.join(Rails.root, path)
-
-        FileUtils.rm_f(file) if File.exist?(file)
-      when /^(jdbc)?postgresql$/
-        ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-        ActiveRecord::Base.connection.drop_database config['database']
-      end
-    end
-
-    def self.mysql_creation_options(config)
-      @charset   = ENV['CHARSET']   || 'utf8'
-      @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
+  module Databases
+    #
+  end
 
-      {
-        :charset   => (config['charset']   || @charset),
-        :collation => (config['collation'] || @collation)
-      }
+  class Database
+    def self.setup(adapter = nil)
+      Combustion::Database::Reset.call adapter
+      Combustion::Database::LoadSchema.call
+      Combustion::Database::Migrate.call
     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'

data/lib/combustion/database/load_schema.rb

@@ -0,0 +1,26 @@
+class Combustion::Database::LoadSchema
+  UnknownSchemaFormat = Class.new StandardError
+
+  def self.call
+    new.call
+  end
+
+  def call
+    case schema_format
+    when :ruby
+      load Rails.root.join('db', 'schema.rb')
+    when :sql
+      ActiveRecord::Base.connection.execute(
+        File.read(Rails.root.join('db', 'structure.sql'))
+      )
+    else
+      raise UnknownSchemaFormat, "Unknown schema format: #{schema_format}"
+    end
+  end
+
+  private
+
+  def schema_format
+    Combustion.schema_format
+  end
+end

data/lib/combustion/database/migrate.rb

@@ -0,0 +1,40 @@
+class Combustion::Database::Migrate
+  def self.call
+    new.call
+  end
+
+  def call
+    if ActiveRecord::VERSION::STRING >= '3.1.0'
+      migrator.migrate paths, nil
+    else
+      paths.each { |path| migrator.migrate path, nil }
+    end
+  end
+
+  private
+
+  def base_migration_paths
+    if migrator.respond_to?(:migrations_paths)
+      migrator.migrations_paths
+    else
+      Array('db/migrate/')
+    end
+  end
+
+  def migrator
+    @migrator ||= ActiveRecord::Migrator
+  end
+
+  def paths
+    engine_path     = Rails.application.root.sub(::Combustion.path, '')
+    migration_paths = Rails.application.paths['db/migrate'].to_a
+
+    if migration_paths.include?(engine_path.join('db/migrate').to_s)
+      paths = []
+    else
+      paths = base_migration_paths
+    end
+
+    (paths + migration_paths + [File.join(Rails.root, 'db/migrate')]).uniq
+  end
+end

data/lib/combustion/database/reset.rb

@@ -0,0 +1,53 @@
+class Combustion::Database::Reset
+  UnsupportedDatabase = Class.new StandardError
+
+  def self.call(adapter = nil)
+    new(adapter).call
+  end
+
+  def initialize(adapter = nil)
+    @adapter = adapter
+
+    set_configurations
+  end
+
+  def call
+    operator.reset
+  end
+
+  private
+
+  def configuration
+    @configuration ||= ActiveRecord::Base.configurations['test']
+  end
+
+  def operator
+    operator_class.new configuration
+  end
+
+  def operator_class
+    @operator ||= case configuration['adapter']
+    when /mysql/
+      Combustion::Databases::MySQL
+    when /postgresql/, /postgis/
+      Combustion::Databases::PostgreSQL
+    when /sqlite/
+      Combustion::Databases::SQLite
+    when /sqlserver/
+      Combustion::Databases::SQLServer
+    when 'oci', 'oracle'
+      Combustion::Databases::Oracle
+    when 'firebird'
+      Combustion::Databases::Firebird
+    else
+      raise UnsupportedDatabase,
+        "Unsupported database type: #{configuration['adapter']}"
+    end
+  end
+
+  def set_configurations
+    ActiveRecord::Base.configurations = YAML.load(
+      ERB.new(File.read("#{Rails.root}/config/database.yml")).result
+    )
+  end
+end

data/lib/combustion/databases/base.rb

@@ -0,0 +1,22 @@
+require 'active_support/core_ext/module/delegation'
+
+class Combustion::Databases::Base
+  def initialize(configuration)
+    @configuration = configuration
+  end
+
+  def reset
+    drop
+    create
+  end
+
+  private
+
+  attr_reader :configuration
+
+  delegate :establish_connection, :connection, :to => :base
+
+  def base
+    ActiveRecord::Base
+  end
+end

data/lib/combustion/databases/firebird.rb

@@ -0,0 +1,6 @@
+class Combustion::Databases::Firebird < Combustion::Databases::Base
+  def reset
+    establish_connection :test
+    connection.recreate_database!
+  end
+end

data/lib/combustion/databases/mysql.rb

@@ -0,0 +1,71 @@
+class Combustion::Databases::MySQL < Combustion::Databases::Base
+  ACCESS_DENIED_ERROR = 10145
+
+  def reset
+    super
+
+    establish_connection :test
+  end
+
+  private
+
+  def charset
+    configuration['charset'] || ENV['CHARSET'] || 'utf8'
+  end
+
+  def collation
+    configuration['collation'] || ENV['COLLATION'] || 'utf8_unicode_ci'
+  end
+
+  def create
+    establish_connection configuration.merge('database' => nil)
+    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
+  end
+
+  def create_as_root
+    print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
+    root_password = $stdin.gets.strip
+    establish_connection configuration.merge(
+      'database' => nil, 'username' => 'root', 'password' => root_password
+    )
+    connection.create_database config['database'], creation_options
+    connection.execute grant_statement
+    establish_connection configuration
+  end
+
+  def creation_options
+    {:charset => charset, :collation => collation}
+  end
+
+  def drop
+    establish_connection configuration
+    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
+    else
+      error_class = config['adapter'] =~ /mysql2/ && defined?(Mysql2) ? Mysql2::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;
+    SQL
+  end
+end

data/lib/combustion/databases/oracle.rb

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

data/lib/combustion/databases/postgresql.rb

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

data/lib/combustion/databases/sql_server.rb

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

data/lib/combustion/databases/sqlite.rb

@@ -0,0 +1,35 @@
+require 'fileutils'
+require 'pathname'
+
+class Combustion::Databases::SQLite < Combustion::Databases::Base
+  private
+
+  def create
+    if exists?
+      $stderr.puts "#{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}"
+  end
+
+  def drop
+    FileUtils.rm_f file if exists?
+  end
+
+  def exists?
+    File.exist? file
+  end
+
+  def file
+    @file ||= path.absolute? ? path.to_s : File.join(Rails.root, path)
+  end
+
+  def path
+    @path ||= Pathname.new configuration['database']
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -113,6 +113,16 @@ files:
 - lib/combustion.rb
 - lib/combustion/application.rb
 - lib/combustion/database.rb
+- lib/combustion/database/load_schema.rb
+- lib/combustion/database/migrate.rb
+- lib/combustion/database/reset.rb
+- lib/combustion/databases/base.rb
+- lib/combustion/databases/firebird.rb
+- lib/combustion/databases/mysql.rb
+- lib/combustion/databases/oracle.rb
+- lib/combustion/databases/postgresql.rb
+- lib/combustion/databases/sql_server.rb
+- lib/combustion/databases/sqlite.rb
 - lib/combustion/generator.rb
 - spec/database_spec.rb
 - spec/dummy/db/migrate/20150717075542_create_dummy_test_table.rb