staticmatic 0.10.1 → 0.10.2

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (C) 2009 Stephen Bartholomew
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,30 +1,29 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+require "rubygems"
+require "rake"
+require "rake/testtask"
 require File.dirname(__FILE__) + '/lib/staticmatic'
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('staticmatic', StaticMatic::VERSION) do |p|
-  p.developer('Stephen Bartholomew', 'steve@curve21.com')
-  p.summary = "Lightweight Static Site Framework"
-  p.rubyforge_name       = p.name 
-  p.extra_deps         = [
-    ['haml','>= 2.0'],
-    ['mongrel','>= 1.0']
-  ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'markdown')
-  p.rsync_args = '-av --delete --ignore-errors'
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "staticmatic"
+    gem.executables = "staticmatic"
+    gem.summary = "Lightweight Static Site Framework"
+    gem.email = "steve@curve21.com"
+    gem.homepage = "http://staticmatic.net"
+    gem.description = "Lightweight Static Site Framework"
+    gem.authors = ["Stephen Bartholomew"]
+    gem.rubyforge_project = "staticmatic"
+    
+    gem.files =  FileList["[A-Z]*", "{bin,lib,test}/**/*"]
+    
+    gem.add_dependency("haml", ">=2.0.0")
+    gem.add_dependency("mongrel", ">=1.1.5")
+  end
+rescue LoadError
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gemgem.github.com"
 end
 
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-
 desc "Run all unit tests"
 Rake::TestTask.new(:test) do |t|
   t.test_files = Dir.glob("test/*_test.rb")

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:major: 0
+:minor: 10
+:patch: 2

data/lib/staticmatic.rb

@@ -5,7 +5,7 @@ require 'mongrel'
 require 'fileutils'
 
 module StaticMatic
-  VERSION = '0.10.1'
+  VERSION = '0.10.2'
 end
 
 ["render", "build", "setup", "server", "helpers", "rescue"].each do |mixin|

data/lib/staticmatic/mixins/render.rb

@@ -16,7 +16,7 @@ module StaticMatic::RenderMixin
     begin
       # clear all scope variables except @staticmatic
       @scope.instance_variables.each do |var|
-        @scope.instance_variable_set(var, nil) unless var == '@staticmatic' 
+        @scope.instance_variable_set(var, nil) unless var == ('@staticmatic' || :@staticmatic) 
       end
       html = generate_html_from_template_source(File.read(full_file_path))
   
@@ -94,8 +94,8 @@ module StaticMatic::RenderMixin
   #
   def generate_html_from_template_source(source, options = {})
     html = Haml::Engine.new(source, self.configuration.haml_options.merge(options))
-    
-    html.render(@scope, options) { yield }
+    locals = options[:locals] || {}
+    html.render(@scope, locals) { yield }
   end
 
   def determine_layout(dir = '')

data/test/base_test.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + "/test_helper"
+
+class StaticMatic::BaseTest < Test::Unit::TestCase
+  def setup
+    setup_staticmatic
+  end
+
+  should "set initial configuration settings" do
+    assert_equal true, @staticmatic.configuration.use_extensions_for_page_links
+    assert_equal 3000, @staticmatic.configuration.preview_server_port
+  end
+
+end

data/test/helpers_test.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + "/test_helper"
+
+class StaticMatic::HelpersTest < Test::Unit::TestCase
+  def setup
+    setup_staticmatic
+  end
+  
+  should "include custom helper" do
+    content = @staticmatic.generate_html_with_layout("index")
+    assert_match "Hello, Steve!", content
+  end
+end

data/test/render_test.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + "/test_helper"
+
+class StaticMatic::RenderTest < Test::Unit::TestCase
+  def setup
+    setup_staticmatic
+  end
+  
+  should "generate content with a layout" do
+    content = @staticmatic.generate_html_with_layout("index")
+    assert_match "StaticMatic", content
+    assert_match "This is some test content", content
+  end
+  
+  should "generate html with layout assigned in template" do
+    content = @staticmatic.generate_html_with_layout("layout_test")
+    assert_match "Alternate Layout", content
+  end
+  
+  should "generate css" do
+    content = @staticmatic.generate_css("application")
+  end
+  
+  should "find source filename from path" do
+    assert_equal "application", @staticmatic.source_template_from_path("@base_dir/src/stylesheets/application.css")[1]
+  end
+  
+  should "find layout from passed path" do
+    assert_equal "projects", @staticmatic.determine_layout("test/projects")
+  end
+end

data/test/rescue_test.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + "/test_helper"
+
+class StaticMatic::RescueTest < Test::Unit::TestCase
+  def setup
+    setup_staticmatic
+  end
+  
+  should "catch haml template errors" do
+    output = @staticmatic.generate_html_with_layout("page_with_error")
+    assert_match /StaticMatic::TemplateError/, output 
+  end
+  
+  should "catch sass template errors" do
+    output = @staticmatic.generate_css("css_with_error")
+    assert_match /StaticMatic::TemplateError/, output 
+  end
+  
+  should "re-raise and catch partial errors" do
+    begin
+      @staticmatic.generate_html("page_with_partial_error")
+    rescue StaticMatic::TemplateError => template_error
+      assert_match /partials\/partial_with_error/, template_error.filename
+    end
+  end
+  
+  should "handle non-template errors" do
+    begin
+      raise Exception.new("This is an exception")
+    rescue Exception => e
+      output = @staticmatic.render_rescue_from_error(e)
+    end
+    
+    assert_match /Exception/, output
+    assert_match /This is an exception/, output
+  end
+end

data/test/sandbox/test_site/site/index

@@ -0,0 +1,3 @@
+<h1>StaticMatic!</h1>
+<p>This is some test content</p>
+Hello, Steve!

data/test/sandbox/test_site/site/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <title>StaticMatic</title>
+    <link rel="stylesheet" href="stylesheets/application.css" media="all"/>
+  </head>
+  <body>
+    <h1>StaticMatic!</h1>
+  </body>
+</html>

data/test/sandbox/test_site/site/layout_test

@@ -0,0 +1 @@
+<p>This is a layout test</p>

data/test/sandbox/test_site/site/page_with_error

@@ -0,0 +1,4 @@
+<h1>NoMethodError</h1>
+<p>undefined method `bang!' for #<Object:0x1973d98></p>
+<h2>Stack Trace</h2>
+(haml):3:in `render'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `render'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `instance_eval'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `render'<br/>./bin/../lib/staticmatic/handlers/haml.rb:8:in `compile'<br/>./bin/../lib/staticmatic/template.rb:17:in `template_for'<br/>./bin/../lib/staticmatic/mixins/render.rb:4:in `render'<br/>./bin/../lib/staticmatic/mixins/build.rb:8:in `build'<br/>./bin/../lib/staticmatic/mixins/build.rb:4:in `each'<br/>./bin/../lib/staticmatic/mixins/build.rb:4:in `build'<br/>./bin/../lib/staticmatic/base.rb:58:in `send'<br/>./bin/../lib/staticmatic/base.rb:58:in `run'<br/>bin/staticmatic:23

data/test/sandbox/test_site/site/page_with_partial_error

@@ -0,0 +1,4 @@
+<h1>NoMethodError</h1>
+<p>undefined method `generate_partial' for nil:NilClass</p>
+<h2>Stack Trace</h2>
+./bin/../lib/staticmatic/helpers.rb:178:in `partial'<br/>(haml):3:in `render'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `render'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `instance_eval'<br/>/usr/local/lib/ruby/gems/1.8/gems/haml-2.0.4/lib/haml/engine.rb:149:in `render'<br/>./bin/../lib/staticmatic/handlers/haml.rb:8:in `compile'<br/>./bin/../lib/staticmatic/template.rb:17:in `template_for'<br/>./bin/../lib/staticmatic/mixins/render.rb:4:in `render'<br/>./bin/../lib/staticmatic/mixins/build.rb:8:in `build'<br/>./bin/../lib/staticmatic/mixins/build.rb:4:in `each'<br/>./bin/../lib/staticmatic/mixins/build.rb:4:in `build'<br/>./bin/../lib/staticmatic/base.rb:58:in `send'<br/>./bin/../lib/staticmatic/base.rb:58:in `run'<br/>bin/staticmatic:23

data/test/sandbox/test_site/site/stylesheets/application.css

@@ -0,0 +1,2 @@
+body {
+  font-family: Verdana, Helvetica, sans-serif; }

data/test/sandbox/test_site/site/sub_folder/another_sub_folder.

@@ -0,0 +1,4 @@
+<h1>NoMethodError</h1>
+<p>undefined method `[]' for nil:NilClass</p>
+<h2>Stack Trace</h2>
+./bin/../lib/staticmatic/template.rb:27:in `handler_for'<br/>./bin/../lib/staticmatic/template.rb:13:in `template_for'<br/>./bin/../lib/staticmatic/mixins/render.rb:4:in `render'<br/>./bin/../lib/staticmatic/mixins/build.rb:9:in `build'<br/>./bin/../lib/staticmatic/mixins/build.rb:4:in `each'<br/>./bin/../lib/staticmatic/mixins/build.rb:4:in `build'<br/>./bin/../lib/staticmatic/base.rb:58:in `send'<br/>./bin/../lib/staticmatic/base.rb:58:in `run'<br/>bin/staticmatic:23

