rbjs 0.10.2 → 0.10.3

data/lib/rbjs.rb

@@ -36,7 +36,7 @@ module Rbjs
     
     def evaluate function_parameters = nil
       instance_exec *function_parameters, &@_block
-      @_called_expressions.map(&:last_of_chain).reject(&:is_argument).map(&:to_s).join(";\n")
+      @_called_expressions.map(&:last_childs).flatten.reject(&:is_argument).map(&:to_s).join(";\n")
     end
     
     def method_missing name, *args, &block
@@ -57,10 +57,11 @@ module Rbjs
   
   class Expression
     attr_accessor :parent_expression
-    attr_accessor :child_expression
+    attr_accessor :child_expressions
     attr_accessor :is_argument
     
     def initialize name, view_context = nil, *args, &block
+      @child_expressions = []
       @name = name.to_s.gsub '!', '()'
       @_view_context = view_context
       args << block if block_given?
@@ -70,7 +71,7 @@ module Rbjs
     def method_missing name, *args, &block
       expression = Expression.new name, @_view_context, *args, &block
       expression.parent_expression = self
-      self.child_expression = expression
+      @child_expressions << expression
       expression
     end
     
@@ -89,17 +90,21 @@ module Rbjs
         @name + argument_list
       end        
     end
+
+    def to_ary
+      nil
+    end
     
     def argument_list
       return '' if @arguments.empty?
       '(' + @arguments.join(', ') + ')'
     end
     
-    def last_of_chain
-      if @child_expression
-        @child_expression.last_of_chain
+    def last_childs
+      if @child_expressions.length > 0
+        @child_expressions.map(&:last_childs).flatten
       else
-        self
+        [self]
       end
     end
     

data/lib/rbjs/version.rb

@@ -1,3 +1,3 @@
 module Rbjs
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 end

data/spec/rbjs_spec.rb

@@ -133,4 +133,24 @@ describe Rbjs::Root, '#evaluate' do
     js.strip.should == "docs.map(function(doc) {\nw.match(/^_/);\nemit(doc)})"
   end
 
+  it "should render multiple calls to locally assigned expressions" do
+    js = build do
+      selector = jQuery('#content').find('.note')
+      selector.hide!
+      selector.html 'some text'
+    end
+    js.strip.should == "jQuery(\"#content\").find(\".note\").hide();\njQuery(\"#content\").find(\".note\").html(\"some text\")"
+  end
+
+  it "should support multiple nested functions" do
+    js = build do
+      jQuery('.note').fadeIn do
+        delay 1000 do
+          jQuery('.note').hide!
+        end
+      end
+    end
+    js.strip.should == ''
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbjs
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70329092185820 !ruby/object:Gem::Requirement
+  requirement: &70186833414720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329092185820
+  version_requirements: *70186833414720
 description: Remote Javascript Builder for Ruby on Rails
 email:
 - buhrmi@gmail.com