spire 0.4.6 → 0.4.7

data/Gemfile

@@ -1,13 +1,13 @@
+source 'https://rubygems.org'
 gem "rack", ">= 1.3.0"
-gem "rack-rewrite", ">= 1.2.1"
 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.
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", ">= 1.6.4"
+  gem "simplecov", ">= 0.6.0"
 end
 

data/Gemfile.lock

@@ -1,4 +1,5 @@
 GEM
+  remote: https://rubygems.org/
   specs:
     erubis (2.7.0)
     git (1.2.5)
@@ -7,19 +8,21 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    multi_json (1.3.6)
     rack (1.3.5)
-    rack-rewrite (1.2.1)
     rake (0.9.2.2)
-    rcov (0.9.11)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (>= 1.0.0)
   erubis (>= 2.7.0)
   haml (>= 3.1.0)
-  jeweler (~> 1.6.4)
+  jeweler (>= 1.6.4)
   rack (>= 1.3.0)
-  rack-rewrite (>= 1.2.1)
-  rcov
+  simplecov (>= 0.6.0)

data/Rakefile

@@ -32,16 +32,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
-task :default => :test
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/lib/spire/class/MainController.rb

@@ -1,63 +1,50 @@
 require 'spire/http'
+require 'spire/resource/buffer'
  
 module Spire
+  
   class MainController
+    attr_accessor :buffer
+
+    def initialize
+      @buffer = Buffer.new
+    end
+
+    def get_buffer
+      @buffer.data
+    end
     
     def render(opts={})
-      data = {}
+      instance_vars = {}
       instance_variables.each do |var|
-        data[var] = instance_variable_get(var)
+        instance_vars[var] = instance_variable_get(var)
       end
       
       if opts[:text]
-        return opts[:text]
-      end
-      
-      if opts[:file]
-        contents = Public.new :file => "test.html", :render => true
-        file = contents.extension_check
-        return file
+        @buffer.append(opts[:text])
       end
-      
-      if opts[:view].is_a? Array
-        @storage = ""
-        opts[:view].each do |file|          
-          file_path = File.join($base_path, 'views', file)      
-          return 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
+      if opts[:view]
+        file_path = File.join($base_path, 'views', opts[:view])
+        return 404 unless File.exists?(file_path)
+        contents = IO.read(file_path)
+        extension = File.extname(file_path)
+
+        case extension
+        when '.haml'
+          require 'haml' 
+          insert = Haml::Engine.new(contents).render(Object.new, instance_vars)
+        when '.rhtml'
+          require 'erubis'
+          eruby = Erubis::Eruby.new(contents)
+          insert = eruby.result(instance_vars)
+        else
+         return false
         end
-       return @storage
+        @buffer.append(insert)
       end
-      
-      file_path = File.join($base_path, 'views', opts[:view])
-      return 404 unless File.exists?(file_path)
-      contents = IO.read(file_path)
-      extension = File.extname(file_path)
 
-      case extension
-      when '.haml'
-        require 'haml' 
-        Haml::Engine.new(contents).render(Object.new)
-      when '.rhtml'
-        require 'erubis'
-        eruby = Erubis::Eruby.new(contents)
-        eruby.result(data)
-      else
-        contents
-      end
+      return nil
     end
     
   end

data/lib/spire/error.rb

@@ -34,7 +34,7 @@ module Spire
         end
         
         def return_404
-            @return = Response.new(self.style_error("404 - Page not found"), 'text/html;', 404)
+            @return = Response.new(self.style_error("404 - File not found"), 'text/html;', 404)
         end
         
         def return_444

data/lib/spire/http.rb

@@ -7,12 +7,6 @@ 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

@@ -4,13 +4,11 @@ module Spire
   class Public
     def initialize(opts={:render=>true})
       @opts = opts
-      mime = Mime.new
-      @mime_types = mime.return_mimes
     end
     
     def extension_check
       file_extension = File.extname(@opts[:file])
-      @mime_types.each do |ext, type|
+      Mime.return_mimes.each do |ext, type|
         if file_extension == ext
           @content_type = type
         end
@@ -22,6 +20,17 @@ module Spire
         return [false, @content_type]
       end
     end
+
+    def self.return_file(file)
+      result = Public.new :file => file, :render => true
+      file = result.extension_check
+      puts file
+      if file == 404
+        return Error.new :status => 404, :message => "404 // File not found"
+      else
+        return Response.new(file[:file], file[:content_type], 200)
+      end
+    end
     
     def create_response
       path = File.expand_path(__FILE__)

data/lib/spire/resource/buffer.rb

