combustion 0.3.0 → 0.3.1

data/HISTORY

@@ -1,3 +1,9 @@
+0.3.1 - September 12th 2011
+* Allow for different versions of Capybara (Leo Liang).
+* Including Capybara::DSL instead of Capybara.
+* Require 3.1.0 or better.
+* Allow for JRuby in the database.yml template (Philip Arndt).
+
 0.3.0 - September 2nd 2011
 * Simple generator to create a pretty minimal internal Rails app.
 

data/README.textile

@@ -9,9 +9,9 @@ h2. Usage
 Get the gem into either your gemspec or your Gemfile, depending on how you manage your engine's dependencies:
 
 <pre><code># gemspec
-gem.add_development_dependency 'combustion', '~> 0.2.0'
+gem.add_development_dependency 'combustion', '~> 0.3.1'
 # Gemfile
-gem 'combustion', '~> 0.2.0`, :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:
 
@@ -20,15 +20,23 @@ require 'bundler'
 
 Bundler.require :default, :development
 
+require 'capybara/rspec'
+
 Combustion.initialize!
 
 require 'rspec/rails'
-require 'capybara/rspec'
+require 'capybara/rails'
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
 end</code></pre>
 
+You'll also want to run the generator that creates a minimal set of files expected by Rails - run this in the directory of your engine:
+
+<pre><code>combust
+# or, if bundling with the git repo:
+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.
 
 h3. Configuring which Rails modules should be loaded.
@@ -42,7 +50,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 create:
+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:
 
 * config/database.yml
 * db/schema.rb
@@ -63,7 +71,7 @@ h3. Using ActionController and ActionView
 
 You'll only need to add controllers and views to your internal Rails app for whatever you're testing that your engine doesn't provide - this may be nothing at all, so perhaps you don't even need @spec/internal/app/views@ or @spec/internal/app/controllers@ directories.
 
-However, if you're doing any testing of your engine's controllers or views, then you're going to need routes set up for them - so create a standard routes file at @spec/internal/config/routes.rb@:
+However, if you're doing any testing of your engine's controllers or views, then you're going to need routes set up for them - so modify @spec/internal/config/routes.rb@ accordingly:
 
 <pre><code>Rails.application.routes.draw do
   resources :pages
@@ -77,15 +85,7 @@ Your tests will execute within the test environment for the internal Rails app -
 
 h3. Rack it up
 
-Once you've got this set up, you can fire up your test environment quite easily with Rack - here's an example @config.ru@ file that could live in the root of your engine folder:
-
-<pre><code>require 'rubygems'
-require 'bundler'
-
-Bundler.require :default, :development
-
-Combustion.initialize!
-run Combustion::Application</code></pre>
+Once you've got this set up, you can fire up your test environment quite easily with Rack - a @config.ru@ file is provided by the generator. Just run @rackup@ and visit "http://localhost:9292":http://localhost:9292.
 
 h3. Get your test on!
 
@@ -109,8 +109,6 @@ h2. Limitations and Known Issues
 
 Combustion is currently written with the expectation it'll be used with RSpec. I'd love to make this more flexible - if you want to give it a shot before I get around to it, patches are very much welcome.
 
-I'm also keen to have a generator that adds the standard set of files and folders (@config/database.yml@, @config/routes.rb@, @db/schema.rb@, @log@) into @spec/internal@, just to make it even easier to get going. Again, patches are welcome for this, but I'll likely get to it pretty soon.
-
 I've not tried using this with Cucumber, but it should work in theory without too much hassle. Let me know if I'm wrong!
 
 h2. Contributing
@@ -124,4 +122,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.
+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.

data/combustion.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'rails', '>= 3.1.0.rc5'
+  s.add_runtime_dependency 'rails', '>= 3.1.0'
   s.add_runtime_dependency 'thor',  '>= 0.14.6'
 end

data/lib/combustion.rb

@@ -17,12 +17,23 @@ module Combustion
     end
 
     RSpec.configure do |config|
-      config.include(Capybara) if defined?(Capybara)
+      include_capybara_into config
 
       config.include(Combustion::Application.routes.url_helpers)
       config.include(Combustion::Application.routes.mounted_helpers)
     end if defined?(RSpec) && RSpec.respond_to?(:configure)
   end
+
+  def self.include_capybara_into(config)
+    return unless defined?(Capybara)
+
+    config.include Capybara::RSpecMatchers if defined?(Capybara::RSpecMatchers)
+    config.include Capybara::DSL           if defined?(Capybara::DSL)
+
+    unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
+      config.include Capybara
+    end
+  end
 end
 
 require 'combustion/application'

data/lib/combustion/version.rb

@@ -1,3 +1,3 @@
 module Combustion
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/templates/database.yml

@@ -1,3 +1,3 @@
 test:
-  adapter:  sqlite3
+  adapter:  <%= "jdbc" if defined? JRUBY_VERSION %>sqlite3
   database: db/combustion_test.sqlite

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000 Z
+date: 2011-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156512840 !ruby/object:Gem::Requirement
+  requirement: &2152618140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc5
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156512840
+  version_requirements: *2152618140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156511640 !ruby/object:Gem::Requirement
+  requirement: &2152617480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156511640
+  version_requirements: *2152617480
 description: Test your Rails Engines without needing a full Rails app
 email:
 - pat@freelancing-gods.com