lib/staticmatic/config.rb spec/config_spec.rb @@ -3,14 +3,14 @@ $:.unshift "#{File.dirname(__FILE__)}/../vendor/html-scanner" lib_path = File.dirname(__FILE__) require 'rubygems' +gem 'activesupport', '=2.0.2' +gem 'actionpack', '=2.0.2' require 'active_support' -require 'actionpack' require 'action_view' require 'haml' require 'sass' -require 'mongrel' -["base", "rescue", "previewer", "builder", "template_handlers/sass", "deprecation", "actionpack_support/mime"].each do |file| +["base", "config", "rescue", "template_handlers/sass", "deprecation", "actionpack_support/mime"].each do |file| require "#{lib_path}/staticmatic/#{file}" end @@ -29,10 +29,7 @@ ActionView::Base.class_eval do include Mime end - - # TODO: Replace with a correct template registration Haml.init_rails(binding) # ActionView::Base.register_template_handler(:haml, Haml::Template) -ActionView::Base.register_template_handler :sass, StaticMatic::TemplateHandlers::Sass - +ActionView::Base.register_template_handler :sass, StaticMatic::TemplateHandlers::Sass \ No newline at end of file lib/staticmatic.rb @@ -13,10 +13,24 @@ module StaticMatic @src_dir = "#{@root_dir}/src" @build_dir = "#{@root_dir}/site" load_helpers + initialize_config initialize_logger initialize_template end + def initialize_config + StaticMatic::Config.setup + config_file = File.join(@root_dir, "config.rb") + + if File.exists? config_file + require config_file + end + + if defined?(Haml::Template) + Haml::Template.options = StaticMatic::Config[:haml_options] + end + end + # Create a logger to keep ActionView happy def initialize_logger @logger = Logger.new($stderr) lib/staticmatic/base.rb @@ -1,3 +1,5 @@ +require 'mongrel' + module StaticMatic class Previewer < Mongrel::HttpHandler @@file_only_methods = ["GET","HEAD"] @@ -51,10 +53,9 @@ module StaticMatic class << self # Starts the StaticMatic preview server def start(staticmatic) - port = "3000" - config = Mongrel::Configurator.new do - puts "Running Preview of #{staticmatic.root_dir} on port #{port}" - listener :port => port do + config = Mongrel::Configurator.new :host => StaticMatic::Config[:host] do + puts "Running Preview of #{staticmatic.root_dir} on port #{StaticMatic::Config[:post]}" + listener :port => StaticMatic::Config[:post] do uri "/", :handler => Previewer.new(staticmatic) end trap("INT") { stop } lib/staticmatic/previewer.rb @@ -6,7 +6,7 @@ module StaticMatic end def render(template, local_assigns) - ::Sass::Engine.new(template).render + ::Sass::Engine.new(template, StaticMatic::Config[:sass_options]).render end end end lib/staticmatic/template_handlers/sass.rb @@ -1,9 +1,11 @@ require File.dirname(__FILE__) + "/../staticmatic" task :build do + require File.dirname(__FILE__) + "/../staticmatic/staticmatic/builder" StaticMatic::Builder.build StaticMatic::Base.new(".") end task :preview do + require File.dirname(__FILE__) + "/../staticmatic/staticmatic/previewer" StaticMatic::Previewer.start StaticMatic::Base.new(".") end \ No newline at end of file lib/tasks/staticmatic.rb @@ -0,0 +1,3 @@ +StaticMatic::Config.setup( + :custom_option => false +) \ No newline at end of file spec/fixtures/sample/config.rb a995f4e523358929fe254d691ecc694b8a55adf9 c7490a2fa2cf4806ccf453a06feb4d354e19da5e Stephen Bartholomew steve@curve21.com http://github.com/stevebartholomew/staticmatic/commit/aafdef05c5926a6c2c08cd1d6e2cce020e92b656 aafdef05c5926a6c2c08cd1d6e2cce020e92b656 2008-06-16T12:49:53-07:00 2008-06-16T12:49:53-07:00 Fixed config branch conflicts cd76bbd2e09df5be1ea73f3c934024c1201fb541 Stephen Bartholomew steve@curve21.com