activerecord_generators/ma_migration/ma_migration_generator.rb activerecord_generators/ma_migration/templates/schema/migrations/%time_stamp%_add_ma_user.rb datamapper_generators/ma_migration/ma_migration_generator.rb datamapper_generators/ma_migration/templates/schema/migrations/add_ma_user.rb 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 @@ -17,4 +17,28 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Based on the Rails plugin by Rick Olsen + +Licence of restful_authentication + +Copyright (c) 2005 Rick Olson + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +======= \ No newline at end of file LICENSE @@ -30,7 +30,7 @@ And in your custom slice, get access to the user class with MA[:user] ===Useful Helpers -The normal merb_auth helpers are available for your application, but also there is some consistent +The normal merb-auth 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. @@ -52,7 +52,7 @@ Instructions for installation: === Quick Install # config/init.rb dependency "merb-slices" -dependency "merb_auth" +dependency "merb-auth" # router r.add_slice(:MerbAuth, "path/to/mount/at") @@ -65,7 +65,7 @@ rake slices:merb_auth:install # add the slice as a regular dependency -dependency 'merb_auth' +dependency 'merb-auth' # if needed, configure which slices to load and in which order @@ -85,9 +85,9 @@ If you'd like to specify MerbAuth for mounting or other routeing options given i r.add_slice(:MerbAuth) -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 /merb-auth. So your login url will be at -/merb_auth/login +/merb-auth/login If you'd like to specify a different mount point in your application do it like this. @@ -95,7 +95,7 @@ r.add_slice(:MerbAuth, 'authentcation') Your login url will now be /authentication/login, your signup url will be at /authentication/users/new -Alternatively you can just mount merb_authenticaiton directly onto your application. (Recommended) +Alternatively you can just mount merb-auth directly onto your application. (Recommended) r.slice(:MerbAuth) @@ -135,7 +135,7 @@ plural_model_path) \:activate: # ||= :"#{single_model_name}_activation" -A named route called :login, and one called :logout is also included. +A named route called :login, :logout and :signup are also included. === Including activation emails for account verification @@ -167,13 +167,13 @@ You can override the views MerbAuth provides. Lets face it. They're pretty ba 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/merb-auth/app/views/ ==== Example To change the login form you'd head on over to -Merb.root/slices/merb_authenticaiton/app/views/users/new.html.(haml|erb) +Merb.root/slices/merb-auth/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 @@ -185,4 +185,11 @@ To setup merbful authentication to use your own layout use a before_app_loads bl ==== Example -Merb::Slices.config[:merb_auth] = { :layout => :application } \ No newline at end of file +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 +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" +NAME = "merb-auth" AUTHOR = "Merb Core" EMAIL = "has.sox@gmail.com" HOMEPAGE = "http://merbivore.com/" SUMMARY = "Merb Slice that provides authentication" -GEM_VERSION = "0.11.0" +GEM_VERSION = "0.1.0" spec = Gem::Specification.new do |s| s.rubyforge_project = 'merb' @@ -28,7 +28,7 @@ spec = Gem::Specification.new do |s| s.add_dependency('merb-mailer', '>= 0.9.4') s.add_dependency('merb_helpers', '>= 0.9.4') s.require_path = 'lib' - s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,app,public,stubs}/**/*") + s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,app,public,stubs,activerecord_generators,datamapper_generators}/**/*") end Rake::GemPackageTask.new(spec) do |pkg| Rakefile @@ -12,7 +12,7 @@ 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", "merb-auth", "adapters") MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.load_slice @@ -33,75 +33,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("/merb-auth/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("/merb-auth/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(:login).should == "/merb-auth/login" end it "should have route to Sessions#destroy from '/logout' via delete" do - request_to("/merb_auth/logout", :delete) do |params| + request_to("/merb-auth/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("/merb-auth/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 "/merb-auth/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 "/merb-auth/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("/merb-auth/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 "/merb-auth/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 "/merb-auth/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("/merb-auth/logout") {|request| request.stub!(:current_user).and_return(@quentin) } controller.cookies["auth_token"].should == nil end it 'logs in with cookie' do @quentin.remember_me - controller = get "/merb_auth/login" do |c| + controller = get "/merb-auth/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 @@ -10,7 +10,7 @@ describe MA::Users 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", "merb-auth", "adapters") MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.load_slice @@ -73,7 +73,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("/merb-auth/users/activate/1234") do |params| params[:controller].should == "Users" params[:action].should == "activate" params[:activation_code].should == "1234" @@ -84,7 +84,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 "/merb-auth/users/activate/#{@user.activation_code}" controller.should redirect_to("/") User.authenticate('aaron@example.com', 'test').should_not be_nil end @@ -92,6 +92,6 @@ describe MA::Users do def create_user(options = {}) - post "/merb_auth/users/", :user => valid_user_hash.merge(options) + post "/merb-auth/users/", :user => valid_user_hash.merge(options) end end \ No newline at end of file spec/controllers/users_spec.rb @@ -8,7 +8,7 @@ describe MA::UserMailer 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", "merb-auth", "adapters") MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.loaded spec/mailers/user_mailer_spec.rb @@ -3,12 +3,12 @@ require 'activerecord' require 'dm-core' # For note purposes -# Merb::Slices.register_and_load(../../lib/merb_auth.rb) +# Merb::Slices.register_and_load(../../lib/merb-auth.rb) describe MerbAuth do before(:all) do - @adapter_path = File.dirname(__FILE__) / ".." / "lib" / "merb_auth" / "adapters" + @adapter_path = File.dirname(__FILE__) / ".." / "lib" / "merb-auth" / "adapters" @ar_path = @adapter_path / "activerecord" @config = Merb::Slices::config[:merb_auth] DataMapper.setup(:default, 'sqlite3::memory:') @@ -147,7 +147,7 @@ describe "MerbAuth (module)" do end it "should have an :identifier property" do - MerbAuth.identifier.should == "merb_auth" + MerbAuth.identifier.should == "merb-auth" end it "should have an :identifier_sym property" do @@ -188,14 +188,14 @@ describe "MerbAuth (module)" do it "should have a app_dir_for method" do root_path = MerbAuth.app_dir_for(:root) - root_path.should == Merb.root / 'slices' / 'merb_auth' + root_path.should == Merb.root / 'slices' / 'merb-auth' app_path = MerbAuth.app_dir_for(:application) app_path.should == root_path / 'app' [:view, :model, :controller, :helper, :mailer, :part].each do |type| MerbAuth.app_dir_for(type).should == app_path / "#{type}s" end public_path = MerbAuth.app_dir_for(:public) - public_path.should == Merb.dir_for(:public) / 'slices' / 'merb_auth' + public_path.should == Merb.dir_for(:public) / 'slices' / 'merb-auth' [:stylesheet, :javascript, :image].each do |type| MerbAuth.app_dir_for(type).should == public_path / "#{type}s" end @@ -203,7 +203,7 @@ describe "MerbAuth (module)" do it "should have a public_dir_for method" do public_path = MerbAuth.public_dir_for(:public) - public_path.should == '/slices' / 'merb_auth' + public_path.should == '/slices' / 'merb-auth' [:stylesheet, :javascript, :image].each do |type| MerbAuth.public_dir_for(type).should == public_path / "#{type}s" end spec/merb_auth_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", "merb-auth", "adapters") MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.loaded 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", "merb-auth", "adapters") MA.register_adapter :datamapper, "#{adapter_path}/datamapper" MA.register_adapter :activerecord, "#{adapter_path}/activerecord" MA.loaded spec/models/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', 'merb-auth.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', 'merb-auth.rb') module Merb def self.orm_generator_scope @@ -84,14 +84,14 @@ Spec::Runner.configure do |config| end -# GLobal helpers for merb_auth +# GLobal helpers for merb-auth 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") end - load File.join(File.dirname(__FILE__), "..", "lib", "merb_auth.rb") + load File.join(File.dirname(__FILE__), "..", "lib", "merb-auth.rb") register_datamapper! stub_orm_scope yield if block_given? spec/spec_helper.rb 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 8bf10b2bb182780a07df30f534d3a66601e7ac0b Daniel Neighman has.sox@gmail.com http://github.com/hassox/merbful_authentication/commit/5a3baae1c956c26c34170863f8c1aeac8849cd56 5a3baae1c956c26c34170863f8c1aeac8849cd56 2008-06-11T03:10:02-07:00 2008-06-11T03:10:02-07:00 Finishs the rename and adds migrations. I think the initial port is done 3214c8432b5f5b661ba066983b9be38860d0584e Daniel Neighman has.sox@gmail.com