rjs -> prototype-rails for consistency

njfbradburn · Apr 30, 2011 · 63fbf49 · 63fbf49
1 parent 920cfbc
commit 63fbf49
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,39 +1,39 @@
 GIT
   remote: git://github.com/brynary/rack-test.git
-  revision: 38fa75d41eb11b259fd06f87e9b15f2b4f8f8b76
+  revision: cbbec1b5013473cf99b2fabe92fdb3c9795c5a0a
   specs:
     rack-test (0.5.7)
       rack (>= 1.0)
 
 GIT
   remote: git://github.com/rack/rack.git
-  revision: cd73f8f0db954659286abe006ad803603d261b55
+  revision: 37d2b2fe40667eb0a7ff89111713832be934aa9f
   specs:
     rack (1.2.1)
 
 GIT
   remote: git://github.com/rails/rails.git
-  revision: c630750fa59e248fb5af96f850392333e341ccd7
+  revision: 9971387a3b4ca0c03b9bd32de7dc417c5399fdd7
   specs:
     actionmailer (3.1.0.beta)
       actionpack (= 3.1.0.beta)
-      mail (~> 2.2.15)
+      mail (~> 2.3.0)
     actionpack (3.1.0.beta)
       activemodel (= 3.1.0.beta)
       activesupport (= 3.1.0.beta)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.5.0)
+      i18n (~> 0.6.0beta1)
       rack (~> 1.2.1)
       rack-cache (~> 1.0.0)
-      rack-mount (~> 0.7.1)
+      rack-mount (~> 0.7.2)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
     activemodel (3.1.0.beta)
       activesupport (= 3.1.0.beta)
       bcrypt-ruby (~> 2.1.4)
       builder (~> 3.0.0)
-      i18n (~> 0.5.0)
+      i18n (~> 0.6.0beta1)
     activerecord (3.1.0.beta)
       activemodel (= 3.1.0.beta)
       activesupport (= 3.1.0.beta)
@@ -43,6 +43,7 @@ GIT
       activemodel (= 3.1.0.beta)
       activesupport (= 3.1.0.beta)
     activesupport (3.1.0.beta)
+      multi_json (~> 1.0.0)
     rails (3.1.0.beta)
       actionmailer (= 3.1.0.beta)
       actionpack (= 3.1.0.beta)
@@ -65,26 +66,26 @@ GEM
     bcrypt-ruby (2.1.4)
     builder (3.0.0)
     erubis (2.7.0)
-    i18n (0.5.0)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
+    i18n (0.6.0beta1)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     mocha (0.9.12)
+    multi_json (1.0.0)
     polyglot (0.3.1)
     rack-cache (1.0.1)
       rack (>= 0.4)
-    rack-mount (0.7.1)
+    rack-mount (0.7.2)
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rake (0.8.7)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby

diff --git a/lib/prototype-rails.rb b/lib/prototype-rails.rb
@@ -1,14 +1,14 @@
 ActiveSupport.on_load(:action_controller) do
-  require 'rjs/selector_assertions'
-  require 'rjs/renderers'
+  require 'prototype-rails/selector_assertions'
+  require 'prototype-rails/renderers'
 end
 
 ActiveSupport.on_load(:action_view) do
   require 'action_view/helpers/prototype_helper'
   require 'action_view/helpers/scriptaculous_helper'
   require 'action_view/template/handlers/rjs'
-  require 'rjs/javascript_helper'
-  require 'rjs/rendering'
+  require 'prototype-rails/javascript_helper'
+  require 'prototype-rails/rendering'
 
   ActionView::Base.class_eval do
     cattr_accessor :debug_rjs

diff --git a/lib/rjs/javascript_helper.rb → lib/prototype-rails/javascript_helper.rb b/lib/rjs/javascript_helper.rb → lib/prototype-rails/javascript_helper.rb
diff --git a/lib/rjs/renderers.rb → lib/prototype-rails/renderers.rb b/lib/rjs/renderers.rb → lib/prototype-rails/renderers.rb
diff --git a/lib/rjs/rendering.rb → lib/prototype-rails/rendering.rb b/lib/rjs/rendering.rb → lib/prototype-rails/rendering.rb
diff --git a/lib/rjs/selector_assertions.rb → lib/prototype-rails/selector_assertions.rb b/lib/rjs/selector_assertions.rb → lib/prototype-rails/selector_assertions.rb