lib/bones/proxy.rb lib/bones/server.rb lib/bones/static.rb @@ -12,7 +12,7 @@ What it does: Requirements: - ActiveSupport - - rack (0.3.0 only at this time) + - rack (0.3.0 or later should work) Starting it up: README @@ -68,6 +68,6 @@ Gem::Specification.new do |s| ] # Dependencies - s.add_dependency("rack", ["= 0.3.0"]) + s.add_dependency("rack", [">= 0.3.0"]) s.add_dependency("activesupport", [">= 2.1.0"]) end \ No newline at end of file bones.gemspec @@ -57,9 +57,10 @@ class Bones output = template.compile # Build a rack response - Rack::Response.new.finish do |response| - response.write output - end + # Rack::Response.new.finish do |response| + # response.write output + # end + [200, { 'Content-Type' => 'text/html'}, output] end # Returns array of all pages (excluding partials) lib/bones.rb @@ -76,6 +76,10 @@ class Bones # Compiles the template (along with the layout # if necessary) def compile + unless File.exist?(filename) + raise "Template missing\n#{filename}" + end + src = ERB.new(File.read(filename)).src src = (local_assigns_source || '') + (src || '') @content_for_layout = eval(src) # erb.result(binding) lib/bones/template.rb @@ -8,7 +8,7 @@ require File.join(File.dirname(__FILE__), 'extensions.rb') ActiveSupport::Dependencies.load_paths.push << Bones.system_path require 'yaml' -require 'rack' +gem 'rack' require 'rack/request' require 'rack/response' lib/boot.rb @@ -6,7 +6,7 @@ desc "Start bones server" task :server do ARGV.shift load File.join(File.dirname(__FILE__), '..', 'server.rb') - BonesServer.run + Bones::Server.run end desc "Cache page templates for redistribution (non-versioned)" lib/tasks/bones.rb lib/server.rb b4e7a952941f88252204e4e9bbde8e1a733913db Chris Scharf scharfie@gmail.com http://github.com/scharfie/bones/commit/5d61a44ca00b05646ca831701250fe697d52b1c0 5d61a44ca00b05646ca831701250fe697d52b1c0 2009-04-18T15:23:32-07:00 2009-04-18T15:23:32-07:00 Adding support for rackup/passenger 1177981491959f953dd270f6394b08842848b688 Chris Scharf scharfie@gmail.com