Skip to content

Commit

Permalink
removing last bits of erb views, general clean up of gemspec file, re…
Browse files Browse the repository at this point in the history
…moving needless security helper.
  • Loading branch information
zombor committed Jun 16, 2010
1 parent e01213b commit 6e3701d
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 82 deletions.
46 changes: 0 additions & 46 deletions lib/classes/security.rb

This file was deleted.

2 changes: 1 addition & 1 deletion lib/core/core.rb
Expand Up @@ -46,7 +46,7 @@ def call(env)
# Load hooks
Picombo::Config.get('config.hooks').each do |hook|
Picombo::Core.find_file('hooks', hook).each do |file|
require file
load file
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/hooks/profiler.rb
@@ -1,3 +1,3 @@
Picombo::Event.add('system.display') do
Picombo::View::Core.new('bench/footer').render()
Picombo::Stache::Bench_Footer.new.output
end
22 changes: 22 additions & 0 deletions lib/views/bench/footer.mustache
@@ -0,0 +1,22 @@
<table style="width: 100%">
<tr>
<th align="left">System Benchmarks</th>
<th align="right">Time</th>
</tr>
<tr>
<td>Picombo Setup</td>
<td align="right">{{loading}}</td>
</tr>
<tr>
<td>Environment Setup</td>
<td align="right">{{setup}}</td>
</tr>
<tr>
<td>Controller Execution</td>
<td align="right">{{controller_execution}}</td>
</tr>
<tr>
<td>Total Execution</td>
<td align="right">{{application}}</td>
</tr>
</table>
23 changes: 23 additions & 0 deletions lib/views/bench/footer.rb
@@ -0,0 +1,23 @@
module Picombo
module Stache
class Bench_Footer < Mustache
self.template = File.open(Picombo::Core.find_file('views', 'bench/footer', true, 'mustache').shift).read

def loading
Picombo::Bench.instance.get('loading')
end

def setup
Picombo::Bench.instance.get('setup')
end

def controller_execution
Picombo::Bench.instance.get('controller_execution')
end

def application
Picombo::Bench.instance.get('application')
end
end
end
end
22 changes: 0 additions & 22 deletions lib/views/bench/footer.rhtml

This file was deleted.

1 change: 0 additions & 1 deletion lib/views/tests/test.rhtml

This file was deleted.

14 changes: 3 additions & 11 deletions picombo.gemspec
@@ -1,7 +1,7 @@
Gem::Specification.new do |s|
s.name = %q{picombo}
s.version = "0.2.6"
s.date = %q{2010-06-08}
s.version = "0.3.0"
s.date = %q{2010-06-15}
s.authors = ["Jeremy Bush"]
s.email = %q{contractfrombelow@gmail.com}
s.summary = %q{A lightweight MVC web framework}
Expand All @@ -11,7 +11,6 @@ Gem::Specification.new do |s|
s.add_dependency('mustache', '>= 0.10.0')
s.files = [
'./lib/classes/bench.rb',
'./lib/classes/cache',
'./lib/classes/cache/file.rb',
'./lib/classes/cache.rb',
'./lib/classes/config.rb',
Expand All @@ -22,26 +21,19 @@ Gem::Specification.new do |s|
'./lib/classes/input.rb',
'./lib/classes/log.rb',
'./lib/classes/router.rb',
'./lib/classes/security.rb',
'./lib/classes/session.rb',
'./lib/classes/url.rb',
'./lib/classes/view/stache.rb',
'./lib/classes/view/xml.rb',
'./lib/classes/view.rb',
'./lib/config/cache.yaml',
'./lib/config/log.yaml',
'./lib/config/mimes.yaml',
'./lib/config/routes.rb',
'./lib/controllers/error',
'./lib/controllers/error/404.rb',
'./lib/controllers/template.rb',
'./lib/core/core.rb',
'./lib/core/core_cli.rb',
'./lib/hooks/mustache.rb',
'./lib/hooks/profiler.rb',
'./lib/picombo.rb',
'./lib/views/bench/footer.rhtml',
'./lib/views/error/404.mustache',
'./lib/views/error/404.rb',
'./lib/views/tests/test.rhtml']
'./lib/views/error/404.rb']
end

0 comments on commit 6e3701d

Please sign in to comment.