render.rb in rhodes-3.1.0.beta.1

- old
+ new

@@ -1,5 +1,31 @@
+#------------------------------------------------------------------------
+# (The MIT License)
+# 
+# Copyright (c) 2008-2011 Rhomobile, Inc.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+# 
+# http://rhomobile.com
+#------------------------------------------------------------------------
+
 require 'rho/rhoapplication'
 require 'rho/rhocontroller'
 require 'rho/rho'
 
 module Rho
@@ -196,11 +222,14 @@
         require 'helpers/application_helper'
         include ApplicationHelper
         require 'helpers/browser_helper'
         include BrowserHelper
         
-        def initialize(obj=nil)
+        def initialize()
+        end
+        
+        def set_vars(obj=nil)
           @vars = {}
           if obj
             obj.each do |key,value|
               @vars[key.to_sym()] = value if key && key.length > 0
             end
@@ -229,14 +258,17 @@
 
       options[:locals] = {} if options[:locals].nil? or !options[:locals].is_a?(Hash)
        
       content = ""
       if options[:collection].nil?
-        locals = localclass.new(options[:locals])
+        locals = localclass.new()
 
         self.instance_variables.each do |ivar|
           locals.instance_variable_set(ivar,self.instance_variable_get(ivar))
         end
+        
+        locals.set_vars(options[:locals])
+        
         modelpath = @request[:modelpath]
         modelpath = Rho::RhoFSConnector.get_model_path("app",model) if model
         content = eval_compiled_file(modelpath+'_' + partial_name.to_s+RHO_ERB_EXT, locals.get_binding )
       else
         #xruby issue - https://www.pivotaltracker.com/story/show/3454121