app/models/membership.rb db/migrate/052_add_user_admin_bool.rb db/migrate/053_create_memberships.rb test/fixtures/memberships.yml test/unit/membership_test.rb @@ -14,6 +14,10 @@ class Site < ActiveRecord::Base has_many :assets, :as => :attachable, :order => 'created_at desc' has_many :assets, :order => 'created_at desc', :conditions => 'parent_id is null' + has_many :memberships + has_many :members, :through => :memberships, :source => :user + has_many :admins, :through => :memberships, :source => :user, :conditions => ['memberships.admin = ? or users.admin = ?', true, true] + before_validation :downcase_host before_validation :set_default_timezone before_validation_on_create :set_default_comment_options app/models/site.rb @@ -1,7 +1,15 @@ class User < UserAuth + @@admin_scope = {:find => { :conditions => ['admin = ?', true] } } has_many :articles acts_as_paranoid + has_many :memberships + has_many :sites, :through => :memberships, :order => 'title, host' + + def self.find_admins(*args) + with_scope(@@admin_scope) { find *args } + end + def to_liquid [:login, :email].inject({}) { |hsh, attr_name| hsh.merge attr_name.to_s => send(attr_name) } end app/models/user.rb @@ -6,4 +6,5 @@ default: crypted_password: 00742970dc9e6319f8019fd54864d3ea740f04b1 # test activated_at: <%= Time.now.utc.to_s :db %> created_at: <%= Time.now.utc.to_s :db %> - updated_at: <%= Time.now.utc.to_s :db %> \ No newline at end of file + updated_at: <%= Time.now.utc.to_s :db %> + admin: true \ No newline at end of file db/bootstrap/users.yml @@ -2,7 +2,7 @@ # migrations feature of ActiveRecord to incrementally modify your database, and # then regenerate this schema definition. -ActiveRecord::Schema.define(:version => 51) do +ActiveRecord::Schema.define(:version => 53) do create_table "assets", :force => true do |t| t.column "content_type", :string @@ -95,6 +95,13 @@ ActiveRecord::Schema.define(:version => 51) do t.column "site_id", :integer end + create_table "memberships", :force => true do |t| + t.column "site_id", :integer + t.column "user_id", :integer + t.column "created_at", :datetime + t.column "admin", :boolean, :default => false + end + create_table "sections", :force => true do |t| t.column "name", :string t.column "show_paged_articles", :boolean, :default => false @@ -152,6 +159,7 @@ ActiveRecord::Schema.define(:version => 51) do t.column "remember_token", :string t.column "remember_token_expires_at", :datetime t.column "filter", :string + t.column "admin", :boolean, :default => false end end db/schema.rb @@ -11,6 +11,7 @@ quentin: remember_token: quentintoken remember_token_expires_at: <%= 5.days.from_now.to_s :db %> # activated_at: <%= 5.days.ago.to_s :db %> # only if you're activating new signups + admin: true arthur: id: 2 login: arthur test/fixtures/users.yml @@ -46,6 +46,10 @@ class UserTest < Test::Unit::TestCase assert_equal '', users(:quentin).reload.filter end + def test_should_find_admins + assert_models_equal [users(:quentin)], User.find_admins(:all) + end + protected def create_user(options = {}) User.create({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options)) test/unit/user_test.rb a8e03e5772c8a9123606bfe4018f8b2f78f18b71 technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/francois/mephisto/commit/2bdff7b66cf6bbbad6e365e7393546af7c2deb7e 2bdff7b66cf6bbbad6e365e7393546af7c2deb7e 2006-09-06T00:21:00-07:00 2006-09-06T00:21:00-07:00 add simple site memberships git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2090 567b1171-46fb-0310-a4c9-b4bef9110e78 a1f1e06d1e5f85768954dcb93d89f920794aac1e technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78