combustion 0.3.2 → 0.3.3

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/HISTORY

@@ -1,3 +1,12 @@
+0.3.3 - December 23rd 2012
+* Removing version file - version number can just live in the gemspec.
+* Load ActionController and ActionMailer via their Railties, not non-existent Engines (Chris Beer).
+* SQL Schema support (Geoff Hodgson).
+* Documentation fixes (Philip Arndt, Inge Jørgensen, Erkan Yilmaz).
+* Include migrations from the internal app when migrating the database (Warren Seen).
+* Correctly drop the test database when using SQLite (Warren Seen).
+* Don't attempt to load sprockets for Rails 3.0.x (Alex Rozumey).
+
 0.3.2 - March 3rd 2011
 * Tentative Rails 3.0 and migrations support.
 * Allow for different internal app directory.

data/README.textile

@@ -11,9 +11,9 @@ Get the gem into either your gemspec or your Gemfile, depending on how you manag
 <pre><code># gemspec
 gem.add_development_dependency 'combustion', '~> 0.3.1'
 # Gemfile
-gem 'combustion', '~> 0.3.1`, :group => :development</code></pre>
+gem 'combustion', '~> 0.3.1', :group => :development</code></pre>
 
-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/rspec@. Here's an example within context:
+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:
 
 <pre><code>require 'rubygems'
 require 'bundler'
@@ -39,6 +39,8 @@ bundle exec combust</code></pre>
 
 What Combustion is doing is setting up a Rails application at @spec/internal@ - but you only need to add the files within that directory that you're going to use. Read on for some detail about what that involves.
 
+If you want to use Cucumber, I recommend starting with "these notes":https://github.com/pat/combustion/issues/16 from Niklas Cathor.
+
 h3. Configuring a different test app directory
 
 If you want your app to be located somewhere other than @spec/internal@, then make sure you configure it before you call @Combustion.initialize!@:
@@ -57,7 +59,7 @@ ActiveSupport is always loaded, as it's an integral part of Rails.
 
 h3. Using Models and ActiveRecord
 
-If you're using ActiveRecord, then there's two critical files within your internal Rails app at @spec/internal@ that you'll need to modify:
+If you're using ActiveRecord, then there are two critical files within your internal Rails app at @spec/internal@ that you'll need to modify:
 
 * config/database.yml
 * db/schema.rb
@@ -72,6 +74,13 @@ Both follow the same structure as in any normal Rails application - and the sche
   end
 end</code></pre>
 
+h3. Configuring Combustion to initialise the test db from a .sql file instead of schema.rb
+
+Name the file structure.sql and configure Combustion to use it before initialising:
+
+<pre><code>Combustion.schema_format = :sql
+Combustion.initialize!</code></pre>
+
 Any models that aren't provided by your engine should be located at @spec/internal/app/models@.
 
 h3. Using ActionController and ActionView
@@ -96,7 +105,7 @@ Once you've got this set up, you can fire up your test environment quite easily
 
 h3. Get your test on!
 
-Now you're good to go - you can write specs within your engine's spec directory just like you were testing a full Rails application - models in @spec/models@, controllers in @spec/controllers@. If you bring Capybara into the mix, then the standard helpers helpers from that will be loaded as well.
+Now you're good to go - you can write specs within your engine's spec directory just like you were testing a full Rails application - models in @spec/models@, controllers in @spec/controllers@. If you bring Capybara into the mix, then the standard helpers from that will be loaded as well.
 
 <pre><code>require 'spec_helper'
 
@@ -129,4 +138,4 @@ There are no tests - partly because Combustion was extracted out from the tests
 
 h2. Credits
 
-Copyright (c) 2011, Combustion is developed and maintained by Pat Allan, and is released under the open MIT Licence. Many thanks to HyperTiny for encouraging its development, and "all who have contributed patches":https://github.com/freelancing-god/combustion/contributors.
+Copyright (c) 2011, Combustion is developed and maintained by Pat Allan, and is released under the open MIT Licence. Many thanks to HyperTiny for encouraging its development, and "all who have contributed patches":https://github.com/pat/combustion/contributors.

data/combustion.gemspec

@@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require 'combustion/version'
-
 Gem::Specification.new do |s|
   s.name        = 'combustion'