@@ -0,0 +1,13 @@
+module Spire
+	class Buffer
+	  attr_accessor :data
+
+	  def initialize
+	    @data = String.new
+	  end
+
+	  def append(insert)
+	    @data = @data + insert
+	   end
+	end
+end

data/lib/spire/resource/mime.rb

@@ -1,7 +1,7 @@
 module Spire
   class Mime
-    def return_mimes
-       return @mime_types = {
+    def self.return_mimes
+       return {
           ".html" => "text/html",
           ".text" => "text/plain",
           ".js" => "text/javascript",

data/lib/spire/router.rb

@@ -15,8 +15,8 @@ module Spire
       @app["controller"] = nil
       
       if @request["controller"] == "favicon.ico"
-        self.return_file("favicon.ico")
-        @request["controller"] = nil
+        favicon = Public.return_file("favicon.ico")
+        return favicon
       end
       
       if @request["controller"] == nil
@@ -37,43 +37,27 @@ module Spire
         end
       end
       
-      unless @app["controller"]
-        return Error.new :message => "404 // Route not found in system/routes.rb", :status => 404
+      if !@app["controller"]
+        return Error.new :message => "Route not found in system/routes.rb", :status => 404
       end
       
       return self.run
     end 
     
-    def return_file(file)
-      result = Public.new :file => file, :render => true
-      file = result.extension_check
-      
-      if file == 404
-        return Error.new :status => 404, :message => "404 // File not found"
-      else
-        return Response.new(file[:file], file[:content_type], 200)
-      end
-    end
-    
     def run
       require "#{$base_path}/controllers/#{@app["controller"]}Controller"
       @class = Kernel.const_get(@app["controller"]).new()
     
       result = @class.method(@app["action"]).call
+      buffer = @class.get_buffer
       
-      if result.is_a? Hash
-        if result[:file]
-          return Response.new(result[:file], result[:content_type], 200)
-        end
+      if !buffer || !result
+        return Error.new :message => "No method/Response from method. See #{@app["controller"]}##{@app["action"]} and check for a response", :status => 404
       end
-      
+
       content_type = "text/html;"
       status = 200
-            
-      if result == 404 or result == nil
-        return Error.new :message => "404 // No method/Response from method. See #{@app["controller"]}##{@app["action"]} and check for a response", :status => 404
-      end
-      
+
       if @class.instance_variable_get(:@status)
         status = @class.instance_variable_get(:@status)
       end
@@ -81,8 +65,12 @@ module Spire
       if @class.instance_variable_get(:@content_type) 
         content_type = @class.instance_variable_get(:content_type) 
       end
-            
-      return Response.new(result, content_type, status)
+
+      if result
+        buffer = buffer + result
+      end
+
+      return Response.new(buffer, content_type, status)
     end
 
     def call(env)

data/spire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Nicol"]
-  s.date = "2011-11-15"
+  s.date = "2012-08-08"
   s.description = "Light rack-based framework with controllers, HAML/ERB views, router & error handler"
   s.email = "scott@scottnicol.co.uk"
   s.executables = ["spire"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "lib/spire/error.rb",
     "lib/spire/http.rb",
     "lib/spire/public.rb",
+    "lib/spire/resource/buffer.rb",
     "lib/spire/resource/mime.rb",
     "lib/spire/router.rb",
     "spire.gemspec"
@@ -35,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/snicol/spire"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "A light controller-only rack framework with a dash of views"
 
   if s.respond_to? :specification_version then
@@ -43,29 +44,26 @@ 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"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0.6.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"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_dependency(%q<simplecov>, [">= 0.6.0"])
     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"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+    s.add_dependency(%q<simplecov>, [">= 0.6.0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spire
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70280841893160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,15 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70280841893160
-- !ruby/object:Gem::Dependency
-  name: rack-rewrite
-  requirement: &70280842012880 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70280842012880
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70280842015600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +37,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70280842015600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70280842017300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,40 +53,60 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70280842017300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70280842019320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70280842019320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70280842021720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70280842021720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70280842023380 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70280842023380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: Light rack-based framework with controllers, HAML/ERB views, router &
   error handler
 email: scott@scottnicol.co.uk
@@ -108,6 +127,7 @@ files:
 - lib/spire/error.rb
 - lib/spire/http.rb
 - lib/spire/public.rb
+- lib/spire/resource/buffer.rb
 - lib/spire/resource/mime.rb
 - lib/spire/router.rb
 - spire.gemspec
@@ -126,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2756815043673532844
+      hash: -782353004668183630
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A light controller-only rack framework with a dash of views