begin view object

Author: frogr

lib/tinyrails.rb

@@ -7,6 +7,7 @@
 require_relative 'tinyrails/util'
 require_relative 'tinyrails/controller'
 require_relative 'tinyrails/file_model'
+require_relative 'tinyrails/view'
 
 module Tinyrails
   class Application

lib/tinyrails/controller.rb

@@ -25,7 +25,7 @@ def render_to_string(view_name, locals = {})
       filename = File.join 'app', 'views', controller_name, "#{view_name}.html.erb"
       template = File.read filename
       eruby = Erubis::Eruby.new(template)
-      eruby.result locals.merge(env: env)
+      eruby.result(view_object.instance_eval { binding })
     end
 
     def response(text, status=200, headers={})
@@ -40,14 +40,20 @@ def get_response
     end
 
     def render(view_name, locals={})
+      view = Tinyrails::View.new(@env)
+
       controller_vars = {}
       instance_variables.each do |var|
         next if var == :@env || var == :@request || var == :@response
-        key = var.to_s.gsub('@',  '').to_sym
-        controller_vars[key] = instance_variable_get(var)
+        value = instance_variable_get(var)
+        view.isntance_variable_set(var, value)
+      end
+
+      locals.each do |k, v|
+        view.instance_variable_set("#{k}", v)
       end
 
-      response(render_to_string(view_name, locals.merge(controller_vars)))
+      response(render_to_string(view_name, view))
     end
 
     def request

lib/tinyrails/view.rb

@@ -0,0 +1,9 @@
+module Tinyrails
+  class View
+  def initialize(env)
+    @env = env
+  end
+
+  attr_accessor :env
+  end
+end