Skip to content

Commit

Permalink
Merge master into widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
tashian committed Jul 6, 2011
1 parent c18106d commit a9c7c41
Show file tree
Hide file tree
Showing 81 changed files with 3,105 additions and 238 deletions.
Empty file added .gitmodules
View file
Empty file.
25 changes: 24 additions & 1 deletion Gemfile
View file
@@ -1,6 +1,7 @@
source 'http://rubygems.org'

gem 'rails', '3.0.7'
gem 'rake', '0.8.7'

# database gems -- need both pg and mysql for app and wiki
gem 'pg'
Expand All @@ -12,6 +13,9 @@ gem "settingslogic"
# HAML support
gem "haml"

# RABL for API / JSON
gem 'rabl'

# RMagick
gem 'rmagick', '2.13.1'
gem 'simple_captcha', :git => 'git://github.com/galetahub/simple-captcha.git'
Expand Down Expand Up @@ -47,6 +51,7 @@ gem 'RedCloth'
gem 'bluecloth'
gem 'htmlentities'
gem "json"
gem "nokogiri"

# Deployment
gem 'capistrano'
Expand All @@ -57,13 +62,31 @@ gem 'newrelic_rpm'

# oauth
gem 'oauth'
gem 'facebooker2'

gem 'will_paginate', '~> 3.0.pre2'

gem "validates_captcha"
gem "okkez-open_id_authentication"

gem "acts-as-taggable-on", :git => 'git://github.com/mbleigh/acts-as-taggable-on.git'
gem "acts-as-taggable-on", :git => 'http://github.com/mbleigh/acts-as-taggable-on.git'

### temp just for showing to drm
gem 'mechanize'
#gem 'formageddon', '0.0.0', :require => 'formageddon', :path => '/Users/aross/pcf-work/gitbranches/formageddon'
gem 'formageddon', :git => 'git://github.com/opencongress/formageddon.git'

gem 'rspec'
gem 'rspec-rails', '~> 2.4'
gem 'cucumber', '0.8.5'
gem 'cucumber-rails'
gem 'webrat'
gem 'selenium-client'

gem 'capybara'
gem 'capybara-envjs'

gem 'autotest'

# Testing
group :test, :development do
Expand Down
92 changes: 59 additions & 33 deletions Gemfile.lock
View file
Expand Up @@ -5,7 +5,16 @@ GIT
simple_captcha (0.1.1)

GIT
remote: git://github.com/mbleigh/acts-as-taggable-on.git
remote: git://github.com/opencongress/formageddon.git
revision: 887a36965fb1ec87c54c36128d6ae7fbff7380dd
specs:
formageddon (0.0.0)
delayed_job (~> 2.1)
haml
mechanize

