spire 0.1.10 → 0.2.0

data/README.rdoc

@@ -2,4 +2,72 @@
 
 Light controller-only rack framework with a dash of views.
 
+= Installation
 
+    gem install spire
+    spire -c project_name
+    cd project_name && rackup
+
+This will install spire, create a project called 'project_name' in the same directory it's run in, and then start the site. 
+
+= Usage 
+
+== Routes
+
+Routes are used in the config.ru, they work like the old-style Rails routes:
+    run Spire::Router.new(path, {
+      "default" => "index#index", # the default route!
+      "/index" => "index#index",
+    })
+The "default" route is what is opened when someone goes to '/' on your address.
+    "/index" => "index#index",
+This would match the '/index' request to the IndexController (in app/controllers) and execute the index method in that controller.
+    "/foo/bar" => "foo#bar"
+That would when '/foo/bar' is requested return the response found in the FooController and the value in Bar that's returned.
+
+== Controllers
+
+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
+
+    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")
+      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.
+
+== Views
+
+=== 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!"]))
+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.
+
+=== 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"))
+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!

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.2.0

data/lib/spire/router.rb

@@ -13,6 +13,8 @@ module Spire
     end
 
     def route
+      @controller_value = nil
+      @action_value = nil
       if @request[:controller] == nil
          route = @routes['default'].split("#")
          @controller_value = route[0].capitalize
@@ -36,8 +38,9 @@ module Spire
       end
         unless @controller_value
           return Response.new('404 - Page or route not found!')
+        else
+          return self.run
         end
-        return self.run
     end 
 
     def run

data/spire.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.1.10"
+  s.version = "0.2.0"
 
   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.10
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70334205602660 !ruby/object:Gem::Requirement
+  requirement: &70198527649580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334205602660
+  version_requirements: *70198527649580
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70334205602160 !ruby/object:Gem::Requirement
+  requirement: &70198527648940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334205602160
+  version_requirements: *70198527648940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70334205601600 !ruby/object:Gem::Requirement
+  requirement: &70198527642920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70334205601600
+  version_requirements: *70198527642920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70334205601120 !ruby/object:Gem::Requirement
+  requirement: &70198527641760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70334205601120
+  version_requirements: *70198527641760
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70334205600620 !ruby/object:Gem::Requirement
+  requirement: &70198527640160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334205600620
+  version_requirements: *70198527640160
 description: ! "Light rack-based framework with controllers, static views and a router
   \n    with templating engine support coming soon"
 email: scott@scottnicol.co.uk
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2817838242833963823
+      hash: -1664516455746204772
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: