merb

Hello,

Running merb-gen authenticated -p User did actually modified two files, as follows:

$ git status

1. On branch master

nothing to commit (working directory clean)

$ merb-gen authenticated -p User

dependency merbful_authentication_tests

create spec/controllers/

create spec/controllers/

exists spec

create spec/controllers

create spec/models

create spec/authenticated_system_spec_helper.rb

create spec/user_spec_helper.rb

create spec/controllers/sessions_spec.rb

create spec/controllers/users_spec.rb

create spec/models/user_spec.rb

dependency merbful_authentication_model

exists app

create app/models

create lib

create lib/authenticated_system

create app/models/user.rb

create lib/authenticated_system/authenticated_system_orm_map.rb

exists app/controllers/

exists app/controllers/

exists app/helpers/

exists app/controllers/

exists app/helpers/

exists app

exists app/views

create app/views/sessions

create app/views/Users

exists app/controllers

create lib

create lib/authenticated_system

create app/views/sessions/new.html.erb

create app/views/Users/new.html.erb

create app/controllers/sessions.rb

create app/controllers/Users.rb

create lib/authenticated_system/authenticated_routes.rb

create lib/authenticated_system/authenticated_system_model.rb

create lib/authenticated_system/authenticated_dependencies.rb

create lib/authenticated_system/authenticated_system_controller.rb

$ git status

1. On branch master
2. Changed but not updated:
3. (use "git add ..." to update what will be committed)

#

1. modified: config/init.rb
2. modified: config/router.rb

#

no changes added to commit (use "git add" and/or "git commit -a")

$ git diff

diff --git a/config/init.rb b/config/init.rb

index 4108fde..32cb865 100644

--- a/config/init.rb

+++ b/config/init.rb

@@ -56,3 +56,8 @@ Merb::BootLoader.after_app_loads do

1. dependency "magic_admin" # this gem uses the app's model classes

end

+

+begin

• require File.join(File.dirname(__FILE__), '..', 'lib', 'authenticated_system/authenticated_dependencies')

+rescue LoadError

+end

diff --git a/config/router.rb b/config/router.rb

index c60d454..0d811fd 100644

--- a/config/router.rb

+++ b/config/router.rb

@@ -32,4 +32,6 @@ Merb::Router.prepare do |r|

1. Change this for your home page to be available at /
2. r.match('/').to(:controller => 'whatever', :action =>'index')

-end

\ No newline at end of file

+end

+

+AuthenticatedSystem.add_routes rescue nil