spire 0.2.2 → 0.2.3

data/Gemfile

@@ -1,5 +1,5 @@
 gem "rack", ">= 1.3.0"
-
+gem "rack-rewrite", ">= 1.2.1"
 gem "haml", ">= 3.1.0"
 gem "erubis", ">= 2.7.0"
 

data/Gemfile.lock

@@ -8,6 +8,7 @@ GEM
       git (>= 1.2.5)
       rake
     rack (1.3.3)
+    rack-rewrite (1.2.1)
     rake (0.9.2)
     rcov (0.9.10)
 
@@ -20,4 +21,5 @@ DEPENDENCIES
   haml (>= 3.1.0)
   jeweler (~> 1.6.4)
   rack (>= 1.3.0)
+  rack-rewrite (>= 1.2.1)
   rcov

data/README.rdoc

@@ -6,7 +6,7 @@ Light controller-only rack framework with a dash of views.
 
     gem install spire
     spire -c project_name
-    cd project_name && rackup
+    cd !$ && rackup
 
 This will install spire, create a project called 'project_name' in the same directory it's run in, and then start the site. 
 
@@ -29,46 +29,47 @@ That would when '/foo/bar' is requested return the response found in the FooCont
 
 Controllers are named to tie with the routes (read above). They are stored in:
     project_name/app/controllers/
-And must be defined like so:
-    class Test < Spire::MainController
+With the naming scheme like so:
+		FooController.rb
+Where Foo is the name of the controller. The name must be camel-cased. All classes must be defined like so:
+    class Foo < Spire::MainController
 
     end
 as a skeleton controller for the framework to use. An example response would look like this:
     class Index < Spire::MainController
       def index
-        Spire::Response.new("This is just a response")
+        "This is just a response"
       end
     end
 This would display a html page with that text. The Response.new initiator could be used like so:
-    Spire::Response.new("<h1>This is a test page</h1>, "text/html", 200)
-Where the first argument is the output, second argument is the content-type and the last the status/response code.
+    def index
+      @status = 200
+      @content_type = "text/html;"
+      return "Hi, I'm a test page!"
+    end
+Where the first instance variable @status is the HTTP status to show, the second being the content type, and the last being the returned value as a string.
 
 == Views
 
+=== RHTML
+RHTML templates are executed using erubis due to its speed. To create a erb view, you must create a view in:
+    /app/views/
+With the naming scheme of:
+    template.rhtml
+The .rhtml is important so Spire knows what file it is. To pass data to a view, you simply define an instance variable before you render the template and it will automatically be accessible in your view template.
+To render a template, you simply use:
+    render("index.rhtml")
+
 === HAML
 HAML templates can be rendered like so:
-    Spire::Response.new(render("index", "haml", ["Welcome to Spire!", 
-      "This is a base app to extend your own on. Have fun!"]))
+    render("index.haml")
 This would load the index.haml view in:
-    project_name/app/views/index.haml
-The first argument in the render method above is the file name, the second being the file type, and the last is the content to pass to the view. In the above example, it's an array of two strings.
-To access the data in the view, you have to use the 'data' variable like so:
-    %title= data[0]
-    %h1= data[1]
-This above example would use the first array entry from our render method as a title, and the second array entry for a nice big header.
+    /app/views/index.haml
+To pass data to the view, define and fill an instance variable with content or an object, and you can use it inside your HAML view.
 
 === HTML
 HTML are static templates to be used in your project/app, they can't use variables, nor can they execute ruby code. They can be rendered using:
-    Spire::Response.new(render("index", "html"))
+    render("index.html")
 Which would load the 'index.html' file from:
     project_name/app/views/index.html
-The first argument is the file name, the second being the extension.
-
-= Coming soon...
-More documentation will be coming soon as more features are being added
-=== Error Handler
-=== SASS Support
-=== Improved Response handler
-=== Lots of bugfixes
-=== Some secret goodes!
-
+The first argument is the file name, the second being the extension.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/spire/error.rb

@@ -1,11 +1,42 @@
 module Spire
     class Error
         def initialize(message, status='200')
-            @return = Response.new(message, 'text/html; charset=uft8;', status)
+            case status
+            when 200
+                self.return_error(message, status)
+            when 404
+                self.return_404
+            when 401
+                self.return_401
+            when 204
+                self.return_204
+            when 301
+                self.return_301
+            end
+        end
+
+        def return_404
+            @return = Response.new("404 // Page not found", 'text/html;', 404)
+        end
+
+        def return_401
+            @return = Response.new("401 // Not authorized", 'text/html;', 401)
+        end
+
+        def return_204
+            @return = Response.new("204 // No content", 'text/html;', 204)
+        end
+
+        def return_301
+            @return = Response.new("301 // Moved permanently", 'text/html;', 301)
+        end
+
+        def return_error(message, status)
+            @return = Response.new(message, 'text/html;', status)
         end
 
         def to_rack
             @return.to_rack
         end
     end
-end
+end

data/lib/spire/router.rb

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

data/spire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Nicol"]
-  s.date = "2011-10-06"
+  s.date = "2011-10-07"
   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"]
@@ -41,6 +41,7 @@ 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<rack-rewrite>, [">= 1.2.1"])
       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"])
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 1.3.0"])
+      s.add_dependency(%q<rack-rewrite>, [">= 1.2.1"])
       s.add_dependency(%q<haml>, [">= 3.1.0"])
       s.add_dependency(%q<erubis>, [">= 2.7.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rack>, [">= 1.3.0"])
+    s.add_dependency(%q<rack-rewrite>, [">= 1.2.1"])
     s.add_dependency(%q<haml>, [">= 3.1.0"])
     s.add_dependency(%q<erubis>, [">= 2.7.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spire
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000Z
+date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70150248916120 !ruby/object:Gem::Requirement
+  requirement: &70227958728580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70150248916120
+  version_requirements: *70227958728580
+- !ruby/object:Gem::Dependency
+  name: rack-rewrite
+  requirement: &70227958723620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *70227958723620
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70150248915580 !ruby/object:Gem::Requirement
+  requirement: &70227958712040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70150248915580
+  version_requirements: *70227958712040
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70150248915020 !ruby/object:Gem::Requirement
+  requirement: &70227958709100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70150248915020
+  version_requirements: *70227958709100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70150248914520 !ruby/object:Gem::Requirement
+  requirement: &70227958707440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70150248914520
+  version_requirements: *70227958707440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70150248914020 !ruby/object:Gem::Requirement
+  requirement: &70227958705300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70150248914020
+  version_requirements: *70227958705300
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70150248913480 !ruby/object:Gem::Requirement
+  requirement: &70227958703260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70150248913480
+  version_requirements: *70227958703260
 description: ! "Light rack-based framework with controllers, static views and a router
   \n    with templating engine support coming soon"
 email: scott@scottnicol.co.uk
@@ -113,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 98693962747438593
+      hash: -337069759895717094
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: