From: Date: Sat, 4 Aug 2007 04:43:54 +0000 (-0400) Subject: Well, it seems I forgot to add the acts_as_authenticated to the repository on my... X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/22f84a3ea8bc39eb4cb91575d35dfca683336032?ds=inline Well, it seems I forgot to add the acts_as_authenticated to the repository on my last commit, but they're there now. Also, I recently added the Gruff graphing plugin, and created a new controller for the graphs, with a method I ported from pollarize to chart how many people have voted per day. The basic_login page works, and the create user sstem works, but is unpolished and still points to a poem as the index page, so if you read a poem, it's supposed to happen. The quickvote creation from the homepage is NOT working however, and is about to be investigated. I'm not sure how much else isn't working. I noted details abotu acts_as_authenticated adn Gruff in the README. --- diff --git a/README b/README index 341ef6d..8c02056 100644 --- a/README +++ b/README @@ -22,4 +22,35 @@ http://technoweenie.stikipad.com/plugins/show/Acts+as+Authenticated is the best site for documentation regarding acts_as_authenticaed. Also, currently it only stores the user_id in the session, but i just found a guide to help me make it store the entire user object, so I'll do that while my battery -charges. \ No newline at end of file +charges. + +08/03/07 +Handy trick: use the command 'gem_server' from a shell to create a server at +http://localhost:8008 that is an easy to navigate locally-hosted website with +all the documentation on local gems you have in a easy to read format. + +jlsharps: I added the Gruff plug-in today, which is viewable under the folder +vender/plugins/gruff. I installed it directly using the Gruff plug-in and +included controller generate utility. The version 0.1.2, which doesn't seem to +be the latest version. I've looked into it and it see and it seems that the +latest version is 0.2.8. However, I wasn't sure how including a gem w/o a plugin +would function in end-game rails so I just what I used for now. If you guys +(mako of john) know how to do it, it'd probably be better to upgrade, but it +didn't seem like the best use of my time right now. I got the plug-in here: +http://topfunky.net/svn/plugins/gruff. You can get the gruff gem v 0.2.8 by +typing "sudo gem install gruff", I believe it's also hosted on RubyForge. + +I created the GraphsController for Gruff methods to use. In Pollarize I put them +in the ApplicationContorller file, so they would be accessible to all. While +that it also an option here, it would also mean there wouldn't be much room for +playing around because everything in the Application file has to be perfect or +it seems to throw Error Code 500 (basically everything breaks). The show() +is a sample sample provided with Gruff. + +Documentation is here:http://gruff.rubyforge.org/ Alternately, if you have the +gem installed, you can use the ri command, or the above mentioned gem_server. + +If you guys want more helpful stuff here, let me know. + + + diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb new file mode 100644 index 0000000..c13203b --- /dev/null +++ b/app/controllers/account_controller.rb @@ -0,0 +1,45 @@ +class AccountController < ApplicationController + layout 'hc' + + # Be sure to include AuthenticationSystem in Application Controller instead + include AuthenticatedSystem + # If you want "remember me" functionality, add this before_filter to Application Controller + before_filter :login_from_cookie + + # say something nice, you goof! something sweet. + def index + redirect_to(:action => 'signup') unless logged_in? || User.count > 0 + end + + def login + return unless request.post? + self.current_user = User.authenticate(params[:login], params[:password]) + if logged_in? + if params[:remember_me] == "1" + self.current_user.remember_me + cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at } + end + redirect_back_or_default(:controller => '/account', :action => 'index') + flash[:notice] = "Logged in successfully" + end + end + + def signup + @user = User.new(params[:user]) + return unless request.post? + @user.save! + self.current_user = @user + redirect_back_or_default(:controller => '/account', :action => 'index') + flash[:notice] = "Thanks for signing up!" + rescue ActiveRecord::RecordInvalid + render :action => 'signup' + end + + def logout + self.current_user.forget_me if logged_in? + cookies.delete :auth_token + reset_session + flash[:notice] = "You have been logged out." + redirect_back_or_default(:controller => '/account', :action => 'index') + end +end diff --git a/app/controllers/application.rb b/app/controllers/application.rb index d92ab97..a5bb108 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -2,6 +2,7 @@ # Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base + include AuthenticatedSystem helper :user model :user end diff --git a/app/controllers/graphs_controller.rb b/app/controllers/graphs_controller.rb new file mode 100644 index 0000000..c810853 --- /dev/null +++ b/app/controllers/graphs_controller.rb @@ -0,0 +1,87 @@ +class GraphsController < ApplicationController + + # To make caching easier, add a line like this to config/routes.rb: + # map.graph "graph/:action/:id/image.png", :controller => "graph" + # + # Then reference it with the named route: + # image_tag graph_url(:action => 'show', :id => 42) + + def show + g = Gruff::Line.new + # Uncomment to use your own theme or font + # See http://colourlovers.com or http://www.firewheeldesign.com/widgets/ for color ideas +# g.theme = { +# :colors => ['#663366', '#cccc99', '#cc6633', '#cc9966', '#99cc99'], +# :marker_color => 'white', +# :background_colors => ['black', '#333333'] +# } +# g.font = File.expand_path('artwork/fonts/VeraBd.ttf', RAILS_ROOT) + + g.title = "Gruff-o-Rama" + + g.data("Apples", [1, 2, 3, 4, 4, 3]) + g.data("Oranges", [4, 8, 7, 9, 8, 9]) + g.data("Watermelon", [2, 3, 1, 5, 6, 8]) + g.data("Peaches", [9, 9, 10, 8, 7, 9]) + + g.labels = {0 => '2004', 2 => '2005', 4 => '2006'} + + send_data(g.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "gruff.png") + end + + #The following section has been pasted directly fromworking pollarize graphs + #and hasn't been adopted to fit Selectricity yet + + def day_votes + @poll = Poll.find(params[:id]) + line = Gruff::Line.new + line.title = "Voters Per Day" + line.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf', RAILS_ROOT) + line.data("#{@poll.name}", voter_days["voters_per_day"] ) + line.labels = voter_days["days_hash"] + line.x_axis_label = "Date" + line.y_axis_label = "Number of Votes" + line.minimum_value = 0.0 + line.draw + send_data(line.to_blob, + :disposition => 'inline', + :type => 'image/png', + :filename => "dayvotes#{@poll.id}.png") + end + + def voter_days + @poll = Poll.find(params[:id]) + voter_times = Array.new + unique_days = Array.new + voters_per_day = Array.new + days_hash = Hash.new + + @poll.questions.each do |qstn| + qstn.votes.each do |vote| + voter_times << vote.time unless voter_times.any? {|utime| utime == vote.time} + end + end + voter_times.sort! + #find all times in voter_times with the same date, and then concatenate + #that number onto votes_per_day + # + #doesn't work jsut yet + voter_times.each_with_index do |time, index| + count = 1 + unless unique_days.any? { |d1| d1.eql?(time.mon.to_s+"/"+time.day.to_s) } + unique_days << (time.mon.to_s+"/"+time.day.to_s) + count += (voter_times[(index+1)..-1].find_all {|t| t.mon == time.mon && t.day == time.day}).size + voters_per_day << count + end + end + + unique_days.each_with_index do |fmtdate, index| + days_hash[index] = fmtdate + end + return { "voters_per_day" => voters_per_day, "days_hash" => days_hash } + + end + #end copy/pasted section + + +end diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index 10815b3..61a4c69 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -10,6 +10,7 @@ class QuickvoteController < ApplicationController ############################################################# def create + breakpoint if params[:quickvote] @quickvote = QuickVote.new(params[:quickvote]) diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 3307d88..dd049f7 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -10,7 +10,7 @@ class SiteController < ApplicationController # check to see that we actually have record of them if User.find_all(["id = ?", session[:user].id]).length == 1 # if we have record of them, grab the list of their elections - session[:user] = User.find(session[:user].id) + session[:user] = User.find(session[:user]) @current_elections = session[:user].elections.sort do |a,b| b.enddate <=> a.enddate end diff --git a/app/helpers/account_helper.rb b/app/helpers/account_helper.rb new file mode 100644 index 0000000..1b63056 --- /dev/null +++ b/app/helpers/account_helper.rb @@ -0,0 +1,2 @@ +module AccountHelper +end \ No newline at end of file diff --git a/app/models/account.rb b/app/models/account.rb new file mode 100644 index 0000000..e69de29 diff --git a/app/views/account/index.rhtml b/app/views/account/index.rhtml new file mode 100644 index 0000000..d600d59 --- /dev/null +++ b/app/views/account/index.rhtml @@ -0,0 +1,56 @@ +

