Permalink
Browse files

Cleaned up code

  • Loading branch information...
1 parent c07f3b1 commit 1bbd5a50db4afef69a91c8d03da2b52e027f2dc2 @p8 p8 committed Mar 3, 2012
Showing with 5 additions and 5 deletions.
  1. +5 −4 lib/simple_state_machine.rb
  2. +0 −1 spec/spec_helper.rb
@@ -5,9 +5,10 @@
require 'simple_state_machine/state_machine_definition'
require 'simple_state_machine/transition'
require 'simple_state_machine/decorator/default'
-# if defined?(ActiveRecord)
+if defined?(ActiveRecord)
require 'simple_state_machine/active_record'
require 'simple_state_machine/decorator/active_record'
-# end
-require "simple_state_machine/railtie" if defined?(Rails::Railtie)
-
+end
+if defined?(Rails::Railtie)
+ require "simple_state_machine/railtie"
+end
View
@@ -1,7 +1,6 @@
require "rubygems"
require "bundler"
Bundler.require :test
-#Bundler.setup(:test, :activerecord)
begin
require 'active_record'
rescue LoadError

0 comments on commit 1bbd5a5

Please sign in to comment.