prototype-rails 3.1.0 → 3.2.0.rc1

data/Gemfile

@@ -1,4 +1,3 @@
 source :rubygems
 
-gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '3-1-0'
-gem 'mocha'
+gemspec

data/lib/action_view/helpers/prototype_helper.rb

@@ -546,7 +546,15 @@ module ActionView
             end
 
             def with_formats(*args)
-              @context ? @context.lookup_context.update_details(:formats => args) { yield } : yield
+              return yield unless @context
+              
+              lookup = @context.lookup_context
+              begin
+                old_formats, lookup.formats = lookup.formats, args
+                yield
+              ensure
+                lookup.formats = old_formats
+              end
             end
 
             def javascript_object_for(object)

data/lib/prototype-rails/selector_assertions.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/module/aliasing'
 require 'action_controller/vendor/html-scanner'
 require 'action_dispatch/testing/assertions'
 require 'action_dispatch/testing/assertions/selector'

data/test/abstract_unit.rb

@@ -104,7 +104,7 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
 
   def self.build_app(routes = nil)
     RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
-      middleware.use "ActionDispatch::ShowExceptions"
+      middleware.use "ActionDispatch::ShowExceptions", ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public")
       middleware.use "ActionDispatch::Callbacks"
       middleware.use "ActionDispatch::ParamsParser"
       middleware.use "ActionDispatch::Cookies"

data/test/assert_select_test.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'abstract_unit'
 
 class AssertSelectTest < ActionController::TestCase
@@ -47,7 +49,7 @@ class AssertSelectTest < ActionController::TestCase
       assert_select "#2"
     end
   end
-  
+
   # With multiple results.
   def test_assert_select_from_rjs_with_multiple_results
     render_rjs do |page|
@@ -121,19 +123,22 @@ class AssertSelectTest < ActionController::TestCase
 
   def test_assert_select_rjs_with_unicode
     # Test that non-ascii characters (which are converted into \uXXXX in RJS) are decoded correctly.
+
+    unicode = "\343\203\201\343\202\261\343\203\203\343\203\210"
     render_rjs do |page|
-      page.replace "test", "<div id=\"1\">\343\203\201\343\202\261\343\203\203\343\203\210</div>"
+      page.replace "test", %(<div id="1">#{unicode}</div>)
     end
+
     assert_select_rjs do
       str = "#1"
-      assert_select str, :text => "\343\203\201\343\202\261\343\203\203\343\203\210"
-      assert_select str, "\343\203\201\343\202\261\343\203\203\343\203\210"
+      assert_select str, :text => unicode
+      assert_select str, unicode
       if str.respond_to?(:force_encoding)
         assert_select str, /\343\203\201..\343\203\210/u
         assert_raise(Assertion) { assert_select str, /\343\203\201.\343\203\210/u }
       else
-        assert_select str, Regexp.new("\343\203\201..\343\203\210",0,'U')
-        assert_raise(Assertion) { assert_select str, Regexp.new("\343\203\201.\343\203\210",0,'U') }
+        assert_select str, Regexp.new("\343\203\201..\343\203\210", 0, 'U')
+        assert_raise(Assertion) { assert_select str, Regexp.new("\343\203\201.\343\203\210", 0, 'U') }
       end
     end
   end

data/test/fixtures/test/render_explicit_html_template.js.rjs

@@ -1 +1 @@
-page.call "document.write", render(:partial => "one.html.erb")
+page.call "document.write", render(:partial => 'one')

metadata

@@ -1,47 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: prototype-rails
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 3
-  - 1
-  - 0
-  version: 3.1.0
+version: !ruby/object:Gem::Version
+  version: 3.2.0.rc1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Xavier Noria
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-31 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &69515510 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: 3.2.0.rc
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *69515510
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &69514670 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *69514670
 description: 
 email: fxn@hashref.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - Rakefile
 - Gemfile
@@ -92,39 +89,28 @@ files:
 - test/fixtures/test/_two.html.erb
 - test/fixtures/respond_with/using_resource.js.rjs
 - test/javascript_helper_test.rb
-has_rdoc: true
 homepage: http://github.com/rails/prototype-rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Prototype, Scriptaculous, and RJS for Ruby on Rails
 test_files: []
-