formageddon fixes and improvements

chrigui · Aug 23, 2011 · 9f4cb11 · 9f4cb11
1 parent 72a334a
commit 9f4cb11
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -12,7 +12,7 @@ GIT
 
 GIT
   remote: git://github.com/opencongress/formageddon.git
-  revision: cbe25619e10f452ae8e9b25c21b66902191b9750
+  revision: 249ec3a7616d988bbbf3ba9eea811b37a714c222
   specs:
     formageddon (0.0.0)
       delayed_job (~> 2.1)
@@ -165,15 +165,20 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mechanize (1.0.0)
-      nokogiri (>= 1.2.1)
+    mechanize (2.0.1)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (~> 1.8)
+      nokogiri (~> 1.4)
+      webrobots (~> 0.0, >= 0.0.9)
     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-http-digest_auth (1.1.1)
+    net-http-persistent (1.8.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -182,7 +187,7 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     newrelic_rpm (3.0.1)
-    nokogiri (1.4.4)
+    nokogiri (1.5.0)
     oauth (0.4.4)
     okkez-open_id_authentication (1.0.1)
       ruby-openid (>= 2.0.4)
@@ -259,6 +264,8 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
+    webrobots (0.0.11)
+      nokogiri (>= 1.4.4)
     will_paginate (3.0.pre2)
     xpath (0.1.4)
       nokogiri (~> 1.3)

diff --git a/app/controllers/admin/contact_congress_controller.rb b/app/controllers/admin/contact_congress_controller.rb
@@ -3,7 +3,7 @@ class Admin::ContactCongressController < Admin::IndexController
 
   def index
     @page_title = 'Contact Congress Configuration'
-    @people = Person.where("title IS NOT NULL").order("title ASC, page_views_count DESC").all
+    @people = Person.all_sitting
   end
 
   def letters

diff --git a/bin/test_formageddon_recipients.rb b/bin/test_formageddon_recipients.rb
@@ -10,7 +10,7 @@
 
 send = false
 #people = Person.representatives
-people = Person.where("id IN (400034, 300005, 300026, 400408, 400412, 412321, 412249)")
+people = Person.where("id IN (300005)")
 bill = Bill.find_by_ident('112-h1349')
 sender = User.find_by_login('drm')
 people.each do |p|

diff --git a/config/initializers/formageddon.rb b/config/initializers/formageddon.rb
@@ -30,7 +30,8 @@
       "Re" => "issue",
       "SubjectOther" => 'Other',
       "view" => 'N/A',
-      "responsereq" => 'yes'
+      "responsereq" => 'yes',
+      "newsletter_action" => 'unsubscribe'
     }