lion 0.0.3 → 0.0.4

data/lib/lion/version.rb

@@ -1,3 +1,3 @@
 module Lion
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/src/config.ru

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'slim'
+require 'haml'
 require './lion'
 
 run Lion

data/lib/src/gemfile

@@ -2,5 +2,6 @@ source "http://rubygems.org"
 
 gem "sinatra", :require => "sinatra/base"
 gem 'coffee-script'
+gem 'haml'
 gem "sass"
 gem "join"

data/lib/src/lion.rb

@@ -5,7 +5,6 @@ class Lion < Sinatra::Base
 	configure do
 		set :views, "./views"
 		set :public, "./public"
-		set :slim, :pretty => true
 		set :port, 4000
 		set :run, true
 		set :static, true
@@ -16,19 +15,17 @@ class Lion < Sinatra::Base
   end
 	
 	@pages = []
-	@template = slim
-	
-	Dir['./views/*.slim'].each do |template|
+	Dir['./views/*.haml'].each do |template|
 		@pages << File.basename(template).chomp(File.extname(template) )
 	end
 	
 	get '/' do
-	  slim :index
+	  haml :index
 	end
 
 	@pages.each do |page|
 		get '/' + page do
-			slim page
+			haml page
 		end
 	end
 

data/lib/src/views/index.haml

@@ -0,0 +1 @@
+%p Welcome

data/lib/src/views/layout.haml

@@ -0,0 +1,18 @@
+!!!5
+%html(class="no-js" lang="en")
+  %head
+    %meta(charset="utf-8")
+    %title="Project Title"
+    %meta(content="" name="description")
+    %meta(content="" name="author")
+    %script(src="http://html5shim.googlecode.com/svn/trunk/html5.js")
+    %meta(name="viewport" content="width=(device-width; initial-scale=1.0;)maximum-scale=1.0;")
+    %link(rel="stylesheet" href="public/stylesheets/css/style.css" type="text/css")
+
+  %body
+    .container
+      %h1.center Lion
+      == yield
+	
+    %script(src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js")
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lion
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2157533060 !ruby/object:Gem::Requirement
+  requirement: &2157531340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157533060
+  version_requirements: *2157531340
 description: A sinatra based front end framework
 email:
 - owain@owainlewis.com
@@ -103,8 +103,8 @@ files:
 - lib/src/public/stylesheets/scss/style.scss
 - lib/src/rakefile
 - lib/src/views/.DS_Store
-- lib/src/views/index.slim
-- lib/src/views/layout.slim
+- lib/src/views/index.haml
+- lib/src/views/layout.haml
 - lion.gemspec
 - readme.md
 - todo.txt

data/lib/src/views/index.slim

@@ -1,2 +0,0 @@
-h1 Welcome to Lion
-p Lion is a small Ruby framework built on top of Rack and Sinatra

data/lib/src/views/layout.slim

@@ -1,23 +0,0 @@
-doctype 5
-html class="no-js" lang="en"
-  head
-    meta charset="utf-8"
-    title="Project Title"
-    meta content="" name="description"
-    meta content="" name="author"
-    script src="http://html5shim.googlecode.com/svn/trunk/html5.js"
-    
-    | <!-- Mobile Specific Meta Tags -->
-    meta name="viewport" content="width=(device-width; initial-scale=1.0;)maximum-scale=1.0;"
-  
-    | <!-- CSS -->
-    link rel="stylesheet" href="/stylesheets/css/style.css" type="text/css"
-
-  body
-    .container
-		== yield
-	
-    script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"
-    script src="http://ajax.cdnjs.com/ajax/libs/underscore.js/1.1.6/underscore-min.js"
-    script src="http://ajax.cdnjs.com/ajax/libs/backbone.js/0.3.3/backbone-min.js"
-    script src="javascripts/application.js"