app/views/layout/merbful_authentication.html.erb lib/merbful_authentication.rb lib/merbful_authentication/adapters/activerecord/init.rb lib/merbful_authentication/adapters/activerecord/map.rb lib/merbful_authentication/adapters/activerecord/model.rb lib/merbful_authentication/adapters/common.rb lib/merbful_authentication/adapters/datamapper/init.rb lib/merbful_authentication/adapters/datamapper/map.rb lib/merbful_authentication/adapters/datamapper/model.rb lib/merbful_authentication/adapters/map.rb lib/merbful_authentication/controller/controller.rb lib/merbful_authentication/controller/sessions_base.rb lib/merbful_authentication/controller/users_base.rb lib/merbful_authentication/initializer.rb lib/merbful_authentication/merbtasks.rb lib/merbful_authentication/slicetasks.rb spec/merbful_authentication_spec.rb @@ -1,31 +1,31 @@ -MerbAuth +MerbfulAuthentication ===================== A slice for the Merb framework. -MerbAuth is an authentication framework for the Merb Web Framework. +MerbfulAuthentication is an authentication framework for the Merb Web Framework. Currently DataMapper and ActiveRecord supportis available. It should be pretty easy to add your own. -MerbAuth provides your model with a mixin that gives your model all the required behavior +MerbfulAuthentication provides your model with a mixin that gives your model all the required behavior and links it to the controllers. As an example. In your normal applications model directory create your user model. class User - include MerbAuth::Adapter::DataMapper - include MerbAuth::Adapter::DataMapper::DefaultModelSetup + include MerbfulAuthentication::Adapter::DataMapper + include MerbfulAuthentication::Adapter::DataMapper::DefaultModelSetup end This will give the User class the required behavior and provide access to the class through -MerbAuth[:user] for other slice authors. To save key presses a handy constant is available +MerbfulAuthentication[:user] for other slice authors. To save key presses a handy constant is available MA. So using the MA constant you can declare your class like this class Person include MA::Adapter::DataMapper - include MerbAuth::Adapter::DataMapper::DefaultModelSetup + include MerbfulAuthentication::Adapter::DataMapper::DefaultModelSetup end And in your custom slice, get access to the user class with MA[:user] @@ -40,14 +40,14 @@ rake slices:merb_auth:ar:setup # ActiveRecord defaults ===Useful Helpers -The normal merb-auth helpers are available for your application, but also there is some consistent +The normal merbful_authentication helpers are available for your application, but also there is some consistent helpers for other slice authors. Most notably is the controller helper :current_ma_user also aliased as :current_person, or :current_user or whatever your user class name is. === Controllers -The controllers that drive MerbAuth are always named MA::Users, and MA::Sessions +The controllers that drive MerbfulAuthentication are always named MA::Users, and MA::Sessions These are then mapped to appropriately named routes. @@ -62,10 +62,10 @@ Instructions for installation: === Quick Install # config/init.rb dependency "merb-slices" -dependency "merb-auth" +dependency "merbful_authentication" # router -r.add_slice(:MerbAuth, "path/to/mount/at") +r.add_slice(:MerbfulAuthentication, "path/to/mount/at") # Boot strap to your app rake slices:merb_auth:install @@ -75,39 +75,39 @@ rake slices:merb_auth:install # add the slice as a regular dependency -dependency 'merb-auth' +dependency 'merbful_authentication' # if needed, configure which slices to load and in which order -Merb::Plugins.config[:merb_slices] = { :queue => ["MerbAuth", ...] } +Merb::Plugins.config[:merb_slices] = { :queue => ["MerbfulAuthentication", ...] } === Configure Your Router -In config/router.rb you need to activate your brand new MerbAuth Slice. You can do this a number of ways. +In config/router.rb you need to activate your brand new MerbfulAuthentication Slice. You can do this a number of ways. The easiest way is like this: r.add_slices -If you'd like to specify MerbAuth for mounting or other routeing options given in slices +If you'd like to specify MerbfulAuthentication for mounting or other routeing options given in slices -r.add_slice(:MerbAuth) +r.add_slice(:MerbfulAuthentication) -By default this will mount the slice at /merb-auth. So your login url will be at +By default this will mount the slice at /merbful_authentication. So your login url will be at -/merb-auth/login +/merbful_authentication/login If you'd like to specify a different mount point in your application do it like this. -r.add_slice(:MerbAuth, 'authentcation') +r.add_slice(:MerbfulAuthentication, 'authentcation') Your login url will now be /authentication/login, your signup url will be at /authentication/users/new -Alternatively you can just mount merb-auth directly onto your application. (Recommended) +Alternatively you can just mount merbful_authentication directly onto your application. (Recommended) -r.add_slice(:MerbAuth, :path => "", :default_routes => false) +r.add_slice(:MerbfulAuthentication, :path => "", :default_routes => false) If you'd like to set more options, I suggest you look up the merb-slices documentation. @@ -126,7 +126,7 @@ by writing it to the config/slices.yml file ==== Login Field -By default merb-auth uses the "email" field to login. If you want to use a different field, even one of your own, +By default merbful_authentication uses the "email" field to login. If you want to use a different field, even one of your own, you can use the \:login_field: jid @@ -180,17 +180,17 @@ There is also the subjects that you can setup for your emails === Override the Views -You can override the views MerbAuth provides. Lets face it. They're pretty basic. +You can override the views MerbfulAuthentication provides. Lets face it. They're pretty basic. To do this, you need to edit the files in the bootstrapped directories in your application. -Merb.root/slices/merb-auth/app/views/ +Merb.root/slices/merbful_authentication/app/views/ ==== Example To change the login form you'd head on over to -Merb.root/slices/merb-auth/app/views/users/new.html.(haml|erb) +Merb.root/slices/merbful_authentication/app/views/users/new.html.(haml|erb) And put in your own view there. The same is available for any of the components of merbful authentication @@ -206,7 +206,7 @@ Merb::Slices.config[:merb_auth] = { :layout => :application } === Migrations -There is a migration task for merb-auth to generate your migrations. Make sure you have use_orm selected so that +There is a migration task for merbful_authentication to generate your migrations. Make sure you have use_orm selected so that it knows which generator to use. Then from your host application rake slices:merb_auth:generate_migration \ No newline at end of file README @@ -5,12 +5,12 @@ require 'merb-core/version' require 'merb-core/test/tasks/spectasks' require 'merb-core/tasks/merb_rake_helper' -NAME = "merb-auth" -AUTHOR = "Merb Core" +NAME = "merbful_authentication" +AUTHOR = "Daniel Neighman" EMAIL = "has.sox@gmail.com" HOMEPAGE = "http://merbivore.com/" SUMMARY = "Merb Slice that provides authentication" -GEM_VERSION = "0.1.0" +GEM_VERSION = "0.10.0" spec = Gem::Specification.new do |s| s.rubyforge_project = 'merb' @@ -35,7 +35,7 @@ Rake::GemPackageTask.new(spec) do |pkg| pkg.gem_spec = spec end -desc "Install MerbAuth as a gem" +desc "Install MerbfulAuthentication as a gem" task :install => [:package] do sh %{#{sudo} gem install pkg/#{NAME}-#{GEM_VERSION} --no-update-sources} end Rakefile @@ -1,6 +1,6 @@ TODO: -- Fix MerbAuth.description and MerbAuth.version +- Fix MerbfulAuthentication.description and MerbfulAuthentication.version - Fix LICENSE with your name - Fix Rakefile with your name and contact info - Add your code to lib/merb_auth.rb @@ -8,7 +8,7 @@ TODO: Remove anything that you don't need: -- app/controllers/main.rb MerbAuth::Main controller +- app/controllers/main.rb MerbfulAuthentication::Main controller - app/views/layout/merb_auth.html.erb - spec/controllers/main_spec.rb controller specs - public/* any public files \ No newline at end of file TODO @@ -30,7 +30,7 @@ class MaMigrationGenerator < Merb::GeneratorBase protected def banner <<-EOS - Creates a migration for merb-auth user model + Creates a migration for merbful_authentication user model USAGE: #{$0} #{spec.name} name" EOS activerecord_generators/ma_migration/ma_migration_generator.rb @@ -1,4 +1,4 @@ -module MerbAuth +module MerbfulAuthentication class Application < Merb::Controller controller_for_slice app/controllers/application.rb @@ -1,3 +1,3 @@ -class MerbAuth::Sessions < MerbAuth::Application +class MerbfulAuthentication::Sessions < MerbfulAuthentication::Application end \ No newline at end of file app/controllers/sessions.rb @@ -1,3 +1,3 @@ -class MerbAuth::Users < MerbAuth::Application +class MerbfulAuthentication::Users < MerbfulAuthentication::Application end \ No newline at end of file app/controllers/users.rb @@ -1,5 +1,5 @@ module Merb - module MerbAuth + module MerbfulAuthentication module ApplicationHelper # @param *segments<Array[#to_s]> Path segments to append. @@ -34,7 +34,7 @@ module Merb # @return <String> # A path relative to the public directory, with added segments. def public_path_for(type, *segments) - File.join(::MerbAuth.public_dir_for(type), *segments) + File.join(::MerbfulAuthentication.public_dir_for(type), *segments) end # Construct an app-level path. @@ -45,7 +45,7 @@ module Merb # @return <String> # A path within the host application, with added segments. def app_path_for(type, *segments) - File.join(::MerbAuth.app_dir_for(type), *segments) + File.join(::MerbfulAuthentication.app_dir_for(type), *segments) end # Construct a slice-level path. @@ -56,7 +56,7 @@ module Merb # @return <String> # A path within the slice source (Gem), with added segments. def slice_path_for(type, *segments) - File.join(::MerbAuth.dir_for(type), *segments) + File.join(::MerbfulAuthentication.dir_for(type), *segments) end end app/helpers/application_helper.rb @@ -1,6 +1,6 @@ -class MerbAuth::UserMailer < Merb::MailController +class MerbfulAuthentication::UserMailer < Merb::MailController - controller_for_slice MerbAuth, :templates_for => :mailer, :path => "views" + controller_for_slice MerbfulAuthentication, :templates_for => :mailer, :path => "views" def signup @ivar = params[MA[:single_resource]] app/mailers/user_mailer.rb @@ -2,4 +2,4 @@ Your password has been reset. Please visit: - <%= url(:merb_auth_password, :id => @ivar.password_reset_key ) %> \ No newline at end of file + <%= slice_url(:password, :id => @ivar.password_reset_key ) %> \ No newline at end of file app/mailers/views/user_mailer/forgot_password.text.erb @@ -3,5 +3,5 @@ Your account has been created. Username: <%= @ivar.email %> Visit this url to activate your account: - - <%= url(MA[:routes][:user][:activate], :activation_code => @ivar.activation_code) %> \ No newline at end of file + + <%= slice_url(MA[:routes][:user][:activate], :activation_code => @ivar.activation_code) %> \ No newline at end of file app/mailers/views/user_mailer/signup.text.erb @@ -1,4 +1,4 @@ -<%= form :action => url(:login) do -%> +<%= form :action => slice_url(:login) do -%> <p><label for="email">Email</label><br/> <%= text_field :name => "email" %></p> app/views/sessions/new.html.erb @@ -1,5 +1,5 @@ <%= error_messages_for @ivar %> -<%= form_for @ivar, :action => url(MA[:routes][:user][:index]) do %> +<%= form_for @ivar, :action => slice_url(MA[:routes][:user][:index]) do %> <p> <%= text_field :email, :label => "Email" %> </p> app/views/users/new.html.erb @@ -29,7 +29,7 @@ class MaMigrationGenerator < Merb::GeneratorBase protected def banner <<-EOS - Creates a migration for merb-auth user model + Creates a migration for merbful_authentication user model USAGE: #{$0} #{spec.name} name" EOS datamapper_generators/ma_migration/ma_migration_generator.rb @@ -1,7 +1,7 @@ -module MerbAuth +module MerbfulAuthentication class Passwords < Application - controller_for_slice :MerbAuth + controller_for_slice :MerbfulAuthentication def _template_location(context, type = nil, controller = controller_name) if controller.nil? || controller != "merb_auth/passwords" plugins/forgotten_password/app/controllers/passwords.rb @@ -1,4 +1,4 @@ -module MerbAuth +module MerbfulAuthentication module ForgottenPassword module Model @@ -49,4 +49,4 @@ module MerbAuth end end -MA[:user].send(:include, MerbAuth::ForgottenPassword::Model) \ No newline at end of file +MA[:user].send(:include, MerbfulAuthentication::ForgottenPassword::Model) \ No newline at end of file plugins/forgotten_password/app/models/user.rb @@ -1,4 +1,4 @@ -if MerbAuth[:forgotten_password] && MerbAuth[:user] +if MerbfulAuthentication[:forgotten_password] && MerbfulAuthentication[:user] dir = File.expand_path(File.dirname(__FILE__)) Dir[File.join(dir, "app", "**/*.rb")].each{ |f| require f } end plugins/forgotten_password/forgotten_password.rb @@ -1,7 +1,7 @@ -MerbAuth.plugins[:forgotten_password] = File.join(File.expand_path(File.dirname(__FILE__)) / "forgotten_password.rb") +MerbfulAuthentication.plugins[:forgotten_password] = File.join(File.expand_path(File.dirname(__FILE__)) / "forgotten_password.rb") MA.add_routes do |r| - if MerbAuth[:forgotten_password] && MerbAuth[:user] + if MerbfulAuthentication[:forgotten_password] && MerbfulAuthentication[:user] r.match("/passwords/edit").to(:controller => "Passwords", :action => "edit").name(:merb_auth_edit_password_form) r.match("/passwords", :method => :put).to(:controller => "Passwords", :action => "update") r.resources :passwords plugins/forgotten_password/init.rb @@ -20,7 +20,7 @@ end DataMapper.setup(:default, 'sqlite3::memory:') -adapter_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "merb-auth", "adapters")) +adapter_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "merbful_authentication", "adapters")) MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.load_slice @@ -31,6 +31,6 @@ end User.auto_migrate! MA.activate -Merb::Router.prepare{|r| r.add_slice(:MerbAuth)} +Merb::Router.prepare{|r| r.add_slice(:MerbfulAuthentication)} MA.load_plugins! plugins/forgotten_password/spec/spec_helper.rb @@ -1,4 +1,4 @@ -module MerbAuth +module MerbfulAuthentication module Controller module Tester def self.included(base) spec/controllers/plugins/test_plugin.rb @@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe MA::Sessions, "Index action" do before(:all) do + reload_ma! Object.class_eval do remove_const("User") if defined?(User) end @@ -12,14 +13,14 @@ describe MA::Sessions, "Index action" do DataMapper.setup(:default, 'sqlite3::memory:') Merb.stub!(:orm_generator_scope).and_return("datamapper") - adapter_path = File.join( File.dirname(__FILE__), "..", "..", "lib", "merb-auth", "adapters") + adapter_path = File.join( File.dirname(__FILE__), "..", "..", "lib", "merbful_authentication", "adapters") MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.load_slice class User include MA::Adapter::DataMapper - include MerbAuth::Adapter::DataMapper::DefaultModelSetup + include MerbfulAuthentication::Adapter::DataMapper::DefaultModelSetup end end @@ -34,75 +35,75 @@ describe MA::Sessions, "Index action" do end it "should have a route to Sessions#new from '/login'" do - request_to("/merb-auth/login") do |params| + request_to("/merbful_authentication/login") do |params| params[:controller].should == "Sessions" params[:action].should == "create" end end it "should route to Sessions#create from '/login' via post" do - request_to("/merb-auth/login", :post) do |params| + request_to("/merbful_authentication/login", :post) do |params| params[:controller].should == "Sessions" params[:action].should == "create" end end it "should have a named route :login" do - @controller.url(:login).should == "/merb-auth/login" + @controller.url(:merbful_authentication_login).should == "/merbful_authentication/login" end it "should have route to Sessions#destroy from '/logout' via delete" do - request_to("/merb-auth/logout", :delete) do |params| + request_to("/merbful_authentication/logout", :delete) do |params| params[:controller].should == "Sessions" params[:action].should == "destroy" end end it "should route to Sessions#destroy from '/logout' via get" do - request_to("/merb-auth/logout") do |params| + request_to("/merbful_authentication/logout") do |params| params[:controller].should == "Sessions" params[:action].should == "destroy" end end it 'logins and redirects' do - controller = post "/merb-auth/login", :email => 'quentin@example.com', :password => 'test' + controller = post "/merbful_authentication/login", :email => 'quentin@example.com', :password => 'test' controller.session[:user].should_not be_nil controller.session[:user].should == @quentin.id controller.should redirect_to("/") end it 'fails login and does not redirect' do - controller = post "/merb-auth/login", :email => 'quentin@example.com', :password => 'bad password' + controller = post "/merbful_authentication/login", :email => 'quentin@example.com', :password => 'bad password' controller.session[:user].should be_nil controller.should be_successful end it 'logs out' do - controller = get("/merb-auth/logout"){|controller| controller.stub!(:current_user).and_return(@quentin) } + controller = get("/merbful_authentication/logout"){|controller| controller.stub!(:current_user).and_return(@quentin) } controller.session[:user].should be_nil controller.should redirect end it 'remembers me' do - controller = post "/merb-auth/login", :email => 'quentin@example.com', :password => 'test', :remember_me => "1" + controller = post "/merbful_authentication/login", :email => 'quentin@example.com', :password => 'test', :remember_me => "1" controller.cookies["auth_token"].should_not be_nil end it 'does not remember me' do - controller = post "/merb-auth/login", :email => 'quentin@example.com', :password => 'test', :remember_me => "0" + controller = post "/merbful_authentication/login", :email => 'quentin@example.com', :password => 'test', :remember_me => "0" controller.cookies["auth_token"].should be_nil end it 'deletes token on logout' do - controller = get("/merb-auth/logout") {|request| request.stub!(:current_user).and_return(@quentin) } + controller = get("/merbful_authentication/logout") {|request| request.stub!(:current_user).and_return(@quentin) } controller.cookies["auth_token"].should be_blank end it 'logs in with cookie' do @quentin.remember_me - controller = get "/merb-auth/login" do |c| + controller = get "/merbful_authentication/login" do |c| c.request.env[Merb::Const::HTTP_COOKIE] = "auth_token=#{@quentin.remember_token}" end controller.should be_logged_in spec/controllers/sessions_spec.rb @@ -3,14 +3,14 @@ require File.dirname(__FILE__) + '/../spec_helper' describe MA::Users do before(:all) do - + reload_ma! MA[:use_activation] = true DataMapper.setup(:default, 'sqlite3::memory:') Merb.stub!(:orm_generator_scope).and_return("datamapper") - adapter_path = File.join( File.dirname(__FILE__), "..", "..", "lib", "merb-auth", "adapters") + adapter_path = File.join( File.dirname(__FILE__), "..", "..", "lib", "merbful_authentication", "adapters") MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.load_slice @@ -18,7 +18,7 @@ describe MA::Users do class User include MA::Adapter::DataMapper - include MerbAuth::Adapter::DataMapper::DefaultModelSetup + include MerbfulAuthentication::Adapter::DataMapper::DefaultModelSetup end end @@ -74,7 +74,7 @@ describe MA::Users do end it "should have a route for user activation" do - request_to("/merb-auth/users/activate/1234") do |params| + request_to("/merbful_authentication/users/activate/1234") do |params| params[:controller].should == "Users" params[:action].should == "activate" params[:activation_code].should == "1234" @@ -85,7 +85,7 @@ describe MA::Users do controller = create_user(:email => "aaron@example.com", :password => "test", :password_confirmation => "test") @user = controller.assigns(:user) User.authenticate('aaron@example.com', 'test').should be_nil - controller = get "/merb-auth/users/activate/#{@user.activation_code}" + controller = get "/merbful_authentication/users/activate/#{@user.activation_code}" controller.should redirect_to("/") User.authenticate('aaron@example.com', 'test').should_not be_nil end @@ -114,6 +114,6 @@ describe MA::Users do def create_user(options = {}) - post "/merb-auth/users/", :user => valid_user_hash.merge(options) + post "/merbful_authentication/users/", :user => valid_user_hash.merge(options) end end spec/controllers/users_spec.rb @@ -3,19 +3,20 @@ require File.dirname(__FILE__) + '/../spec_helper' describe MA::UserMailer do before(:all) do + reload_ma! MA[:use_activation] = true DataMapper.setup(:default, 'sqlite3::memory:') Merb.stub!(:orm_generator_scope).and_return("datamapper") - adapter_path = File.join( File.dirname(__FILE__), "..", "..", "lib", "merb-auth", "adapters") + adapter_path = File.join( File.dirname(__FILE__), "..", "..", "lib", "merbful_authentication", "adapters") MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.loaded class User include MA::Adapter::DataMapper - include MerbAuth::Adapter::DataMapper::DefaultModelSetup + include MerbfulAuthentication::Adapter::DataMapper::DefaultModelSetup end end @@ -52,7 +53,7 @@ describe MA::UserMailer do it "should mention the activation link in the signup emails" do deliver(:signup, @mailer_params, :user => @u) - the_url = MA::UserMailer.new.url(:user_activation, :activation_code => @u.activation_code) + the_url = MA::UserMailer.new.url(:merbful_authentication_user_activation, :activation_code => @u.activation_code) the_url.should_not be_nil @delivery.text.should include( the_url ) end spec/mailers/user_mailer_spec.rb @@ -7,7 +7,7 @@ describe "MA ActiveRecord User Model" do Merb.stub!(:orm_generator_scope).and_return("activerecord") - adapter_path = File.join( File.dirname(__FILE__), "..", "..", "lib", "merb-auth", "adapters") + adapter_path = File.join( File.dirname(__FILE__), "..", "..", "lib", "merbful_authentication", "adapters") MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.loaded @@ -38,13 +38,13 @@ describe "MA ActiveRecord User Model" do UserMigration.up class User < ActiveRecord::Base - include MerbAuth::Adapter::ActiveRecord - include MerbAuth::Adapter::ActiveRecord::DefaultModelSetup + include MerbfulAuthentication::Adapter::ActiveRecord + include MerbfulAuthentication::Adapter::ActiveRecord::DefaultModelSetup end MA.activate end - it_should_behave_like "A MerbAuth User Model" + it_should_behave_like "A MerbfulAuthentication User Model" end \ No newline at end of file spec/models/ar_model_spec.rb @@ -7,7 +7,7 @@ describe "MA User Model" do DataMapper.setup(:default, 'sqlite3::memory:') Merb.stub!(:orm_generator_scope).and_return("datamapper") - adapter_path = File.join( File.dirname(__FILE__), "..", "..", "lib", "merb-auth", "adapters") + adapter_path = File.join( File.dirname(__FILE__), "..", "..", "lib", "merbful_authentication", "adapters") MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.loaded @@ -18,6 +18,6 @@ describe "MA User Model" do end end - it_should_behave_like "A MerbAuth User Model" + it_should_behave_like "A MerbfulAuthentication User Model" end \ No newline at end of file spec/models/model_spec.rb @@ -1,7 +1,7 @@ -describe "A MerbAuth User Model", :shared => true do +describe "A MerbfulAuthentication User Model", :shared => true do before(:all) do - raise "You need to set the MerbAuth[:user] class to use this spec" unless MA[:user].is_a?(Class) + raise "You need to set the MerbfulAuthentication[:user] class to use this spec" unless MA[:user].is_a?(Class) end before(:each) do @@ -11,7 +11,7 @@ describe "A MerbAuth User Model", :shared => true do MA[:from_email] = "example@email.com" end - it "should include MerbAuth::Adapter::Common mixin" do + it "should include MerbfulAuthentication::Adapter::Common mixin" do MA[:user].should include(MA::Adapter::Common) end spec/shared_specs/shared_model_spec.rb @@ -13,13 +13,13 @@ require 'merb-mailer' # Merb::Config.use do |c| # c[:session_store] = "memory" # end -# Merb::Slices.register_and_load(File.join(File.dirname(__FILE__), '..', 'lib', 'merb-auth.rb')) +# Merb::Slices.register_and_load(File.join(File.dirname(__FILE__), '..', 'lib', 'merbful_authentication.rb')) # end # # end Merb::Plugins.config[:merb_slices][:auto_register] = true -Merb::Plugins.config[:merb_slices][:search_path] = File.join(File.dirname(__FILE__), '..', 'lib', 'merb-auth.rb') +Merb::Plugins.config[:merb_slices][:search_path] = File.join(File.dirname(__FILE__), '..', 'lib', 'merbful_authentication.rb') module Merb def self.orm_generator_scope @@ -78,23 +78,39 @@ Spec::Runner.configure do |config| config.include(Merb::Test::ControllerHelper) config.include(Merb::Test::SliceHelper) config.include(ValidModelHashes) - config.before(:each) do - Merb::Router.prepare { |r| r.add_slice(:MerbAuth) } if standalone? - end + # config.before(:each) do + # Merb::Router.prepare { add_slice(:MerbfulAuthentication, :default_routes => false) } if standalone? + # end + # config.after(:each) do + # Merb::Router.reset! + # end +end + +def stub_orm_scope(scope = "datamapper") + Merb.stub!(:orm_generator_scope).and_return(scope) +end + +def register_activerecord! + MA.register_adapter :activerecord, "#{File.expand_path(File.dirname(__FILE__)) / ".." / "lib" / "merbful_authentication" / "adapters" / "activerecord"}" +end + +def register_datamapper! + MA.register_adapter :datamapper, "#{File.expand_path(File.dirname(__FILE__)) / ".." / "lib" / "merbful_authentication" / "adapters" / "datamapper"}" end -# GLobal helpers for merb-auth +# GLobal helpers for merbful_authentication def reload_ma!(create_class = nil) Object.class_eval do remove_const("User") if defined?(User) remove_const("MA") if defined?(MA) - remove_const("MerbAuth") + remove_const("MerbfulAuthentication") end - load File.join(File.dirname(__FILE__), "..", "lib", "merb-auth.rb") + load File.join(File.dirname(__FILE__), "..", "lib", "merbful_authentication.rb") register_datamapper! stub_orm_scope - + Merb::Router.reset! + Merb::Router.prepare { add_slice(:MerbfulAuthentication, :default_routes => false) } if standalone? MA.load_slice yield if block_given? MA[:user] = nil @@ -104,11 +120,12 @@ def reload_ma!(create_class = nil) Object.class_eval <<-EOS class #{create_class} include DataMapper::Resource - include MerbAuth::Adapter::DataMapper - include MerbAuth::Adapter::DataMapper::DefaultModelSetup + include MerbfulAuthentication::Adapter::DataMapper + include MerbfulAuthentication::Adapter::DataMapper::DefaultModelSetup end EOS end Merb::BootLoader::MaLoadPlugins.run MA.activate + end spec/spec_helper.rb @@ -1,2 +1,2 @@ -class MerbAuth::Application < Merb::Controller +class MerbfulAuthentication::Application < Merb::Controller end \ No newline at end of file stubs/app/controllers/application.rb @@ -1,2 +1,2 @@ -class MerbAuth::Main < MerbAuth::Application +class MerbfulAuthentication::Main < MerbfulAuthentication::Application end \ No newline at end of file stubs/app/controllers/main.rb app/views/layout/merb_auth.html.erb lib/merb-auth.rb lib/merb-auth/adapters/activerecord/init.rb lib/merb-auth/adapters/activerecord/map.rb lib/merb-auth/adapters/activerecord/model.rb lib/merb-auth/adapters/common.rb lib/merb-auth/adapters/datamapper/init.rb lib/merb-auth/adapters/datamapper/map.rb lib/merb-auth/adapters/datamapper/model.rb lib/merb-auth/adapters/map.rb lib/merb-auth/controller/controller.rb lib/merb-auth/controller/sessions_base.rb lib/merb-auth/controller/users_base.rb lib/merb-auth/initializer.rb lib/merb-auth/merbtasks.rb lib/merb-auth/slicetasks.rb spec/merb_auth_spec.rb a54332fbcf3648bd7745520674cf5152df4db2b1 Daniel Neighman has.sox@gmail.com http://github.com/hassox/merbful_authentication/commit/58c4f84b43db6adadd1e0dc4dfd637cec8dfaccb 58c4f84b43db6adadd1e0dc4dfd637cec8dfaccb 2008-09-27T07:35:14-07:00 2008-09-27T07:35:14-07:00 REnames merb-auth to merbful_authentication 1dc4e0606359a5ae0d1967d602ec81540f910abe Daniel Neighman has.sox@gmail.com