lib/staticmatic/autoload.rb @@ -1,6 +1,7 @@ -$:.unshift "#{File.dirname(__FILE__)}/../vendor/html-scanner" - -lib_path = File.dirname(__FILE__) +$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../vendor/html-scanner" +$LOAD_PATH.unshift File.dirname(__FILE__) unless + $LOAD_PATH.include?(File.dirname(__FILE__)) || + $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__))) require 'rubygems' gem 'activesupport', '=2.0.2' @@ -9,28 +10,18 @@ require 'active_support' require 'action_view' require 'haml' require 'sass' - -["base", "config", "rescue", "template_handlers/sass", "deprecation", "actionpack_support/mime"].each do |file| - require "#{lib_path}/staticmatic/#{file}" -end - -Dir["#{lib_path}/staticmatic/helpers/*_helper.rb","#{lib_path}/staticmatic/helpers/*_helpers.rb" ].each do |file| - require file - module_name = "StaticMatic::Helpers::" + file.match(/([a-z_]+)\.rb$/)[1].camelize - ActionView::Base.class_eval { include module_name.constantize } -end - -StaticMatic::Base.class_eval do - include StaticMatic::Rescue - include StaticMatic::Deprecation -end +require 'staticmatic/autoload' +require 'staticmatic/base' ActionView::Base.class_eval do + include StaticMatic::Helpers::AssetTagHelper + include StaticMatic::Helpers::DeprecatedHelpers + include StaticMatic::Helpers::PageHelper + include StaticMatic::Helpers::UrlHelper include Mime include StaticMatic::Deprecation 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 \ No newline at end of file lib/staticmatic.rb @@ -1,5 +1,5 @@ module Mime - CSS = "text/css" + CSS = "text/css" HTML = "text/html" - JS = "text/js" + JS = "text/javascript" end \ No newline at end of file lib/staticmatic/actionpack_support/mime.rb @@ -1,5 +1,7 @@ module StaticMatic class Base + include StaticMatic::Rescue + include StaticMatic::Deprecation attr_accessor :logger attr_accessor :root_dir lib/staticmatic/base.rb @@ -85,6 +85,7 @@ module StaticMatic class << self def build(staticmatic) + staticmatic = StaticMatic::Base.new(staticmatic) if staticmatic.is_a? String new(staticmatic) end end lib/staticmatic/builder.rb @@ -53,6 +53,7 @@ module StaticMatic class << self # Starts the StaticMatic preview server def start(staticmatic) + staticmatic = StaticMatic::Base.new(staticmatic) if staticmatic.is_a? String config = Mongrel::Configurator.new :host => StaticMatic::Config[:host] do puts "Running Preview of #{staticmatic.root_dir} on port #{StaticMatic::Config[:post]}" lib/staticmatic/previewer.rb @@ -1,13 +1,11 @@ -module StaticMatic - module TemplateHandlers - class Sass - def initialize(view) - @view = view - end - - def render(template, local_assigns) - ::Sass::Engine.new(template, StaticMatic::Config[:sass_options]).render - end +module StaticMatic::TemplateHandlers + class Sass + def initialize(view) + @view = view + end + + def render(template, local_assigns) + ::Sass::Engine.new(template, StaticMatic::Config[:sass_options]).render end end end \ No newline at end of file lib/staticmatic/template_handlers/sass.rb @@ -1,11 +1,9 @@ -require File.dirname(__FILE__) + "/../staticmatic" +require File.join(File.dirname(__FILE__), "..", "staticmatic") task :build do - require File.dirname(__FILE__) + "/../staticmatic/staticmatic/builder" - StaticMatic::Builder.build StaticMatic::Base.new(".") + StaticMatic::Builder.build(".") end task :preview do - require File.dirname(__FILE__) + "/../staticmatic/staticmatic/previewer" - StaticMatic::Previewer.start StaticMatic::Base.new(".") + StaticMatic::Previewer.start(".") end \ No newline at end of file lib/tasks/staticmatic.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + "/../lib/staticmatic" +require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic") describe "ActionView Helper Integration" do spec/action_view_helpers_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + "/../lib/staticmatic" +require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic") describe "Asset Helpers" do ActionView::Base.included_modules.each do |mod| spec/asset_helpers_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + "/../lib/staticmatic" +require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic") describe "Backward compatibility for existing sites" do before(:all) do spec/backward_compatibilty_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + "/../lib/staticmatic" +require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic") describe StaticMatic::Base do before(:all) do spec/base_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + "/../lib/staticmatic" +require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic") describe StaticMatic::Config do it "should be able to get a configuration key" do spec/config_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + "/../lib/staticmatic" +require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic") # WIP: tested only be seeing that deprecation messages appear! describe "Deprecation of old methods" do spec/deprecation_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + "/../lib/staticmatic" +require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic") describe StaticMatic::Base do before(:all) do spec/layouts_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + "/../lib/staticmatic" +require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic") describe StaticMatic::Base do before(:all) do spec/rendering_spec.rb 047157a8a40e1ec94aacaffc683d38db454368d7 Thomas Reynolds tdreyno@gmail.com http://github.com/stevebartholomew/staticmatic/commit/dc0e7855e82968ca7430a588512da4a8ae502797 dc0e7855e82968ca7430a588512da4a8ae502797 2008-06-17T13:30:11-07:00 2008-06-17T13:30:00-07:00 make loading on-demand and explicit f74b45e1914f917e33bba56dc8612307a124b2f7 Thomas Reynolds tdreyno@gmail.com