spire 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/app/controllers/IndexController.rb

@@ -1,6 +1,5 @@
 class Index < Spire::MainController
   def index
-    content = "test1"
-    render("index", content)    
+    Spire::Response.new(render("index", "haml", ["Index Page", "This is the index page!"])) 
   end
 end

data/app/views/index.haml

@@ -1 +1,2 @@
-%h1 Test
+%title= data[0]
+%h1= data[1]

data/lib/spire/class/MainController.rb

@@ -2,12 +2,12 @@ require 'spire/http'
 
 module Spire
   class MainController
-    def render(view, type="haml")
+    def render(view, type="haml", data="")
       if type == "html"
-        return File.open('./app/views/'+view+'.html', 'r').read
+        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)
+        Haml::Engine.new(file).render(Object.new, :data => data)
       end
     end
   end

data/lib/spire/router.rb

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

data/spire.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Nicol"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spire
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70154277774060 !ruby/object:Gem::Requirement
+  requirement: &70297560742380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70154277774060
+  version_requirements: *70297560742380
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70154277773460 !ruby/object:Gem::Requirement
+  requirement: &70297560741780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70154277773460
+  version_requirements: *70297560741780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70154277772860 !ruby/object:Gem::Requirement
+  requirement: &70297560741160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70154277772860
+  version_requirements: *70297560741160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70154277772160 !ruby/object:Gem::Requirement
+  requirement: &70297560740540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70154277772160
+  version_requirements: *70297560740540
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70154277760460 !ruby/object:Gem::Requirement
+  requirement: &70297560739960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154277760460
+  version_requirements: *70297560739960
 description: ! "Light rack-based framework with controllers, static views and a router
   \n    with templating engine support coming soon"
 email: scott@scottnicol.co.uk
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2085978523116185766
+      hash: -2512937818801430279
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: