Changeset 3754

Timestamp:

03/03/06 19:34:23 (3 years ago)

Author:

david

Message:

RJS now does enumerations, baby! (closes #3876) [Rick Olson]

Files:

• trunk/actionpack/lib/action_view/helpers/prototype_helper.rb (modified) (6 diffs)
• trunk/actionpack/test/template/prototype_helper_test.rb (modified) (3 diffs)
• trunk/activesupport/lib/active_support/json.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/json/encoders/core.rb (modified) (1 diff)
• trunk/activesupport/test/json.rb (modified) (1 diff)

trunk/actionpack/lib/action_view/helpers/prototype_helper.rb

@@ -435 +435 @@
-        #   page.select('p.welcome b').first.hide # => $$('p.welcome b').first().hide();
-        def select(pattern)
-
+Element
-        end
-  
@@ -688 +688 @@
-    # Converts chained method calls on DOM proxy elements into JavaScript chains 
-    class JavaScriptProxy < Builder::BlankSlate #:nodoc:
-
+ = nil
-        @generator = generator
-
+ if root
-      end
-
@@ -698 +698 @@
-            assign($1, arguments.first)
-          else
-method
+"#{method.to_s.first}#{method.to_s.classify[1..-1]}"
-          end
-        end
@@ -708 +708 @@
-
-        def assign(variable, value)
- "#{variable} = #{@generator.send(:javascript_object_for, value)}"
+("#{variable} = #{@generator.send(:javascript_object_for, value)}")
-        end
-        
@@ -716 +716 @@
-        
-        def append_to_function_chain!(call)
- = function_chain[-1][0..-2] if function_chain[-1][-1..-1] == ";" # strip last ;
+.chomp!(';')
-          function_chain[-1] += ".#{call};"
-        end
@@ -738 +738 @@
-        replace :partial => @id.to_s
-      end
+      
-    end
-
+    class JavaScriptVariableProxy < JavaScriptProxy #:nodoc:
+      def initialize(generator, variable)
+        @variable = variable
+        @empty    = true # only record lines if we have to.  gets rid of unnecessary linebreaks
+        super(generator)
+      end
+
+      # The JSON Encoder calls this to check for the #to_json method
+      # Since it's a blank slate object, I suppose it responds to anything.
+      def respond_to?(method)
+        true
+      end
+
+      def to_json
+        @variable
+      end
+      
+      private
+        def append_to_function_chain!(call)
+          @generator << @variable if @empty
+          @empty = false
+          super
+        end
+    end
+
-    class JavaScriptCollectionProxy < JavaScriptProxy #:nodoc:
+      ENUMERABLE_METHODS_WITH_RETURN = [:all, :any, :collect, :map, :detect, :find, :findAll, :select, :max, :min, :partition, :reject, :sortBy]
+      ENUMERABLE_METHODS = ENUMERABLE_METHODS_WITH_RETURN + [:each]
+
-      def initialize(generator, pattern)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        super(generator, "$$('#{pattern}')")
-      end
-
-      # TODO: Implement funky stuff like .each
-    end
-  end

trunk/actionpack/test/template/prototype_helper_test.rb

@@ -149 +149 @@
-end
-
+ActionView::Helpers::JavaScriptCollectionProxy.send :public, :enumerate
+
-class JavaScriptGeneratorTest < Test::Unit::TestCase
-  include BaseTest
@@ -245 +247 @@
-
-  def test_element_proxy_two_deep
-display
-display
+clean_whitespace
+cleanWhitespace
-  end
-  
@@ -282 +284 @@
-      @generator.drop_receiving('blah', :url => { :action => "order" })
-  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) {
+value.removeClassName("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|
+      page.call 'alert', memo
+      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) {
+alert(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

trunk/activesupport/lib/active_support/json.rb

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

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

@@ -57 +57 @@
-        end
-      end
+
+      define_encoder Regexp do |regexp|
+        regexp.inspect
+      end
-    end
-  end

trunk/activesupport/test/json.rb

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