kontrol 0.3 → 0.3.1

data/lib/kontrol/application.rb

@@ -20,13 +20,13 @@ module Kontrol
     end
 
     def load_template(file)
-      ERB.new(File.read("#{self.path}/templates/#{file}"))
+      @templates[file] ||= Template.new(self, "#{self.path}/templates/#{file}")
     end
     
     # Render template with given variables.
-    def render_template(file, vars)
-      template = load_template(file) or raise "not found: #{path}"
-      Template.render(template, self, "#{self.path}/templates/#{file}", vars)
+    def render_template(file, variables)
+      template = load_template(file) or raise "template not found: #{path}"
+      template.render(variables)
     end
 
     # Render named template and insert into layout with given variables.

data/lib/kontrol/template.rb

@@ -1,27 +1,51 @@
 module Kontrol
 
+  class View
+    
+    def initialize(variables)
+      variables.each do |k, v|
+        instance_variable_set "@#{k}", v
+      end
+    end
+    
+    def __binding__
+      binding
+    end
+
+    def method_missing(id, *args, &block)
+      if @__app__.respond_to?(id)
+        @__app__.send(id, *args, &block)
+      else      
+        super
+      end
+    end
+  end
+
   # This class renders an ERB template for a set of attributes, which
   # are accessible as instance variables.
   class Template
     include Helpers
 
-    # Initialize this template with an ERB instance.
-    def initialize(app, vars)
-      @__app__ = app
+    def initialize(app, file)
+      @app = app
+      @file = file
       
-      vars.each do |k, v|
-        instance_variable_set "@#{k}", v
-      end
-    end
-   
-    def __binding__
-      binding
+      load
     end
 
-    def self.render(erb, app, file, vars)
-      template = Template.new(app, vars)
+    def load
+      @mtime = File.mtime(file)
+      @erb = ERB.new(File.read(file))
+    end
+    
+    def changed?
+      File.mtime(@file) != @mtime
+    end
+    
+    def render(variables)
+      load if ENV['RACK_ENV'] != 'production' and changed?
       
-      return erb.result(template.__binding__)
+      @erb.result(View.new(@app, variables).__binding__)
 
     rescue => e
       e.backtrace.each do |s|
@@ -30,13 +54,6 @@ module Kontrol
       raise e
     end
 
-    def method_missing(id, *args, &block)
-      if @__app__.respond_to?(id)
-        return @__app__.send(id, *args, &block)
-      end
-      super
-    end
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kontrol
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - Matthias Georgi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +01:00
+date: 2010-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: []