combustion 0.4.0 → 0.5.0

data/.gitignore

@@ -2,4 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
-.rvmrc
+.rvmrc
+.ruby-version

data/HISTORY

@@ -1,3 +1,8 @@
+0.5.0 - May 1st 2013
+* whitelist_attributes is now set within configure_for_combustion, as it depends on which Railties are loaded.
+* Make sure Rails gems are loaded before the engine's gem (Pablo Herrero).
+* Fixed Rails version comparison (Josh Adam).
+
 0.4.0 - March 16th 2013
 * Don't delete the SQLite test database if it doesn't exist (Michael Gee, Alexander Rozumiy).
 * Support for secret_key_base for Rails 4 apps (Philip Arndt).

data/{README.textile → README.md}

@@ -1,25 +1,28 @@
-h1. Combustion
+# Combustion
 
 Combustion is a library to help you test your Rails Engines in a simple and effective manner, instead of creating a full Rails application in your spec or test folder.
 
 It allows you to write your specs within the context of your engine, using only the parts of a Rails app you need.
 
-h2. Usage
+## 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.3.1'
-# Gemfile
-gem 'combustion', '~> 0.3.1', :group => :test</code></pre>
+```ruby
+# gemspec
+gem.add_development_dependency 'combustion', '~> 0.4.0'
 
-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:
+# Gemfile
+gem 'combustion', '~> 0.4.0', :group => :test
+```
 
-<pre><code>require 'rubygems'
-require 'bundler'
+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:
 
-Bundler.require :default, :test
+```ruby
+require 'rubygems'
+require 'bundler/setup'
 
+require 'combustion'
 require 'capybara/rspec'
 
 Combustion.initialize!
@@ -29,103 +32,119 @@ require 'capybara/rails'
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
-end</code></pre>
+end
+```
 
 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
+```shell
+combust
+
 # or, if bundling with the git repo:
-bundle exec combust</code></pre>
+bundle exec combust
+```
 
