royw-railroad_xing 0.5.0.1 → 0.5.0.2

data/ChangeLog

@@ -1,3 +1,8 @@
+Version 0.5.0.2 (jun 5 2009)
+- Rails 2.3 changed the filename for ApplicationController from 
+  app/controllers/application.rb to app/controllers/application_controller.rb
+  Fix provided by Walt Jones http://waltgordonjones.com/218/using-railroad-with-rails-23
+
 Version 0.5.0.1 (dec 19 2008)
 - Forked from http://railroad.rubyforge.org to http://github.com/royw/railroad_xing
 - Added support for Merb and DataMapper

data/lib/railroad/ar_model.rb

@@ -6,6 +6,7 @@
 class AR_Model
   def initialize(klass, options)
     @klass = klass
+    @options = options
     # Processed habtm associations
     @habtm = []
   end

data/lib/railroad/merb_framework.rb

@@ -14,7 +14,10 @@ class MerbFramework
   def initialize
     require 'merb-core'
     Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
-    DataMapper.auto_migrate!
+    case Merb::Config[:merb_orm]
+      when :datamapper: DataMapper.auto_migrate!
+      when :activerecord: ActiveRecord::Migrator.migrate(File.expand_path(File.dirname(__FILE__) + "/schema/migrations"))
+    end
     @name = 'Merb'
     @migration_version = nil
   end

data/lib/railroad/rails_framework.rb

@@ -20,7 +20,8 @@ class RailsFramework
   # get the controller's files returning the application controller first in returned array
   def get_controller_files(options)
     files = []
-    files << 'app/controllers/application.rb'
+    files << 'app/controllers/application_controller.rb' if File.exist?('app/controllers/application_controller.rb')
+    files << 'app/controllers/application.rb' if File.exist?('app/controllers/application.rb')
     files += Dir.glob("app/controllers/**/*_controller.rb") - options.exclude
     files.uniq
   end

data/railroad_xing.gemspec

@@ -1,6 +1,6 @@
 SPEC = Gem::Specification.new do |s|
   s.name         = "railroad_xing"
-  s.version      = "0.5.0.1"
+  s.version      = "0.5.0.2"
   s.authors      = ["Javier Smaldone", "Roy Wright"]
   s.email        = "roy@wright.org"
   s.homepage     = "http://github.com/royw/railroad_xing"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-railroad_xing
 version: !ruby/object:Gem::Version 
-  version: 0.5.0.1
+  version: 0.5.0.2
 platform: ruby
 authors: 
 - Javier Smaldone
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 -08:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: railroad
 dependencies: []