@@ -24,6 +24,8 @@ * [#49] mack-data_mapper: mack-data_mapper.rb will require mack-data_mapper_tasks.rb * [#49] Updated warning message if orm is defined in app_config (i.e. user only needs to require mack-[orm_name], instead of both that and mack-[orm_name]_tasks). * [#50] Mack will now have 2 environment files: mack_core and mack_app. Mack.rb will load both files, but it gives other module a chance to load just the core files and not the application's files. +* [#51] Application generator should generate orm support in the right place +* [#52] mack-more: mack-[orm] should require mack-[orm].rb using its full path. * gem: application_configuration 1.5.1 * gem: ruby-debug 0.10.0 CHANGELOG @@ -2,7 +2,6 @@ whiny_config_missing: false mack::session_id: _<%= @options["app"].downcase %>_session_id -orm: <%= @options["orm"] %> mack::testing_framework: <%= @options["testing_framework"] %> # Mack provides RJS support through mack-javascript gem. lib/generators/mack_application_generator/templates/config/app_config/default.yml.template @@ -5,6 +5,9 @@ # :libs, optional, is an array of files you want to require. # :source, options, is the source you want to use to install a particular gem. require_gems do |gem| +<% if @options["orm"] -%> + gem.add "mack-<%=@options["orm"]%>", :libs => "mack-<%=@options["orm"]%>" +<% end -%> # examples: # gem.add :redgreen, :version => "1.2.2", :libs => :redgreen # gem.add :termios lib/generators/mack_application_generator/templates/config/initializers/gems.rb.template 27377420d7755048861f04cdead812cb320dbb28 dsutedja dsutedja@helium.com http://github.com/markbates/mack/commit/cea5fbfdf8bb6a462dc5975ffe360f882b6d9b3a cea5fbfdf8bb6a462dc5975ffe360f882b6d9b3a 2008-07-24T11:03:13-07:00 2008-07-24T11:03:13-07:00 Application generator should generate orm support in the right place [#51 state:resolved] c7d88875b24014c6d3ef221d205f1ad1886751b0 dsutedja dsutedja@helium.com