-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.
+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 a different test app directory
+If you want to use Cucumber, I recommend starting with [these notes in issue #16](https://github.com/pat/combustion/issues/16) from Niklas Cathor.
 
-If you want your app to be located somewhere other than @spec/internal@, then make sure you configure it before you call @Combustion.initialize!@:
+### 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!`:
+
+```ruby
+Combustion.path = 'spec/dummy'
+Combustion.initialize!
+```
 
-<pre><code>Combustion.path = 'spec/dummy'
-Combustion.initialize!</code></pre>
 
-h3. Configuring which Rails modules should be loaded.
+### Configuring which Rails modules should be loaded.
 
-By default, Combustion doesn't come with any of the Rails stack. You can customise this though - just pass in what you'd like loaded to the @Combustion.initialize!@ call:
+By default, Combustion doesn't come with any of the Rails stack. You can customise this though - just pass in what you'd like loaded to the `Combustion.initialize!` call:
 
-<pre><code>
+```ruby
 Combustion.initialize! :active_record, :action_controller,
                        :action_view, :sprockets
-</code></pre>
+```
+
 
 And then in your engine's Gemfile:
 
-<pre><code>
+```ruby
 group :test do
   gem 'activerecord'
   gem 'actionpack' # action_controller, action_view
   gem 'sprockets'
 end
-</code></pre>
+```
 
 Make sure to specify the appropriate version that you want to use.
 
-ActiveSupport is always loaded, as it's an integral part of Rails.
+ActiveSupport and Railties are always loaded, as they're an integral part of Rails.
 
-h3. Using Models and ActiveRecord
+### Using Models and ActiveRecord
 
-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:
+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
 
 Both follow the same structure as in any normal Rails application - and the schema file lets you avoid migrations, as it gets run whenever the test suite starts. Here's a quick sample (note that tables are overwritten if they already exist - this is necessary):
 
-<pre><code>ActiveRecord::Schema.define do
+```ruby
+ActiveRecord::Schema.define do
   create_table(:pages, :force => true) do |t|
     t.string :name
     t.text   :content
     t.timestamps
   end
-end</code></pre>
+end
+```
 
-h3. Configuring Combustion to initialise the test db from a .sql file instead of schema.rb
+### 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>
+```ruby
+Combustion.schema_format = :sql
+Combustion.initialize!
+```
 
-Any models that aren't provided by your engine should be located at @spec/internal/app/models@.
+Any models that aren't provided by your engine should be located at `spec/internal/app/models`.
 
-h3. Using ActionController and ActionView
+### 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.
+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 modify @spec/internal/config/routes.rb@ accordingly:
+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
+```ruby
+Rails.application.routes.draw do
   resources :pages
-end</code></pre>
+end
+```
 
 Just like in a standard Rails app, if you have a mounted engine, then its routes are accessible through whatever it has been loaded as.
 
-h3. Using other Rails-focused libraries
+### Using other Rails-focused libraries
 
-Be aware that other gems may require parts of Rails when they're loaded, and this could cause some issues with Combustion's own setup. You may need to manage the loading yourself by setting @:require@ to false in your Gemfile for the gem in question, and then requiring it manually in your spec_helper. View "this issue":https://github.com/pat/combustion/issues/33 for an example with FactoryGirl.
+Be aware that other gems may require parts of Rails when they're loaded, and this could cause some issues with Combustion's own setup. You may need to manage the loading yourself by setting `:require` to false in your Gemfile for the gem in question, and then requiring it manually in your spec_helper. View [issue #33](https://github.com/pat/combustion/issues/33) for an example with FactoryGirl.
 
-h3. Environment and Logging
+### Environment and Logging
 
-Your tests will execute within the test environment for the internal Rails app - and so logs are available at @spec/internal/log/test.log@. You should probably create that log directory so Rails doesn't complain.
+Your tests will execute within the test environment for the internal Rails app - and so logs are available at `spec/internal/log/test.log`. You should probably create that log directory so Rails doesn't complain.
 
-h3. Rack it up
+### Rack it up
 
-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.
+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!
+### 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 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'
+```ruby
+require 'spec_helper'
 
 describe Page do
   describe '#valid' do
@@ -133,19 +152,21 @@ describe Page do
       # This is just an example. Go write your own tests!
     end
   end
-end</code></pre>
+end
+```
+
 
-h2. Compatibility
+## Compatibility
 
 Developed for Rails 3.1 and Ruby 1.9. It should work on any other Ruby, and possibly Rails 3.0, but will not work neatly with earlier versions of Rails.
 
-h2. Limitations and Known Issues
+## 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'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
+## Contributing
 
 Contributions are very much welcome - but keep in mind the following:
 
@@ -154,6 +175,6 @@ Contributions are very much welcome - but keep in mind the following:
 
 There are no tests - partly because Combustion was extracted out from the tests of HyperTiny's Dobro, and partly because there's not much code. Still, if you can find a clean way of testing this, that'd be fantastic.
 
-h2. Credits
+## 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/pat/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,10 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'combustion'
-  s.version     = '0.4.0'
+  s.version     = '0.5.0'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
-  s.homepage    = ''
+  s.homepage    = 'https://github.com/pat/combustion'
   s.summary     = 'Elegant Rails Engine Testing'
   s.description = 'Test your Rails Engines without needing a full Rails app'
 

data/lib/combustion.rb

@@ -7,7 +7,7 @@ module Combustion
   self.path          = '/spec/internal'
   self.schema_format = :ruby
 
-  if Rails.version > '3.1'
+  if Rails.version.to_s > '3.1'
     Modules = %w( active_record action_controller action_view action_mailer
       sprockets )
   else
@@ -18,6 +18,8 @@ module Combustion
     modules = Modules if modules == [:all]
     modules.each { |mod| require "#{mod}/railtie" }
 
+    Bundler.require :default, Rails.env
+
     Combustion::Application.configure_for_combustion
     Combustion::Application.initialize!
 

data/lib/combustion/application.rb

@@ -5,25 +5,27 @@ module Combustion
   class Application < Rails::Application
     # Core Settings
     config.cache_classes               = true
-    config.whiny_nils                  = true if Rails.version < '4.0.0'
+    config.whiny_nils                  = true if Rails.version.to_s < '4.0.0'
     config.consider_all_requests_local = true
     config.secret_token                = Digest::SHA1.hexdigest Time.now.to_s
     config.eager_load                  = Rails.env.production?
-    config.secret_key_base             = SecureRandom.hex if Rails.version >= '4.0.0'
+    config.secret_key_base             = SecureRandom.hex if Rails.version.to_s >= '4.0.0'
 
     # ActiveSupport Settings
     config.active_support.deprecation = :stderr
 
-    # Turn on ActiveRecord attribute whitelisting
-    # This way the dummy app matches new rails apps re: this setting
-    config.active_record.whitelist_attributes = true if config.respond_to? :active_record
-
-    # Some settings we're not sure if we want, so let's not load them by default.
-    # Instead, wait for this method to be invoked (to get around load-order
-    # complications).
+    # Some settings we're not sure if we want, so let's not load them by
+    # default. Instead, wait for this method to be invoked (to get around
+    # load-order complications).
     def self.configure_for_combustion
       config.root = File.expand_path File.join(Dir.pwd, Combustion.path)
 
+      if defined? ActiveRecord::Railtie
+        # Turn on ActiveRecord attribute whitelisting
+        # This way the dummy app matches new rails apps re: this setting
+        config.active_record.whitelist_attributes = true
+      end
+
       if defined? ActionController::Railtie
         config.action_dispatch.show_exceptions            = false
         config.action_controller.perform_caching          = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -71,7 +71,7 @@ files:
 - Gemfile
 - HISTORY
 - LICENCE
-- README.textile
+- README.md
 - Rakefile
 - bin/combust
 - combustion.gemspec
@@ -83,7 +83,7 @@ files:
 - templates/database.yml
 - templates/routes.rb
 - templates/schema.rb
-homepage: ''
+homepage: https://github.com/pat/combustion
 licenses: []
 post_install_message: 
 rdoc_options: []