lib/bones/bones.rb lib/bones/boot.rb lib/bones/extensions.rb scharfie-bones.gemspec @@ -1 +1,2 @@ -.svn/ \ No newline at end of file +.svn/ +*.gem \ No newline at end of file .gitignore @@ -1,5 +1,6 @@ #!/usr/bin/env ruby -require File.join(File.dirname(__FILE__), '../lib/boot') +require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bones/boot.rb')) +require File.expand_path(File.join(File.dirname(__FILE__), '../lib/bones/initializer.rb')) path = ARGV.shift if path.nil? bin/bones @@ -1,74 +1 @@ -# Bones - the _real_ request handler, -# which BonesProxy loads and calls upon to -# do the dirty work. -class Bones - class << self - attr_accessor :base, :root - attr_accessor :system_path, :pages_path, :layouts_path - attr_accessor :booted - - def base - @base || '' - end - - # Path to the root of the bones project - # Defaults to current directory - def root - @root ||= File.expand_path(File.dirname(__FILE__) + '/../../') - end - - # Path to the bones system files - # Defaults to the directory containing this file - def system_path - @system_path ||= File.expand_path(File.dirname(__FILE__)) - end - - # Path to the directory containing the page templates - # [root]/pages - def pages_path - @pages_path || root / 'pages' - end - - # Path to the directory containing the layout templates - # [root]/layouts - def layouts_path - @layouts_path || root / 'layouts' - end - - def booted? - @booted - end - end - - # Resets root, pages, and layouts paths and the base setting - def self.reset - @pages_path = @layouts_path = @root = @base = nil - end - - # Process incoming request (for real this time!) - def call(env) - # Grab the request - request = Rack::Request.new(env) - - # Create a new template for the given path - # and compile it - template = Template.new(request.path_info) - template.request = request - output = template.compile - - # Build a rack response - # Rack::Response.new.finish do |response| - # response.write output - # end - [200, { 'Content-Type' => 'text/html'}, output] - end - - # Returns array of all pages (excluding partials) - def self.pages - Dir.chdir(Bones.pages_path) do - Dir.glob('**/*.html.erb').map do |f| - f.starts_with?('_') ? nil : f.gsub('.html.erb', '') - end.compact - end - end -end \ No newline at end of file +require File.join(File.dirname(__FILE__), "bones/bones.rb") \ No newline at end of file lib/bones.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), '..', 'boot.rb') +require File.join(File.dirname(__FILE__), '../bones/boot.rb') task :default => :server lib/tasks/bones.rb @@ -1,11 +1,11 @@ -bones_boot = File.join(File.dirname(__FILE__), 'bones', 'lib', 'boot.rb') +bones_boot = File.join(File.dirname(__FILE__), 'vendor/bones/lib/bones/boot.rb') if File.file?(bones_boot) require bones_boot else require 'rubygems' require 'bones' - require 'boot' + require 'bones/boot' end Bones.root = File.expand_path(File.dirname(__FILE__)) \ No newline at end of file pushables/boot.rb bones.gemspec lib/boot.rb lib/extensions.rb c59453e0c1d4ca97db492ce1f99ac8e625a9559a Chris Scharf scharfie@gmail.com http://github.com/scharfie/bones/commit/5da4769c7a50d6bf12e5413a11c85d23ad15c44a 5da4769c7a50d6bf12e5413a11c85d23ad15c44a 2009-10-24T12:25:18-07:00 2009-10-24T12:25:18-07:00 cleaning up paths 1500a4c556d5c92e48dc6608e1bba5e3bceebe80 Chris Scharf scharfie@gmail.com