spire 0.1.1 → 0.1.2

data/Gemfile

@@ -1,11 +1,11 @@
 source "http://rubygems.org"
 
 gem "rack", ">= 1.3.0"
+gem "haml", ">= 3.1.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
+    haml (3.1.3)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -9,14 +10,13 @@ GEM
     rack (1.3.3)
     rake (0.9.2)
     rcov (0.9.10)
-    shoulda (2.11.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  haml (>= 3.1.0)
   jeweler (~> 1.6.4)
   rack (>= 1.3.0)
   rcov
-  shoulda

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/controllers/IndexController.rb

@@ -1,5 +1,6 @@
-class Index
+class Index < Spire::MainController
   def index
-    Spire::Response.new("<h1>Hey, an index</h1>")
+    content = "test1"
+    render("index", content)    
   end
 end

data/app/views/index.haml

@@ -0,0 +1 @@
+%h1 Test

data/config.ru

@@ -1,6 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), 'lib')
 
 require 'rack'
+require 'haml' 
 require 'spire'
 
 run Spire::Router.new('./app', {

data/lib/spire/class/MainController.rb

@@ -2,9 +2,13 @@ require 'spire/http'
 
 module Spire
   class MainController
-    def render(view)
-      file = File.open('./app/views/'+view+'.html', 'r')
-      Response.new(file.read)
+    def render(view, type="haml")
+      if type == "html"
+        return File.open('./app/views/'+view+'.html', 'r').read
+      elsif type == "haml"
+        file = File.open('./app/views/'+view+'.haml', 'r').read
+        return Haml::Engine.new(file).render(s)
+      end
     end
   end
 end

data/lib/spire/router.rb

@@ -43,7 +43,9 @@ module Spire
     def run
       require "#{@base_path}/controllers/#{@controller_value}Controller"
       @app = Kernel.const_get(@controller_value).new
-      @app.method(@action_value).call
+      @return = {}
+      @return = @app.method(@action_value).call
+      Spire::Response.new(@return)
     end
 
     def call(env)

data/spire.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Nicol"]
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/controllers/IndexController.rb",
+    "app/views/index.haml",
     "app/views/index.html",
     "config.ru",
     "lib/spire.rb",
@@ -44,20 +45,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.3.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.1.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 1.3.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<haml>, [">= 3.1.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 1.3.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<haml>, [">= 3.1.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spire
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70209982962660 !ruby/object:Gem::Requirement
+  requirement: &70154277774060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70209982962660
+  version_requirements: *70154277774060
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70209982962080 !ruby/object:Gem::Requirement
+  name: haml
+  requirement: &70154277773460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 3.1.0
+  type: :runtime
   prerelease: false
-  version_requirements: *70209982962080
+  version_requirements: *70154277773460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70209982961460 !ruby/object:Gem::Requirement
+  requirement: &70154277772860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70209982961460
+  version_requirements: *70154277772860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70209982960900 !ruby/object:Gem::Requirement
+  requirement: &70154277772160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70209982960900
+  version_requirements: *70154277772160
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70209982960240 !ruby/object:Gem::Requirement
+  requirement: &70154277760460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209982960240
+  version_requirements: *70154277760460
 description: ! "Light rack-based framework with controllers, static views and a router
   \n    with templating engine support coming soon"
 email: scott@scottnicol.co.uk
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/IndexController.rb
+- app/views/index.haml
 - app/views/index.html
 - config.ru
 - lib/spire.rb
@@ -105,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1445955480384827028
+      hash: 2085978523116185766
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: