staticmatic 0.1.1 → 0.2.0

data/bin/staticmatic

@@ -1,19 +1,13 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../lib/staticmatic'
 
 command = ARGV[0]
 directory = ARGV[1]
 
 if !command || !directory
-  puts 'Usage: staticmatic <build|setup> <directory>'
+  puts 'Usage: staticmatic <build|setup|preview> <directory>'
   exit
 end
 
-staticmatic = StaticMatic.new(directory)
-
-case command
-  when 'build'
-    staticmatic.build
-  when 'setup'
-    staticmatic.setup
-end
+staticmatic = StaticMatic::Base.new(directory)
+staticmatic.run(command)

data/example/src/layouts/application.haml

@@ -2,8 +2,10 @@
 %html
   %head
     %title Welcome to my site
+    = stylesheets
   %body
     #menu
       %ul
-        %li Test
+        %li=link "Home", "/"
+        %li=link "Contact"
     = yield

data/example/src/pages/index.haml

@@ -1,5 +1,3 @@
-%h1 This is a test - with a change
+%h1 Welcome to StaticMatic
 
-= link img('image_path.jpg'), 'index'
-
-= img 'test'
+%p Managing static site with Haml & Sass

data/example/src/stylesheets/application.sass

@@ -1,2 +1,4 @@
 body
-  :color = #ff0000
+  :font
+    :family verdana
+    :size 10pt

data/lib/staticmatic/base.rb

@@ -0,0 +1,158 @@
+module StaticMatic
+  class Base
+    VERSION = '0.2.0'
+
+    # Directories generated for a new site setup
+    @@base_dirs = %w{
+      site/
+      site/stylesheets
+      site/images
+      site/javascripts
+      src/
+      src/pages/
+      src/layouts
+      src/stylesheets
+    }
+  
+    # Templates for setup and their location
+    @@templates = {
+      'application.haml' => 'layouts',
+      'application.sass' => 'stylesheets',
+      'index.haml' => 'pages'
+    }
+      
+    def initialize(base_dir)
+      @base_dir = base_dir
+      @src_dir = "#{@base_dir}/src"
+      @site_dir = "#{@base_dir}/site"
+      @templates_dir = File.dirname(__FILE__) + '/templates'
+    end
+  
+    def run(command)
+      valid_commands = ['build', 'setup', 'preview']
+      
+      if valid_commands.include?(command)
+        send(command)
+      else
+        puts "#{command} is not a valid StaticMatic command"
+      end
+    end
+    
+    def build
+      build_css
+      build_html
+    end
+  
+    def setup
+      if !File.exists?(@base_dir)
+        Dir.mkdir(@base_dir)
+      end
+    
+      @@base_dirs.each do |directory|
+        directory = "#{@base_dir}/#{directory}"
+        if !File.exists?(directory)
+          Dir.mkdir(directory)
+          puts "created #{directory}"
+        end
+      end
+  
+      @@templates.each do |template, destination|
+        copy_file("#{@templates_dir}/#{template}", "#{@src_dir}/#{destination}")
+      end
+  
+      puts "Done"
+    end
+    
+    def preview
+      puts "StaticMatic Preview Server Starting..."
+      StaticMatic::Server.start(@base_dir)
+    end
+  
+    def copy_file(from, to)
+      FileUtils.cp(from, to)
+    end
+  
+    def save_page(filename, content)
+      filename = "#{filename}"
+      generate_site_file(filename, 'html', content)
+    end
+  
+    def save_stylesheet(filename, content)
+      filename = "stylesheets/#{filename}"
+      generate_site_file(filename, 'css', content)
+    end
+  
+    def generate_site_file(filename, extension, content)
+      path = File.join(@site_dir,"#{filename}.#{extension}")
+      File.open(path, 'w+') do |f|
+        f << content
+      end
+      
+      puts "created #{path}"
+    end
+    
+    # Keeps track of the layout template to use when generating the site
+    #
+    def layout=(name)
+      if name != @layout_name
+        @layout_name = name
+      end
+    end
+    
+    def layout
+      if !@layout_name
+        @layout_name = "application"
+      end
+           
+      File.read("#{@src_dir}/layouts/#{@layout_name}.haml")
+    end
+    
+    # Generate html from source file:
+    # generate_html("index.haml")
+    def generate_html(source_file)
+      page = Haml::Engine.new(File.read("#{@src_dir}/pages/#{source_file}.haml"), :locals => {:base_dir => @base_dir})
+      page.render
+    end
+    
+    def generate_html_with_layout(source)
+      Haml::Engine.new(layout, :locals => {:base_dir => @base_dir}).to_html { generate_html(source) }
+    end
+    
+    def generate_css(source)
+      stylesheet = Sass::Engine.new(File.read("#{@src_dir}/stylesheets/#{source}.sass"))
+      stylesheet.to_css
+    end
+  
+    def template_exists?(name)
+      File.exists?("#{@src_dir}/pages/#{name}.haml") || File.exists?("#{@src_dir}/stylesheets/#{name}.sass")
+     end
+    
+    # Build HTML from the source files
+    def build_html
+      Dir["#{@src_dir}/pages/**/*.haml"].each do |path|
+        template = source_template_from_path(path)
+        save_page(template, generate_html_with_layout(template))
+      end
+    end
+  
+    # Build CSS from the source files
+    def build_css
+      Dir["#{@src_dir}/stylesheets/**/*.sass"].each do |path|
+        template = source_template_from_path(path)
+        save_stylesheet(template, generate_css(template))
+      end
+    end
+    
+    # Returns a raw template name from a source file path:
+    # source_template_from_path("/path/to/site/src/stylesheets/application.sass")  ->  "application"
+    def source_template_from_path(path)
+      File.basename(path).chomp(File.extname(path))
+    end
+  
+    class << self
+      def base_dirs
+        @@base_dirs
+      end
+    end
+  end
+end

data/lib/staticmatic/helpers.rb

@@ -1,14 +1,13 @@
 module Haml
   module Helpers
     
-    # Generates links to all stylesheets in the site's directory
+    # Generates links to all stylesheets in the source directory
     def stylesheets
-      stylesheet_dir = "#{base_dir}/site/stylesheets/"
+      stylesheet_dir = "#{base_dir}/src/stylesheets"
       output = ""
-      Dir.entries(stylesheet_dir).each do |file|
-        if file.match(/([a-z0-9_-]+)\.css$/)
-          output << tag(:link, :href => "stylesheets/#{file}", :rel => 'stylesheet', :media => 'all')
-        end
+      Dir["#{stylesheet_dir}/**/*.sass"].each do |path|
+        filename_without_extension = File.basename(path).chomp(File.extname(path))
+        output << tag(:link, :href => "stylesheets/#{filename_without_extension}.css", :rel => 'stylesheet', :media => 'all')
       end
       
       output

data/lib/staticmatic/server.rb

@@ -0,0 +1,67 @@
+module StaticMatic
+  class Server < Mongrel::HttpHandler
+    @@file_only_methods = ["GET","HEAD"]
+ 
+    def initialize(base_dir)
+      @files = Mongrel::DirHandler.new("#{base_dir}/site",false)
+      @staticmatic = StaticMatic::Base.new(base_dir)
+    end
+  
+    def process(request, response)
+      path_info = request.params[Mongrel::Const::PATH_INFO]
+      get_or_head = @@file_only_methods.include? request.params[Mongrel::Const::REQUEST_METHOD]
+      
+      file_to_serve = path_info
+      
+      file_name, file_ext = path_info.split('.')
+      
+      if file_name == "/"
+        file_name = "index"
+        file_ext = "html"
+      end
+      
+      # remove stylesheets/ directory if applicable
+      file_name.gsub!("/stylesheets/", "")
+      
+      if file_ext && file_ext.match(/html|css/)
+        response.start(200) do |head, out|
+          output = ""
+          
+          if @staticmatic.template_exists?(file_name)
+            if file_ext == "html"
+              output = @staticmatic.generate_html_with_layout("#{file_name}")
+            elsif file_ext == "css"
+              output = @staticmatic.generate_css("#{file_name}")
+            end
+          else
+            output = "File not Found"
+          end
+          out.write output
+        end
+      else
+        # try to serve static file from site dir
+        if @files.can_serve(path_info)
+          @files.process(request,response)
+        end
+      end
+    end
+    
+    class << self
+      # Starts the StaticMatic preview server
+      #
+      # StaticMatic.start('/path/to/site/')
+      #
+      def start(base_dir, port = 3000)
+        config = Mongrel::Configurator.new :host => "127.0.0.1" do
+          puts "Running Preview of #{base_dir} on 127.0.0.1:#{port}"
+          listener :port => port do
+            uri "/", :handler => Server.new(base_dir)
+          end
+          trap("INT") { stop }
+          run
+        end
+        config.join
+      end
+    end
+  end
+end

