env.rb env/dev.rb env/live.rb env/sociar.rb @@ -1,3 +1,3 @@ class AdminController < Ramaze::Controller - scaffold_all_models :only => MODELS + scaffold_all_models end controller/admin.rb @@ -29,15 +29,4 @@ class AppController < Ramaze::Controller end end -require 'controller/account' -require 'controller/admin' -require 'controller/blog' -require 'controller/comment' -require 'controller/css' -require 'controller/feed' -require 'controller/friend' -require 'controller/home' -require 'controller/main' -require 'controller/message' -require 'controller/image' -require 'controller/profile' +acquire 'controller/*.rb' controller/app.rb @@ -2,7 +2,7 @@ class BlogController < AppController helper :form def index(login = nil, title = nil) - @user = User[:login => login] + @user = login_or_user(login) @profile = @user.profile @blogs = @profile.blogs controller/blog.rb @@ -1,4 +1,4 @@ -class MainController < AppController +class IndexController < AppController map '/' def index controller/main.rb @@ -2,7 +2,7 @@ module Ramaze module Helper module Config def config - SOCIAR + SOCIAR.site end end end helper/config.rb @@ -11,6 +11,8 @@ class Blog < Sequel::Model foreign_key :profile_id end + create_table unless table_exists? + validations.clear validates_presence_of :title, :body, :profile_id @@ -39,7 +41,4 @@ class Blog < Sequel::Model def affected_profiles [profile] + profile.friends + profile.followers end - - - MODELS << self end model/blog.rb @@ -1,6 +1,4 @@ class Comment < Sequel::Model - MODELS << self - set_schema do primary_key :id @@ -16,6 +14,8 @@ class Comment < Sequel::Model foreign_key :to_id end + create_table unless table_exists? + many_to_one :from, :key => :from_id, :class => :User many_to_one :to, :key => :to_id, :class => :User model/comment.rb @@ -10,6 +10,8 @@ class FeedItem < Sequel::Model foreign_key :item_id end + + create_table unless table_exists? end __END__ model/feed_item.rb @@ -1,5 +1,6 @@ class Image < Sequel::Model - MODELS << self + include Ramaze::Helper::CGI + include Ramaze::Helper::Link PATH = "/image" SIZES = { @@ -20,6 +21,8 @@ class Image < Sequel::Model belongs_to :profile + create_table unless table_exists? + # Hooks hooks.clear @@ -105,9 +108,6 @@ class Image < Sequel::Model "%s_%08d%s" % [profile.user.login, n, ext] end - include Ramaze::Helper::CGI - include Ramaze::Helper::Link - # TODO: lightbox def linked(size) src = send("#{size}_url") model/image.rb @@ -1,11 +1,14 @@ require 'ramaze/helper/gravatar' class Profile < Sequel::Model - MODELS << self - include Ramaze::Helper::CGI include Ramaze::Helper::Gravatar + SEARCH = %w[ + name location blog website flickr aim_name flickr_name + gtalk_name ichat_name youtube_name + ] + set_schema do primary_key :id @@ -38,6 +41,8 @@ class Profile < Sequel::Model has_many :feeds has_many :images + create_table unless table_exists? + # has_many : # has_many :feed_items, # :through => :feeds, @@ -64,9 +69,6 @@ class Profile < Sequel::Model self.updated_at = Time.now end - SEARCH = %w[name location blog website flickr aim_name flickr_name gtalk_name - ichat_name youtube_name] - def self.search(query = {}) SEARCH.map{|key| key, value = key.to_sym, query[key] @@ -86,7 +88,12 @@ class Profile < Sequel::Model def avatar(size = 50) s = { 50 => 'small', 100 => 'medium', 150 => 'big' }[size] - gravatar(email, size, "/media/avatar/default_#{s}.png") + + if Ramaze::Global.mode == 'live' + gravatar(email, size, "/media/avatar/default_#{s}.png") + else + "/media/avatar/default_#{s}.png" + end rescue => ex Ramaze::Log.error(ex) "/media/avatar/default_#{s}.png" @@ -158,12 +165,4 @@ class Profile < Sequel::Model %|<tr><td class="key">#{title}:</td><td class="value">#{value}</td></tr>| end end - - private - - def flink(value, url = '<a href="%value">%value</a>') - return unless value - esc = h(value) - url.gsub('%value', esc) - end end model/profile.rb @@ -1,4 +1,9 @@ class User < Sequel::Model + include Ramaze::Helper::Link + include Ramaze::Helper::CGI + + SEARCH = %w[login] + set_schema do primary_key :id @@ -27,6 +32,8 @@ class User < Sequel::Model belongs_to :profile + create_table unless table_exists? + # Validation attr_accessor :password, :password_confirmation, :email @@ -42,12 +49,13 @@ class User < Sequel::Model hooks.clear before_create{ self.created_at = Time.now } - after_create{ + before_save{ self.updated_at = Time.now } + + after_create do self.crypted_password = encrypt(password) - self.profile = profile = Profile.create(:email => email, :user => self) + self.profile = Profile.create(:email => email, :user => self) save - } - before_save{ self.updated_at = Time.now } + end # Remember until next year def remember_me @@ -94,8 +102,6 @@ class User < Sequel::Model order(:created_at.desc).limit(n).eager(:profile) end - SEARCH = %w[login] - def self.search(query = {}) SEARCH.map{|key| key, value = key.to_sym, query[key] @@ -104,8 +110,6 @@ class User < Sequel::Model end # Quick profile access - include Ramaze::Helper::Link - include Ramaze::Helper::CGI def images profile.images @@ -151,6 +155,4 @@ class User < Sequel::Model return rand(1e128) UUID.random_create end - - MODELS << self end model/user.rb @@ -26,6 +26,7 @@ end describe 'User register' do require 'start' + ramaze :adapter => :thin, :port => 7007, :run_loose => true behaves_like 'mechanize' spec/story/user/register.rb @@ -4,14 +4,16 @@ require 'maruku' require 'sequel' require 'scaffolding_extensions' -require __DIR__/'vendor/flickr' -require __DIR__/'settings' +$LOAD_PATH.unshift(__DIR__) -require __DIR__/'model/app' -require __DIR__/'controller/app' +require 'env' +require 'vendor/flickr' +acquire 'model/*.rb' +require 'controller/app' -if $0 == __FILE__ - require __DIR__/'db/init' -end +require 'db/init' if SOCIAR.mode == 'dev' -Ramaze.start :adapter => :thin +r = SOCIAR.ramaze +Ramaze.start :adapter => r.adapter, + :host => r.host, + :port => r.port start.rb @@ -20,7 +20,7 @@ <div id="menu"> <div class="top"> <?r if logged_in? ?> - #{ A 'Newest Stuff', :href => R(MainController) } + #{ A 'Newest Stuff', :href => R(IndexController) } #{ A 'Dashboard', :href => R(ProfileController) } #{ A 'Admin', :href => R(AdminController) } #{ A 'Logout', :href => R(AccountController, :logout) } view/page.xhtml @@ -18,7 +18,7 @@ <img src="/media/blurp_photos.png" title="Profile icon" alt="Profile icon" /> </b> <p class="grid_7 omega"> - #{config.site_name} allows users to upload images with captions to their profile. We love someone to build albums, tagging and commenting on photos for this open source project! + #{config.title} allows users to upload images with captions to their profile. We love someone to build albums, tagging and commenting on photos for this open source project! </p> </div> <?r end ?> @@ -29,7 +29,7 @@ <img src="/media/blurp_friends.png" title="Profile icon" alt="Profile icon" /> </b> <p class="grid_7 omega"> - Finding your friends is easy, get started by searching for profiles on #{config.site_name}. + Finding your friends is easy, get started by searching for profiles on #{config.title}. <a href="/profile/search">To the search</a>. </p> </div> @@ -41,7 +41,7 @@ <img src="/media/blurp_message.png" title="Profile icon" alt="Profile icon" /> </b> <p class="grid_7 omega"> - Exchange messages with friends and other people on #{config.site_name}. We already sent you a message to get you started, go check it out in <a href="/message">your messages</a>. + Exchange messages with friends and other people on #{config.title}. We already sent you a message to get you started, go check it out in <a href="/message">your messages</a>. </p> </div> <?r end ?> view/profile/getting_started.xhtml model/app.rb settings.rb settings.yaml 7c9381bce438da4706d4f636b5600667cf7bc9b3 Michael Fellinger m.fellinger@gmail.com http://github.com/manveru/sociar/commit/b69c3aac6e10f606fc27a6b2d0913b4fd3006218 b69c3aac6e10f606fc27a6b2d0913b4fd3006218 2008-06-01T22:08:46-07:00 2008-06-01T22:08:46-07:00 Switch config to Configuration 5da29821f6df5be4377568b1b2f63301c49dd4fe Michael Fellinger m.fellinger@gmail.com