updated gems, user ordered hash on ruby 1.8.x

hubertlepicki · Oct 29, 2010 · 98703e8 · 98703e8
1 parent c81e427
commit 98703e8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 37 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", "3.0.0"
+gem "rails", "3.0.1"
 gem "mongo", "1.1"
 gem "bson_ext", ">=1.0.5"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -46,32 +46,32 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
       mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
     arel (1.0.1)
       activesupport (~> 3.0.0)
     bson (1.1)
@@ -85,7 +85,6 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
     cgi_multipart_eof_fix (2.5.0)
-    columnize (0.3.1)
     culerity (0.2.12)
     daemons (1.0.10)
     diff-lcs (1.1.2)
@@ -97,8 +96,7 @@ GEM
     gem_plugin (0.2.3)
     i18n (0.4.1)
     json_pure (1.4.6)
-    linecache (0.43)
-    mail (2.2.6.1)
+    mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
@@ -115,31 +113,26 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
       bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    ruby-debug (0.10.3)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
-      linecache (>= 0.3)
     rubyzip (0.9.4)
     selenium-webdriver (0.0.28)
       ffi (>= 0.6.1)
       json_pure
       rubyzip
-    thor (0.14.2)
+    thor (0.14.3)
     timecop (0.3.5)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
@@ -156,12 +149,11 @@ DEPENDENCIES
   fastthread
   mongo (= 1.1)
   mongrel (= 1.2.0.pre2)
-  rails (= 3.0.0)
+  rails (= 3.0.1)
   rspec!
   rspec-core!
   rspec-expectations!
   rspec-mocks!
   rspec-rails!
-  ruby-debug (>= 0.10.3)
   steak!
   timecop (= 0.3.5)
diff --git a/app/controllers/go_translate_yourself/site_translations_controller.rb b/app/controllers/go_translate_yourself/site_translations_controller.rb
@@ -3,7 +3,7 @@ class SiteTranslationsController < ApplicationController
     before_filter :auth
 
     def edit
-      @translations = Hash[
+      @translations = hash_class[
         *GoTranslateYourself.current_store.keys_without_prefix.collect do |key| 
           [key, GoTranslateYourself.current_store.default_translation("dev.#{key}")]
         end.flatten
@@ -26,6 +26,10 @@ def update
     def auth
       GoTranslateYourself.auth_handler.bind(self).call if GoTranslateYourself.auth_handler.is_a? Proc
     end
+
+    def hash_class
+      RUBY_VERSION < '1.9' ? ActiveSupport::OrderedHash : Hash
+    end
   end
 end