> git pull git://github.com/trevmex/authlogic_rails3_example
Then working through the merges necessary to merge in authlogic code, with a few skips
* git checkout --ours db/schema.rb
* git checkout --ours db/seeds.rb
* git checkout --theirs Gemfile
* change config/initializers/rspec_generator.rb Replace AuthlogicRails3Example with Depot (or your app name)
Then after code looked reasonably merged
> bundle install
> rake
Get complaints about unknown email_format validator
Seemed to have missed an important set of entries in config/application.rb
#Custom directories with classes and modules you want to be autoloadable.
# config.autoload_paths += %W(#{config.root}/extras)
config.autoload_paths += %W(#{config.root}/lib)
config.autoload_paths += %W(#{config.root}/lib/**/)
This is required to reference the format validator introduced with the AuthLogic Example.
After this fix we get to something interesting... the rspec tests fail!
interesting distractions but ultimately abandoned the attempt to simply merge the two projects.
ReplyDeleteAlso found that https://github.com/binarylogic/authlogic the original project has been updated for many of the Rails 3 issues people had been complaining about.
So started over following that standard example.