In the Caboose.

+ +<% content_for 'poem' do -%> +"Train delayed? and what's to say?" +"Blocked by last night's snow they say." +Seven hours or so to wait; +Well, that's pleasant! but there's the freight. +Depot loafing no one fancies, +We'll try the caboose and take our chances. + +Cool this morning in Watertown, +Somewhat frosty___mercury down; +Enter caboose___roaring fire, +With never an air-hole; heat so dire +That we shrivel and pant; we are roasted through- +Outside, thermometer thirty-two. + +We start with a jerk and suddenly stop. +"What's broke?" says one; another "What's up?", +"Oh, nothing," they answer, "That's our way: +You must stand the jerking, sorry to say." +We "stand it" with oft this painful thought: +Are our heads on yet, or are they not? + +Comrades in misery___let me see; +Girl like a statue opposite me; +Back and forth the others jostle___ +She never winks, nor moves a muscle; +See her, as she sits there now; +She's "well balanced," anyhow. + +Woman in trouble, tearful eyes, +Sits by the window, softly cries, +Pity___for griefs we may not know, +For breasts that ache, for tears that flow, +Though we know not why. Her eyelids red +Tell a sorrowful tale___some hope is dead. + +Man who follows the Golden Rule, +And lends his papers___a pocket full, +Has a blank book___once in a minute +Has an idea, and writes it in it. +Guess him? Yes, of course I can, +He's a___well___a newspaper man. + +Blue-eyed fairy, wrapped in fur; +Sweet young mother tending her. +Fairy thinks it's "awful far," +Wants to get off this "naughty car." +So do we, young golden-hair; +All this crowd are with you there! +<% end -%> + +<%= simple_format @content_for_poem %> + +

-- Ellen P. Allerton.

\ No newline at end of file diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml new file mode 100644 index 0000000..a14ff99 --- /dev/null +++ b/app/views/account/login.rhtml @@ -0,0 +1,14 @@ +<% form_tag do -%> +


+<%= text_field_tag 'login' %>

+ +


+<%= password_field_tag 'password' %>

+ + + +

<%= submit_tag 'Log in' %>

+<% end -%> diff --git a/app/views/account/signup.rhtml b/app/views/account/signup.rhtml new file mode 100644 index 0000000..c0012a7 --- /dev/null +++ b/app/views/account/signup.rhtml @@ -0,0 +1,16 @@ +<%= error_messages_for :user %> +<% form_for :user do |f| -%> +


+<%= f.text_field :login %>

+ +


+<%= f.text_field :email %>

+ +


+<%= f.password_field :password %>

+ +


+<%= f.password_field :password_confirmation %>

+ +

<%= submit_tag 'Sign up' %>

+<% end -%> diff --git a/app/views/layouts/hc.rhtml b/app/views/layouts/hc.rhtml index 2408083..13b2e72 100755 --- a/app/views/layouts/hc.rhtml +++ b/app/views/layouts/hc.rhtml @@ -17,7 +17,7 @@