spire 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/spire/class/MainController.rb

@@ -3,31 +3,61 @@ require 'spire/http'
 module Spire
   class MainController
     
-    def initialize(base_path)
-      @base_path = base_path
-    end
-    
-    def render(view)
+    def render(opts={})
       data = {}
       instance_variables.each do |var|
         data[var] = instance_variable_get(var)
       end
       
-      type = view.split('.')[1]
+      if opts[:text]
+        return opts[:text]
+      end
+      
+      if opts[:file]
+        contents = Public.new :file => "test.html", :render => true
+        file = contents.extension_check
+        return file
+      end
+      if opts[:view].is_a? Array
+        @storage = ""
+        opts[:view].each do |file|          
+          file_path = File.join($base_path, 'views', file)
+          return Error.new(:status => 404) unless File.exists?(file_path)
+          contents = IO.read(file_path)
+          extension = File.extname(file_path)
+
+          case extension
+            when '.haml'
+              require 'haml' 
+              @storage = @storage + Haml::Engine.new(contents).render(Object.new)
+            when '.rhtml'
+              require 'erubis'
+              eruby = Erubis::Eruby.new(contents)
+              @storage = @storage + eruby.result(data)
+            else
+              @storage = @storage + contents
+          end
+        end
+       return @storage
+      end
+      
+      file_path = File.join($base_path, 'views', opts[:view])
+      return Error.new(:status => 404) unless File.exists?(file_path)
+      contents = IO.read(file_path)
+      extension = File.extname(file_path)
 
-      if type == "html"
-        File.open(@base_path+'/views/'+view, 'r').read
-      elsif type == "haml"
+      case extension
+      when '.haml'
         require 'haml' 
-        file = File.open(@base_path+'/views/'+view, 'r').read
-        Haml::Engine.new(file).render(Object.new, data)
-      elsif type == "rhtml"
+        Haml::Engine.new(contents).render(Object.new)
+      when '.rhtml'
         require 'erubis'
-        file = File.open(@base_path+'/views/'+view, 'r').read
-        eruby = Erubis::Eruby.new(file)
-        return eruby.result(data)
+        eruby = Erubis::Eruby.new(contents)
+        eruby.result(data)
+      else
+        contents
       end
     end
     
   end
-end
+end

data/lib/spire/error.rb

@@ -1,6 +1,9 @@
 module Spire
     class Error
-        def initialize(message, status='200')
+        def initialize(opts={})
+            status = opts[:status] or 200
+            message = opts[:message] or "Unknown Error"
+            
             case status
             when 200
                 self.return_error(message, status)
@@ -12,6 +15,8 @@ module Spire
                 self.return_204
             when 301
                 self.return_301
+            when 444
+                self.return_444
             end
         end
 
@@ -34,7 +39,11 @@ module Spire
         def return_error(message, status)
             @return = Response.new(message, 'text/html;', status)
         end
-
+          
+        def return_444
+            @return = Response.new("No response made by the server, check for a valid response", 'text/html;', 404)
+        end
+        
         def to_rack
             @return.to_rack
         end

data/lib/spire/http.rb

@@ -7,6 +7,12 @@ module Spire
       @headers = {'Content-Type' => content_type}
       @status_code = status
     end
+    
+    def manual_response(content, headers, status)
+      @content = content
+      @headers = headers
+      @status_code = status
+    end
 
     def to_rack
       [status_code, headers, [content]]

data/lib/spire/public.rb

@@ -0,0 +1,43 @@
+require 'spire/resource/mime'
+
+module Spire
+  class Public
+    def initialize(opts={:render=>true})
+      @file = opts[:file]
+      @render = opts[:render]
+      mime = Mime.new
+      @mime_types = mime.return_mimes
+    end
+    
+    def extension_check
+      file_extension = File.extname(@file)
+      @mime_types.each do |ext, type|
+        if file_extension == ext
+          @content_type = type
+        end
+      end
+      
+      if @render
+        self.create_response
+      else
+        return [false, @content_type]
+      end
+    end
+    
+    def create_response
+      path = File.expand_path(__FILE__)
+      path["lib/spire/public.rb"] = "public/#{@file}"
+      return Error.new(:status => 404) unless File.exists?(path)
+      file = IO.read(path)
+      @return = {}
+      @return[:file] = file
+      @return[:content_type] = @content_type
+      return @return
+    end
+    
+    def to_rack
+      @return.to_rack
+    end
+        
+  end
+end

data/lib/spire/resource/mime.rb

@@ -0,0 +1,31 @@
+module Spire
+  class Mime
+    def return_mimes
+       return @mime_types = {
+          ".html" => "text/html",
+          ".text" => "text/plain",
+          ".js" => "text/javascript",
+          ".css" => "text/css",
+          ".ics" => "text/calendar",
+          ".csv" => "text/csv",
+
+          ".png" => "image/png",
+          ".jpeg" => "image/jpeg",
+          ".gif" => "image/gif",
+          ".bmp" => "image/bmp",
+          ".tiff" => "image/tiff",
+
+          ".mpeg" => "video/mpeg",
+
+          ".xml" => "application/xml",
+          ".rss" => "application/rss+xml",
+          ".atom" => "application/atom+xml",
+          ".yaml" => "application/x-yaml",
+
+          ".json" => "application/json",
+          ".pdf" => "application/pdf",
+          ".zip" => "application/zip"
+      }
+    end
+  end
+end

data/lib/spire/router.rb

@@ -1,7 +1,7 @@
 module Spire
   class Router
     def initialize(base_path, routes)
-      @base_path = base_path
+      $base_path = base_path
       @routes = routes
       @app = {}
     end
@@ -35,23 +35,30 @@ module Spire
       end
       
       unless @app["controller"]
-        return Error.new(nil ,404)
+        return Error.new :status => 404
       end
       
       return self.run
     end 
     
     def return_file
-      # still need to add checks for mime types. this will be done in a seperate class once i get round to it
-      return Response.new(File.open("/public/#{@request["action"]}", "r").read)
+      result = Public.new :file => "test.html", :render => true
+      file = result.extension_check
+      return Response.new(file[:file], file[:content_type], 200)
     end
     
     def run
-      require "#{@base_path}/controllers/#{@app["controller"]}Controller"
-      @class = Kernel.const_get(@app["controller"]).new(@base_path)
+      require "#{$base_path}/controllers/#{@app["controller"]}Controller"
+      @class = Kernel.const_get(@app["controller"]).new()
     
       result = @class.method(@app["action"]).call
       
+      if result.is_a? Hash
+        if result[:file]
+          return Response.new(result[:file], result[:content_type], 200)
+        end
+      end
+      
       content_type = "text/html;"
       status = 200
       
@@ -73,6 +80,8 @@ module Spire
       puts response
       if response
         response.to_rack
+      else
+        Error.new :status => 444
       end
     end
   end

data/lib/spire.rb

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

data/spire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Nicol"]
-  s.date = "2011-10-07"
+  s.date = "2011-10-19"
   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"]
@@ -27,6 +27,8 @@ Gem::Specification.new do |s|
     "lib/spire/class/MainController.rb",
     "lib/spire/error.rb",
     "lib/spire/http.rb",
+    "lib/spire/public.rb",
+    "lib/spire/resource/mime.rb",
     "lib/spire/router.rb",
     "spire.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spire
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-07 00:00:00.000000000Z
+date: 2011-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70227958728580 !ruby/object:Gem::Requirement
+  requirement: &70270452034600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70227958728580
+  version_requirements: *70270452034600
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
-  requirement: &70227958723620 !ruby/object:Gem::Requirement
+  requirement: &70270452033320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70227958723620
+  version_requirements: *70270452033320
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70227958712040 !ruby/object:Gem::Requirement
+  requirement: &70270452031420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70227958712040
+  version_requirements: *70270452031420
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70227958709100 !ruby/object:Gem::Requirement
+  requirement: &70270452030140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70227958709100
+  version_requirements: *70270452030140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70227958707440 !ruby/object:Gem::Requirement
+  requirement: &70270452001980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70227958707440
+  version_requirements: *70270452001980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70227958705300 !ruby/object:Gem::Requirement
+  requirement: &70270452001000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70227958705300
+  version_requirements: *70270452001000
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70227958703260 !ruby/object:Gem::Requirement
+  requirement: &70270451999840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227958703260
+  version_requirements: *70270451999840
 description: ! "Light rack-based framework with controllers, static views and a router
   \n    with templating engine support coming soon"
 email: scott@scottnicol.co.uk
@@ -107,6 +107,8 @@ files:
 - lib/spire/class/MainController.rb
 - lib/spire/error.rb
 - lib/spire/http.rb
+- lib/spire/public.rb
+- lib/spire/resource/mime.rb
 - lib/spire/router.rb
 - spire.gemspec
 homepage: http://github.com/snicol/spire
@@ -124,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -337069759895717094
+      hash: 829611496356220362
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: