spire 0.2.0 → 0.2.2

data/Gemfile

@@ -1,7 +1,7 @@
-source "http://rubygems.org"
-
 gem "rack", ">= 1.3.0"
+
 gem "haml", ">= 3.1.0"
+gem "erubis", ">= 2.7.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -10,3 +10,4 @@ group :development do
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end
+

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GEM
-  remote: http://rubygems.org/
   specs:
+    erubis (2.7.0)
     git (1.2.5)
     haml (3.1.3)
     jeweler (1.6.4)
@@ -16,6 +16,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  erubis (>= 2.7.0)
   haml (>= 3.1.0)
   jeweler (~> 1.6.4)
   rack (>= 1.3.0)

data/README.rdoc

@@ -70,4 +70,5 @@ More documentation will be coming soon as more features are being added
 === SASS Support
 === Improved Response handler
 === Lots of bugfixes
-=== Some secret goodes!
+=== Some secret goodes!
+

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/lib/spire/class/MainController.rb

@@ -1,6 +1,5 @@
 require 'spire/http'
-require 'haml' 
-
+ 
 module Spire
   class MainController
     
@@ -8,12 +7,25 @@ module Spire
       @base_path = base_path
     end
     
-    def render(view, type="haml", data="")
+    def render(view)
+      data = {}
+      instance_variables.each do |var|
+        data[var] = instance_variable_get(var)
+      end
+      
+      type = view.split('.')[1]
+
       if type == "html"
-        File.open(@base_path+'/views/'+view+'.html', 'r').read
+        File.open(@base_path+'/views/'+view, 'r').read
       elsif type == "haml"
-        file = File.open(@base_path+'/views/'+view+'.haml', 'r').read
-        Haml::Engine.new(file).render(Object.new, :data => data)
+        require 'haml' 
+        file = File.open(@base_path+'/views/'+view, 'r').read
+        Haml::Engine.new(file).render(Object.new, data)
+      elsif type == "rhtml"
+        require 'erubis'
+        file = File.open(@base_path+'/views/'+view, 'r').read
+        eruby = Erubis::Eruby.new(file)
+        return eruby.result(data)
       end
     end
     

data/lib/spire/error.rb

@@ -0,0 +1,11 @@
+module Spire
+    class Error
+        def initialize(message, status='200')
+            @return = Response.new(message, 'text/html; charset=uft8;', status)
+        end
+
+        def to_rack
+            @return.to_rack
+        end
+    end
+end

data/lib/spire/router.rb

@@ -7,55 +7,68 @@ module Spire
 
     def disect(env)
       req = env['REQUEST_PATH'].split("/")
-      @request = {}
-      @request[:controller] = req[1]
-      @request[:action] = req[2]
+      @request = {"controller" => req[1], "action" => req[2]}    
     end
 
     def route
       @controller_value = nil
       @action_value = nil
-      if @request[:controller] == nil
+      if @request["controller"] == "favicon.ico"
+        return Response.new(File.open("public/favicon.ico", 'r').read, "image/ico;")
+      end
+      if @request["controller"] == nil
          route = @routes['default'].split("#")
          @controller_value = route[0].capitalize
-         if @request[:action] == nil 
-           @action_value = "index"
-         else
-           @action_value = route[1]
-         end
+         @action_value = route[1]
       else
         @routes.each do |key, value|
           keys = key.split("/")
           values = value.split("#")
-          if @request[:controller] == keys[1] && @request[:action] == keys[3]
+          if @request["controller"] == keys[1] && @request["action"] == keys[3]
+            puts values[0]
             @controller_value = values[0].capitalize
+            puts @controller_value
             @action_value = values[1]
-          elsif @request[:controller] == keys[1]
+          elsif @request["controller"] == keys[1]
+            puts values[0]
             @controller_value = values[0].capitalize
-            @action_value = values[1]        
+            puts @controller_value
+            @action_value = values[1]            
           end
         end
       end
-        unless @controller_value
-          return Response.new('404 - Page or route not found!')
-        else
-          return self.run
-        end
+      unless @controller_value
+        return Error.new("<title>404</title><body><h2>404 // Page not found</h2></body>")
+      end
+      return self.run
     end 
-
+    
     def run
       require "#{@base_path}/controllers/#{@controller_value}Controller"
       @app = Kernel.const_get(@controller_value).new(@base_path)
-      return @app.method(@action_value).call
+    
+      result = @app.method(@action_value).call
+      content_type = "text/html;"
+      status = 200
+      
+      if @app.instance_variable_get(:@status)
+        status = @app.instance_variable_get(:@status)
+      end
+      if @app.instance_variable_get(:@content_type) 
+        content_type = @app.instance_variable_get(:content_type) 
+      end
+      
+      return Response.new(result, content_type, status)
     end
 
     def call(env)
       self.disect(env)
       response = self.route
+
       puts response
       if response
         response.to_rack
       end
     end
   end
-end
+end

data/lib/spire.rb

@@ -1,3 +1,6 @@
+require 'spire/error'
 require 'spire/router'
+require 'spire/http'
+
 require 'spire/class/MainController'
 

data/spire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Nicol"]
-  s.date = "2011-09-27"
+  s.date = "2011-10-06"
   s.description = "Light rack-based framework with controllers, static views and a router \n    with templating engine support coming soon"
   s.email = "scott@scottnicol.co.uk"
   s.executables = ["spire"]
@@ -17,21 +17,18 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    ".document",
     "Gemfile",
     "Gemfile.lock",
     "README.rdoc",
     "Rakefile",
     "VERSION",
     "bin/spire",
-    "config.ru",
     "lib/spire.rb",
     "lib/spire/class/MainController.rb",
+    "lib/spire/error.rb",
     "lib/spire/http.rb",
     "lib/spire/router.rb",
-    "spire.gemspec",
-    "test/helper.rb",
-    "test/test_spire.rb"
+    "spire.gemspec"
   ]
   s.homepage = "http://github.com/snicol/spire"
   s.licenses = ["MIT"]
@@ -45,12 +42,14 @@ 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_runtime_dependency(%q<haml>, [">= 3.1.0"])
+      s.add_runtime_dependency(%q<erubis>, [">= 2.7.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<haml>, [">= 3.1.0"])
+      s.add_dependency(%q<erubis>, [">= 2.7.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -58,6 +57,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rack>, [">= 1.3.0"])
     s.add_dependency(%q<haml>, [">= 3.1.0"])
+    s.add_dependency(%q<erubis>, [">= 2.7.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.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000Z
+date: 2011-10-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70198527649580 !ruby/object:Gem::Requirement
+  requirement: &70150248916120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70198527649580
+  version_requirements: *70150248916120
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70198527648940 !ruby/object:Gem::Requirement
+  requirement: &70150248915580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70198527648940
+  version_requirements: *70150248915580
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: &70150248915020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70150248915020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70198527642920 !ruby/object:Gem::Requirement
+  requirement: &70150248914520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70198527642920
+  version_requirements: *70150248914520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70198527641760 !ruby/object:Gem::Requirement
+  requirement: &70150248914020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70198527641760
+  version_requirements: *70150248914020
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70198527640160 !ruby/object:Gem::Requirement
+  requirement: &70150248913480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198527640160
+  version_requirements: *70150248913480
 description: ! "Light rack-based framework with controllers, static views and a router
   \n    with templating engine support coming soon"
 email: scott@scottnicol.co.uk
@@ -75,21 +86,18 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
 - Gemfile
 - Gemfile.lock
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/spire
-- config.ru
 - lib/spire.rb
 - lib/spire/class/MainController.rb
+- lib/spire/error.rb
 - lib/spire/http.rb
 - lib/spire/router.rb
 - spire.gemspec
-- test/helper.rb
-- test/test_spire.rb
 homepage: http://github.com/snicol/spire
 licenses:
 - MIT
@@ -105,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1664516455746204772
+      hash: 98693962747438593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/config.ru

@@ -1,12 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), 'lib')
-
-require 'rack'
-require 'spire'
-
-path = File.expand_path(__FILE__)
-path["config.ru"] = "app"
-
-run Spire::Router.new(path, {
-  "default" => "index#index", # the default route!
-  "/index" => "index#index",
-})

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'spire'
-
-class Test::Unit::TestCase
-end

data/test/test_spire.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestSpire < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end