data/test/sandbox/test_site/site/sub_folder/another_sub_folder/index.html

@@ -0,0 +1 @@
+Sub sub folder test

data/test/sandbox/test_site/site/sub_folder/another_sub_folder/index.html.html

@@ -0,0 +1 @@
+Sub sub folder test

data/test/sandbox/test_site/site/sub_folder/index.html

@@ -0,0 +1 @@
+An index of a sub folder

data/test/sandbox/test_site/src/helpers/application_helper.rb

@@ -0,0 +1,5 @@
+module ApplicationHelper
+  def greet(name)
+    "Hello, #{name}!"
+  end
+end

data/test/sandbox/test_site/src/layouts/alternate_layout.haml

@@ -0,0 +1,3 @@
+%h1 Alternate Layout
+
+= yield

data/test/sandbox/test_site/src/layouts/application.haml

@@ -0,0 +1,7 @@
+!!!
+%html
+  %head
+    %title StaticMatic
+    = stylesheets
+  %body
+    = yield

data/test/sandbox/test_site/src/layouts/projects.haml

@@ -0,0 +1 @@
+%h1 Sub dir test

data/test/sandbox/test_site/src/pages/hello_world.erb

@@ -0,0 +1 @@
+<%= "Hello World!" %>

data/test/sandbox/test_site/src/pages/index.haml

@@ -0,0 +1,5 @@
+%h1 StaticMatic!
+
+%p This is some test content
+
+= greet("Steve")

data/test/sandbox/test_site/src/pages/layout_test.haml

@@ -0,0 +1,2 @@
+- @layout = "alternate_layout"
+%p This is a layout test

data/test/sandbox/test_site/src/pages/page_with_error.haml

@@ -0,0 +1,5 @@
+%h1 Hello
+
+- bang!
+
+%h2 A test

data/test/sandbox/test_site/src/pages/page_with_partial_error.haml

@@ -0,0 +1,3 @@
+%h1 Partial Error
+
+= partial "partial_with_error"

data/test/sandbox/test_site/src/partials/menu.haml

@@ -0,0 +1 @@
+My Menu

data/test/sandbox/test_site/src/partials/partial_with_error.haml

@@ -0,0 +1 @@
+- bang!

data/test/sandbox/test_site/src/stylesheets/application.sass

@@ -0,0 +1,2 @@
+body
+  :font-family = "Verdana, Helvetica, sans-serif"

data/test/sandbox/test_site/src/stylesheets/css_with_error.sass

@@ -0,0 +1,5 @@
+body
+    syntax--- error
+
+h1
+  :font-family Arial

data/test/server_test.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + "/test_helper"
+
+
+class StaticMatic::ServerTest < Test::Unit::TestCase
+  def setup
+    @base_dir = File.dirname(__FILE__) + '/sandbox/tmp'
+  end
+
+  def test_default
+    assert true
+  end
+end

data/test/setup_test.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + "/test_helper"
+
+class StaticMatic::SetupTest < Test::Unit::TestCase
+  def setup
+    setup_staticmatic
+  end
+  
+  should "setup directories" do
+    tmp_dir = File.dirname(__FILE__) + '/sandbox/tmp'
+    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
+end

data/test/template_error_test.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + "/test_helper"
+
+class StaticMatic::TemplateTest < Test::Unit::TestCase
+  def setup
+    setup_staticmatic
+    
+    template_file = File.join(TEST_SITE_PATH, "src", "pages", "page_with_error.haml")
+    
+    begin
+      @staticmatic.generate_html_from_template_source(File.read(template_file))
+    rescue Exception => e
+      @template_error = StaticMatic::TemplateError.new(template_file, e)
+    end
+  end
+  
+  should "extract source around line number" do
+    assert_match /\- bang\!/, @template_error.source_extract
+  end
+  
+  should "extract line number from backtrace" do
+    assert_equal "3", @template_error.line_number
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: staticmatic
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-30 00:00:00 +00:00
-default_executable: 
+date: 2009-09-20 00:00:00 +01:00
+default_executable: staticmatic
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel
@@ -30,44 +30,22 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.0"
+        version: 1.1.5
     version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-description: 
-email: 
-- steve@curve21.com
+description: Lightweight Static Site Framework
+email: steve@curve21.com
 executables: 
 - staticmatic
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.rdoc
+- LICENSE
+- README.markdown
 files: 
-- History.txt
-- Manifest.txt
-- README.rdoc
+- LICENSE
+- README.markdown
 - Rakefile