data/lib/staticmatic/templates/application.sass

@@ -1,2 +1,4 @@
 body
-  :font-family = "Verdana, Helvetica, sans-serif"
+  :font
+    :family Verdana
+    :size 10pt

data/lib/staticmatic.rb

@@ -1,112 +1,6 @@
 require 'rubygems'
 require 'haml'
+require 'mongrel'
 require File.dirname(__FILE__) + '/staticmatic/helpers'
-
-class StaticMatic
-  VERSION = '0.1.0'
-
-  # Directories generated for a new site setup
-  cattr_reader :base_dirs
-  @@base_dirs = %w{
-    site/
-    site/stylesheets
-    site/images
-    site/javascripts
-    src/
-    src/pages/
-    src/layouts
-    src/stylesheets
-  }
-  
-  # Templates for setup and their location
-  @@templates = {
-    'application.haml' => 'layouts',
-    'application.sass' => 'stylesheets',
-    'index.haml' => 'pages'
-  }
-  
-  def initialize(base_dir)
-    @base_dir = base_dir
-    @src_dir = "#{@base_dir}/src"
-    @site_dir = "#{@base_dir}/site"
-    @templates_dir = File.dirname(__FILE__) + '/staticmatic/templates'
-  end
-  
-  def build
-    build_css
-    build_html
-  end
-  
-  def setup
-    if !File.exists?(@base_dir)
-      Dir.mkdir(@base_dir)
-    end
-    
-    @@base_dirs.each do |directory|
-      directory = "#{@base_dir}/#{directory}"
-      if !File.exists?(directory)
-        Dir.mkdir(directory)
-        puts "created #{directory}"
-      end
-    end
-  
-    @@templates.each do |template, destination|
-      copy_file("#{@templates_dir}/#{template}", "#{@src_dir}/#{destination}")
-    end
-  
-    puts "Done"
-  end
-  
-  private
-  
-  def copy_file(from, to)
-    `cp #{from} #{to}`
-  end
-  
-  def save_page(filename, content)
-    filename = "#{filename}"
-    generate_site_file(filename, 'html', content)
-  end
-  
-  def save_stylesheet(filename, content)
-    filename = "stylesheets/#{filename}"
-    generate_site_file(filename, 'css', content)
-  end
-  
-  def generate_site_file(filename, extension, content)
-    site_file = File.new("#{@site_dir}/#{filename}.#{extension}", 'w+')
-    site_file << content
-    site_file.close
-    puts "created #{@site_dir}/#{filename}.#{extension}"
-  end
-  
-  def build_html
-    layout_content = File.read("#{@src_dir}/layouts/application.haml")
-    
-    Dir.entries("#{@src_dir}/pages").each do |file|
-      if matches = file.match(/([a-z0-9_-]+)\.haml$/)
-        
-        filename_without_extension = matches[1]
-        
-        page = Haml::Engine.new(File.read("#{@src_dir}/pages/#{file}"), :locals => {:base_dir => @base_dir})
-        page_content = page.render
-
-        content_with_layout = Haml::Engine.new(layout_content, :locals => {:base_dir => @base_dir}).render { page_content }
-        
-        save_page(filename_without_extension, content_with_layout)
-      end
-    end
-  end
-  
-  def build_css
-    Dir.entries("#{@src_dir}/stylesheets").each do |file|
-      if matches = file.match(/([a-z0-9_-]+)\.sass$/)
-        filename_without_extension = matches[1]
-        
-        stylesheet = Sass::Engine.new(File.read("#{@src_dir}/stylesheets/#{file}"))
-
-        save_stylesheet(filename_without_extension, stylesheet.render)
-      end
-    end
-  end
-end
+require File.dirname(__FILE__) + '/staticmatic/base'
+require File.dirname(__FILE__) + '/staticmatic/server'

data/test/base_test.rb

