lib/nutcracker/web/app.rb in nutcracker-web-0.0.2 vs lib/nutcracker/web/app.rb in nutcracker-web-0.0.3
- old
+ new
@@ -5,17 +5,22 @@
module Nutcracker
module Web
class App < Sinatra::Base
enable :inline_templates
set :root, File.expand_path('../'*4,__FILE__)
+
+ def initialize(nutcracker = nil)
+ @nutcracker = nutcracker
+ super()
+ end
get '/' do
haml :index
end
def overview
- $nutcracker.overview rescue
+ @nutcracker.overview rescue
JSON.parse File.read File.join(settings.root,"example.json")
end
def self.assets
require 'sprockets'
@@ -37,10 +42,9 @@
%head
%title Nutcracker-Web
%script(type='text/javascript' src='http://www.google.com/jsapi')
%script(type='text/javascript' src='assets/application.js')
%link(rel='stylesheet' href='assets/application.css')
- %link(rel="shortcut icon" href="http://publishers.kontera.com/favicon.ico")
%body
= yield
@@ index
#navbar