0
@@ -119,9 +119,8 @@ module Kernel
0
 
0
     begin
0
       Merb.generator_scope.delete(:merb_default)
0
-      orm_plugin = resolve_orm_plugin_name(orm)
0
-
0
       register_orm(orm)
0
+      orm_plugin = "merb_#{orm}"
0
       Kernel.dependency(orm_plugin)
0
     rescue LoadError => e
0
       Merb.logger.warn!("The #{orm_plugin} gem was not found.  You may need to install it.")
0
@@ -133,7 +132,7 @@ module Kernel
0
   #
0
   # ==== Parameters
0
   # orm<~to_sym>::
0
-  #   ORM alias, like :activerecord, :datamapper or :sequel. :dm_core is an ad hoc solution.
0
+  #   ORM alias, like :activerecord, :datamapper or :sequel.
0
   #
0
   # ==== Returns
0
   # Boolean::
0
@@ -149,42 +148,13 @@ module Kernel
0
   #
0
   # ==== Parameters
0
   # orm<~to_sym>::
0
-  #   ORM alias, like :activerecord, :datamapper or :sequel. :dm_core is an ad hoc solution.
0
+  #   ORM alias, like :activerecord, :datamapper or :sequel.
0
   #--
0
   # @private
0
   def register_orm(orm)
0
     Merb.generator_scope.unshift(orm.to_sym) unless Merb.generator_scope.include?(orm.to_sym)
0
   end
0
 
0
-  # Registers ORM alias into ORM plugin gem name.
0
-  #
0
-  # ==== Parameters
0
-  # orm<~to_sym>::
0
-  #   ORM alias, like :activerecord, :datamapper or :sequel. :dm_core is an ad hoc solution.
0
-  #
0
-  # ==== Notes
0
-  #   DataMapper is in the process of rewrite and this introduces number of specific notes.
0
-  #
0
-  #   dm_core is used as an ad hoc solution because Datamapper team decided to mantain
0
-  #   Merb plugin on their own.
0
-  #
0
-  #   So :datamapper uses merb_datamapper (old) for DM 0.3 and :dm_core uses new dm-merb for DM 0.9.
0
-  #
0
-  # ==== Examples
0
-  #
0
-  # resolve_orm_plugin_name(:activerecord)      # => merb_activerecord
0
-  # resolve_orm_plugin_name(:merb_activerecord) # => merb_activerecord
0
-  # resolve_orm_plugin_name(:dm_core)           # => dm-merb
0
-  #--
0
-  # @private
0
-  def resolve_orm_plugin_name(orm)
0
-    case orm.to_s
0
-        when /^merb_/   then orm.to_s
0
-        when 'dm_core'  then 'dm-merb'
0
-        else "merb_#{orm}"
0
-        end
0
-  end
0
-
0
   # Used in Merb.root/config/init.rb to tell Merb which testing framework to
0
   # use. Currently Merb has plugins to support RSpec and Test::Unit.
0
   #