@@ -0,0 +1,48 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/staticmatic'
+
+class StaticMaticBaseTest < Test::Unit::TestCase
+  def setup
+    @base_dir = File.dirname(__FILE__) + '/sandbox/test_site'
+    @tmp_dir = File.dirname(__FILE__) + '/sandbox/tmp'
+    
+    @staticmatic = StaticMatic::Base.new(@base_dir)
+  end
+  
+  def test_should_setup_directories
+    staticmatic = StaticMatic::Base.new(@tmp_dir)
+    staticmatic.run('setup')
+    
+    StaticMatic::Base.base_dirs.each do |dir|
+      assert File.exists?("#{@tmp_dir}/#{dir}"), "Should create #{dir}"
+    end
+    
+    StaticMatic::Base.base_dirs.reverse.each do |dir|
+      Dir.entries("#{@tmp_dir}/#{dir}").each do |file|
+        next if file.match(/^\./)
+        File.delete("#{@tmp_dir}/#{dir}/#{file}")
+      end
+      Dir.delete("#{@tmp_dir}/#{dir}") if File.exists?("#{@tmp_dir}/#{dir}")
+    end
+
+  end
+  
+  def test_should_set_layout_template
+    @staticmatic.layout = "application"
+    assert_match "StaticMatic - Test Site Template", @staticmatic.layout
+  end
+
+  def test_should_generate_html_with_layout
+    content = @staticmatic.generate_html_with_layout("index")
+    assert_match "StaticMatic - Test Site Template", content
+    assert_match "This is some test content", content
+  end
+  
+  def test_should_generate_css
+    content = @staticmatic.generate_css("application")
+  end
+  
+  def test_should_find_source_filename_from_path
+    assert_equal "application", @staticmatic.source_template_from_path("@base_dir/src/stylesheets/application.css")
+  end
+end

data/test/server_test.rb

@@ -0,0 +1,9 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/staticmatic'
+
+class StaticMaticServerTest < Test::Unit::TestCase
+  def setup
+    @base_dir = File.dirname(__FILE__) + '/sandbox/tmp'
+  end
+
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: staticmatic
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-05-27 00:00:00 +01:00
+  version: 0.2.0
+date: 2007-06-10 00:00:00 +01:00
 summary: Manage static sites using Haml & Sass
 require_paths: 
 - lib
@@ -53,14 +53,17 @@ files:
 - example/src/stylesheets/application.sass
 - lib/staticmatic
 - lib/staticmatic.rb
+- lib/staticmatic/base.rb
 - lib/staticmatic/helpers.rb
+- lib/staticmatic/server.rb
 - lib/staticmatic/templates
 - lib/staticmatic/templates/application.haml
 - lib/staticmatic/templates/application.sass
 - lib/staticmatic/templates/index.haml
+- test/base_test.rb
 - test/helpers_test.rb
 - test/sandbox
-- test/staticmatic_test.rb
+- test/server_test.rb
 - test/sandbox/test_site
 - test/sandbox/tmp
 - test/sandbox/test_site/config.rb
@@ -78,8 +81,9 @@ files:
 - test/sandbox/test_site/src/pages/index.haml
 - test/sandbox/test_site/src/stylesheets/application.sass
 test_files: 
+- test/base_test.rb
 - test/helpers_test.rb
-- test/staticmatic_test.rb
+- test/server_test.rb
 rdoc_options: []
 
 extra_rdoc_files: []

data/test/staticmatic_test.rb

@@ -1,27 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/staticmatic'
-
-class StaticMaticTest < Test::Unit::TestCase
-  def setup
-    @base_dir = File.dirname(__FILE__) + '/sandbox/tmp'
-  end
-  
-  def test_should_setup_directories
-    staticmatic = StaticMatic.new(@base_dir)
-    staticmatic.setup
-    
-    StaticMatic.base_dirs.each do |dir|
-      assert File.exists?("#{@base_dir}/#{dir}"), "Should create #{dir}"
-    end
-  end
-  
-  def teardown
-    StaticMatic.base_dirs.reverse.each do |dir|
-      Dir.entries("#{@base_dir}/#{dir}").each do |file|
-        next if file.match(/^\./)
-        File.delete("#{@base_dir}/#{dir}/#{file}")
-      end
-      Dir.delete("#{@base_dir}/#{dir}") if File.exists?("#{@base_dir}/#{dir}")
-    end
-  end
-end