@@ -120,7 +120,12 @@ module Kernel end begin Merb.generator_scope.delete(:merb_default) - orm_plugin = orm.to_s.match(/^merb_/) ? orm.to_s : "merb_#{orm}" + orm_plugin = case orm.to_s + when /^merb_/ then orm.to_s + when 'dm_core' then 'dm-merb' + else "merb_#{orm}" + end + Merb.generator_scope.unshift(orm.to_sym) unless Merb.generator_scope.include?(orm.to_sym) Kernel.dependency(orm_plugin) rescue LoadError => e lib/merb-core/core_ext/kernel.rb 64b6b14d03e6905b1705b0eaf1bb33524fa026e3 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/07fc6048093c4122cac22ea6068c0f06ef3984c5 07fc6048093c4122cac22ea6068c0f06ef3984c5 2008-04-07T12:51:10-07:00 2008-04-07T12:51:10-07:00 Added 'use_orm :dm_core' option to use datamapper 0.9.0 with the dm-merb gem from dm-more 03e83c790f016497312dacacaaa4b4d2200bfa6a Ben Burkert ben@benburkert.com