combustion 0.5.0 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 487efa718a0c0a0dc7bccb6199ab9aa22330fd54
+  data.tar.gz: 67f17279b60d5e1ea508b5638ef61b50ba32fcd4
+SHA512:
+  metadata.gz: b44177fef4256791333fc3d0674c242f932242f5428dc4cd26a1d309508e5c41466d7c143d80f7e9eb88de1c2cb7aaea147e4621232c06fd2b4641cb947e477d
+  data.tar.gz: c260e84e10d0082e5c86983a0c0be5e3b1f8e2831467313cd0f343daddacdca1ec49b33cf48f0bd6ebbb110a159e833489af7df8be515a55ce67d46bed633b3c

data/HISTORY

@@ -1,3 +1,9 @@
+0.5.1 - July 25th 2013
+* Mass assignment errors raise exceptions instead of just being logged (Pat Allan).
+* whilelist_attributes is only set for Rails 3.2 apps (Philip Arndt).
+* Support ActiveRecord 3.0.x (Philip Arndt).
+* Allow custom application configuration (Pablo Herrero).
+
 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).

data/README.md

@@ -10,10 +10,10 @@ Get the gem into either your gemspec or your Gemfile, depending on how you manag
 
 ```ruby
 # gemspec
-gem.add_development_dependency 'combustion', '~> 0.4.0'
+gem.add_development_dependency 'combustion', '~> 0.5.1'
 
 # Gemfile
-gem 'combustion', '~> 0.4.0', :group => :test
+gem 'combustion', '~> 0.5.1', :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:
@@ -127,6 +127,20 @@ 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.
 
+### Customizing Rails application settings
+
+If you would like to specify any Rails configuration parameter, you can do it without creating any environment file, simply passing a block to Combustion.initialize! like this:
+
+```ruby
+Combustion.initialize! :all do
+  config.active_record.whitelist_attributes = false
+end
+```
+
+Values given through the initialize! block will be set during Rails initialization proccess, exactly before the corresponding environment file inside `spec/internals/config/enviroments` is loaded (when that file exists), overriding Combustion's defaults.
+
+Parameters defined in, for instance, `spec/internals/config/environments/test.rb`, would override Combustion's defaults and also config settings passed to initialize!.
+
 ### 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 [issue #33](https://github.com/pat/combustion/issues/33) for an example with FactoryGirl.

data/combustion.gemspec

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

data/lib/combustion.rb

@@ -3,6 +3,7 @@ require 'active_support/dependencies'
 
 module Combustion
   mattr_accessor :path, :schema_format
+  mattr_reader :setup_environment
 
   self.path          = '/spec/internal'
   self.schema_format = :ruby
@@ -14,7 +15,9 @@ module Combustion
     Modules = %w( active_record action_controller action_view action_mailer )
   end
 
-  def self.initialize!(*modules)
+  def self.initialize!(*modules, &block)
+    @@setup_environment = block if block_given?
+
     modules = Modules if modules == [:all]
     modules.each { |mod| require "#{mod}/railtie" }
 

data/lib/combustion/application.rb

@@ -20,26 +20,31 @@ module Combustion
     def self.configure_for_combustion
       config.root = File.expand_path File.join(Dir.pwd, Combustion.path)
 
-      if defined? ActiveRecord::Railtie
+      if defined?(ActiveRecord::Railtie) && ::ActiveRecord.constants.include?(:MassAssignmentSecurity)
         # Turn on ActiveRecord attribute whitelisting
         # This way the dummy app matches new rails apps re: this setting
-        config.active_record.whitelist_attributes = true
+        config.active_record.whitelist_attributes      = true
+        config.active_record.mass_assignment_sanitizer = :strict
       end
 
-      if defined? ActionController::Railtie
+      if 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::Railtie
+      if defined?(ActionMailer::Railtie)
         config.action_mailer.delivery_method     = :test
         config.action_mailer.default_url_options = {:host => 'www.example.com'}
       end
 
-      if defined? Sprockets
+      if defined?(Sprockets)
         config.assets.enabled = true
       end
     end
+
+    initializer :load_customized_environment_for_combustion, :before => :load_environment_config, :group => :all do
+      Combustion::Application.class_eval(&Combustion.setup_environment) if Combustion.setup_environment
+    end
   end
 end

data/lib/combustion/database.rb

@@ -64,7 +64,12 @@ module Combustion
       end
       # Append the migrations inside the internal app's db/migrate directory
       paths << File.join(Rails.root, 'db/migrate')
-      migrator.migrate paths, nil
+
+      if ActiveRecord::VERSION::STRING >= '3.1.0'
+        migrator.migrate paths, nil
+      else
+        paths.each { |path| migrator.migrate path, nil }
+      end
     end
 
     private

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: combustion
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   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
         version: 0.14.6
   type: :runtime
   prerelease: false
   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
@@ -85,27 +78,25 @@ files:
 - templates/schema.rb
 homepage: https://github.com/pat/combustion
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: combustion
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Elegant Rails Engine Testing
 test_files: []
-has_rdoc: