app/controllers/sessions_controller.rb app/controllers/users_controller.rb app/helpers/sessions_helper.rb app/helpers/users_helper.rb app/views/account/_settings_menu.html.erb app/views/account/front.html.erb app/views/account/picture.html.erb app/views/account/settings.html.erb app/views/sessions/new.html.erb app/views/statuses/_latest.html.erb app/views/user/_friend.html.erb app/views/user/_user_stats.html.erb app/views/users/_user_bar.html.erb app/views/users/new.html.erb config/initializers/site_keys.rb db/migrate/20090119123823_create_users.rb lib/authenticated_system.rb lib/authenticated_test_helper.rb public/images/arr2.gif public/images/bg.gif public/images/checkmark.gif public/images/default_profile.png public/images/default_profile_bigger.png public/images/favicon.gif public/images/favicon.ico public/images/girl.gif public/images/icon_direct_reply.gif public/images/icon_reply.gif public/images/icon_star_empty.gif public/images/icon_star_full.gif public/images/icon_throbber.gif public/images/icon_trash.gif public/images/loader.gif public/images/pale.png public/images/profile/about.png public/images/profile/one.png public/images/profile/rob.png public/images/rob_mini.jpg public/images/round-btn-hover.gif public/images/round-btn.gif public/images/tiny_check.gif public/images/toggle_closed.gif public/images/toggle_opened.gif public/images/twitter_logo_s.png public/javascripts/jquery.color.js public/javascripts/jquery.min.js public/javascripts/timeline.js public/stylesheets/front.css public/stylesheets/lightwindow.css public/stylesheets/master.css public/stylesheets/screen.css public/stylesheets/timeline.css test/functional/sessions_controller_test.rb test/functional/users_controller_test.rb vendor/plugins/restful-authentication/.gitignore vendor/plugins/restful-authentication/CHANGELOG vendor/plugins/restful-authentication/README.textile vendor/plugins/restful-authentication/Rakefile vendor/plugins/restful-authentication/TODO vendor/plugins/restful-authentication/generators/authenticated/USAGE vendor/plugins/restful-authentication/generators/authenticated/authenticated_generator.rb vendor/plugins/restful-authentication/generators/authenticated/lib/insert_routes.rb vendor/plugins/restful-authentication/generators/authenticated/templates/_model_partial.html.erb vendor/plugins/restful-authentication/generators/authenticated/templates/activation.erb vendor/plugins/restful-authentication/generators/authenticated/templates/authenticated_system.rb vendor/plugins/restful-authentication/generators/authenticated/templates/authenticated_test_helper.rb vendor/plugins/restful-authentication/generators/authenticated/templates/controller.rb vendor/plugins/restful-authentication/generators/authenticated/templates/helper.rb vendor/plugins/restful-authentication/generators/authenticated/templates/login.html.erb vendor/plugins/restful-authentication/generators/authenticated/templates/mailer.rb vendor/plugins/restful-authentication/generators/authenticated/templates/migration.rb vendor/plugins/restful-authentication/generators/authenticated/templates/model.rb vendor/plugins/restful-authentication/generators/authenticated/templates/model_controller.rb vendor/plugins/restful-authentication/generators/authenticated/templates/model_helper.rb vendor/plugins/restful-authentication/generators/authenticated/templates/model_helper_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/observer.rb vendor/plugins/restful-authentication/generators/authenticated/templates/signup.html.erb vendor/plugins/restful-authentication/generators/authenticated/templates/signup_notification.erb vendor/plugins/restful-authentication/generators/authenticated/templates/site_keys.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/controllers/access_control_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/controllers/authenticated_system_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/controllers/sessions_controller_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/controllers/users_controller_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/fixtures/users.yml vendor/plugins/restful-authentication/generators/authenticated/templates/spec/helpers/users_helper_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/spec/models/user_spec.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/rest_auth_stories.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/rest_auth_stories_helper.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/steps/ra_navigation_steps.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/steps/ra_resource_steps.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/steps/ra_response_steps.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/steps/user_steps.rb vendor/plugins/restful-authentication/generators/authenticated/templates/stories/users/accounts.story vendor/plugins/restful-authentication/generators/authenticated/templates/stories/users/sessions.story vendor/plugins/restful-authentication/generators/authenticated/templates/test/functional_test.rb vendor/plugins/restful-authentication/generators/authenticated/templates/test/mailer_test.rb vendor/plugins/restful-authentication/generators/authenticated/templates/test/model_functional_test.rb vendor/plugins/restful-authentication/generators/authenticated/templates/test/unit_test.rb vendor/plugins/restful-authentication/init.rb vendor/plugins/restful-authentication/install.rb vendor/plugins/restful-authentication/lib/authentication.rb vendor/plugins/restful-authentication/lib/authentication/by_cookie_token.rb vendor/plugins/restful-authentication/lib/authentication/by_password.rb vendor/plugins/restful-authentication/lib/authorization.rb vendor/plugins/restful-authentication/lib/authorization/aasm_roles.rb vendor/plugins/restful-authentication/lib/authorization/stateful_roles.rb vendor/plugins/restful-authentication/lib/trustification.rb vendor/plugins/restful-authentication/lib/trustification/email_validation.rb vendor/plugins/restful-authentication/notes/AccessControl.txt vendor/plugins/restful-authentication/notes/Authentication.txt vendor/plugins/restful-authentication/notes/Authorization.txt vendor/plugins/restful-authentication/notes/RailsPlugins.txt vendor/plugins/restful-authentication/notes/SecurityFramework.graffle vendor/plugins/restful-authentication/notes/SecurityFramework.png vendor/plugins/restful-authentication/notes/SecurityPatterns.txt vendor/plugins/restful-authentication/notes/Tradeoffs.txt vendor/plugins/restful-authentication/notes/Trustification.txt vendor/plugins/restful-authentication/rails/init.rb vendor/plugins/restful-authentication/restful-authentication.gemspec vendor/plugins/restful-authentication/tasks/auth.rake @@ -1,5 +1,6 @@ public/.DS_Store log/* +tmp/* db/*sqlite3 db/development.sqlite3 .DS_Store .gitignore @@ -1,5 +1,5 @@ class AccountController < ApplicationController - before_filter :authenticate + before_filter :authenticate, :except=>[:front, :login, :end_session] def index @tweets = @user.public_tweets.find(:all,:include => :user,:limit => 20 ) @@ -7,14 +7,11 @@ class AccountController < ApplicationController def end_session reset_session + redirect_to :action=>'front' end def update_profile_image - upload_image = "#{RAILS_ROOT}/tmp/upload/#{@user.id}" - File.open(upload_image, "wb") { |f| f.write(params[:image].read) } - cmd = "convert -size 100x100 #{upload_image} #{RAILS_ROOT}/public/images/profile/#{@user.username}.png" - puts cmd - puts `#{cmd}` + upload_image(params[:image]) redirect_to :action=>'index' end @@ -32,11 +29,32 @@ class AccountController < ApplicationController format.json { render :json => rate_limit } end end + + def settings + if (request.post?) + if (@user.update_attributes(params[:user])) + flash[:notice] = 'User attributes updated' + end + end + end + + def picture + if (request.post?) + upload_image(params[:profile_image][:uploaded_data]) + end + end private def date_formatted(date) date.gmtime.strftime("%a %b %d %H:%M:%S +0000 %Y") end - + + def upload_image(image) + upload_image = "#{RAILS_ROOT}/tmp/upload/#{@user.id}" + File.open(upload_image, "wb") { |f| f.write(image.read) } + cmd = "convert -size 100x100 #{upload_image} #{RAILS_ROOT}/public/images/profile/#{@user.username}.png" + puts cmd + puts `#{cmd}` + end end app/controllers/account_controller.rb @@ -2,6 +2,8 @@ # Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base + include AuthenticatedSystem + helper :all # include all helpers, all the time # See ActionController::RequestForgeryProtection for details @@ -16,15 +18,13 @@ class ApplicationController < ActionController::Base def verify_authenticity_token return true end + def authenticate - if user = authenticate_with_http_basic { |u, p| u if !u.to_s.strip.blank? } - logger.debug user - @user = User.find_or_create_by_username(user) - else - request_http_basic_authentication - end + x = login_required + @user = current_user + x end - + private def render_tweets(root="statuses") app/controllers/application.rb @@ -1,4 +1,6 @@ class FriendshipsController < ApplicationController + before_filter :authenticate + def exists respond_to do |format| format.xml { render :xml=>"<friends>true</friends>"} app/controllers/friendships_controller.rb @@ -1,11 +1,13 @@ class StatusesController < ApplicationController before_filter :authenticate, :except => [:show] + def replies @tweets = @user.replies.find(:all, :include => :user,:limit => 25) render_tweets end def friends_timeline + puts "request=#{@user}" limit = params[:all] ? 100000000000 : 25 @tweets = Tweet.find(:all,:order => "tweets.created_at DESC",:conditions => "tweets.tweet_type!='direct'",:include => :user,:limit => limit) render_tweets @@ -45,8 +47,14 @@ class StatusesController < ApplicationController recipient = User.find_or_create_by_username(recipient_name) end - @tweet = Tweet.create({:tweet => tweet, :user => @user, :recipient => recipient, :tweet_type => type, :source => params[:source]}) - render_tweet - + @tweet = Tweet.create({:tweet => tweet, :user => @user, :recipient => recipient, :tweet_type => type, :source => params[:source] || 'web'}) + if (params['twttr']) + latest_status = render_to_string :partial => "latest", :object=> @tweet + ret = {"status_count"=>@user.public_tweets.count, "latest_status"=> latest_status,"text"=>tweet} + ret["status_tr"] = render_to_string :partial => "tweet", :object=> @tweet, :locals=>{:type=>'friends_update'} + render :json => ret + else + render_tweet + end end end app/controllers/statuses_controller.rb @@ -1,10 +1,7 @@ class UserController < ApplicationController + def index @duser = User.find_or_create_by_username(params[:username]) - if (@duser == @user) - redirect_to :controller=>'account' - else - @tweets = @duser.public_tweets.find(:all,:include => :user,:limit => 20 ) - end + @tweets = @duser.public_tweets.find(:all,:include => :user,:limit => 20 ) end end app/controllers/user_controller.rb @@ -1,2 +1,13 @@ module AccountHelper + def settings_list_entry(page) + "<li id=\"tab_#{page}\">#{settings_link(page)}</li>" + end + + def settings_link(page) + if (params[:action]==page) + page.capitalize + else + "<a href=\"#{page}\" id=\"#{page}_tab\">#{page.capitalize}</a>" + end + end end app/helpers/account_helper.rb @@ -1,3 +1,9 @@ # Methods added to this helper will be available to all templates in the application. module ApplicationHelper + def setup(options) + @title = "Twetter / #{options[:title]}" || "Twetter" + @body_id = options[:body_id] || "body" + @body_classes = options[:body_classes] || "account" + @css = options[:css] || [] + end end app/helpers/application_helper.rb @@ -1,2 +1,5 @@ module StatusesHelper + def link_users(tweet) + html_escape(tweet).gsub(/@(\S+)/, '@<a href="/\1"/>\1</a>') + end end app/helpers/statuses_helper.rb @@ -1,24 +1,111 @@ +require 'digest/sha1' + class User < ActiveRecord::Base + include Authentication + include Authentication::ByPassword + include Authentication::ByCookieToken + has_many :tweets - has_many :replies, :class_name=>'Tweet', :foreign_key=>'recipient_id', :conditions=>"tweet_type='reply'", :order => "tweets.created_at DESC" - has_many :direct_messages_received, :class_name=>'Tweet', :foreign_key=>'recipient_id', :conditions=>"tweet_type='direct'", :order => "tweets.created_at DESC" - has_many :direct_messages_sent, :class_name=>'Tweet', :conditions=>"tweet_type='direct'", :order => "tweets.created_at DESC" - has_many :public_tweets, :class_name=>'Tweet', :conditions=>"tweet_type!='direct'", :order=>"tweets.created_at DESC" + has_many :replies, :class_name=>'Tweet', :foreign_key=>'recipient_id', :conditions=>"tweet_type='reply'", :order => "tweets.created_at DESC" + has_many :direct_messages_received, :class_name=>'Tweet', :foreign_key=>'recipient_id', :conditions=>"tweet_type='direct'", :order => "tweets.created_at DESC" + has_many :direct_messages_sent, :class_name=>'Tweet', :conditions=>"tweet_type='direct'", :order => "tweets.created_at DESC" + has_many :public_tweets, :class_name=>'Tweet', :conditions=>"tweet_type!='direct'", :order=>"tweets.created_at DESC" + + validates_presence_of :username + validates_length_of :username, :within => 3..40 + validates_uniqueness_of :username + validates_format_of :username, :with => Authentication.login_regex, :message => Authentication.bad_login_message + + validates_format_of :name, :with => Authentication.name_regex, :message => Authentication.bad_name_message, :allow_nil => true + validates_length_of :name, :maximum => 100 + + + # HACK HACK HACK -- how to do attr_accessible from here? + # prevents a user from submitting a crafted form that bypasses activation + # anything else you want your user to change should be added here. + attr_accessible :username, :name, :password, :password_confirmation, :bio, :location + + + + # Authenticates a user by their login name and unencrypted password. Returns the user or nil. + # + # uff. this is really an authorization, not authentication routine. + # We really need a Dispatch Chain here or something. + # This will also let us return a human error message. + # + def self.authenticate(login, password) + u = find_or_create_by_username(login) + if (!u.crypted_password) + u.password = password + u.save! + return u + end + u.authenticated?(password) ? u : nil + end + + def password_required? + false + end + + + def username=(value) + write_attribute :username, (value ? value.downcase : nil) + end + + def web_profile_url + file = "#{RAILS_ROOT}/public/images/profile/#{self.username}.png" + if (File.exists?(file)) + number = File.mtime(file).to_i.to_s rescue "" + "/images/profile/#{self.username}.png?#{number}" + else + "/images/default_profile.png" + end + end def profile_url - File.exists?("#{RAILS_ROOT}/public/images/profile/#{self.username}.png") ? - "http://twitter.com/images/profile/#{self.username}.png" : - "http://twitter.com/images/rails.png" + "http://twitter.com#{self.web_profile_url}" end - + def to_map(include_latest=false) - ret = {:id=>id, :name=>username, :screen_name=>username, :profile_image_url=> profile_url, - :location=>'Rails Camp', :description=>'', :url=>'', :protected=>false, :followers_count=>User.count} + ret = {:id=>id, :name=>name, :screen_name=>username, :profile_image_url=> profile_url, + :location=>location, :description=>bio, :url=>'', :protected=>false, :followers_count=>follower_count} if (include_latest) last_tweet = public_tweets.find(:first) ret[:status] = last_tweet.to_map(false) if (!last_tweet.nil?) end ret end - + + def name + read_attribute(:name) || self.username + end + + def latest_tweet + public_tweets[0] + end + + def following_count + User.count - 1 + end + + def follower_count + User.count - 1 + end + + def friends + User.find(:all, :conditions => ["id != ?", self.id]) + end + + + private + + def self.md5(pass) + Digest::MD5.hexdigest("--Twetter--#{pass}") + end + + + protected + + + end app/models/user.rb @@ -1,3 +1,5 @@ +<% setup({}) %> + <h1><%= @user.username %></h1> <%= image_tag @user.profile_url, :style=>"float:left"%> <% form_tag({:action => 'update_profile_image'}, {:multipart => true}) do %> app/views/account/index.html.erb @@ -1,25 +1,177 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" - "http://www.w3.org/TR/html4/strict.dtd"> - -<html lang="en"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>Twetter</title> - <meta name="generator" content="TextMate http://macromates.com/"> - <meta name="author" content="Phil Oye"> -  - <%= stylesheet_link_tag 'twetter' %> - <link rel="icon" type="image/gif" href="favicon.gif" /> -</head> -<body> -<div id="container"> - <div id="header"> - <h1>Twetter</h1> - <p>Mac nerds get <a href="twitterrific3.zip">Twitterific</a> - </div> - <div id="content"> - <%= yield %> - </div> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + + <head> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type" /> +<meta content="en-us" http-equiv="Content-Language" /> +<meta content="Twitter is a free social messaging utility for staying connected in real-time" name="description" /> +<meta content="no" http-equiv="imagetoolbar" /> +<meta content="width => 780" name="viewport" /> +<meta content="4FTTxY4uvo0RZTMQqIyhh18HsepyJOctQ+XTOu1zsfE=" name="verify-v1" /> +<meta content="y" name="session-loggedin" /> +<meta content="16360207" name="session-userid" /> +<meta content="rob_nielsen" name="session-user-screen_name" /> +<meta content="rob_test" name="page-user-screen_name" /> + + <title><%= @title %></title> + <link href="/images/favicon.ico" rel="shortcut icon" type="image/x-icon" /> + <% @css.each do |css| %> + <%= stylesheet_link_tag css %> + <% end %> + <%= stylesheet_link_tag 'master' %> + + <style type="text/css"> + body { background: #9ae4e8 url(/images/bg.gif) fixed no-repeat top left; } + div.content-bubble-arrow { margin-top: 6px; padding-top: 11px; background: url(/images/arr2.gif) no-repeat 25px 0px; } + .status-btn input.round-btn { background: url('/images/round-btn.gif'); } + .status-btn input.round-btn:hover { background: url('/images/round-btn-hover.gif'); } + .status-btn input.disabled, .status-btn input.disabled:hover { background: url('/images/round-btn.gif'); } + .hentry .actions .fav { background-image: url('/images/icon_star_full.gif'); } + .hentry .actions .non-fav { background-image: url('/images/icon_star_empty.gif'); } + .hentry .actions .fav-throb, .hentry .actions a.del-throb { background-image: url('/images/icon_throbber.gif'); } + .hentry .actions .del { background-image: url('/images/icon_trash.gif'); } + body#show .repl, .hentry .actions .repl { background-image: url('/images/icon_reply.gif'); } + .direct_message .actions .repl { background-image: url('/images/icon_direct_reply.gif'); } + .direct_message .actions .del { background-image: url('/images/icon_trash.gif'); } + .notify { background-image: url('/images/girl.gif'); } + .promotion, ul#tabMenu a#keyword_search_tab.hover, ul#tabMenu a:hover { background-image: url('/images/pale.png'); } + div#follow-toggle.closed { background-image: url('/images/toggle_closed.gif'); } + div#follow-toggle.opened { background-image: url('/images/toggle_opened.gif'); } + .follow-actions .following { background-image: url('/images/checkmark.gif'); } +</style> + <link rel="alternate" type="application/rss+xml" title="rob_test (RSS)" href="/statuses/user_timeline/17525701.rss" /> + <link rel="alternate" type="application/atom+xml" title="rob_test (Atom)" href="/statuses/user_timeline/17525701.atom" /> + </head> + + <body class="<%= @body_classes %>" id="<%= @body_id %>"> + <div id="dim-screen"></div> + <ul id="accessibility"> + <li>On a mobile phone? Check out <a href="http://m.twitter.com/">m.twitter.com</a>!</li> + <li><a href="#footer" accesskey="2">Skip to navigation</a></li> + <li><a href="#tabMenu" accesskey="3">Jump to the sidebar</a></li> <li><a href="#signin">Skip to sign in form</a></li> + +</ul> + + + <div id="container" class="subpage"> + <span id="loader" style="display:none"><img alt="Loader" src="/images/loader.gif" /></span> + <h1 id="header"> + <a href="/home" title="Twetter: home" accesskey="1"> + + <img alt="Twetter.com" height="41" src="/images/twitter_logo_s.png" width="191" /> + + </a> +</h1> + + + <% if flash[:notice] || flash[:error] %> + <div id="flash"> + <h2 class="thumb"><img alt="Girl" class="girl" src="/images/girl.gif" /></h2> + + <div class="content-bubble-arrow"></div> + <div class="desc"><p><%= flash[:notice] %><%= flash[:error] %></p></div> + + <% else %> + <div id="flash" style="display:none;"> + <% end %> + </div> + <div class="content-bubble-arrow"></div> + + <table cellspacing="0" class="columns"> + <tbody> + <tr> + <td id="content" class="column"> + <div class="wrapper"> + <%= yield %> + </div> + </td> + + <td id="side_base" class="column"> + <div id="side"> + <%= yield :sidebar %> + </div> + <hr/> + + </td> + + </tr> + </tbody> + </table> + + + <div id="footer" > + <h3>Footer</h3> + + <ul> + <li class="first">© 2009 Twetter</li> + + <li><a href="/about#about">About Us</a></li> + <li><a href="/about#contact">Contact</a></li> +  + </ul> + </div> -</body> + + <hr /> + + <div id="navigation"> + <ul> + <li class="first"><a href="/home" id="home_link">Home</a></li> + <li><a href="/rob_nielsen" id="profile_link">Profile</a></li> +  + + <li><a href="/account/settings" id="settings_link">Settings</a></li> +  + <li><a id="sign_out_link" href="#" onclick="document.getElementById('sign_out_form').submit(); return false;">Sign out</a></li> + + + </ul> + <form method="post" id="sign_out_form" action="/sessions/destroy" style="display:none;"> + <input name="authenticity_token" value="cf586308d33b4601f0dfba618cc4bbf7c5baf1c0" type="hidden" /> + </form> + + </div> + + + + </div> + + + <script src="/javascripts/jquery.min.js" type="text/javascript"></script><script src="/javascripts/application.js" type="text/javascript"></script><script src="/javascripts/jquery.color.js" type="text/javascript"></script> +<script src="/javascripts/timeline.js" type="text/javascript"></script> +<script type="text/javascript"> +//<![CDATA[ + twttr.form_authenticity_token = 'cf586308d33b4601f0dfba618cc4bbf7c5baf1c0'; + +//]]> + +</script> +<% if (flash[:notice]||flash[:error]) %> + <script type="text/javascript"> +//<![CDATA[ + + $( function () { + setTimeout(function() { $('#flash').slideUp(); }, 3000); + }); + +//]]> + </script> +<% end %> + +<%= yield :javascript %> + + </body> + </html> app/views/layouts/application.html.erb @@ -1,5 +1,27 @@ -<div class="tweet <%=cycle("on", "off") %>"> - <h2><%= h tweet.user.username %></h2> - <p><%= h tweet.tweet %></p> - <span class="datetime" ><%= time_ago_in_words(tweet.created_at) + " ago" %></span> -</div> +<tr class="hentry status u-<%= h tweet.user.username %><%= (tweet.user==@user) ? " mine" : "" %><%= ((type=='mine' && tweet_counter==0) || type=='friends_update') ? " latest-status":"" %>" id="status_<%= h tweet.id %>"> + <% if (type!='mine') %> + <td class="thumb vcard author"> + <a href="/<%= h tweet.user.username %>" class="url"><img alt="<%= tweet.user.name %>" class="photo fn" height="48" src="<%= tweet.user.web_profile_url %>" width="48"/></a> + </td> + <% end %> + <td class="status-body"> + <div> + <% if (type!='mine') %> + <strong><a href="/<%= h tweet.user.username %>" title="<%= tweet.user.name %>"><%= tweet.user.username %></a></strong> + <% end %> + <span class="entry-content"><%= link_users(tweet.tweet) %></span> + <span class="meta entry-meta"><a href="/<%= h tweet.user.username %>/status/<%= h tweet.id %>" class="entry-date" rel="bookmark"><span class="published" title="<%= tweet.created_at_formatted %>"><%= time_ago_in_words(tweet.created_at) %> + ago</span></a> <span>from <%= h tweet.source%></span> + <% if (!tweet.recipient.nil?) then %> + <a href="http://twitter.com/rob_nielsen/status/1014433331">in reply to <%= tweet.recipient.username %></a> + <% end %> + </span> + </div> + </td> + <td class="actions"> + <div> + <a class="non-fav" id="status_star_<%= h tweet.id %>" title="favorite this update">  </a><a class="repl" href="/home?status=@<%= h tweet.user.username %>%20&in_reply_to_status_id=<%= h tweet.id %>&in_reply_to=<%= h tweet.user.username %>" title="reply to <%= h tweet.user.username %>">  </a> + </div> + </td> +</tr> + app/views/statuses/_tweet.html.erb @@ -1 +1,145 @@ -<%= render :partial=>'tweet', :collection=>@tweets %> \ No newline at end of file +<% setup(:title=>"Home", :body_id=>"home", :body_classes=>"account replyable", :css=>['timeline']) %> + +<form action="/status/update" id="doingForm" method="post"> + <div style="margin:0;padding:0"> + <input name="authenticity_token" type="hidden" value="35b185be716b1d76607e18b2fc154509ac055063"/></div> + <input id="tab_action" name="tab" type="hidden" value="home"/> + <input id="authenticity_token" name="authenticity_token" type="hidden" value="35b185be716b1d76607e18b2fc154509ac055063"/> + <input id="in_reply_to_status_id" name="in_reply_to_status_id" type="hidden" value=""/> + <input id="in_reply_to" name="in_reply_to" type="hidden" value=""/> + <input id="source" name="source" type="hidden" value=""/> + <fieldset class="common-form standard-form"> + <div class="bar"> + <h3><label for="status" class="doing">What are you doing?</label></h3> + <span id="chars_left_notice" class="numeric"> + + <strong id="status-field-char-counter" class="char-counter"></strong> + </span> + </div> + <div class="info"> + <textarea cols="40" rows="2" id="status" name="status"><%= params[:status] %></textarea> + + <div class="status-btn"> + <input type="submit" name="update" value="update" id="update-submit" class="status-btn round-btn"/> + </div> + + <% if (!@user.latest_tweet.nil?) %> + <div id="currently"> + <strong>Latest:</strong> + <span id="latest_status"> + <%= render :partial=>'latest', :object=>@user.latest_tweet %> + </span> + </div> + <% end %> + </div> + + </fieldset> +</form> + +<div class="tab"> + + <h2 class="timeline-header" style="display:none;"></h2> + + <table cellspacing="0" class="doing" id="timeline"> + <tbody id="timeline_body_for_update" style="display: none"></tbody> + <tbody id="timeline_body"> + <%= render :partial=>'statuses/tweet', :collection=>@tweets, :locals=>{:type=>'friends'} %> + </tbody> + </table> + + + <div class="bottom_nav"> + <div class="pagination" id="pagination"> + + + <a href="/home?page=2" class="section_links" rel="prev">Older »</a> + + </div> + <span class="left"><a href="/statuses/friends_timeline/16360207.rss" class="section_links">RSS</a></span> + </div> + +</div> + + +<img alt="Icon_star_full" src="http://assets0.twitter.com/images/icon_star_full.gif" style="display:none;"/> + + +<% content_for :sidebar do %> + + <div class="section"> + <div class="user_icon"> + <a href="/<%= h @user.username %>" class="url" rel="contact" title="<%= h @user.name %>"><img alt="<%= h @user.name %>" class="side_thumb photo fn" height="73" src="<%= @user.web_profile_url %>" width="73"/></a> + + <p id="me_name"><%= h @user.username %></p> + + </div> + + <%= render :partial=>'user/user_stats', :object=> @user %> + + </div> + + <ul id="tabMenu"> + <li> + + <a href="/home" id="home_tab">Home</a></li> + <li> + <a href="/replies" id="replies_tab">@Replies</a></li> + <li> + <a href="/direct_messages" id="direct_messages_tab"><span id="message_count" class="stat_count">6</span> + Direct Messages</a></li> + + <li> + <a href="/favorites" id="favorites_tab">Favorites</a></li> + <li> + <a href="/public_timeline" id="public_timeline_tab">Everyone</a></li> + </ul> + + <div class="section last"> + + <div class="section-header" id="people"> + + <a href="/invitations" class="section-links">add</a> + + <h1>Following</h1> + </div> + + + <div id="friends"> + + <%= render :partial=>'user/friend', :collection=>@user.friends %> + + </div> + <div id="friends_view_all"><a href="/friends" rel="me">View All…</a></div> + + + </div> + + <div class="section last"> + <div class="section-header"> + <h1>Device Updates</h1> + </div> + <div id="device_control"> + + <div id="device_msg"> + <a href="/devices">Set up SMS updates</a> + </div> + </div> + + + </div> + +<% end %> + +<% content_for :javascript do %> + <script type="text/javascript"> +//<![CDATA[ + + $( function () { + $('#latest_status').isCurrentStatus();$('#doingForm').isUpdateForm(); $('body#home ul#tabMenu li a#home_tab, body#profile ul#tabMenu li a#updates_tab, body#replies ul#tabMenu li a#replies_tab, body.direct_messages ul#tabMenu li a#direct_messages_tab, body#favourings ul#tabMenu li a#favorites_tab, body#public_timeline ul#tabMenu li a#public_timeline_tab').isSidebarTab(); + $('#current_user_send_via_sms, #current_user_send_via_none').isDeviceUpdateOption(); + + }); + +//]]> + </script> +<% end %> \ No newline at end of file app/views/statuses/tweets.html.erb @@ -1,5 +1,133 @@ -<h1><%= @duser.username %></h1> -<%= image_tag @duser.profile_url %> -<br/> -<%= render :partial=>'statuses/tweet', :collection=>@tweets %> +<% setup(:title=>@duser.username, :body_id=>"profile", :css=>['timeline']) %> +<div class="profile-head"> + <h2 class="thumb"> +  + <%= image_tag @duser.web_profile_url, :size=>"73x73" %> + <%= @duser.username %> + </h2> + <div class="clear"></div> + <div id="follow_actions_17525701" class="follow-actions rob_test"> + <% if (@duser != @user) %> + <div class="follow-control"> + <div id="follow-toggle" class="closed med-btn"> + + <img class="ticon" src="/images/tiny_check.gif" alt="following" class="followicon"/><strong>Following</strong>  + </div> + + <div id="follow-details"> + <p id="following"> + <strong>You follow <%= h @duser.username %></strong> + <input class="remove-button" id="remove_button" onclick="removeUser(17525701, <%= @duser.username %>, 'cf586308d33b4601f0dfba618cc4bbf7c5baf1c0');" type="button" value="Remove"/> + <br/> + <span class="desc"><%= h @duser.username %> + 's updates appear in your <a href="/home">timeline</a>.</span> + </p> + + <div id="notifications"> + </div> + </div> + </div> + <% end %> + </div> + + <div class="hentry"> + </div> +</div> + +<div class="tab"> + <table cellspacing="0" class="doing" id="timeline"> + <tbody id="timeline_body_for_update" style="display: none"></tbody> + <tbody id="timeline_body"> + + <%= render :partial=>'statuses/tweet', :collection=>@tweets, :locals=>{:type=>'mine'} %> + + </tbody> + </table> + <div class="bottom_nav"> + <div class="pagination" id="pagination"> + <span class="section_links disabled">Older »</span> + </div> + <span class="statuses_options"> + <a href="http://twitter.com/statuses/user_timeline/17525701.rss" class="section_links">RSS</a> + </span> + </div> +</div> + +<% content_for :sidebar do %> + + <div class="section"> + <span class="section-links"> + </span> + <address> + <ul class="about vcard entry-author"> + <li><span class="label">Name</span> <span class="fn"><%= h @duser.username %></span></li> + <% if @duser.location %> + <li><span class="label">Location</span> <span class="adr"><%= h @duser.location %></span></li> + <% end %> + <% if @duser.bio %> + <li id="bio"><span class="label">Bio</span> <span class="bio"><%= h @duser.bio %></span></li> + <% end %> + </ul> + </address> + + <%= render :partial=>'user_stats', :object=> @duser %> + + </div> + + <ul id="tabMenu"> + <li> + <a href="/rob_test" id="updates_tab">Updates</a></li> + <li> + <a href="/rob_test/favourites" id="favorites_tab">Favorites</a></li> + </ul> + + <div class="section last"> + + + <div class="section-header"> + + <h1>Actions</h1> + </div> +  + <ul> + <li> + <a href="/direct_messages/create/<%= @duser.id %>">message</a> <%= h @duser.username %> + </li> + + + <a href="/blocks/confirm/<%= @duser.id %>" style="color: gray;">block</a> <%= h @duser.username %> + + + </ul> + + <br/> + + <div class="section-header"> + <h1>Following</h1> + </div> + + + <div id="friends"> + + <%= render :partial=>'friend', :collection=>@duser.friends %> + + + </div> + <br/> + </div> + +<% end %> + +<% content_for :javascript do %> + <script type="text/javascript"> + //<![CDATA[ + + $( function () { + $('body#profile ul#tabMenu li a#updates_tab, body#favourings ul#tabMenu li a#favorites_tab').isSidebarTab(); + + }); + + //]]> + </script> +<% end %> \ No newline at end of file app/views/user/index.html.erb @@ -1,7 +1,11 @@ ActionController::Routing::Routes.draw do |map| - map.root :controller => "statuses" ,:action => "friends_timeline" + map.logout '/logout', :controller => 'sessions', :action => 'destroy' + map.login '/login', :controller => 'sessions', :action => 'new' + map.resource :session + map.root :controller => "sessions" ,:action => "new" map.connect "/home" , :controller => "statuses" ,:action => "friends_timeline" map.connect "/statuses/public_timeline.:format", :controller => "statuses", :action => "friends_timeline" + map.connect "/status/update", :controller => "statuses", :action=> "update" # See how all your routes lay out with "rake routes" config/routes.rb @@ -1,8 +1,8 @@ class CreateTweets < ActiveRecord::Migration def self.up create_table :tweets do |t| - t.string :username,:tweet,:source - t.integer :user_id + t.string :tweet,:source, :tweet_type + t.integer :recipient_id, :user_id t.timestamps end end db/migrate/20080621002401_create_tweets.rb @@ -9,22 +9,32 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20081121112034) do +ActiveRecord::Schema.define(:version => 20090119123823) do create_table "tweets", :force => true do |t| t.string "tweet" t.string "source" + t.string "tweet_type" + t.integer "recipient_id" t.integer "user_id" t.datetime "created_at" t.datetime "updated_at" - t.integer "recipient_id" - t.string "tweet_type" end create_table "users", :force => true do |t| - t.string "username" + t.string "username", :limit => 40 + t.string "name", :limit => 100, :default => "" + t.string "email", :limit => 100 + t.string "crypted_password", :limit => 40 + t.string "salt", :limit => 40 t.datetime "created_at" t.datetime "updated_at" + t.string "remember_token", :limit => 40 + t.datetime "remember_token_expires_at" + t.string "bio" + t.string "location" end + add_index "users", ["username"], :name => "index_users_on_username", :unique => true + end db/schema.rb public/images/profile/rob_nielsen.png @@ -1,2 +1,565 @@ -// Place your application-specific JavaScript functions and classes here -// This file is automatically included by javascript_include_tag :defaults +if (!window.console || !console.firebug) { + var names = ["log","debug","info","warn","error","assert","dir","dirxml","group","groupEnd","time","timeEnd","count","trace","profile","profileEnd"]; + window.console = {}; + for (var i = 0; i < names.length; ++i) { + window.console[names[i]] = function() { + } + } +} +function _(C, A) { + if (twttr.i18n) { + var B = twttr.i18n[C]; + if (B) { + C = B + } + } + if (A) { + for (var D in A) { + C = C.replace(new RegExp("\\#\\{" + D + "\\}", "gi"), A[D]) + } + } + return C +} +(function() { + if (document.all) { + if (/MSIE (\d+\.\d+);/.test(navigator.userAgent)) { + var A = new Number(RegExp.$1); + if (A >= 8) { + $.browser.msie8 = true + } else { + if (A >= 7) { + $.browser.msie7 = true + } else { + $.browser.msie6 = true + } + } + } + } +})(); +$.fn.isSidebarTab = function() { + return this.each(function() { + var A = $(this); + A.click(function() { + var B = A.attr("href"); + twttr.googleAnalytics(B + "/refresh"); + $.ajax({type:"GET",url:B,data:{twttr:true},dataType:"json",beforeSend:twttr.loading,success:function(C) { + twttr.processJson(C); + $.initializeTimeline() + },complete:twttr.loaded}); + return false + }) + }) +}; +$.fn.isDeviceUpdateOption = function() { + return this.each(function() { + var A = $(this); + A.click(function() { + $.ajax({type:"POST",dataType:"json",url:"/account/update_send_via",data:{authenticity_token:twttr.form_authenticity_token,"current_user[send_via]":A.attr("value"),twttr:true},beforeSend:twttr.loading,complete:twttr.loaded}) + }) + }) +}; +$.fn.isExampleField = function(A, B, C) { + if (!C) { + C = "focus" + } + return this.each(function() { + var D = $(this); + if (B) { + D.val(B) + } else { + B = D.val() + } + D.attr("title", B); + D.bind(C, function() { + if (D.val() == D.attr("title")) { + D.val("").css("color", "#000").select() + } + }); + D.blur(function() { + if (D.val() == "") { + D.val(D.attr("title")).css("color", "") + } + }); + if (A) { + $(A).mousedown(function() { + if (D.val() == D.attr("title")) { + D.val("") + } + return true + }) + } + }) +}; +$.fn.isUpdateForm = function() { + return this.each(function() { + var I = $(this); + var F = I.find("textarea").isCharCounter(); + var A = I.find("input[type=submit]"); + var B = I.find("label.doing"); + var E = /^\s*@(\w+)\W+/; + var D = /^\s*[dD][mM]?\s+(?:(\w+)\W+)?/; + function H() { + var J = F.val(); + if (J.length > 140) { + alert(_("That update is over 140 characters!")); + return false + } else { + if (J.replace(/s\*/g, "") == "") { + return false + } else { + A.attr("disabled", "disabled"); + return true + } + } + } + function G(J) { + A.removeAttr("disabled", "disabled"); + var K = J.text; + if (J.flash) { + $("#flash").html(J.flash).fadeIn(200) + } else { + $("#timeline tr.hentry:first").removeClass("latest-status"); + if (J.status_tr && $("body").attr("id") == "home") { + $("#timeline tbody").prepend(J.status_tr); + $.initializeTimeline() + } + $("#update_count").fadeOut("medium", function() { + $("#update_count").html(J.status_count).fadeIn("medium") + }); + if (J.latest_status) { + $("#latest_status").html(J.latest_status).isCurrentStatus(true) + } + } + F.val("").focusEnd(); + $("#in_reply_to_status_id").val(""); + $("#in_reply_to").val(""); + C(""); + F.trigger("change") + } + function C(K) { + var J; + if (J = K.match(D)) { + B.html(_("Direct message") + (J[1] ? " " + J[1] : "") + ":"); + A.val(_("send")) + } else { + if (J = K.match(E)) { + B.html(_("Reply to #{screen_name}:", {screen_name:J[1]})); + A.val(_("reply")) + } else { + B.html(_("What are you doing?")); + A.val(_("update")) + } + } + } + F.bind("keyup blur focus", function() { + C($(this).val()) + }); + I.submit(function() { + if (H()) { + twttr.googleAnalytics("/status/update/refresh"); + var O = F.val(); + var N = {authenticity_token:twttr.form_authenticity_token,status:O,twttr:true}; + var K = window.location.href; + if ($("body").attr("id") == "home" && ((K.indexOf("page=") == -1) || K.match(/page=1(?!\d)/))) { + N.return_rendered_status = true + } + var J = $("#in_reply_to_status_id").val(); + var M; + if (J && (M = O.match(E))) { + if (M[1] == $("#in_reply_to").val()) { + N.in_reply_to_status_id = J + } + } + var L = $("#source").val(); + if (L) { + N.source = L + } + $.ajax({type:"POST",dataType:"json",url:"/status/update",data:N,success:G,beforeSend:twttr.loading,complete:twttr.loaded}) + } + return false + }); + F.focusEnd() + }) +}; +$.fn.isDirectMessageForm = function() { + return this.each(function() { + var A = $(this); + var B = A.find("textarea").isCharCounter(); + B.find("input[type=submit]").attr("disabled", "disabled").addClass("disabled"); + B.focusEnd(); + A.find("select").change(function(C) { + B.trigger("update", C) + }) + }) +}; +$.fn.isCharCounter = function() { + return this.each(function() { + var H = $(this); + var B = H.parents("form"); + var D = B.find(".char-counter"); + var F = B.find("input[type=submit]"); + var A = B.find("select"); + function G() { + F.attr("disabled", "disabled").addClass("disabled") + } + function E() { + F.removeAttr("disabled").removeClass("disabled") + } + function C() { + var J = H.val(); + var I = J.length; + D.html("" + (140 - I)); + if (I <= 0) { + D.css("color", "#cccccc"); + G() + } else { + if (A.length == 0 || A.val()) { + E() + } else { + G() + } + if (I > 130) { + D.css("color", "#d40d12") + } else { + if (I > 120) { + D.css("color", "#5c0002") + } else { + D.css("color", "#cccccc") + } + } + } + } + H.bind("keyup blur focus change paste input", function(I) { + C() + }); + H.focus() + }) +}; +$.fn.isCurrentStatus = function(A) { + return this.each(function() { + var D = $(this); + var B = D.find("#latest_text"); + var C = B.find(".status-text"); + var G = B.find(".entry-meta"); + $("#latest_text_full, #latest_text").click(function() { + $("#latest_text_full, #latest_text").toggle() + }); + B.css("visibility", "hidden"); + twttr.boxTruncate($("#latest_text_full .status-text").text(), "#currently #latest_text .status-text", "#currently #latest_text", {height:40,minlength:60}); + B.css("visibility", "visible"); + if (A) { + var F = C.css("color"); + var E = G.css("color"); + if (!$.browser.msie) { + B.css("opacity", 0) + } + C.css("color", "#000"); + G.css("color", "#000"); + if (!$.browser.msie) { + B.animate({opacity:1}, 1000) + } + if (twttr.timeouts.updateLatestStatus) { + clearTimeout(twttr.timeouts.updateLatestStatus) + } + twttr.timeouts.updateLatestStatus = setTimeout(function() { + C.animate({color:F}, 3000); + G.animate({color:E}, 3000) + }, 5000) + } + }) +}; +$.fn.isNotificationSetting = function() { + return this.each(function() { + var B = $(this); + var A = B.attr("id").replace("notify_on_", "").replace("notify_off_", ""); + B.click(function() { + var C = B.attr("value"); + $.ajax({type:"POST",dataType:"text",url:"/friends/" + C + "/" + A,data:{authenticity_token:twttr.form_authenticity_token,twttr:true},success:function(D) { + if (D.match(/success/)) { + $(".follow-control").trigger("refresh", ["notify_" + (C == "follow" ? "on" : "off")]) + } else { + twttr.error() + } + },beforeSend:twttr.loading,complete:twttr.loaded}) + }) + }) +}; +$.fn.isNudgable = function() { + return this.each(function() { + var A = $(this); + A.click(function() { + var B = A.parents("form"); + B.find("input[name=authenticity_token]").val(twttr.form_authenticity_token); + B.submit(); + return false + }) + }) +}; +$.fn.isSelectAll = function(A) { + return this.each(function() { + var B = $(this); + var C = $(A); + var E = C.find("input[type=checkbox]"); + function D() { + var F = true; + E.each(function() { + if (!this.checked) { + F = false; + return false + } + }); + B.get(0).checked = F + } + B.click(function() { + var F = B.get(0).checked; + E.each(function() { + this.checked = F + }) + }); + E.click(function() { + D() + }) + }) +}; +$.fn.isFollowControl = function() { + return this.each(function() { + var E = $(this); + var F = E.parents(".follow-actions"); + var H = E.find(".follow-button"); + var C = F.attr("class").split(" ").pop(); + var B = F.attr("id").replace("follow_actions_", ""); + var G = F.find("#follow-toggle"); + var A = F.find(".remove-button"); + F.find(".notify-input").isNotificationSetting(); + function D(I) { + $.ajax({type:"GET",dataType:"json",url:"/account/refresh_follow_control/" + B,data:{action_taken:I},success:function(J) { + twttr.processJson(J); + $(".follow-control").isFollowControl() + },beforeSend:twttr.loading,complete:twttr.loaded}) + } + H.click(function() { + $.ajax({type:"POST",dataType:"text",url:"/friendships/create/" + B,data:{authenticity_token:twttr.form_authenticity_token,twttr:true},success:function(I) { + if (I.match(/Bring/)) { + twttr.error() + } else { + if (I.match(/success/)) { + E.trigger("refresh", ["followed"]) + } else { + if (I.match(/242/)) { + } else { + twttr.error(I) + } + } + } + },beforeSend:twttr.loading,complete:twttr.loaded}); + return false + }); + E.bind("refresh", function(I, J) { + D(J) + }); + G.click(function() { + var I = F.find("#follow-details").toggle(); + if (I.css("display") == "block") { + G.removeClass("closed").addClass("opened") + } else { + G.removeClass("opened").addClass("closed") + } + return false + }); + A.click(function() { + $.ajax({type:"POST",dataType:"text",url:"/friendships/destroy/" + B,data:{authenticity_token:twttr.form_authenticity_token,twttr:true},success:function(I) { + if (I.match(/success/)) { + E.trigger("refresh", ["removed"]) + } else { + twttr.error() + } + },beforeSend:twttr.loading,complete:twttr.loaded}); + return false + }) + }) +}; +$.fn.isFollowRequestLinks = function() { + return this.each(function() { + var B = $(this); + var D = B.hasClass("ifr-profile"); + var F = D ? B.attr("id").replace("ifr_", "") : ""; + var A = B.find("#accept_all_requests"); + var C = B.find("#deny_all_requests"); + function E(G) { + var H = {decision:G,authenticity_token:twttr.form_authenticity_token}; + if (D) { + H.id = F; + H.source = "profile" + } + $.ajax({type:"POST",url:"/friend_requests/" + (D ? "decision" : "all"),dataType:"text",data:H,cache:false,success:function(I) { + if (I == "fail") { + alert(_("Whoops! Something went wrong. Please refresh the page and try again!")) + } else { + if (D) { + B.fadeOut("medium", function() { + B.html(I) + }); + B.fadeIn("medium") + } else { + var J = window.location; + uri = J.protocol + "//" + J.host + "/"; + window.location = uri + } + } + },beforeSend:twttr.loading,complete:twttr.loaded}) + } + A.click(function() { + E("accept"); + return false + }); + C.click(function() { + E("deny"); + return false + }) + }) +}; +$.fn.isTabMenu = function() { + return this.each(function() { + var B = $(this); + if ($this.id == "networktab") { + return true + } + function A(C) { + B.find("li a").each(function() { + var E = $(this); + var F = E.parent(); + var D = ""; + if (((D = E.attr("class")) == C) && !F.hasClass("active")) { + F.addClass("active"); + $("#" + D).show() + } else { + F.removeClass("active"); + $("#" + D).hide() + } + }) + } + B.find("li a").each(function() { + var C = $(this); + C.click(function() { + A(C.attr("class")); + return false + }) + }) + }) +}; +$.fn.focusEnd = function() { + var A; + var B; + return this.each(function() { + A = this; + A.focus(); + if ($.browser.msie) { + B = A.createTextRange(); + B.collapse(false); + B.select() + } else { + A.selectionStart = A.value.length; + A.selectionEnd = A.value.length + } + }) +}; +$.fn.focusFirstTextField = function() { + return this.find("input[type=text]:visible:enabled:first").focus().length > 0 +},$.fn.focusFirstTextArea = function() { + return this.find("textarea:visible:enabled:first").focus().length > 0 +}; +$.fn.focusFirstTextElement = function() { + return this.focusFirstTextField() || this.focusFirstTextArea() +},$.fn.isWrapped = function(E) { + if (!E) { + return + } + $this = $(this); + $this.hide(); + var C = $this.html(); + var G = C.length; + var B = ""; + var H = $this.width(); + var F = H / E; + var A = G / F; + for (var D = 0; D <= F; D += 1) { + B += (C.substr(A * D, A) + "\n") + } + $this.html(B).show() +}; +if (!window.twttr) { + var _tmp = {}; + var twttr = (function() { + var rtn = {timeouts:{},processJson:function(json) { + if (typeof (json) == "object") { + var evals = []; + $.each(json, function(selector, content) { + if (selector.charAt(0) == "$") { + evals.push(content) + } else { + var contentPadded = "<div>" + content + "</div>"; + var $content = $(selector, $(contentPadded)); + if ($content.length == 1) { + $(selector).replaceWith($content) + } else { + $(selector).html(content) + } + } + }); + $.each(evals, function(index, js) { + if (js) { + eval(js) + } + }) + } + },boxTruncate:function(txt, textContainer, container, opts) { + if (!opts) { + opts = {} + } + if (opts.minlength && (txt.length < opts.minlength)) { + $(textContainer).text(txt); + if (!opts.width || $(container).width() <= opts.width) { + return txt + } + } + var curr = ""; + for (var i = 0; i < txt.length; i++) { + curr += txt.charAt(i); + if (opts.minlength > curr.length) { + continue + } + $(textContainer).text(curr + "..."); + if (opts.height && $(container).height() > opts.height) { + $(textContainer).text(curr = curr.substring(0, curr.length - 1) + "..."); + return curr + } + if (opts.width && $(container).width() > opts.width) { + if (/\s/gi.test(txt.charAt(i))) { + $(textContainer).text(curr = curr.substring(0, curr.length - 1) + "-") + } else { + $(textContainer).text(curr = curr.substring(0, curr.length - 1) + "-" + txt.charAt(i)) + } + } + } + $(textContainer).text(curr); + return curr + },googleAnalytics:function(trackid) { + if (window.pageTracker) { + window.pageTracker._trackEvent("Ajax", "refresh", trackid, null) + } + },fadeAndReplace:function(selector, content) { + $(selector).fadeOut("medium", function() { + $(selector).html(content) + }); + $(selector).fadeIn("medium") + },error:function(msg) { + alert(msg ? msg : _("Whoops! Something went wrong. Please refresh the page and try again!")) + },loading:function() { + $("#loader").fadeIn(200) + },loaded:function() { + $("#loader").fadeOut(200) + }}; + return rtn + })() +} +; \ No newline at end of file public/javascripts/application.js @@ -4,6 +4,7 @@ <facet type="RailsFacetType" name="Ruby on Rails"> <configuration> <RAILS_FACET_CONFIG_ID NAME="SHOULD_USE_RSPEC_PLUGIN" VALUE="false" /> + <RAILS_FACET_CONFIG_ID NAME="RAILS_FACET_SUPPORT_ADDED" VALUE="true" /> <RAILS_FACET_CONFIG_ID NAME="RAILS_FACET_APPLICATION_ROOT" VALUE="$MODULE_DIR$" /> </configuration> </facet> rnielsen-twetter.iml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <project relativePaths="false" version="4"> + <component name="AntConfiguration"> + <defaultAnt bundledAnt="true" /> + </component> <component name="BuildJarProjectSettings"> <option name="BUILD_JARS_ON_MAKE" value="false" /> </component> @@ -27,6 +30,9 @@ <entry name="?*.ftl" /> </wildcardResourcePatterns> </component> + <component name="CopyrightManager" default=""> + <module2copyright /> + </component> <component name="DependencyValidationManager"> <option name="SKIP_IMPORT_STATEMENTS" value="false" /> </component> @@ -212,6 +218,9 @@ <converter id="ror-modules" /> <converter id="SelenaRunConfToDiana" /> </component> + <component name="ProjectKey"> + <option name="state" value="project:///Users/rob/work/git/rnielsen-twetter/rnielsen-twetter.ipr" /> + </component> <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/rnielsen-twetter.iml" filepath="$PROJECT_DIR$/rnielsen-twetter.iml" /> rnielsen-twetter.ipr @@ -1,7 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> <project relativePaths="false" version="4"> + <component name="CCaseConfig"> + <option name="checkoutReserved" value="false" /> + <option name="markExternalChangeAsUpToDate" value="true" /> + <option name="checkInUseHijack" value="true" /> + <option name="useUcmModel" value="true" /> + <option name="isOffline" value="false" /> + <option name="synchOutside" value="false" /> + <option name="isHistoryResticted" value="true" /> + <option name="useIdenticalSwitch" value="true" /> + <option name="synchActivitiesOnRefresh" value="true" /> + <option name="lastScr" value="" /> + <option name="scrTextFileName" value="" /> + <option name="historyRevisionsNumber" value="4" /> + </component> <component name="ChangeListManager"> - <list default="true" name="Default" comment="" /> + <list default="true" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/statuses/_tweet.html.erb" afterPath="$PROJECT_DIR$/app/views/statuses/_tweet.html.erb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/account_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/account_controller.rb" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/app/controllers/upload_controller.rb" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/layouts/application.html.erb" afterPath="$PROJECT_DIR$/app/views/layouts/application.html.erb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/application.rb" afterPath="$PROJECT_DIR$/app/controllers/application.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/user.rb" afterPath="$PROJECT_DIR$/app/models/user.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rnielsen-twetter.ipr" afterPath="$PROJECT_DIR$/rnielsen-twetter.ipr" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/images/profile/rob_nielsen.png" afterPath="$PROJECT_DIR$/public/images/profile/rob_nielsen.png" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/db/migrate/20080621003504_create_users.rb" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rnielsen-twetter.iml" afterPath="$PROJECT_DIR$/rnielsen-twetter.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rnielsen-twetter.iws" afterPath="$PROJECT_DIR$/rnielsen-twetter.iws" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/fixtures/users.yml" afterPath="$PROJECT_DIR$/test/fixtures/users.yml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/unit/user_test.rb" afterPath="$PROJECT_DIR$/test/unit/user_test.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/user/index.html.erb" afterPath="$PROJECT_DIR$/app/views/user/index.html.erb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/helpers/statuses_helper.rb" afterPath="$PROJECT_DIR$/app/helpers/statuses_helper.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/schema.rb" afterPath="$PROJECT_DIR$/db/schema.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/user_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/user_controller.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tmp/upload/3" afterPath="$PROJECT_DIR$/tmp/upload/3" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/friendships_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/friendships_controller.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/helpers/account_helper.rb" afterPath="$PROJECT_DIR$/app/helpers/account_helper.rb" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/db/migrate/20081121112034_add_direct_messages.rb" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/helpers/application_helper.rb" afterPath="$PROJECT_DIR$/app/helpers/application_helper.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/account/index.html.erb" afterPath="$PROJECT_DIR$/app/views/account/index.html.erb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/javascripts/application.js" afterPath="$PROJECT_DIR$/public/javascripts/application.js" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/migrate/20080621002401_create_tweets.rb" afterPath="$PROJECT_DIR$/db/migrate/20080621002401_create_tweets.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/statuses/tweets.html.erb" afterPath="$PROJECT_DIR$/app/views/statuses/tweets.html.erb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/statuses_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/statuses_controller.rb" /> + </list> <ignored path="rnielsen-twetter.iws" /> <ignored path=".idea/workspace.xml" /> </component> @@ -59,19 +103,91 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="application.rb" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/app/controllers/application.rb"> + <file leaf-file-name="tweets.html.erb" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/views/statuses/tweets.html.erb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="32" column="21" selection-start="1637" selection-end="1637" vertical-scroll-proportion="-13.894737"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="_tweet.html.erb" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/views/statuses/_tweet.html.erb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="17" column="23" selection-start="810" selection-end="1333" vertical-scroll-proportion="-10.736842"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="_latest.html.erb" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/views/statuses/_latest.html.erb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="2" column="92" selection-start="154" selection-end="154" vertical-scroll-proportion="-1.2631578"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name=".gitignore" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/.gitignore"> + <provider selected="true" editor-type-id="text-editor"> + <state line="2" column="5" selection-start="28" selection-end="28" vertical-scroll-proportion="0.043557167"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="schema.rb" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/db/schema.rb"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="113" selection-start="590" selection-end="590" vertical-scroll-proportion="0.23913044"> + <state line="17" column="4" selection-start="902" selection-end="902" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="statuses_controller.rb" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/controllers/statuses_controller.rb"> + <file leaf-file-name="account_controller.rb" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/controllers/account_controller.rb"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="1" column="20" selection-start="68" selection-end="68" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="user.rb" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/models/user.rb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="42" column="0" selection-start="1965" selection-end="1965" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="user_test.rb" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/test/unit/user_test.rb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="11" column="0" selection-start="381" selection-end="381" vertical-scroll-proportion="-5.076923"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="users.yml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/test/fixtures/users.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="25" column="37" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="by_password.rb" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/vendor/plugins/restful-authentication/lib/authentication/by_password.rb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="49" column="24" selection-start="1800" selection-end="1816" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> @@ -95,6 +211,8 @@ <OptionsSetting value="true" id="Update" /> <OptionsSetting value="true" id="Status" /> <OptionsSetting value="true" id="Edit" /> + <OptionsSetting value="true" id="Undo Check Out" /> + <OptionsSetting value="true" id="Get Latest Version" /> <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> @@ -124,46 +242,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="rnielsen-twetter" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="rnielsen-twetter" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="rnielsen-twetter" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="rnielsen-twetter" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="rnielsen-twetter" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="rnielsen-twetter" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="controllers" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -178,17 +256,21 @@ <hideEmptyPackages /> <abbreviatePackageNames /> <showStructure ProjectPane="false" /> - <autoscrollToSource /> - <autoscrollFromSource /> + <autoscrollToSource ProjectPane="true" /> + <autoscrollFromSource ProjectPane="true" /> <sortByType /> </navigator> </component> <component name="PropertiesComponent"> <property name="MemberChooser.copyJavadoc" value="false" /> <property name="GoToClass.includeLibraries" value="false" /> + <property name="options.splitter.details.proportions" value="0.2" /> <property name="MemberChooser.showClasses" value="true" /> + <property name="options.splitter.main.proportions" value="0.3" /> <property name="MemberChooser.sorted" value="false" /> + <property name="options.searchVisible" value="true" /> <property name="GoToFile.includeJavaFiles" value="false" /> + <property name="options.lastSelected" value="preferences.pluginManager" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> </component> <component name="RunManager" selected="Rails.Development: rnielsen-twetter"> @@ -199,6 +281,17 @@ <option name="HOST" value="localhost" /> <option name="PORT" value="5005" /> </configuration> + <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby script"> + <module name="" /> + <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" /> + <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="" /> + <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" /> + <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" /> + <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" /> + <envs /> + <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" /> + <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" /> + </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -256,7 +349,7 @@ <envs /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" /> - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_SHOULD_ATTACH_TEST_RUNNER_UI" VALUE="false" /> + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE="" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" /> @@ -274,6 +367,40 @@ <module name="" /> <envs /> </configuration> + <configuration default="true" type="RSpecRunConfigurationType" factoryName="RSpec"> + <module name="" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" /> + <envs /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="[none]" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUN_SPECS_SEPARATELY" VALUE="false" /> + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_SPEC_RUNNER" VALUE="false" /> + </configuration> + <configuration default="true" type="TestUnitRunConfigurationType" factoryName="Ruby test"> + <module name="" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" /> + <envs /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_CLASS_NAME" VALUE="" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" /> + <RTEST_RUN_CONFIG_SETTINGS_ID NAME="INHERITANCE_CHECK_DISABLED" VALUE="false" /> + </configuration> <configuration default="false" name="test" type="RakeRunConfigurationType" factoryName="Rake"> <module name="rnielsen-twetter" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" /> @@ -284,7 +411,7 @@ <envs /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="test" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" /> - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_SHOULD_ATTACH_TEST_RUNNER_UI" VALUE="true" /> + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" /> @@ -302,7 +429,7 @@ <envs /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" /> - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_SHOULD_ATTACH_TEST_RUNNER_UI" VALUE="true" /> + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" /> <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" /> @@ -360,6 +487,17 @@ </configuration> </component> <component name="ShelveChangesManager" show_recycled="false" /> + <component name="StarteamConfiguration"> + <option name="SERVER" value="" /> + <option name="PORT" value="49201" /> + <option name="USER" value="" /> + <option name="PASSWORD" value="" /> + <option name="PROJECT" value="" /> + <option name="VIEW" value="" /> + <option name="ALTERNATIVE_WORKING_PATH" value="" /> + <option name="LOCK_ON_CHECKOUT" value="false" /> + <option name="UNLOCK_ON_CHECKIN" value="false" /> + </component> <component name="StructureViewFactory"> <option name="AUTOSCROLL_MODE" value="true" /> <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> @@ -373,6 +511,7 @@ <option name="MERGE_DRY_RUN" value="false" /> <option name="MERGE_DIFF_USE_ANCESTRY" value="true" /> <option name="UPDATE_LOCK_ON_DEMAND" value="false" /> + <option name="IGNORE_SPACES_IN_MERGE" value="false" /> <configuration useDefault="true">/Users/rob/.subversion</configuration> <myIsUseDefaultProxy>false</myIsUseDefaultProxy> </component> @@ -398,29 +537,30 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="22" width="1280" height="721" extended-state="0" /> - <editor active="true" /> + <editor active="false" /> <layout> <window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" /> - <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" /> - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" /> + <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="14" side_tool="false" /> + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" /> + <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.6580311" order="0" side_tool="false" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24939074" sideWeight="0.6588629" order="0" side_tool="false" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.328152" sideWeight="0.5" order="1" side_tool="false" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="6" side_tool="false" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3283582" sideWeight="0.5" order="8" side_tool="false" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" /> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3283582" sideWeight="0.5" order="9" side_tool="false" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" /> - <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" /> - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943144" sideWeight="0.5" order="12" side_tool="false" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" /> + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" /> <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="5" side_tool="false" /> @@ -448,6 +588,40 @@ <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> </component> + <component name="VssConfiguration"> + <option name="CLIENT_PATH" value="" /> + <option name="SRCSAFEINI_PATH" value="" /> + <option name="USER_NAME" value="" /> + <option name="PWD" value="" /> + <CheckoutOptions> + <option name="COMMENT" value="" /> + <option name="DO_NOT_GET_LATEST_VERSION" value="false" /> + <option name="REPLACE_WRITABLE" value="false" /> + <option name="RECURSIVE" value="false" /> + </CheckoutOptions> + <CheckinOptions> + <option name="COMMENT" value="" /> + <option name="KEEP_CHECKED_OUT" value="false" /> + <option name="RECURSIVE" value="false" /> + </CheckinOptions> + <AddOptions> + <option name="STORE_ONLY_LATEST_VERSION" value="false" /> + <option name="CHECK_OUT_IMMEDIATELY" value="false" /> + </AddOptions> + <UndocheckoutOptions> + <option name="MAKE_WRITABLE" value="false" /> + <option name="REPLACE_LOCAL_COPY" value="2" /> + <option name="RECURSIVE" value="false" /> + </UndocheckoutOptions> + <GetOptions> + <option name="REPLACE_WRITABLE" value="0" /> + <option name="MAKE_WRITABLE" value="false" /> + <option name="ANSWER_NEGATIVELY" value="false" /> + <option name="ANSWER_POSITIVELY" value="false" /> + <option name="RECURSIVE" value="false" /> + <option name="VERSION" /> + </GetOptions> + </component> <component name="XDebuggerManager"> <breakpoint-manager /> </component> @@ -455,17 +629,119 @@ <history /> <find-history /> </component> + <component name="antWorkspaceConfiguration"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="FILTER_TARGETS" value="false" /> + </component> <component name="editorHistoryManager"> <entry file="file://$PROJECT_DIR$/app/controllers/statuses_controller.rb"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="12" column="11" selection-start="466" selection-end="466" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/app/controllers/application.rb"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="113" selection-start="590" selection-end="590" vertical-scroll-proportion="0.23913044"> + <state line="29" column="6" selection-start="909" selection-end="909" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/views/account/settings.html.erb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="18.631578"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/vendor/plugins/restful-authentication/lib/authentication.rb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="1" column="2" selection-start="24" selection-end="24" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/test/fixtures/tweets.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/controllers/users_controller.rb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/test/fixtures/users.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="25" column="37" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/vendor/plugins/restful-authentication/lib/authentication/by_password.rb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="49" column="24" selection-start="1800" selection-end="1816" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/models/user.rb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="42" column="0" selection-start="1965" selection-end="1965" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/test/unit/user_test.rb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="11" column="0" selection-start="381" selection-end="381" vertical-scroll-proportion="-5.076923"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/controllers/account_controller.rb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="1" column="20" selection-start="68" selection-end="68" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/views/statuses/tweets.html.erb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="32" column="21" selection-start="1637" selection-end="1637" vertical-scroll-proportion="-13.894737"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/db/schema.rb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="17" column="4" selection-start="902" selection-end="902" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/views/statuses/_tweet.html.erb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="17" column="23" selection-start="810" selection-end="1333" vertical-scroll-proportion="-10.736842"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/views/statuses/_latest.html.erb"> + <provider selected="true" editor-type-id="text-editor"> + <state line="2" column="92" selection-start="154" selection-end="154" vertical-scroll-proportion="-1.2631578"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/.gitignore"> + <provider selected="true" editor-type-id="text-editor"> + <state line="2" column="5" selection-start="28" selection-end="28" vertical-scroll-proportion="0.043557167"> <folding /> </state> </provider> @@ -474,6 +750,15 @@ <component name="masterDetails"> <option name="states"> <map> + <entry key="Copyright.UI"> + <value> + <UIState> + <option name="proportions"> + <SplitterProportionsDataImpl /> + </option> + </UIState> + </value> + </entry> <entry key="Errors.UI"> <value> <UIState> @@ -503,7 +788,13 @@ <value> <UIState> <option name="proportions"> - <SplitterProportionsDataImpl /> + <SplitterProportionsDataImpl> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </SplitterProportionsDataImpl> </option> </UIState> </value> @@ -512,6 +803,15 @@ </option> <option name="myStates"> <map> + <entry key="Copyright.UI"> + <value> + <UIState> + <option name="proportions"> + <SplitterProportionsDataImpl /> + </option> + </UIState> + </value> + </entry> <entry key="Errors.UI"> <value> <UIState> @@ -541,7 +841,13 @@ <value> <UIState> <option name="proportions"> - <SplitterProportionsDataImpl /> + <SplitterProportionsDataImpl> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </SplitterProportionsDataImpl> </option> </UIState> </value> rnielsen-twetter.iws @@ -1,7 +1,31 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -# one: -# column: value -# -# two: -# column: value +quentin: + id: 1 + username: quentin + name: Quentin Parker + salt: 1b6453892473a467d07372d45eb05abc2031647a # SHA1('0') + crypted_password: ce51a487053a5c48bfd325c6414e0d125e34198c # 'monkey' + created_at: <%= 5.days.ago.to_s :db %> + remember_token_expires_at: <%= 1.days.from_now.to_s %> + remember_token: c1dfd96eea8cc2b62785275bca38ac261256e278 + +aaron: + id: 2 + username: aaron + name: Aaron Spence + salt: ac3478d69a3c81fa62e60f5c3696165a4e5e6ac4 # SHA1('1') + crypted_password: d89eff8ee3fa88762dd1d9db045c431f1c2b6534 # 'monkey' + created_at: <%= 1.days.ago.to_s :db %> + remember_token_expires_at: + remember_token: + + +old_password_holder: + id: 3 + username: old_password_holder + name: Salty Dog + salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd + crypted_password: 00742970dc9e6319f8019fd54864d3ea740f04b1 # test + created_at: <%= 1.days.ago.to_s :db %> + + test/fixtures/users.yml @@ -1,8 +1,91 @@ -require 'test_helper' +require File.dirname(__FILE__) + '/../test_helper' class UserTest < ActiveSupport::TestCase - # Replace this with your real tests. - def test_truth - assert true + # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead. + # Then, you can remove it from this and the functional test. + include AuthenticatedTestHelper + fixtures :users + + def test_should_create_user + assert_difference 'User.count' do + user = create_user + assert !user.new_record?, "#{user.errors.full_messages.to_sentence}" + end + end + + def test_should_require_username + assert_no_difference 'User.count' do + u = create_user(:username => nil) + assert u.errors.on(:username) + end + end + + def test_should_reset_password + users(:quentin).update_attributes(:password => 'new password', :password_confirmation => 'new password') + assert_equal users(:quentin), User.authenticate('quentin', 'new password') + end + + def test_should_not_rehash_password + users(:quentin).update_attributes(:username => 'quentin2') + assert_equal users(:quentin), User.authenticate('quentin2', 'monkey') + end + + def test_should_authenticate_user + assert_equal users(:quentin), User.authenticate('quentin', 'monkey') + end + + def test_should_create_new_user_if_not_exists + u = User.authenticate('new','user') + assert_equal "new", u.username + end + + def test_should_not_authenticate_if_password_incorrect + assert_nil User.authenticate('quentin', 'minkey') + end + + def test_should_set_remember_token + users(:quentin).remember_me + assert_not_nil users(:quentin).remember_token + assert_not_nil users(:quentin).remember_token_expires_at + end + + def test_should_unset_remember_token + users(:quentin).remember_me + assert_not_nil users(:quentin).remember_token + users(:quentin).forget_me + assert_nil users(:quentin).remember_token + end + + def test_should_remember_me_for_one_week + before = 1.week.from_now.utc + users(:quentin).remember_me_for 1.week + after = 1.week.from_now.utc + assert_not_nil users(:quentin).remember_token + assert_not_nil users(:quentin).remember_token_expires_at + assert users(:quentin).remember_token_expires_at.between?(before, after) + end + + def test_should_remember_me_until_one_week + time = 1.week.from_now.utc + users(:quentin).remember_me_until time + assert_not_nil users(:quentin).remember_token + assert_not_nil users(:quentin).remember_token_expires_at + assert_equal users(:quentin).remember_token_expires_at, time + end + + def test_should_remember_me_default_two_weeks + before = 2.weeks.from_now.utc + users(:quentin).remember_me + after = 2.weeks.from_now.utc + assert_not_nil users(:quentin).remember_token + assert_not_nil users(:quentin).remember_token_expires_at + assert users(:quentin).remember_token_expires_at.between?(before, after) + end + +protected + def create_user(options = {}) + record = User.new({ :username => 'quire', :name => 'Quire', :password => 'quire69', :password_confirmation => 'quire69' }.merge(options)) + record.save + record end end test/unit/user_test.rb app/controllers/upload_controller.rb db/migrate/20080621003504_create_users.rb db/migrate/20081121112034_add_direct_messages.rb tmp/upload/3 65bbf0bee2cda2b55aefd7c87769d942b237e56e Rob Nielsen rob@refactor.com.au http://github.com/rnielsen/twetter/commit/3b48c0d16e1304c54c1ba8c40ca4099cea57c4d1 3b48c0d16e1304c54c1ba8c40ca4099cea57c4d1

2009-02-23T22:12:02-08:00

added authentication 953f67c48a63ac4d837c4d66f828c22b3a9432c3 Rob Nielsen rob@refactor.com.au