-  s.version     = Combustion::VERSION
+  s.version     = '0.3.3'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = ''

data/lib/combustion.rb

@@ -1,9 +1,18 @@
 require 'rails'
 require 'active_support/dependencies'
 
-module Combustion
-  Modules = %w( active_record action_controller action_view action_mailer
-    sprockets )
+module Combustion  
+  mattr_accessor :path, :schema_format
+  
+  self.path          = '/spec/internal'
+  self.schema_format = :ruby
+
+  if Rails.version > '3.1'
+    Modules = %w( active_record action_controller action_view action_mailer
+      sprockets )
+  else
+    Modules = %w( active_record action_controller action_view action_mailer )
+  end
 
   def self.initialize!(*modules)
     modules = Modules if modules.empty? || modules == [:all]
@@ -26,14 +35,6 @@ module Combustion
     end if defined?(RSpec) && RSpec.respond_to?(:configure)
   end
 
-  def self.path
-    @path ||= 'spec/internal'
-  end
-
-  def self.path=(path)
-    @path = path
-  end
-
   def self.include_capybara_into(config)
     return unless defined?(Capybara)
 
@@ -48,4 +49,3 @@ end
 
 require 'combustion/application'
 require 'combustion/database'
-require 'combustion/version'

data/lib/combustion/application.rb

@@ -16,13 +16,13 @@ class Combustion::Application < Rails::Application
   def self.configure_for_combustion
     config.root = File.expand_path File.join(Dir.pwd, Combustion.path)
 
-    if defined?(ActionController) && defined?(ActionController::Engine)
+    if defined?(ActionController) && defined?(ActionController::Railtie)
       config.action_dispatch.show_exceptions            = false
       config.action_controller.perform_caching          = false
       config.action_controller.allow_forgery_protection = false
     end
 
-    if defined?(ActionMailer) && defined?(ActionMailer::Engine)
+    if defined?(ActionMailer) && defined?(ActionMailer::Railtie)
       config.action_mailer.delivery_method     = :test
       config.action_mailer.default_url_options = {:host => 'www.example.com'}
     end

data/lib/combustion/database.rb

@@ -20,8 +20,8 @@ class Combustion::Database
       drop_database(abcs['test'])
       create_database(abcs['test'])
     when /sqlite/
-      dbfile = abcs['test']['database'] || abcs['test']['dbfile']
-      File.delete(dbfile) if File.exist?(dbfile)
+      drop_database(abcs['test'])
+      create_database(abcs['test'])
     when 'sqlserver'
       test = abcs.deep_dup['test']
       test_database = test['database']
@@ -42,17 +42,27 @@ class Combustion::Database
   end
 
   def self.load_schema
-    load "#{Rails.root}/db/schema.rb"
+    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
-    paths    = 'db/migrate/'
+    paths    = Array('db/migrate/')
 
     if migrator.respond_to?(:migrations_paths)
-      paths    = migrator.migrations_paths
+      paths = migrator.migrations_paths
     end
-
+    # Append the migrations inside the internal app's db/migrate directory
+    paths << File.join(Rails.root, 'db/migrate')
     migrator.migrate paths, nil
   end
 

metadata

@@ -1,64 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: combustion
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.3.3
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
 platform: ruby
-authors: 
+authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-12-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
-  version_requirements: *id001
-  prerelease: false
-  name: rails
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 14
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.14.6
-  version_requirements: *id002
+  type: :runtime
   prerelease: false
-  name: thor
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.6
 description: Test your Rails Engines without needing a full Rails app
-email: 
+email:
 - pat@freelancing-gods.com
-executables: 
+executables:
 - combust
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - HISTORY
@@ -71,43 +63,33 @@ files:
 - lib/combustion/application.rb
 - lib/combustion/database.rb
 - lib/combustion/generator.rb
-- lib/combustion/version.rb
 - templates/config.ru
 - templates/database.yml
 - templates/routes.rb
 - templates/schema.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: combustion
-rubygems_version: 1.8.16
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Elegant Rails Engine Testing
 test_files: []
-
+has_rdoc: 

data/lib/combustion/version.rb

@@ -1,3 +0,0 @@
-module Combustion
-  VERSION = '0.3.2'
-end