vendor/haml_maruku_filter.rb view/css/clearfix.sass view/css/reset.sass @@ -22,11 +22,18 @@ class AccountController < Controller def login redirect_referrer if logged_in? push request.referrer unless inside_stack? + + case request[:fail] + when 'session' + flash[:bad] = + 'Failed to login, please make sure you have cookies enabled for this site' + end + return unless request.post? if user_login flash[:good] = "Welcome back #{user.login}" - answer R(ProfileController, user.login) + redirect Rs(:after_login) end end @@ -46,6 +53,20 @@ class AccountController < Controller end end + # This method is simply to check whether we really did login and the browser + # sends us a cookie, if we're not logged in by now it would indicate that the + # client doesn't support cookies or has it disabled and so unable to use this + # site. + # For some reason, the arora seems to have problems handling cookies on + # localhost from rack. + def after_login + if logged_in? + answer R(ProfileController, user.login) + else + redirect Rs(:login, :fail => :session) + end + end + def logout user_logout controller/account.rb @@ -1,5 +1,8 @@ class CssController < Ramaze::Controller engine :Sass + trait :sass_options => { + :style => :compressed, + } end Ramaze::Route[%r!/css/(.+)\.css!] = '/css/%s' controller/css.rb @@ -18,6 +18,7 @@ SOCIAR = Configuration.for :sociar do end ramaze do + gzip true host '0.0.0.0' port 7000 adapter :thin env/sociar.rb @@ -1,2 +1,2 @@ acquire 'model/*.rb' -require 'db/init' +# require 'db/init' model/init.rb @@ -8,14 +8,24 @@ $LOAD_PATH.unshift(__DIR__) require 'env' require 'vendor/flickr' +require 'vendor/haml_maruku_filter' require 'vendor/image_science_cropped_resize' require 'model/init' require 'controller/init' -require 'db/init' if SOCIAR.mode == 'dev' +# require 'db/init' if SOCIAR.mode == 'dev' r = SOCIAR.ramaze + +=begin +if r.gzip + require 'ramaze/contrib/gzip_filter' + gzip = Ramaze::Filter::Gzip + gzip.trait :threshold => 1 + Ramaze::Dispatcher::Action::FILTER << gzip +=end + Ramaze.start :adapter => r.adapter, :host => r.host, :port => r.port, start.rb @@ -4,53 +4,6 @@ require 'sequel' require 'image_science' -# Scaffold image models utilizing thumbnailing and Ramaze integration. -# Resizing is done by ImageScience. -# -# Usage: -# class Avatar < Sequel::Model -# IMAGE = { -# # specifies belongs_to, will create relation and foreign key -# -# :owner => :User, -# -# -# # Remove original and thumbnails on Avatar#destroy -# -# :cleanup => true, -# -# -# # Algorithm to use in ImageScience -# # -# # * resize(width, height) -# # Resizes the image to +width+ and +height+ using a cubic-bspline -# # filter. -# # -# # * thumbnail(size) -# # Creates a proportional thumbnail of the image scaled so its -# # longest edge is resized to +size+. -# # -# # * cropped_thumbnail(size) -# # Creates a square thumbnail of the image cropping the longest edge -# # to match the shortest edge, resizes to +size+. -# -# :agorithm => :thumbnail, -# -# -# # Key specifies the filename and accessors, value are arguments to the -# # algorithm -# -# :sizes => { -# :small => 150, -# :medium => 300, -# :large => 600 -# } -# } -# -# # Perform the scaffold -# include SequelImage -# end - module Sequel module Plugins module Image vendor/image.rb @@ -1,4 +1,57 @@ #about - %h1 About Sociar - %p - Sociar is an open source social network system. It is designed for ease of use and customization. + :maruku + * ToC + {:toc} + + # About Sociar + + Sociar is an open source social network system. It's designed for ease of + use and customization. + + ## Features + + * User + * Authentication + * Ordinary email/password + * Recover lost password + * OpenID + * Avatar / gravatar + * Profile + * Images + * Lightbox + * Tagging + * Thumbnailing + * Upload + * Flickr integration + * Blog + * Commenting + * Email-Notification and Feeds + * Every user has a blog + * Messaging + * Email-Notification and Feeds + * User2User PM + * Search + * For User + * by location + * by name + * For Blog Post + * by fulltext + * by title + + ## Obtaining + + ## Dependencies + + * configuration + * erubis + * faker + * haml + * maruku + * rack + * ramaze + * sequel + * sqlite3-ruby + * xml-simple + + +-# vi: syntax=haml view/about.haml @@ -1,4 +1,5 @@ #login + #flashbox= flashbox %form{:method => 'POST', :name => :login} %fieldset %legend Login view/account/login.haml @@ -1,10 +1,8 @@ .comment.clearfix - .avatar - = @comment.from.avatar_linked_image(50) + .avatar= @comment.from.avatar_linked_image(50) .message .head %span.time= "#{time_diff @comment.updated_at} ago," = @comment.from.name_linked wrote: - .body - = h(@comment.abstract(@size)) + .body= h(@comment.abstract(@size)) view/comment/_show.haml @@ -78,17 +78,17 @@ #footer :text-align center + :color #fff :margin-top 1em :width 100% .info // :margin-left 25% - :background #fdb :float left :width 90% a :margin-right 0.2em :margin-left 0.2em - :color #06a + :color #07b img :text-align center :height 40 @@ -96,8 +96,9 @@ #comments .comment - :width 100% - :margin-bottom 1em + :padding 1em + :margin 1em + :border 1px solid #f60 .avatar :width 60px :float left view/css/layout.sass public/css/clearfix.css public/css/reset.css bd1fdd1385796493ed0b4c496e52ec19f354063b Michael Fellinger m.fellinger@gmail.com http://github.com/manveru/sociar/commit/ebb91316a0aedb88a8ae865a0bfe7788f0a0bc9f ebb91316a0aedb88a8ae865a0bfe7788f0a0bc9f 2008-10-19T08:42:11-07:00 2008-10-19T08:42:11-07:00 Refactoring and cleaning up 97ddaf717c1907e27e1eda9c4fa8d72bbe16d8be Michael Fellinger m.fellinger@gmail.com