1.8.7 -> 1.9.2, whoo hoo

steveklabnik · steveklabnik · commit e153b446ea57 · 2010-12-23T15:56:19.000-05:00
diff --git a/.rvmrc b/.rvmrc
@@ -1 +1 @@
-rvm 1.8.7@hackety-hack.com
+rvm 1.9.2@hackety-hack.com
diff --git a/Gemfile b/Gemfile
@@ -13,20 +13,17 @@ gem "mongo_mapper", "~>0.8.4"
 gem "rack-flash", "~>0.1.1"
 gem "rdiscount", "~>1.6.5"
 gem "i18n", "~>0.4.1"
-gem "bson_ext", "~>1.1"
+gem "bson_ext", "~>1.1.5"
 gem "pony", "~>1.0.1"
 gem "sinatra-content-for"
 
 group :test do
   gem "launchy", "~>0.3.7"
-  gem "autotest", "~>4.3.2"
   gem "capybara", "~>0.3.9"
   gem "factory_girl", "~>1.3.2"
   gem "database_cleaner", "~>0.6.0"
   gem "rspec", "~>2.1.0"
   gem "webrat", "~>0.7.1"
   gem "steak", "~>1.0.0"
-
-  gem "ruby-debug"
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,9 +2,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.3)
-    autotest (4.3.2)
     bson (1.1.2)
-    bson_ext (1.1.2)
+    bson_ext (1.1.5)
     capybara (0.3.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -14,7 +13,6 @@ GEM
       selenium-webdriver (>= 0.0.3)
     childprocess (0.1.4)
       ffi (~> 0.6.3)
-    columnize (0.3.2)
     configuration (1.2.0)
     culerity (0.2.12)
     database_cleaner (0.6.0)
@@ -30,7 +28,6 @@ GEM
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    linecache (0.43)
     mail (2.2.10)
       activesupport (>= 2.3.6)
       i18n (~> 0.4.1)
@@ -64,11 +61,6 @@ GEM
     rspec-expectations (2.1.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.1.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     rubyzip (0.9.4)
     selenium-webdriver (0.1.0)
       childprocess (= 0.1.4)
@@ -94,8 +86,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  autotest (~> 4.3.2)
-  bson_ext (~> 1.1)
+  bson_ext (~> 1.1.5)
   capybara (~> 0.3.9)
   database_cleaner (~> 0.6.0)
   factory_girl (~> 1.3.2)
@@ -107,7 +98,6 @@ DEPENDENCIES
   rack-flash (~> 0.1.1)
   rdiscount (~> 1.6.5)
   rspec (~> 2.1.0)
-  ruby-debug
   sinatra (~> 1.1)
   sinatra-content-for
   steak (~> 1.0.0)
diff --git a/app.rb b/app.rb
@@ -33,7 +33,7 @@
 
 require 'sinatra/content_for'
 
-require 'helpers'
+require_relative 'helpers'
 
 #this makes Haml escape any html by default. See here: http://haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html#options
 set :haml, :escape_html => true
diff --git a/models/hacker.rb b/models/hacker.rb
@@ -75,8 +75,8 @@ def admin?
 
   #a helper function for gravatar urls
   def gravatar_url
-    require 'md5'
-    "http://www.gravatar.com/avatar/#{MD5::md5(email.downcase)}"
+    require 'digest/md5'
+    "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(email.downcase)}"
   end
 
   #this method makes the hacker follow the followee

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-rvm 1.8.7@hackety-hack.com`
	`1`	`+rvm 1.9.2@hackety-hack.com`