+- VERSION.yml
 - bin/staticmatic
 - lib/staticmatic.rb
 - lib/staticmatic/base.rb
@@ -77,22 +55,55 @@ files:
 - lib/staticmatic/mixins/build.rb
 - lib/staticmatic/mixins/helpers.rb
 - lib/staticmatic/mixins/render.rb
+- lib/staticmatic/mixins/rescue.rb
 - lib/staticmatic/mixins/server.rb
 - lib/staticmatic/mixins/setup.rb
 - lib/staticmatic/server.rb
+- lib/staticmatic/template_error.rb
 - lib/staticmatic/templates/default/application.haml
 - lib/staticmatic/templates/default/application.sass
 - lib/staticmatic/templates/default/index.haml
 - lib/staticmatic/templates/rescues/default.haml
 - lib/staticmatic/templates/rescues/template.haml
-- lib/staticmatic/template_error.rb
-- lib/staticmatic/mixins/rescue.rb
+- test/base_test.rb
+- test/helpers_test.rb
+- test/render_test.rb
+- test/rescue_test.rb
+- test/sandbox/test_site/configuration.rb
+- test/sandbox/test_site/site/index
+- test/sandbox/test_site/site/index.html
+- test/sandbox/test_site/site/layout_test
+- test/sandbox/test_site/site/page_with_error
+- test/sandbox/test_site/site/page_with_partial_error
+- test/sandbox/test_site/site/stylesheets/application.css
+- test/sandbox/test_site/site/sub_folder/another_sub_folder.
+- test/sandbox/test_site/site/sub_folder/another_sub_folder/index.html
+- test/sandbox/test_site/site/sub_folder/another_sub_folder/index.html.html
+- test/sandbox/test_site/site/sub_folder/index.html
+- test/sandbox/test_site/src/helpers/application_helper.rb
+- test/sandbox/test_site/src/layouts/alternate_layout.haml
+- test/sandbox/test_site/src/layouts/application.haml
+- test/sandbox/test_site/src/layouts/projects.haml
+- test/sandbox/test_site/src/pages/hello_world.erb
+- test/sandbox/test_site/src/pages/index.haml
+- test/sandbox/test_site/src/pages/layout_test.haml
+- test/sandbox/test_site/src/pages/page_with_error.haml
+- test/sandbox/test_site/src/pages/page_with_partial_error.haml
+- test/sandbox/test_site/src/partials/menu.haml
+- test/sandbox/test_site/src/partials/partial_with_error.haml
+- test/sandbox/test_site/src/stylesheets/application.sass
+- test/sandbox/test_site/src/stylesheets/css_with_error.sass
+- test/server_test.rb
+- test/setup_test.rb
+- test/template_error_test.rb
+- test/test_helper.rb
 has_rdoc: true
-homepage: 
+homepage: http://staticmatic.net
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -110,9 +121,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: staticmatic
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Lightweight Static Site Framework
 test_files: 
+- test/base_test.rb
+- test/helpers_test.rb
+- test/render_test.rb
+- test/rescue_test.rb
+- test/sandbox/test_site/configuration.rb
+- test/sandbox/test_site/src/helpers/application_helper.rb
+- test/server_test.rb
+- test/setup_test.rb
+- test/template_error_test.rb
 - test/test_helper.rb

data/History.txt

@@ -1,6 +0,0 @@
-== 0.10.0 2009-01-01
-
-* Refactoring for forthcoming improvements
-* Improved Error Reporting
-	* More useful error pages
-	* Removed Haml specific error handling

data/Manifest.txt

@@ -1,24 +0,0 @@
-History.txt
-Manifest.txt
-README.rdoc
-Rakefile
-bin/staticmatic
-lib/staticmatic.rb
-lib/staticmatic/base.rb
-lib/staticmatic/configuration.rb
-lib/staticmatic/error.rb
-lib/staticmatic/helpers.rb
-lib/staticmatic/mixins/build.rb
-lib/staticmatic/mixins/helpers.rb
-lib/staticmatic/mixins/render.rb
-lib/staticmatic/mixins/server.rb
-lib/staticmatic/mixins/setup.rb
-lib/staticmatic/server.rb
-lib/staticmatic/templates/default/application.haml
-lib/staticmatic/templates/default/application.sass
-lib/staticmatic/templates/default/index.haml
-lib/staticmatic/templates/default/index.haml
-lib/staticmatic/templates/rescues/default.haml
-lib/staticmatic/templates/rescues/template.haml
-lib/staticmatic/template_error.rb
-lib/staticmatic/mixins/rescue.rb