Ticket #3876: prototype_helpers.fixed.diff

activesupport/test/json.rb

@@ -9 +9 @@
-end
-
-class TestJSONEmitters < Test::Unit::TestCase
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
-                    
-
-
+ 
+ 
-                 
-
-
+ 
+ 
-  
-
+ 
-                  
-
-
-
+ 
+ 
+ 
-
-
-
+
+
+
+
+
+
-  constants.grep(/Tests$/).each do |class_tests|
-    define_method("test_#{class_tests[0..-6].downcase}") do
-      self.class.const_get(class_tests).each do |pair|

activesupport/lib/active_support/json/encoders/core.rb

@@ -56 +56 @@
-          result << '}'
-        end
-      end
+
+      define_encoder Regexp do |regexp|
+        regexp.inspect
+      end
-    end
-  end
-end

activesupport/lib/active_support/json.rb

@@ -3 +3 @@
-module ActiveSupport
-  module JSON #:nodoc:
-    class CircularReferenceError < StandardError; end
-
+
+
+
+
+
+
+
+
+
-    class << self
-      REFERENCE_STACK_VARIABLE = :json_reference_stack
-      

actionpack/test/template/prototype_helper_test.rb

@@ -3 +3 @@
-module BaseTest
-  include ActionView::Helpers::JavaScriptHelper
-  include ActionView::Helpers::PrototypeHelper
+  include ActionView::Helpers::ScriptaculousHelper
-  
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers::TagHelper
@@ -147 +148 @@
-  end
-end
-
+ActionView::Helpers::JavaScriptCollectionProxy.send :public, :enumerate
+
-class JavaScriptGeneratorTest < Test::Unit::TestCase
-  include BaseTest
-  
@@ -234 +237 @@
-
-  def test_element_proxy_one_deep
-    @generator['hello'].hide
-$('hello').hide(
+Element.hide("hello"
-  end
-
-  def test_element_proxy_assignment
@@ -243 +246 @@
-  end
-
-  def test_element_proxy_two_deep
-display
-$('hello').hide("first").display(
+visual_effect(:highlight)
+Element.hide("hello", "first");\nnew Effect.Highlight('hello',{}
-  end
-
+
+
+
+
+
+
+
+
+
+
+
-  def test_select_access
-    assert_equal %($$('div.hello');), @generator.select('div.hello')
-  end
-
-  def test_select_proxy_one_deep
-    @generator.select('p.welcome b').first.hide
-$$('p.welcome b').first().hide(
+Element.hide($$('p.welcome b').first()
-  end
+
+  def test_select_proxy_two_deep
+    @generator.select('p.welcome b').first('a').hide.show
+    assert_equal %(a = $$('p.welcome b').first();\nElement.hide(a);\nElement.show(a);), @generator.to_s
+  end
+
+  def test_collection_proxy_with_each
+    @generator.select('p.welcome b').each do |page, value|
+      value.remove_class_name 'selected'
+    end
+    @generator.select('p.welcome b').each do |page, value, index|
+      page.call 'alert', index
+      page.call 'alert', value, 'selected'
+    end
+      assert_equal <<-EOS.strip, @generator.to_s
+$$('p.welcome b').each(function(value, index) {
+Element.removeClassName(value, "selected");
+});
+$$('p.welcome b').each(function(value, index) {
+alert(index);
+alert(value, "selected");
+});
+      EOS
+  end
+
+  def test_collection_proxy_on_enumerables_with_return_and_index
+    iterator            = Proc.new { |page, value|        page << '(value.className == "welcome")' }
+    iterator_with_index = Proc.new { |page, value, index| page.call 'alert', index ; page << '(value.className == "welcome")' }
+    ActionView::Helpers::JavaScriptCollectionProxy::ENUMERABLE_METHODS_WITH_RETURN.each do |enum|
+      @generator.select('p').enumerate(enum, 'a', &iterator)
+      @generator.select('p').enumerate(enum, 'b', &iterator_with_index)
+      
+      assert_equal <<-EOS.strip, @generator.to_s
+a = $$('p').#{enum}(function(value, index) {
+return (value.className == "welcome");
+});
+b = $$('p').#{enum}(function(value, index) {
+alert(index);
+return (value.className == "welcome");
+});
+      EOS
+      @generator = create_generator
+    end
+  end
+
+  def test_collection_proxy_with_grep
+    @generator.select('p').grep 'a', /^a/ do |page, value|
+      page << '(value.className == "welcome")'
+    end
+    @generator.select('p').grep 'b', /b$/ do |page, value, index|
+      page.call 'alert', value
+      page << '(value.className == "welcome")'
+    end
+
+    assert_equal <<-EOS.strip, @generator.to_s
+a = $$('p').grep(/^a/, function(value, index) {
+return (value.className == "welcome");
+});
+b = $$('p').grep(/b$/, function(value, index) {
+alert(value);
+return (value.className == "welcome");
+});
+    EOS
+  end
+
+  def test_collection_proxy_with_inject
+    @generator.select('p').inject 'a', [] do |page, memo, value|
+      page << '(value.className == "welcome")'
+    end
+    @generator.select('p').inject 'b', nil do |page, memo, value, index|
+      memo.hide.show
+      page << '(value.className == "welcome")'
+    end
+
+    assert_equal <<-EOS.strip, @generator.to_s
+a = $$('p').inject([], function(memo, value, index) {
+return (value.className == "welcome");
+});
+b = $$('p').inject(null, function(memo, value, index) {
+Element.hide(memo);
+Element.show(memo);
+return (value.className == "welcome");
+});
+    EOS
+  end
+
+  def test_collection_proxy_with_pluck
+    @generator.select('p').pluck('a', 'className')
+    assert_equal %(a = $$('p').pluck("className");), @generator.to_s
+  end
+
+  def test_collection_proxy_with_zip
+    ActionView::Helpers::JavaScriptCollectionProxy.new(@generator, '[1, 2, 3]').zip('a', [4, 5, 6], [7, 8, 9])
+    ActionView::Helpers::JavaScriptCollectionProxy.new(@generator, '[1, 2, 3]').zip('b', [4, 5, 6], [7, 8, 9]) do |page, array|
+      page.call 'array.reverse'
+    end
+
+    assert_equal <<-EOS.strip, @generator.to_s
+a = [1, 2, 3].zip([4, 5, 6], [7, 8, 9]);
+b = [1, 2, 3].zip([4, 5, 6], [7, 8, 9], function(array) {
+return array.reverse();
+});
+    EOS
+  end
-end

actionpack/lib/action_view/helpers/prototype_helper.rb

@@ -421 +421 @@
-        # used for further method calls. Examples:
-        #
-        #   page['blank_slate']                  # => $('blank_slate');
-$('blank_slate').show(
-$('blank_slate').show('first').up(
+Element.show("blank_slate"
+Element.show("blank_slate", "first"); Element.up("blank_slate"
-        def [](id)
-          JavaScriptElementProxy.new(self, id)
-        end
@@ -430 +430 @@
-        # Returns a collection reference by finding it through a CSS +pattern+ in the DOM. This collection can then be
-        # used for further method calls. Examples:
-        #
-
-
-
+
+
+
+
-        def select(pattern)
-
+Element
-        end
-  
-        # Inserts HTML at the specified +position+ relative to the DOM element
@@ -595 +596 @@
-        end
-
-        def javascript_object_for(object)
-respond_to?(:to_json) ? object.to_json :
+to_json rescue
-        end
-
-        def arguments_for_call(arguments)
@@ -667 +668 @@
-
-    # Converts chained method calls on DOM proxy elements into JavaScript chains 
-    class JavaScriptProxy < Builder::BlankSlate #:nodoc:
-
+ = nil
-        @generator = generator
-
+ if root
-      end
-
-      private
@@ -687 +688 @@
-        end
-
-        def assign(variable, value)
- "#{variable} = #{@generator.send(:javascript_object_for, value)}"
+("#{variable} = #{@generator.send(:javascript_object_for, value)}")
-        end
-        
-        def function_chain
@@ -695 +696 @@
-        end
-        
-        def append_to_function_chain!(call)
-
-
+
+
+
+
+
+
-        end
-    end
-    
-    class JavaScriptElementProxy < JavaScriptProxy #:nodoc:
-      def initialize(generator, id)
-        @id = id
-, "$('#{id}')"
+
-      end
-
+
-      def replace_html(*options_for_render)
-        call 'update', @generator.send(:render, *options_for_render)
-      end
@@ -717 +722 @@
-      def reload
-        replace :partial => @id.to_s
-      end
+
+      def to_json
+        @id.to_json
+      end
+
+      def visual_effect(name, options = {})
+        @generator << @generator.visual_effect(name, @id, options)
+        self
+      end
+
+      private
+        def method_missing(method, *arguments)
+          if method.to_s =~ /(.*)=$/
+            @generator << "$('#{@id}')"
+            super
+          else
+            @generator.call "Element.#{method.to_s.first}#{method.to_s.classify[1..-1]}", @id, *arguments
+            self
+          end
+        end
-    end
-
-    class JavaScriptCollectionProxy < JavaScriptProxy #:nodoc:
+      ENUMERABLE_METHODS_WITH_RETURN = [:all, :any, :collect, :map, :detect, :find, :findAll, :select, :max, :min, :partition, :reject, :sortBy]
+
-      def initialize(generator, pattern)
-
-
+
-      end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
+    
+    class JavaScriptElementCollectionProxy < JavaScriptCollectionProxy #:nodoc:\
+      def initialize(generator, pattern)
+        super(generator, "$$('#{pattern}')")
+      end
+    end
-  end
-end