city-watch 0.6.3 → 0.6.4

data/lib/city_watch/util/renderer.rb

@@ -1,7 +1,14 @@
+require 'erubis'
+
+TemplateCache = {}
+ViewPath = File.expand_path(File.dirname(__FILE__) + "/../../../views")
+Layout = Proc.new {
+	file_path = "#{ViewPath}/layouts/default.html.erb"
+	Erubis::FastEruby.new(File.read(file_path), bufvar: '@output_buffer', filename: file_path)
+}.call
+
 module Renderer
 	
-	require 'erubis'
-	
 	def render(*tpl)
 		layout do
 			render_bare(*tpl)
@@ -15,11 +22,7 @@ module Renderer
 	private
 	
 	def layout(&block)
-		@layout ||= Proc.new {
-			file_path = "#{view_path}/layouts/default.html.erb"
-			Erubis::FastEruby.new(File.read(file_path), bufvar: '@output_buffer', filename: file_path)
-		}.call
-		@layout.result(binding)
+		Layout.result(binding)
 	end
 	
 	def template_content(file_path)
@@ -27,24 +30,19 @@ module Renderer
 		File.read(file_path)
 	end
 	
-	def template_key(*keys)
-		keys.inject("") {|a,k| a += k.to_s}
-	end
-
 	def template_path(*tpl)
 		tpl.map {|t| "#{view_path}/#{t}.html.erb" }.detect{|p| File.exists?(p) }
 	end
 	
 	def template(*tpl)
-		return @templates[tpl.join] if @templates && @templates[tpl.join]
+		return TemplateCache[tpl.join] if TemplateCache[tpl.join]
 		file_path = template_path(*tpl)
 		return template_content(file_path) if CityWatch.debug?
-		@templates ||= {}
-		@templates[tpl.join] ||= template_content(file_path)
+		TemplateCache[tpl.join] ||= template_content(file_path)
 	end
 	
 	def view_path
-		File.expand_path(File.dirname(__FILE__) + "/../../../views")
+		ViewPath
 	end
 	
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/views/server/summary.html.erb

@@ -3,7 +3,7 @@ sum = summary
 update_time = sum.delete("received_at")
 %>
 <div class="server">
-	<a href="/<%=@host%>"><%=@host%></a>
+	<a href="/<%=@host%>"><%=@host%></a> (Last update: <%=update_time%>)
 	<% sum.each do |watchman,dat| %>
 	<%= Reader::Watchman.new(@host,watchman).render_from_summary(dat) %>
 	<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: city-watch
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors: