more progress

Gemfile

@@ -84,7 +84,7 @@ gem 'ruby-oembed', '~> 0.8.7'
 
 # queue
 
-gem 'resque', '1.19.0'
+gem 'resque', '1.20.0'
 gem 'resque-ensure-connected', :git => 'git://github.com/socialcast/resque-ensure-connected.git'
 gem 'resque-timeout', '1.0.0'
 gem 'SystemTimer', '1.2.3', :platforms => :ruby_18

Gemfile.lock

@@ -349,7 +349,7 @@ GEM
     redis (2.2.2)
     redis-namespace (1.0.3)
       redis (< 3.0.0)
-    resque (1.19.0)
+    resque (1.20.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.0.2)
       sinatra (>= 0.9.2)
@@ -521,7 +521,7 @@ DEPENDENCIES
   rails-i18n
   rails_autolink
   redcarpet (= 2.0.1)
-  resque (= 1.19.0)
+  resque (= 1.20.0)
   resque-ensure-connected!
   resque-timeout (= 1.0.0)
   rest-client (= 1.6.7)

app/helpers/application_helper.rb

@@ -3,6 +3,7 @@
 #   the COPYRIGHT file.
 
 module ApplicationHelper
+  include Rails.application.routes.url_helpers
 
   def how_long_ago(obj)
     timeago(obj.created_at)

app/helpers/notifications_helper.rb

@@ -1,5 +1,7 @@
 module NotificationsHelper
   include PeopleHelper
+  include Rails.application.routes.url_helpers
+
 
   def object_link(note, actors)
     target_type = note.popup_translation_key

app/helpers/people_helper.rb

@@ -4,6 +4,7 @@
 
 module PeopleHelper
   include ERB::Util
+  include Rails.application.routes.url_helpers
 
   def search_header
     if search_query.blank?

config/initializers/patch_openssl_pkey.rb

@@ -5,10 +5,10 @@
 #
 #
 ##Why? as of rails 3.0.4, objects are marshalled by calling to yaml, if it is a text field in the db. since we assume things are strings coming out, and pkey does not seem to define a to_yaml, it was getting set to nil
-#class OpenSSL::PKey::RSA
-#  def to_yaml
-#    self.to_s
-#  end
-#end
+class OpenSSL::PKey::RSA
+ def to_yaml(opts=nil)
+   self.to_s
+ end
+end
 #
 #

spec/helpers/application_helper_spec.rb

@@ -5,6 +5,8 @@
 require 'spec_helper'
 
 describe ApplicationHelper do
+  include Rails.application.routes.url_helpers
+
   before do
     @user = alice
     @person = Factory(:person)

spec/helpers/notifications_helper_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 
 describe NotificationsHelper do
   include ApplicationHelper
+  include Rails.application.routes.url_helpers
+  
   before do
     @user = Factory(:user)
     @person = Factory(:person)

spec/helpers/people_helper_spec.rb

@@ -5,6 +5,8 @@
 require 'spec_helper'
 
 describe PeopleHelper do
+  include Rails.application.routes.url_helpers
+
  before do
     @user = alice
     @person = Factory(:person)