GIT
remote: http://github.com/mbleigh/acts-as-taggable-on.git
revision: 2752cfef4c66318d0925fbe880d5392ad188bb50
specs:
acts-as-taggable-on (2.0.6)
Expand Down Expand Up @@ -46,18 +55,18 @@ GEM
activemodel (= 3.0.7)
activesupport (= 3.0.7)
activesupport (3.0.7)
addressable (2.2.5)
arel (2.0.9)
addressable (2.2.6)
arel (2.0.10)
autotest (4.4.6)
ZenTest (>= 4.4.1)
bluecloth (2.1.0)
builder (2.1.2)
capistrano (2.5.21)
capistrano (2.6.0)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.0.0)
net-ssh-gateway (>= 1.1.0)
capistrano-ext (1.2.1)
capistrano (>= 1.0.0)
capybara (0.4.1.2)
Expand All @@ -72,10 +81,10 @@ GEM
capybara-envjs (0.4.0)
capybara (~> 0.4.0)
envjs (>= 0.3.7)
carrierwave (0.5.3)
carrierwave (0.5.4)
activesupport (~> 3.0)
celerity (0.8.9)
childprocess (0.1.8)
childprocess (0.1.9)
ffi (~> 1.0.6)
closure-compiler (1.1.1)
crack (0.1.8)
Expand All @@ -88,6 +97,10 @@ GEM
cucumber-rails (0.3.2)
cucumber (>= 0.8.0)
culerity (0.2.15)
daemons (1.1.3)
delayed_job (2.1.4)
activesupport (~> 3.0)
daemons
diff-lcs (1.1.2)
em-websocket (0.2.1)
addressable (>= 2.1.1)
Expand All @@ -98,10 +111,12 @@ GEM
abstract (>= 1.0.0)
eventmachine (0.12.10)
excon (0.6.3)
facebooker2 (0.0.11)
mogli (>= 0.0.12)
ruby-hmac
fastercsv (1.5.4)
ffi (1.0.7)
rake (>= 0.8.7)
fog (0.8.1)
ffi (1.0.9)
fog (0.8.2)
builder
excon (~> 0.6.1)
formatador (>= 0.1.3)
Expand All @@ -110,33 +125,32 @@ GEM
net-ssh (>= 2.1.3)
nokogiri (>= 1.4.4)
ruby-hmac
formatador (0.1.3)
formatador (0.1.4)
gherkin (2.1.5)
trollop (~> 1.16.2)
govkit (0.6.1)
fastercsv (>= 1.5.3)
httparty (>= 0.5.2)
json (>= 1.4.3)
nokogiri (>= 1.4.4)
guard (0.3.4)
guard (0.4.1)
thor (~> 0.14.6)
guard-livereload (0.1.10)
guard-livereload (0.1.11)
em-websocket (~> 0.2.0)
guard (>= 0.2.2)
json (~> 1.5.1)
haml (3.1.1)
highline (1.6.1)
hoptoad_notifier (2.4.9)
haml (3.1.2)
highline (1.6.2)
hoptoad_notifier (2.4.11)
activesupport
builder
hpricot (0.8.4)
htmlentities (4.3.0)
httparty (0.7.7)
httparty (0.7.8)
crack (= 0.1.8)
i18n (0.5.0)
jammit (0.6.0)
closure-compiler (>= 0.1.0)
yui-compressor (>= 0.9.1)
jammit (0.6.3)
yui-compressor (>= 0.9.3)
johnson (2.0.0.pre3)
stackdeck (~> 0.2)
json (1.5.1)
Expand All @@ -146,27 +160,32 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mechanize (1.0.0)
nokogiri (>= 1.2.1)
mediacloth (0.0.3)
memcache (1.2.13)
memcache-client (1.8.5)
mime-types (1.16)
mogli (0.0.28)
httparty (>= 0.4.3)
mysql (2.8.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
net-ssh (2.1.4)
net-ssh-gateway (1.0.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
newrelic_rpm (2.14.1)
newrelic_rpm (3.0.1)
nokogiri (1.4.4)
oauth (0.4.4)
okkez-open_id_authentication (1.0.1)
ruby-openid (>= 2.0.4)
open4 (1.0.1)
pg (0.11.0)
polyglot (0.3.1)
rack (1.2.2)
rabl (0.2.8)
rack (1.2.3)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-openid (1.3.1)
Expand All @@ -189,24 +208,24 @@ GEM
thor (~> 0.14.4)
rake (0.8.7)
rmagick (2.13.1)
rspec (2.5.0)
rspec-core (~> 2.5.0)
rspec-expectations (~> 2.5.0)
rspec-mocks (~> 2.5.0)
rspec-core (2.5.1)
rspec-expectations (2.5.0)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
rspec-core (2.6.4)
rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.5.0)
rspec-rails (2.5.0)
rspec-mocks (2.6.0)
rspec-rails (2.6.1)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.5.0)
rspec (~> 2.6.0)
ruby-hmac (0.4.0)
ruby-openid (2.1.8)
rubyzip (0.9.4)
selenium-client (1.2.18)
selenium-webdriver (0.2.0)
selenium-webdriver (0.2.1)
childprocess (>= 0.1.7)
ffi (>= 1.0.7)
json_pure
Expand Down Expand Up @@ -253,7 +272,9 @@ DEPENDENCIES
closure-compiler
cucumber (= 0.8.5)
cucumber-rails
facebooker2
fog
formageddon!
govkit
guard
guard-livereload
Expand All @@ -263,17 +284,22 @@ DEPENDENCIES
htmlentities
jammit
json
mechanize
mediacloth
memcache
memcache-client
mysql
newrelic_rpm
nokogiri
oauth
okkez-open_id_authentication
pg
rabl
rack-openid
rails (= 3.0.7)
rake (= 0.8.7)
rmagick (= 2.13.1)
rspec
rspec-rails (~> 2.4)
ruby-openid
selenium-client
Expand Down
29 changes: 27 additions & 2 deletions app/controllers/account_controller.rb
View file
Expand Up @@ -36,7 +36,7 @@ def get_user_full_name
end
end

def login
def login
if params[:login_action]
session[:login_action] = {:url => session[:return_to], :action_result => params[:login_action]}
end
Expand Down Expand Up @@ -104,8 +104,32 @@ def accept_tos
end
end

def facebook_complete
@page_title = 'Facebook Connect'

@user = User.where(['facebook_uid=?', @facebook_user.id]).first
if @user.nil?
@user = User.new
end

if request.post?
@user.facebook_uid = @facebook_user.id
@user.email = @facebook_user.email
@user.update_attributes(params[:user])

if @user.save
@user.activate
self.current_user = @user
flash[:notice] = 'You have successfully signed up with your Facebook Account!'

redirect_to welcome_url
return
end
end
end

def signup
@page_title = "Create a New Account"
@page_title = "Create a New Account"

logger.info session.inspect

Expand Down Expand Up @@ -178,6 +202,7 @@ def activate
end

def welcome
@page_title = 'Welcome to OpenCongress!'
@user = current_user
@show_tracked_list = true

Expand Down
7 changes: 7 additions & 0 deletions app/controllers/admin/contact_congress_controller.rb
View file
@@ -0,0 +1,7 @@
class Admin::ContactCongressController < Admin::IndexController
before_filter :admin_login_required

def index
@people = Person.all_sitting
end
end

0 comments on commit a9c7c41

Please sign in to comment.