app/public app/views themes/default/public/404.html themes/default/public/500.html themes/default/public/favicon.ico themes/default/public/javascripts/application.js themes/default/public/stylesheets/comment_form.css themes/default/public/stylesheets/master.css themes/default/views/comments.builder themes/default/views/index.builder themes/default/views/index.erb themes/default/views/layout.erb themes/default/views/post.builder themes/default/views/post.erb @@ -2,7 +2,7 @@ require 'yaml' require 'ostruct' require 'pathname' -MARLEY_ROOT = File.join(File.dirname(__FILE__), '..', '..') unless defined?(MARLEY_ROOT) +MARLEY_ROOT = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..') unless defined?(MARLEY_ROOT) module Marley @@ -46,8 +46,6 @@ module Marley # == Wrapping configuration class Configuration - # Theme = Struct.new(:name, :directory, :views, :public) unless defined? Theme - class << self # Load configuration form YAML @@ -55,11 +53,7 @@ module Marley def load raw_config = YAML.load_file( File.join(MARLEY_ROOT, 'config', 'config.yml') ) @@config = nested_hash_to_openstruct(raw_config) - # theme_name = @@config.theme || default_theme_name - # @@theme = Theme.new( theme_name, - # Pathname.new( File.join(themes_directory, theme_name) ), - # Pathname.new( File.join(themes_directory, theme_name, 'views') ), - # Pathname.new( File.join(themes_directory, theme_name, 'public') ) ) + @@theme = Theme.new(@@config) end @@ -105,4 +99,4 @@ module Marley # Autoload Configuration.load -end \ No newline at end of file +end app/lib/configuration.rb @@ -1,4 +1,4 @@ -MARLEY_ROOT = File.join(File.dirname(__FILE__), '..') unless defined?(MARLEY_ROOT) +MARLEY_ROOT = File.join(File.expand_path(File.dirname(__FILE__)), '..') unless defined?(MARLEY_ROOT) $LOAD_PATH.unshift File.join( File.dirname(__FILE__), '..', 'vendor/sinatra-sinatra/lib' ) # Edge Sinatra $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'vendor') @@ -28,8 +28,11 @@ configure do :adapter => 'sqlite3', :database => File.join(Marley::Configuration.data_directory, 'comments.db') ) - # Set paths to views - set :views => Marley::Configuration.theme.directory + # Set paths to views and public + set :views => Marley::Configuration.theme.views.to_s + set :public => Marley::Configuration.theme.public.to_s + # set :public => '/Users/karmi/Projects/Restafari_org/Application/marley/themes/default/public' + # set :public => '/Users/karmi/Projects/Restafari_org/Application/marley/app/../themes/default/public' end configure :production do @@ -59,11 +62,11 @@ helpers do end def not_found - File.read( File.join( File.dirname(__FILE__), 'public', '404.html') ) + File.read( File.join( Sinatra::Application.public, '404.html') ) end def error - File.read( File.join( File.dirname(__FILE__), 'public', '500.html') ) + File.read( File.join( Sinatra::Application.public, '500.html') ) end def config @@ -152,4 +155,4 @@ get '/about' do "<p style=\"font-family:sans-serif\">I'm running on Sinatra version " + Sinatra::VERSION + '</p>' end -# ----------------------------------------------------------------------------- \ No newline at end of file +# ----------------------------------------------------------------------------- app/marley.rb @@ -36,10 +36,6 @@ load File.join(MARLEY_ROOT, 'config', 'db_create_comments.rb' ) class MarleyTest < Test::Unit::TestCase - configure do - set :views => Marley::Configuration.theme.directory - end - def test_should_show_index_page get '/' assert @response.status == 200 app/test/marley_test.rb app/public/404.html app/public/500.html app/public/favicon.ico app/public/images/bg/about.h.png app/public/images/bg/comment-header-line.png app/public/images/bg/divider-floral.png app/public/images/bg/header-comment-form.png app/public/images/bg/restafari.header.bg.png app/public/images/comment-added-tick.png app/public/images/floral.karmi.png app/public/images/footer-linka.png app/public/images/marley.bubble.png app/public/images/rss.icon.12x12.png app/public/javascripts/application.js app/public/stylesheets/comment_form.css app/public/stylesheets/master.css themes/default/comments.builder themes/default/index.builder themes/default/index.erb themes/default/layout.erb themes/default/post.builder themes/default/post.erb 0e3a8d7cb306e16dcf04263922b95a7877a12421 Karel Minarik karmi@karmi.cz http://github.com/lukeredpath/marley/commit/c7b9a46a57779c136410870056a804b9297d28e2 c7b9a46a57779c136410870056a804b9297d28e2 2009-02-13T15:40:13-08:00 2009-02-13T15:40:13-08:00 Shift all files from "views" and "public" into "themes/default" directory. 4646152458418c761e3c07f31bcb8b63e26653f2 Karel Minarik karmi@karmi.cz