@@ -36,15 +36,16 @@ class BlogController < Controller private def save - if request.post? - @post.title = request[:title] - @post.body = request[:body] - if @post.save - flash[:good] = "Created post" - redirect Rs(:/, @post.to_url) - else - flash[:bad] = "Couldn't create post" - end + return unless request.post? + + @post.title = request[:title] + @post.body = request[:body] + + if @post.save + flash[:good] = "Created post" + redirect Rs(:/, @post.to_url) + else + flash[:bad] = "Couldn't create post" end end end controller/blog.rb @@ -37,4 +37,14 @@ class Controller < Ramaze::Controller end end -acquire 'controller/*.rb' +require 'controller/account' +require 'controller/blog' +require 'controller/comment' +require 'controller/css' +require 'controller/feed' +require 'controller/friend' +require 'controller/home' +require 'controller/image' +require 'controller/index' +require 'controller/message' +require 'controller/profile' controller/init.rb @@ -5,7 +5,7 @@ begin require "env/#{SOCIAR.mode}" require "env/#{SOCIAR.host}" rescue LoadError => ex - Ramaze::Log.warn ex + Ramaze::Log.warn ex.message end s = SOCIAR.sequel env.rb @@ -26,10 +26,9 @@ class Blog < Sequel::Model format_of :body, :with => /\A.*\S+.*\Z/m, :message => 'is empty' end - hooks.clear - before_create{ self.created_at = Time.now } - before_save{ self.updated_at = Time.now } - after_create do + before_create(:time){ self.updated_at = self.created_at = Time.now } + before_save(:time){ self.updated_at = Time.now } + after_create(:update_feed) do # feed_item = FeedItem.create(:item => self) # affected_profiles.each do |pr| # pr.feed_items << feed_item model/blog.rb @@ -26,18 +26,9 @@ class Image < Sequel::Model create_table unless table_exists? - # Hooks - hooks.clear - - before_create do - self.created_at = Time.now - end - - before_save do - generate_thumbnails(SIZES) - self.updated_at = Time.now - end - + before_create(:time){ self.updated_at = self.created_at = Time.now } + before_save(:time){ self.updated_at = Time.now } + before_save(:thumbnail){ generate_thumbnails(SIZES) } def file(size = nil) File.join(PATH, filename(size)) model/image.rb @@ -1 +1,8 @@ -acquire 'model/*.rb' +require 'model/blog' +require 'model/comment' +require 'model/feed_item' +require 'model/image' +require 'model/init' +require 'model/message' +require 'model/profile' +require 'model/user' model/init.rb @@ -58,17 +58,8 @@ class Profile < Sequel::Model length_of :email, :within => 3..255 end - # Hooks - hooks.clear - - before_create do - self.created_at = Time.now - self.updated_at = Time.now - end - - before_save do - self.updated_at = Time.now - end + before_create(:time){ self.created_at = self.updated_at = Time.now } + before_save(:time){ self.updated_at = Time.now } def self.search(query = {}) return [] if query.empty? model/profile.rb @@ -42,15 +42,13 @@ class User < Sequel::Model length_of :password, :within => 6..255 end - # Hooks - hooks.clear + before_create(:time){ self.updated_at = self.created_at = Time.now } + before_save(:time){ self.updated_at = Time.now } - before_create{ self.created_at = Time.now } - before_save{ self.updated_at = Time.now } - - after_create do - self.crypted_password = encrypt(password) + after_create(:password) do + eelf.crypted_password = encrypt(password) self.profile = Profile.create(:email => email, :user => self, :login => login) + @new = false # avoid bug where Sequel uses INSERT instead of UPDATE save end model/user.rb 00ff6d2d07ac1ce1b74d51129e6c93149cbf97e1 Michael Fellinger m.fellinger@gmail.com http://github.com/manveru/sociar/commit/1fb1016221114495124bf1590b86101c6853afec 1fb1016221114495124bf1590b86101c6853afec 2009-03-11T09:15:38-07:00 2009-03-11T09:15:38-07:00 Update to work with latest Sequel and Ramaze bf5e98af2825bce2cbe4fe142ec1f48c544b8cfc Michael Fellinger m.fellinger@gmail.com