tdreyno-staticmatic 2.1.4 → 2.9.0

data/bin/sm-build

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'staticmatic')
+StaticMatic::Builder.run_cli(Dir.pwd, 'sm-build', 1,  %w(build --force).concat(ARGV))

data/bin/sm-init

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'staticmatic')
+StaticMatic::Generator.run_cli(Dir.pwd, 'sm-init', 1, %w(setup).concat(ARGV))

data/bin/sm-server

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'staticmatic')
+StaticMatic::Previewer.start(Dir.pwd)

data/lib/staticmatic.rb

@@ -5,6 +5,7 @@ $LOAD_PATH.unshift File.dirname(__FILE__) unless
 require 'rubygems'
 require 'staticmatic/autoload'
 
+gem 'actionpack', '2.1.2'
 require 'active_support'
 $LOAD_PATH.unshift Gem.required_location('actionpack', 'action_controller/vendor/html-scanner')
 require 'action_view'

data/lib/staticmatic/autoload.rb

@@ -1,5 +1,6 @@
 module StaticMatic
   autoload :Base,        File.join(File.dirname(__FILE__), 'base')
+  autoload :Template,    File.join(File.dirname(__FILE__), 'template')
   autoload :Config,      File.join(File.dirname(__FILE__), 'config')
   autoload :Builder,     File.join(File.dirname(__FILE__), 'builder')
   autoload :Generator,   File.join(File.dirname(__FILE__), 'generator')
@@ -14,8 +15,4 @@ module StaticMatic
   
   module TemplateHandlers
   end
-  
-  module Generator
-    autoload :BuilderGenerator, File.join(File.dirname(__FILE__), 'builder')
-  end
 end

data/lib/staticmatic/base.rb

@@ -2,12 +2,12 @@ module StaticMatic
   class Base
     include StaticMatic::Deprecation
   
-    attr_accessor :logger, :root_dir, :src_dir, :build_dir
+    attr_accessor :logger, :root_dir, :build_dir, :extentions, :guard
   
     def initialize(root_dir)
       @root_dir  = root_dir
-      @src_dir   = File.join(@root_dir, "src")
       @build_dir = File.join(@root_dir, "build")
+      @guard = Mutex.new
     
       # Setup logger
       @logger = Logger.new(STDERR)
@@ -17,115 +17,61 @@ module StaticMatic
       StaticMatic::Config.setup
       config_file = File.join(@root_dir, "config.rb")
       require config_file if File.exists? config_file
-    end
-  
-    # Checks to see if a template exists within a given path 
-    #
-    # Current only used by the previewer as ActionView handles the actual checking
-    def can_render?(filename)
-      relative_path = full_template_path(filename)
-      view.template_format = determine_format_for(relative_path)
-      view.finder.class.reload!
-      view.finder.file_exists?(strip_extension(relative_path))
-    end
-  
-    def rendered_ext(filename)
-      regex = Regexp.new('\.(' + ActionView::Template.template_handler_extensions.join('|') + ')')
-      filename.gsub(regex, '')
+      
+      @extentions = ActionView::Template.template_handler_extensions.map { |ext| ext.to_s }
     end
     
-    # Return the format for a given template path 
-    #
-    # For example: application.css.sass -> :css
-    def determine_format_for(filename)
-      extension = File.extname(filename)
-
-      # For templates that have only handler extensions, default for backwards compatibility
-      extension = ".html" if extension.empty? || extension == ".haml"
-      extension = ".css"  if extension == ".sass"
-
-      extension[1,extension.length-1].to_sym
-    end
-
-    def calculate_relative_path_to_root(template)
-      return '' if template.match(/^((\.\.?)?\/|\#|.+?\:)/)
-
-      current_page_depth = template.split('/').length - 2;
-      (current_page_depth > 0) ? ([ '..' ] * current_page_depth).join('/') + '/' : ''
+    def helpers
+      Dir[File.join(@root_dir, 'helpers', '**', '*_helper.rb')]
     end
-  
-    def render(filename)
-      load_helpers
-      filename = full_template_path(filename)
-      output   = do_render(filename)
-    
-      return output if determine_format_for(filename) == :css
-      layout = view.instance_variable_get("@layout")
-      layout = "site" if layout.nil?
-      return output unless layout
     
-      view.instance_variable_set("@content_for_layout", output)
-      view.instance_variable_set("@layout", nil) # Clean @layout variable for next request
-      do_render("layouts/#{layout}")
-    rescue Exception => e
-      rescue_from_error(e)
-    end
-  
-    def view
-      @view ||= begin
-        # Initialize View
-        view = ActionView::Base.new([], {}, self)
-        view.template_format = :html
-        view.finder.view_paths = [ @src_dir ]
-        view.instance_variable_set("@staticmatic", self)
-        view
+    def layouts
+      @layouts ||= Dir[File.join(@root_dir, "layouts", "*")].select do |path|
+        !File.directory?(path)
+      end.map do |path|
+        File.basename(path)
       end
     end
-  
-    def do_render(filename)
-      view.instance_variable_set("@current_page", filename)
-      view.template_format = determine_format_for(filename)
-      view.render_file(strip_extension(filename), true)
-    end
-  
-    def rescue_from_error(exception)
-      rescue_template     = (exception == ActionView::TemplateError) ? "template_error" : "default_error"
-      error_template_path = File.expand_path(File.dirname(__FILE__) + "/templates/rescues/#{rescue_template}.html.erb")
     
-      view.instance_variable_set("@exception", exception)
-      view.render_file(error_template_path, false)
+    def template(filename)
+      filename = full_template_path(filename)
+      @templates ||= {}
+      @templates[filename] ||= Template.new(filename, self)
     end
-  
-    # Load all helpers from src/helpers/
-    def load_helpers
-      Dir[File.join(@src_dir, 'helpers', '**', '*_helper.rb')].each do |helper|
-        load(helper)
-        module_name = File.basename(helper, '.rb').gsub(/(^|\_)./) { |c| c.upcase }.gsub(/\_/, '')
-        ActionView::Base.class_eval("include #{module_name}")
+    
+    def pages
+      @pages ||= Dir[File.join(@root_dir, "pages", "**/*")].select do |path|
+        !File.directory?(path) && File.basename(path) !~ /^_/
+      end.map do |path|
+        path.gsub("#{@root_dir}/", "")
+      end.partition do |relative_path|
+        can_render?(relative_path)
       end
     end
+    
+    # Aliases
+    def dynamic_pages; pages.first; end
+    def static_pages;  pages.last; end
+    
+    # Delegate to Template class
+    def render(filename);       template(filename).render; end
+    def rendered_ext(filename); template(filename).rendered_ext; end
+    def can_render?(filename)
+      return false if filename =~ /images\/|javascripts\//
+      template(filename).can_render?
+    end
   
+  protected  
     # Full path to a template, relative to src/
     def full_template_path(template)
-      template  = template.gsub("#{@src_dir}/", '')
-      directory = template_directory_for(template)
+      template  = template.gsub("#{@root_dir}/", '')
+      directory = template.match(/^(\/)?(layouts|stylesheets|pages)/) ? "" : "pages"
       template  = File.join(directory, template) unless directory.empty?
     
-      path     = File.join(File.expand_path(src_dir), template)
+      path     = File.join(File.expand_path(@root_dir), template)
       template = File.join(template, "index") if File.directory? path
     
       template
     end
-  
-    # Return the source directory for a given template
-    # Default is pages/
-    def template_directory_for(template)
-      template.match(/^(\/)?(layouts|stylesheets|pages)/) ? "" : "pages"
-    end
-  
-    # Remove the extension from a given template path
-    def strip_extension(template)
-      template.split('.').first
-    end
   end
 end

data/lib/staticmatic/builder.rb

@@ -1,80 +1,86 @@
 require 'templater'
+require 'zip/zip'
+require 'find'
+require 'fileutils'
 
 module StaticMatic
   module Builder
     extend Templater::Manifold
     desc "Multiple ways to build a staticmatic site"
 
-    class BuilderGenerator < Templater::Generator
+    class BaseGenerator < Templater::Generator
       # Setup StaticMatic site
       def self.site; @@site ||= ::StaticMatic::Base.new(Dir.pwd); end
       def site;      self.class.site; end
 
       # Define source and desintation
-      def self.source_root; site.src_dir; end
+      def self.source_root; site.root_dir; end
       def destination_root; site.build_dir; end
       
-      # Override the base template to handle haml/sass/layouts
-      option :format, :default => :html, :desc => "Which format to export as (html, rails, dotnet)"
+      # Override template to ask staticmatic for the correct extension to output
+      # NOTE: could probably be better
       def self.template(name, *args, &block)
-        # template = case format
-        #   when :rails
-        #     RailsTemplate
-        #   when :dotnet
-        #     DotNetTemplate
-        #   else
-        #     HTMLTemplate
-        # end
-
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        source, destination = args
-        destination ||= source
-        templates << Templater::ActionDescription.new(name, options) do |generator|
-          HTMLTemplate.new(generator, name, source, destination, options)
+        ext = File.extname(args.first)
+        ext = ext[1..ext.length]
+        
+        if (args[0] === args[1]) && (site.extentions.include? ext)
+          args[1] = site.rendered_ext(args[0])
         end
+        
+        super(name, *args, &block)
       end
       
-      %w(images javascripts stylesheets pages).each do |dir|
-        base_path = File.join(source_root, dir)
-        Dir[File.join(base_path, "**", "*")].each do |path|
-          next if File.directory?(path)
-          relative_path = path.gsub("#{source_root}/", "")
-          
-          if !%w(images javascripts).include?(dir) && site.can_render?(relative_path)
-            destination_path = site.rendered_ext(relative_path)
-          
-            if dir == 'pages'
-              destination_path.gsub!("pages/", "")
-              next if destination_path =~ /^_/
-            end
-            
-            template :rendered_file, relative_path,  destination_path
-          else
-            file :static_file, relative_path
-          end
-        end
+      def render(action)
+        site.render(action.source)
       end
     end
     
-    class HTMLTemplate < Templater::Actions::Template
-      def render
-        generator.site.render(source)
+    require File.join(File.dirname(__FILE__), 'builder', 'html')
+    require File.join(File.dirname(__FILE__), 'builder', 'dotnet')
+    
+    class BuilderGenerator < Templater::Generator
+      # Setup StaticMatic site
+      def self.site; @@site ||= ::StaticMatic::Base.new(Dir.pwd); end
+      def site;      self.class.site; end
+      
+      option :format, :default => :html, :desc => "Which format to export as (html, dotnet)"
+      option :package, :as => :boolean, :desc => "Build a Zip file"
+      
+      invoke :build_html,   :format => :html
+      invoke :build_dotnet, :format => :dotnet
+      
+      def after_generation
+        return unless package
+        
+        output_file = File.join(site.build_dir, "package.zip")
+        FileUtils.rm(output_file) if File.exists?(output_file)
+        
+        Zip::ZipFile.open(output_file, Zip::ZipFile::CREATE) do |zipfile|
+          Find.find(site.build_dir) do |path|
+            Find.prune if File.basename(path)[0] == ?.
+            dest = /build\/(\w.*)/.match(path)
+            zipfile.add(dest[1], path) if dest
+          end 
+        end
+        
+        status_flag = "[PACKAGE]".rjust(12)
+        say "<%= color('#{status_flag}', :green) %>  " + File.basename(output_file)
       end
     end
     
-    # class RailsTemplate < Templater::Actions::Template
-    #   def render
-    #     # No render, just copy it
-    #   end
-    # end
-    #
-    # class DotNetTemplate < Templater::Actions::Template
-    #   def render
-    #     # Wrap with MasterPage tags
-    #     @staticmatic.render(file_name) # no layout
-    #   end
-    # end
-    
     add :build, BuilderGenerator
   end
+end
+
+# Monkey-patch to use a dynamic renderer, not just ERb
+class Templater::Actions::Template
+  # Re-route back to the generator
+  def render
+    if generator.respond_to? :render
+      generator.render(self)
+    else
+      context = generator.instance_eval 'binding'
+      ERB.new(::File.read(source), nil, '-').result(context)
+    end
+  end
 end

data/lib/staticmatic/builder/dotnet.rb

@@ -0,0 +1,44 @@
+module StaticMatic
+  module Builder
+    class DotNetGenerator < BaseGenerator
+      glob! "images",      [] # No templates
+      glob! "javascripts", [] # No templates
+      glob! "stylesheets", site.extentions # Registered templates
+
+      # Run the dynamic pages through actionpack
+      site.dynamic_pages.each do |relative_path|
+        output_name = site.rendered_ext(relative_path).gsub("pages/", "")
+        template output_name.gsub('.', '_').to_sym, relative_path, output_name
+      end
+    
+      # Build master pages
+      site.layouts.each do |layout_name|
+        file_name = (site.layouts.length <= 1) ? "MasterPage" : layout_name.split('.')[0].capitalize
+        template :layout, File.join("layouts", layout_name), "#{file_name}.master"
+      end
+    
+      # Copy static pages
+      site.static_pages.each do |relative_path|
+        output_name = relative_path.gsub("pages/", "")
+        file output_name.gsub('.', '_').to_sym, relative_path, output_name
+      end
+      
+      def render(action)
+        if action.name == :layout
+          output = site.render_layout(action.source, '<asp:ContentPlaceHolder id="content" runat="server" />')
+          file_name = File.basename(action.destination).gsub(".master", '')
+          prefix = %Q(<%@ Master Language="C#" AutoEventWireup="true" CodeFile="#{file_name}.master.cs" Inherits="#{file_name}" %>)
+          output = prefix + "\n" + output
+          output.gsub!("<head", '<head runat="server"')
+        else
+          # replace content_for with <asp:whatevers
+          site.render(action.source)
+          #prefix = %Q(<%@ Master Language="C#" AutoEventWireup="true" CodeFile="#{file_name}.master.cs" Inherits="#{file_name}" %>)
+          #output = prefix + "\n" + output
+        end
+      end
+    end
+    
+    add :build_dotnet, DotNetGenerator
+  end
+end

data/lib/staticmatic/builder/html.rb

@@ -0,0 +1,23 @@
+module StaticMatic
+  module Builder
+    class HTMLGenerator < BaseGenerator
+      glob! "images",      [] # No templates
+      glob! "javascripts", [] # No templates
+      glob! "stylesheets", site.extentions # Registered templates
+    
+      # Run the dynamic pages through actionpack
+      site.dynamic_pages.each do |relative_path|
+        output_name = site.rendered_ext(relative_path).gsub("pages/", "")
+        template output_name.gsub('.', '_').to_sym, relative_path, output_name
+      end
+    
+      # Copy static pages
+      site.static_pages.each do |relative_path|
+        output_name = relative_path.gsub("pages/", "")
+        file output_name.gsub('.', '_').to_sym, relative_path, output_name
+      end
+    end
+    
+    add :build_html, HTMLGenerator
+  end
+end

data/lib/staticmatic/generator.rb

@@ -18,9 +18,9 @@ module StaticMatic
       end
 
       glob!
-      empty_directory :images, File.join("src", "images")
-      empty_directory :javascripts, File.join("src", "javascripts")
-      empty_directory :build, "build"
+      empty_directory :build,       "build"
+      empty_directory :javascripts, "javascripts"
+      empty_directory :images,      "images"
     end
 
     add :setup, StaticmaticGenerator

data/lib/staticmatic/previewer.rb

@@ -3,27 +3,36 @@ require 'mongrel'
 module StaticMatic
   class Previewer < Mongrel::HttpHandler
     def initialize(staticmatic)
-      @files       = Mongrel::DirHandler.new(staticmatic.src_dir, false)
+      @files       = Mongrel::DirHandler.new(staticmatic.root_dir, false)
+      @guard = Mutex.new
       @staticmatic = staticmatic
     end
   
     def process(request, response)
+      return if response.socket.closed?
+      
       path_info   = request.params[Mongrel::Const::PATH_INFO].chomp("/")
       get_or_head = %w(GET HEAD).include? request.params[Mongrel::Const::REQUEST_METHOD]
       
-      if @staticmatic.can_render? path_info
-        file_ext  = File.extname(path_info).gsub(/^\./, '')
-        file_ext  = "html" if file_ext.blank?
-        file_name = CGI::unescape(path_info).gsub!(/^\//, '') || ''
-        
-        response.start(200) do |head, out|
-          output = @staticmatic.render(file_name)
-          head[Mongrel::Const::CONTENT_TYPE] = Mongrel::DirHandler::MIME_TYPES[".#{file_ext}"] || "application/octet-stream"
-          out.write(output || "")
-        end  
-      elsif get_or_head and @files.can_serve(path_info)
-        @files.process(request, response) # try to serve static file from site dir
-      end
+      # Reload(and therefore can_render?) is not thread-safe... so lame
+      @guard.synchronize {
+        if @staticmatic.can_render? path_info
+          file_ext  = File.extname(path_info).gsub(/^\./, '')
+          file_ext  = "html" if file_ext.blank?
+          file_name = CGI::unescape(path_info).gsub!(/^\//, '') || ''
+          begin
+            response.start(200) do |head, out|
+              output = @staticmatic.render(file_name)
+              head[Mongrel::Const::CONTENT_TYPE] = Mongrel::DirHandler::MIME_TYPES[".#{file_ext}"] || "application/octet-stream"
+              out.write(output || "")
+            end
+          rescue Errno::EPIPE
+            response.socket.close
+          end
+        elsif get_or_head and @files.can_serve(path_info)
+          @files.process(request, response) # try to serve static file from site dir
+        end
+      }
     end
     
     class << self

data/lib/staticmatic/template.rb

@@ -0,0 +1,97 @@
+module StaticMatic
+  class Template
+    attr_accessor :view, :path
+    
+    def initialize(filename, site)
+      @path = filename
+      @site = site
+  
+      @view = ActionView::Base.new([], {}, self)
+      @view.template_format = determine_format_for(@path)
+      @view.finder.view_paths = [ @site.root_dir ]
+      @view.instance_variable_set("@staticmatic", @site)
+    end
+  
+    def can_render?
+      @view.finder.class.reload!
+      @view.finder.file_exists?(strip_extension(@path))
+    end
+  
+    def render
+      load_helpers
+      
+      @view.instance_variable_set("@current_page", File.basename(@path))
+      output = @view.render_file(strip_extension(@path), true)
+      return output if layout === false
+      
+      render_with_layout(layout, output)
+    rescue Exception => e
+      rescue_from_error(e)
+    end  
+  
+    def rendered_ext
+      @path.gsub(Regexp.new('\.(' + @site.extentions.join('|') + ')'), '')
+    end
+    
+  protected
+    def render_with_layout(layout, content)
+      #layout = full_template_path(layout).gsub("pages/", "layouts/")
+      @view.instance_variable_set("@content_for_layout", content)
+      output = @view.render_file("layouts/#{layout}", true)
+      
+      # little bit of cleaning for content_for blocks which concat by default (wtf?)
+      @view.instance_variables.grep(/content_for_|layout/).select do |name|
+        name != "content_for_layout"
+      end.each do |name|
+        @view.instance_variable_set(name, nil)
+      end
+      
+      output
+    end
+    
+    def layout
+      return false unless @path.include? "pages"
+      
+      layout = @view.instance_variable_get("@layout")
+      layout = "site" if layout.nil? # @layout = false is valid
+      layout
+    end
+    
+    def rescue_from_error(exception)
+      rescue_template     = (exception == ActionView::TemplateError) ? "template_error" : "default_error"
+      error_template_path = File.expand_path(File.dirname(__FILE__) + "/templates/rescues/#{rescue_template}.html.erb")
+    
+      @view.instance_variable_set("@exception", exception)
+      @view.render_file(error_template_path, false)
+    end
+    
+    # Return the format for a given template path 
+    #
+    # For example: application.css.sass -> :css
+    def determine_format_for(filename)
+      if File.extname(filename).empty? || filename =~ /(\.html|\.haml)/
+        extension = ".html" 
+      elsif filename =~ /(\.css|\.sass)/
+        extension = ".css"
+      else
+        extension = File.extname(filename)
+      end
+      
+      extension[1,extension.length-1].to_sym
+    end
+
+    # Load all helpers from src/helpers/
+    def load_helpers
+      @site.helpers.each do |helper|
+        load(helper)
+        module_name = File.basename(helper, '.rb').gsub(/(^|\_)./) { |c| c.upcase }.gsub(/\_/, '')
+        ActionView::Base.class_eval("include #{module_name}")
+      end
+    end
+
+    # Remove the extension from a given template path
+    def strip_extension(template)
+      template.split('.').first
+    end
+  end
+end

data/spec/action_view_helpers_spec.rb

@@ -7,6 +7,6 @@ describe "ActionView Helper Integration" do
   end
   
   it "should render partial" do
-    @staticmatic.view.render(:partial => "pages/form").should include("This is a form")
+    @staticmatic.render("partial_test").should include("This is a form")
   end
 end

data/spec/asset_helpers_spec.rb

@@ -7,16 +7,18 @@ describe "Asset Helpers" do
   
   include StaticMatic::Helpers::AssetTagHelper
   before :all do
-    @sample_site_path = File.dirname(__FILE__) + "/fixtures/sample"
-    @staticmatic      = StaticMatic::Base.new(@sample_site_path)
-  end
-  
-  it "should render partial" do
-    @staticmatic.view.render(:partial => "pages/form").should include("This is a form")
+    @staticmatic = StaticMatic::Base.new(File.dirname(__FILE__) + "/fixtures/sample")
   end
   
   it "should generate stylesheet link" do
-    @relative_path_to_root = @staticmatic.calculate_relative_path_to_root('pages/services/web_development/costs')
+    @relative_path_to_root = calculate_relative_path_to_root('pages/services/web_development/costs')
     stylesheet_link_tag("site").should include("../../stylesheets/site.css")
   end
+  
+  def calculate_relative_path_to_root(template)
+    return '' if template.match(/^((\.\.?)?\/|\#|.+?\:)/)
+
+    current_page_depth = template.split('/').length - 2;
+    (current_page_depth > 0) ? ([ '..' ] * current_page_depth).join('/') + '/' : ''
+  end
 end

data/spec/base_spec.rb

@@ -6,6 +6,23 @@ describe StaticMatic::Base do
     @staticmatic      = StaticMatic::Base.new(@sample_site_path)
   end
 
+  it "should list static pages" do
+    @staticmatic.static_pages.should include("pages/static.html")
+  end
+  
+  # Depending on system gems, markdown/textile files would be listed here too
+  it "should list dynamic pages" do
+    ["pages/haml_test.html.haml", "pages/hello_world.html.erb", "pages/index.html.erb", 
+     "pages/no_layout.html.erb", "pages/page_with_error.html.haml", "pages/services/index.html.erb", 
+     "pages/services/web_development.html.erb", "pages/specify_layout.html.erb"].each do |path|
+      @staticmatic.dynamic_pages.should include(path)
+    end
+  end
+  
+  it "should list layouts" do
+    @staticmatic.layouts.should == %w(site.html.erb specified_layout.html.erb)
+  end
+  
   it "should catch any haml template errors" do
     output = @staticmatic.render("page_with_error")
     output.should include("Illegal nesting")
@@ -17,13 +34,13 @@ describe StaticMatic::Base do
   end
   
   it "should load custom helpers" do
-    @staticmatic.view.respond_to?(:say).should be_true
+    @staticmatic.template("haml_test").view.respond_to?(:say).should be_true
   end
   
   it "should determine template directory for file" do
-    @staticmatic.full_template_path("stylesheets/site.css").should_not include("pages/")
-    @staticmatic.full_template_path("hello_world.html").should include("pages/")
-    @staticmatic.full_template_path("haml_test").should include("pages/")
+    @staticmatic.template("stylesheets/site.css").path.should_not include("pages/")
+    @staticmatic.template("hello_world.html").path.should include("pages/")
+    @staticmatic.template("haml_test").path.should include("pages/")
   end
   
   it "should know if we can render a template or not" do
@@ -32,11 +49,6 @@ describe StaticMatic::Base do
   end
   
   it "should add index if needed" do
-    @staticmatic.full_template_path("services").should == "pages/services/index"
-  end
-  
-  it "should know the relative path to the base dir" do 
-    @staticmatic.calculate_relative_path_to_root("pages/services/web_development/costs").should == "../../"
-    @staticmatic.calculate_relative_path_to_root("pages/services/web_development").should == "../"
+    @staticmatic.template("services").path.should == "pages/services/index"
   end
 end

data/spec/builder_spec.rb

@@ -1,33 +1,29 @@
-# require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic")
-# require 'templater'
-# 
-# describe StaticMatic::Builder do
-#   before :each do
-#     @root_dir    = File.dirname(__FILE__) + "/fixtures/builder-test"
-#     
-#     orig_stdout = STDOUT.dup
-#     STDOUT.reopen('/dev/null') # redirect stdout to /dev/null
-#     StaticMatic::Builder.run_cli(File.dirname(@root_dir), 'staticmatic', 1, ["setup", File.basename(@root_dir)])
-#     STDOUT.reopen(orig_stdout) # restore stdout
-#   end
-#   
-#   def build_site
-#     @staticmatic = StaticMatic::Base.new(@root_dir)
-#     @staticmatic.logger = mock("logger")
-#     @staticmatic.logger.should_receive(:info).at_least(:once)
-#     StaticMatic::Builder.build(@staticmatic)
-#   end
-#   
-#   after :each do
-#     FileUtils.rm_rf(@root_dir)
-#   end
-#   
-#   it "should not build partial files" do
-#     File.open("#{@root_dir}/src/pages/_partial.html.erb", "w") do |f|
-#       f.puts "Test"
-#     end
-#     
-#     build_site
-#     File.exists?("#{@root_dir}/build/_partial.html").should be_false
-#   end
-# end
+require File.join(File.dirname(__FILE__), "..", "lib", "staticmatic")
+
+describe StaticMatic::Builder do
+  before :each do
+    @root_dir  = File.expand_path(File.join(File.dirname(__FILE__), "fixtures", "builder-test"))
+    @init_cmd  = File.expand_path(File.join(File.dirname(__FILE__), "..", "bin", "sm-init"))
+    @build_cmd = File.expand_path(File.join(File.dirname(__FILE__), "..", "bin", "sm-build"))
+    
+    `cd #{File.dirname(@root_dir)} && #{@init_cmd} #{File.basename(@root_dir)}`
+  end
+  
+  after :each do
+    FileUtils.rm_rf(@root_dir)
+  end
+  
+  it "should build normal files" do
+    `cd #{@root_dir} && #{@build_cmd}`
+    File.exists?("#{@root_dir}/build/index.html").should_not be_false
+  end
+  
+  it "should not build partial files" do
+    File.open("#{@root_dir}/pages/_partial.html.erb", "w") do |f|
+      f.puts "Test"
+    end
+    
+    `cd #{@root_dir} && #{@build_cmd}`
+    File.exists?("#{@root_dir}/build/_partial.html").should be_false
+  end
+end

data/spec/fixtures/sample/pages/partial_test.html.erb

@@ -0,0 +1 @@
+<%= render(:partial => "pages/form") %>

data/spec/fixtures/sample/pages/static.html

@@ -0,0 +1 @@
+Static, no code!

data/spec/layouts_spec.rb

@@ -18,8 +18,7 @@ describe StaticMatic::Base do
   end
   
   it "should clean layout variable for next request" do
-    output = @staticmatic.render("specify_layout")
-    @staticmatic.view.instance_variable_get("@layout").should be_nil
+    @staticmatic.template("specify_layout").view.instance_variable_get("@layout").should be_nil
   end
   
   it "should allow disabling the layout" do

data/spec/rendering_spec.rb

@@ -25,27 +25,6 @@ describe StaticMatic::Base do
     output = @staticmatic.render("haml_test")
     output.should include("<strong>Hello from haml</strong>")
   end
-
-  if ActionView::Template.template_handler_extensions.include? :markdown
-    it "should render markdown template" do
-      output = @staticmatic.render("markdown_test")
-      output.should match(/<strong>Hello from markdown<\/strong>/)
-    end
-  end
-  
-  if ActionView::Template.template_handler_extensions.include? :textile
-    it "should render textile template" do
-      output = @staticmatic.render("textile_test")
-      output.should match(/<strong>Hello from textile<\/strong>/)
-    end
-  end
-  
-  if ActionView::Template.template_handler_extensions.include? :liquid
-    it "should render liquid template" do
-      output = @staticmatic.render("liquid_test")
-      output.should match(/<strong>Hello from liquid<\/strong>/)
-    end
-  end
   
   it "should register a css renderer" do
     output = @staticmatic.render("stylesheets/site.css")
@@ -54,16 +33,16 @@ describe StaticMatic::Base do
   end
   
   it "should setup up css type correctly" do
-    @staticmatic.determine_format_for("stylesheets/site.css").should == :css
+    @staticmatic.template("stylesheets/site.css").view.template_format.should == :css
   end
   
   it "should determine format for file with extension" do
-    @staticmatic.determine_format_for("stylesheets/site.css.sass").should == :css
+    @staticmatic.template("stylesheets/site.css.sass").view.template_format.should == :css
   end
   
   it "should have sensible defaults for haml & sass" do
-    @staticmatic.determine_format_for("stylesheets/site.sass").should == :css
-    @staticmatic.determine_format_for("pages/test.haml").should == :html
+    @staticmatic.template("stylesheets/site.sass").view.template_format.should == :css
+    @staticmatic.template("pages/test.haml").view.template_format.should == :html
   end
   
   it "should render index template from sub-directory" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tdreyno-staticmatic
 version: !ruby/object:Gem::Version 
-  version: 2.1.4
+  version: 2.9.0
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -10,20 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-05 00:00:00 -07:00
-default_executable: staticmatic
+date: 2008-11-05 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: templater
+  name: mongrel
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.3
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mongrel
+  name: rubyzip
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -31,6 +31,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: templater
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.5
+    version: 
 - !ruby/object:Gem::Dependency 
   name: haml
   version_requirement: 
@@ -45,38 +54,45 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.1.2
     version: 
 description: 
 email: tdreyno@gmail.com
 executables: 
-- staticmatic
+- sm-init
+- sm-build
+- sm-server
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - LICENSE
-- bin/staticmatic
+- bin/sm-init
+- bin/sm-build
+- bin/sm-server
 - lib/staticmatic.rb
 - lib/staticmatic/autoload.rb
 - lib/staticmatic/base.rb
 - lib/staticmatic/builder.rb
+- lib/staticmatic/builder/html.rb
+- lib/staticmatic/builder/dotnet.rb
 - lib/staticmatic/config.rb
 - lib/staticmatic/deprecation.rb
 - lib/staticmatic/generator.rb
 - lib/staticmatic/previewer.rb
+- lib/staticmatic/template.rb
 - lib/staticmatic/actionpack_support/mime.rb
 - lib/staticmatic/actionpack_support/remove_partial_benchmark.rb
 - lib/staticmatic/actionpack_support/remove_controller_caching.rb
@@ -90,12 +106,10 @@ files:
 - lib/staticmatic/template_handlers/textile.rb
 - lib/staticmatic/templates/rescues/default_error.html.erb
 - lib/staticmatic/templates/rescues/template_error.html.erb
-- lib/templates/script/server
-- lib/templates/script/builder
-- lib/templates/src/helpers/site_helper.rb
-- lib/templates/src/layouts/site.html.haml
-- lib/templates/src/pages/index.html.haml
-- lib/templates/src/stylesheets/site.css.sass
+- lib/templates/helpers/site_helper.rb
+- lib/templates/layouts/site.html.haml
+- lib/templates/pages/index.html.haml
+- lib/templates/stylesheets/site.css.sass
 - spec/action_view_helpers_spec.rb
 - spec/asset_helpers_spec.rb
 - spec/base_spec.rb
@@ -104,8 +118,6 @@ files:
 - spec/deprecation_spec.rb
 - spec/layouts_spec.rb
 - spec/rendering_spec.rb
-- spec/fixtures/sample/Rakefile
-- spec/fixtures/sample/config.rb
 - spec/fixtures/sample/build/haml_test.html
 - spec/fixtures/sample/build/hello_world.html
 - spec/fixtures/sample/build/index.html
@@ -113,21 +125,23 @@ files:
 - spec/fixtures/sample/build/services/index.html
 - spec/fixtures/sample/build/services/web_development.html
 - spec/fixtures/sample/build/stylesheets/site.css
-- spec/fixtures/sample/src/helpers/speech_helper.rb
-- spec/fixtures/sample/src/layouts/site.html.erb
-- spec/fixtures/sample/src/layouts/specified_layout.html.erb
-- spec/fixtures/sample/src/pages/_form.html.erb
-- spec/fixtures/sample/src/pages/haml_test.html.haml
-- spec/fixtures/sample/src/pages/hello_world.html.erb
-- spec/fixtures/sample/src/pages/index.html.erb
-- spec/fixtures/sample/src/pages/liquid_test.html.liquid
-- spec/fixtures/sample/src/pages/markdown_test.html.markdown
-- spec/fixtures/sample/src/pages/page_with_error.html.haml
-- spec/fixtures/sample/src/pages/specify_layout.html.erb
-- spec/fixtures/sample/src/pages/textile_test.html.textile
-- spec/fixtures/sample/src/pages/services/index.html.erb
-- spec/fixtures/sample/src/pages/services/web_development.html.erb
-- spec/fixtures/sample/src/stylesheets/site.css.sass
+- spec/fixtures/sample/helpers/speech_helper.rb
+- spec/fixtures/sample/layouts/site.html.erb
+- spec/fixtures/sample/layouts/specified_layout.html.erb
+- spec/fixtures/sample/pages/_form.html.erb
+- spec/fixtures/sample/pages/haml_test.html.haml
+- spec/fixtures/sample/pages/hello_world.html.erb
+- spec/fixtures/sample/pages/index.html.erb
+- spec/fixtures/sample/pages/partial_test.html.erb
+- spec/fixtures/sample/pages/liquid_test.html.liquid
+- spec/fixtures/sample/pages/markdown_test.html.markdown
+- spec/fixtures/sample/pages/page_with_error.html.haml
+- spec/fixtures/sample/pages/specify_layout.html.erb
+- spec/fixtures/sample/pages/static.html
+- spec/fixtures/sample/pages/textile_test.html.textile
+- spec/fixtures/sample/pages/services/index.html.erb
+- spec/fixtures/sample/pages/services/web_development.html.erb
+- spec/fixtures/sample/stylesheets/site.css.sass
 has_rdoc: false
 homepage: http://github.com/tdreyno/staticmatic
 post_install_message: 
@@ -163,8 +177,6 @@ test_files:
 - spec/deprecation_spec.rb
 - spec/layouts_spec.rb
 - spec/rendering_spec.rb
-- spec/fixtures/sample/Rakefile
-- spec/fixtures/sample/config.rb
 - spec/fixtures/sample/build/haml_test.html
 - spec/fixtures/sample/build/hello_world.html
 - spec/fixtures/sample/build/index.html
@@ -172,18 +184,20 @@ test_files:
 - spec/fixtures/sample/build/services/index.html
 - spec/fixtures/sample/build/services/web_development.html
 - spec/fixtures/sample/build/stylesheets/site.css
-- spec/fixtures/sample/src/helpers/speech_helper.rb
-- spec/fixtures/sample/src/layouts/site.html.erb
-- spec/fixtures/sample/src/layouts/specified_layout.html.erb
-- spec/fixtures/sample/src/pages/_form.html.erb
-- spec/fixtures/sample/src/pages/haml_test.html.haml
-- spec/fixtures/sample/src/pages/hello_world.html.erb
-- spec/fixtures/sample/src/pages/index.html.erb
-- spec/fixtures/sample/src/pages/liquid_test.html.liquid
-- spec/fixtures/sample/src/pages/markdown_test.html.markdown
-- spec/fixtures/sample/src/pages/page_with_error.html.haml
-- spec/fixtures/sample/src/pages/specify_layout.html.erb
-- spec/fixtures/sample/src/pages/textile_test.html.textile
-- spec/fixtures/sample/src/pages/services/index.html.erb
-- spec/fixtures/sample/src/pages/services/web_development.html.erb
-- spec/fixtures/sample/src/stylesheets/site.css.sass
+- spec/fixtures/sample/helpers/speech_helper.rb
+- spec/fixtures/sample/layouts/site.html.erb
+- spec/fixtures/sample/layouts/specified_layout.html.erb
+- spec/fixtures/sample/pages/_form.html.erb
+- spec/fixtures/sample/pages/haml_test.html.haml
+- spec/fixtures/sample/pages/hello_world.html.erb
+- spec/fixtures/sample/pages/index.html.erb
+- spec/fixtures/sample/pages/partial_test.html.erb
+- spec/fixtures/sample/pages/liquid_test.html.liquid
+- spec/fixtures/sample/pages/markdown_test.html.markdown
+- spec/fixtures/sample/pages/page_with_error.html.haml
+- spec/fixtures/sample/pages/specify_layout.html.erb
+- spec/fixtures/sample/pages/static.html
+- spec/fixtures/sample/pages/textile_test.html.textile
+- spec/fixtures/sample/pages/services/index.html.erb
+- spec/fixtures/sample/pages/services/web_development.html.erb
+- spec/fixtures/sample/stylesheets/site.css.sass

data/bin/staticmatic

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'staticmatic')
-StaticMatic::Generator.run_cli(Dir.pwd, 'staticmatic', 1, ["setup"].concat(ARGV))

data/lib/templates/script/builder

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'staticmatic'
-StaticMatic::Builder.run_cli(Dir.pwd, 'builder', 1,  ["build", "--force"].concat(ARGV))

data/lib/templates/script/server

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'staticmatic'
-StaticMatic::Previewer.start(Dir.pwd)

data/spec/fixtures/sample/Rakefile

@@ -1,4 +0,0 @@
-require 'rake'
-
-# Hard-code path to staticmatic for testing
-require '../../../lib/tasks/staticmatic'

data/spec/fixtures/sample/config.rb

@@ -1,3 +0,0 @@
-StaticMatic::Config.setup(
-  :custom_option => false
-)