autotest/discover.rb autotest/merb.rb autotest/merb_rspec.rb slices/merb-auth/app/controllers/users.rb slices/merb-auth/app/views/sessions/new.html.erb slices/merb-auth/app/views/users/_user.html.erb slices/merb-auth/app/views/users/edit.html.erb slices/merb-auth/app/views/users/index.html.erb slices/merb-auth/app/views/users/new.html.erb slices/merb-auth/app/views/users/show.html.erb @@ -6,7 +6,7 @@ class Application < Merb::Controller before :load_plugins before :fire_before_event before :fix_cache_issue_with_merb_093 - + ## # This just makes sure that params[:format] isn't null, to get around the merb 0.9.3 cache issue def fix_cache_issue_with_merb_093 app/controllers/application.rb @@ -107,7 +107,7 @@ module Merb items << {:text => "Articles", :url => url(:admin_articles)} items << {:text => "Plugins", :url => url(:admin_plugins)} items << {:text => "Settings", :url => url(:admin_configurations)} - items << {:text => "Users", :url => url(:admin_users)} + items << {:text => "Users", :url => url(:users)} if self.current_user == :false items << {:text => "Login", :url => url(:login)} else app/helpers/global_helpers.rb @@ -1,39 +1,11 @@ -require 'digest/sha1' -begin - require File.join(File.dirname(__FILE__), '..', '..', "lib", "authenticated_system", "authenticated_dependencies") -rescue - nil -end class User - include DataMapper::Validate - include AuthenticatedSystem::Model - include DataMapper::Resource - - attr_accessor :password, :password_confirmation + include MerbAuth::Adapter::DataMapper + include MerbAuth::Adapter::DataMapper::DefaultModelSetup - property :id, Integer, :key => true, :serial => true - property :login, String - property :email, String, :length => 255 - property :crypted_password, String - property :salt, String - property :remember_token_expires_at, DateTime - property :remember_token, String property :time_zone, String - property :created_at, DateTime - property :updated_at, DateTime property :name, String property :default_formatter, String - validates_length :login, :within => 3..40 - validates_is_unique :login - validates_present :password, :if => :password_required? - validates_present :password_confirmation, :if => :password_required? - validates_length :password, :within => 4..40, :if => :password_required? - validates_is_confirmed :password, :groups => :create - validates_present :email - - before :save, :encrypt_password - after :save, :set_create_activity after :save, :set_update_activity @@ -52,8 +24,4 @@ class User a.save end end - - def login=(value); - attribute_set :login, value.downcase unless value.nil? - end end app/models/user.rb @@ -40,20 +40,23 @@ use_orm :datamapper ### merb. ### # use_test :test_unit -use_test :rspec, "merb_stories" +use_test :rspec ### Add your other dependencies here # These are some examples of how you might specify dependencies. # gem "archive-tar-minitar" -dependencies "merb_helpers" dependency "merb_helpers" dependency "merb-assets" dependency "merb-cache" dependency "merb-action-args" +dependency "merb_has_flash" +dependency "merb_helpers" dependency "merb-mailer" dependency 'merb_paginate' +dependency "merb-slices" +dependency "merb-auth" dependency "dm-aggregates" dependency "dm-validations" dependency "dm-timestamps" @@ -62,6 +65,13 @@ dependency "dm-timestamps" # OR # dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0" +Merb::BootLoader.before_app_loads do + Merb::Slices.config[:merb_auth] = { + :layout => :admin, + :login_field => :login + } +end + Merb::BootLoader.after_app_loads do require "tzinfo" require "net/http" @@ -94,10 +104,6 @@ Merb::BootLoader.after_app_loads do end require File.join(File.join(Merb.root_path, "lib"), "cache_helper") -begin - require File.join(File.dirname(__FILE__), '..', 'lib', 'authenticated_system/authenticated_dependencies') -rescue LoadError -end Merb::Plugins.config[:merb_cache] = { :cache_html_directory => Merb.dir_for(:public) / "cache", config/init.rb @@ -27,7 +27,7 @@ Merb::Router.prepare do |r| {:controller => "articles", :action => "show", :id => article.id} end end - + # Admin namespace r.namespace :admin do |admin| admin.resource :configurations @@ -37,7 +37,10 @@ Merb::Router.prepare do |r| admin.resources :articles admin.match("").to(:controller => "dashboard", :action => "index") end - + + # Mount merb-auth. + r.add_slice :MerbAuth, "admin" + # Year/month/day routes r.match("/:year").to(:controller => "articles", :action => "index").name(:year) r.match("/:year/:month").to(:controller => "articles", :action => "index").name(:month) @@ -48,4 +51,3 @@ Merb::Router.prepare do |r| r.match('/').to(:controller => 'articles', :action =>'index') end -AuthenticatedSystem.add_routes config/router.rb @@ -9,10 +9,7 @@ module Admin describe "/admin/articles" do it "should get all articles in descending created order" do - Article.should_receive(:all) do |args| - args[:order].should == [:created_at.desc] - @articles - end + Article.should_receive(:all).with(:order => [:created_at.desc], :offset => 0, :limit => 10).and_return(@articles) controller = dispatch_to(Articles, :index) do |controller| controller.should_receive(:login_required).and_return(true) controller.should_receive(:display).with(@articles) spec/controllers/admin/articles_spec.rb app/controllers/admin/sessions.rb app/controllers/admin/users.rb app/views/admin/sessions/new.html.erb app/views/admin/users/_user.html.erb app/views/admin/users/edit.html.erb app/views/admin/users/index.html.erb app/views/admin/users/new.html.erb app/views/admin/users/show.html.erb lib/authenticated_system/authenticated_dependencies.rb lib/authenticated_system/authenticated_routes.rb lib/authenticated_system/authenticated_system_controller.rb lib/authenticated_system/authenticated_system_model.rb lib/authenticated_system/authenticated_system_orm_map.rb spec/authenticated_system_spec_helper.rb spec/controllers/admin/sessions_spec.rb spec/controllers/admin/users_spec.rb spec/helpers/admin/sessions_helper_spec.rb spec/helpers/admin/users_helper_spec.rb spec/models/user_spec.rb spec/user_spec_helper.rb eafb1861bfdc0f92b07282451731d59c3ba7a11d 658fab8c25a8670708f811533cca6a7076720f08 El Draper el@eldiablo.co.uk http://github.com/mleung/feather/commit/d9fdcdc6d8770b111dbf9df8835d92c89aeec166 d9fdcdc6d8770b111dbf9df8835d92c89aeec166 2008-07-18T14:14:02-07:00 2008-07-18T14:14:02-07:00 fixed conflicts Merge branch 'master' of git://github.com/thewordnerd/feather into thewordnerd/master Conflicts: config/init.rb spec/controllers/admin/articles_spec.rb spec/models/user_spec.rb c0776e53a7068c7173dedb53f3e38cb9734e84de El Draper el@eldiablo.co.uk