staticmatic 0.10.2 → 0.10.3

data/Rakefile

@@ -1,6 +1,6 @@
 require "rubygems"
-require "rake"
-require "rake/testtask"
+require 'spec/rake/spectask'
+
 require File.dirname(__FILE__) + '/lib/staticmatic'
 
 begin
@@ -15,7 +15,7 @@ begin
     gem.authors = ["Stephen Bartholomew"]
     gem.rubyforge_project = "staticmatic"
     
-    gem.files =  FileList["[A-Z]*", "{bin,lib,test}/**/*"]
+    gem.files =  FileList["[A-Z]*", "{bin,lib,spec}/**/*"]
     
     gem.add_dependency("haml", ">=2.0.0")
     gem.add_dependency("mongrel", ">=1.1.5")
@@ -24,8 +24,8 @@ 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
 
-desc "Run all unit tests"
-Rake::TestTask.new(:test) do |t|
-  t.test_files = Dir.glob("test/*_test.rb")
-  t.verbose = true
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+  # spec.spec_opts = ['--options', 'spec/spec.opts']
 end

data/VERSION.yml

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

data/lib/staticmatic/base.rb

@@ -39,13 +39,15 @@ module StaticMatic
       @configuration = configuration
       @current_page = nil
       @current_file_stack = []
-      @base_dir = base_dir
+      @base_dir = File.expand_path(base_dir)
       @src_dir = "#{@base_dir}/src"
       @site_dir = "#{@base_dir}/site"
       @templates_dir = File.dirname(__FILE__) + '/templates/default/'
+      
       @layout = "application"
       @scope = Object.new
       @scope.instance_variable_set("@staticmatic", self)
+      
       load_helpers
     end
     

data/lib/staticmatic/helpers.rb

@@ -40,10 +40,16 @@ module StaticMatic
         end
 
         stylesheet_directories.each do |path|
+          
           filename_without_extension = File.basename(path).chomp(File.extname(path))
-
-          options[:href] = "#{relative_path}stylesheets/#{filename_without_extension}.css"
-          output << tag(:link, options)
+          
+          if !filename_without_extension.match(/^\_/)
+            relative_path = path.gsub(/#{@staticmatic.base_dir}\/(src|site)\//, "").
+                                 gsub(/#{filename_without_extension}\.(sass|css)/, "")
+          
+            options[:href] = "#{relative_path}#{filename_without_extension}.css"
+            output << tag(:link, options)
+          end
         end
       else
         #specific files requested and in a specific order

data/lib/staticmatic/templates/default/application.sass

@@ -1,4 +1,4 @@
 body
-  :font
-    :family Verdana
-    :size 10pt
+  font:
+    family: Verdana
+    size: 10pt

data/lib/staticmatic.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'haml'
 require 'sass'
+require 'sass/plugin'
 require 'mongrel'
 require 'fileutils'
 

data/spec/base_spec.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "StaticMatic::Base" do
+  before do
+    setup_staticmatic
+  end
+
+  it "should set initial configuration settings" do
+    @staticmatic.configuration.use_extensions_for_page_links.should == true
+    @staticmatic.configuration.preview_server_port.should == 3000
+  end
+
+end

data/spec/helpers_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "Helpers:" do
+  include StaticMatic::Helpers
+  before do
+    setup_staticmatic
+    @staticmatic.instance_variable_set("@current_page", "")
+  end
+  
+  it "should include custom helper" do
+    content = @staticmatic.generate_html_with_layout("index")
+    content.should match(/Hello, Steve!/)
+  end
+  
+  context "When using the stylesheet helper" do
+    before do
+      @links = stylesheets
+    end
+    
+    it "should set up links for all stylesheets" do
+      @links.should match(/stylesheets\/application\.css/)
+      @links.should match(/stylesheets\/nested\/a_nested_stylesheet\.css/)
+    end
+    
+    it "should not link to partials" do
+      @links.should_not match(/\_forms.css/)
+    end
+  end
+end

data/spec/render_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "StaticMatic::Render" do
+  before do
+    setup_staticmatic
+  end
+  
+  it "generate content with a layout" do
+    content = @staticmatic.generate_html_with_layout("index")
+    content.should match(/StaticMatic/)
+    content.should match(/This is some test content/)
+  end
+  
+  it "generate html with layout assigned in template" do
+    content = @staticmatic.generate_html_with_layout("layout_test")
+    content.should match(/Alternate Layout/)
+  end
+  
+  it "generate css" do
+    content = @staticmatic.generate_css("application")
+  end
+  
+  it "find source filename from path" do
+    @staticmatic.source_template_from_path("@base_dir/src/stylesheets/application.css")[1].should == "application"
+  end
+  
+  it "find layout from passed path" do
+    @staticmatic.determine_layout("test/projects").should == "projects"
+  end
+  
+end

data/spec/rescue_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "StaticMatic::Rescue" do
+  before do
+    setup_staticmatic
+  end
+  
+  it "catch haml template errors" do
+    output = @staticmatic.generate_html_with_layout("page_with_error")
+    output.should match(/StaticMatic::TemplateError/)
+  end
+  
+  it "catch sass template errors" do
+    output = @staticmatic.generate_css("css_with_error")
+    output.should match(/StaticMatic::TemplateError/)
+  end
+  
+  it "re-raise and catch partial errors" do
+    begin
+      @staticmatic.generate_html("page_with_partial_error")
+    rescue StaticMatic::TemplateError => template_error
+      template_error.filename.should match(/partials\/partial_with_error/)
+    end
+  end
+  
+  it "handle non-template errors" do
+    begin
+      raise Exception.new("This is an exception")
+    rescue Exception => e
+      output = @staticmatic.render_rescue_from_error(e)
+    end
+    
+    output.should match(/Exception/)
+    output.should match(/This is an exception/)
+  end
+end

data/spec/sandbox/test_site/src/stylesheets/partials/_forms.sass

@@ -0,0 +1,2 @@
+input 
+  font-size: 12pt

data/spec/server_spec.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+
+describe "StaticMatic::Server" do
+  before do
+    @base_dir = File.dirname(__FILE__) + '/sandbox/tmp'
+  end
+
+  it "default" do
+    true.should_not be_nil
+  end
+end

data/{test/setup_test.rb → spec/setup_spec.rb}

@@ -1,17 +1,17 @@
-require File.dirname(__FILE__) + "/test_helper"
+require File.dirname(__FILE__) + "/spec_helper"
 
-class StaticMatic::SetupTest < Test::Unit::TestCase
-  def setup
+describe "StaticMatic::Setup" do
+  before do
     setup_staticmatic
   end
   
-  should "setup directories" do
+  it "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}"
+      File.exists?("#{tmp_dir}/#{dir}").should_not be_nil, "Should create #{dir}"
     end
     
     StaticMatic::Base.base_dirs.reverse.each do |dir|

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'stringio'
+require 'spec'
+
+require File.dirname(__FILE__) + '/../lib/staticmatic'
+
+TEST_SITE_PATH = File.join(File.dirname(__FILE__), "sandbox", "test_site")
+
+Spec::Runner.configure do |config|
+end
+
+def setup_staticmatic
+  @staticmatic = StaticMatic::Base.new(TEST_SITE_PATH)
+end

data/{test/template_error_test.rb → spec/template_error_spec.rb}

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + "/test_helper"
+require File.dirname(__FILE__) + "/spec_helper"
 
-class StaticMatic::TemplateTest < Test::Unit::TestCase
-  def setup
+describe "StaticMatic::Template" do
+  before do
     setup_staticmatic
     
     template_file = File.join(TEST_SITE_PATH, "src", "pages", "page_with_error.haml")
@@ -13,11 +13,11 @@ class StaticMatic::TemplateTest < Test::Unit::TestCase
     end
   end
   
-  should "extract source around line number" do
-    assert_match /\- bang\!/, @template_error.source_extract
+  it "extract source around line number" do
+    @template_error.source_extract.should match(/\- bang\!/)
   end
   
-  should "extract line number from backtrace" do
-    assert_equal "3", @template_error.line_number
+  it "extract line number from backtrace" do
+    @template_error.line_number.should == "3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: staticmatic
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-20 00:00:00 +01:00
+date: 2009-10-05 00:00:00 +01:00
 default_executable: staticmatic
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,38 +65,40 @@ files:
 - lib/staticmatic/templates/default/index.haml
 - lib/staticmatic/templates/rescues/default.haml
 - lib/staticmatic/templates/rescues/template.haml
-- 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
+- spec/base_spec.rb
+- spec/helpers_spec.rb
+- spec/render_spec.rb
+- spec/rescue_spec.rb
+- spec/sandbox/test_site/configuration.rb
+- spec/sandbox/test_site/site/index
+- spec/sandbox/test_site/site/index.html
+- spec/sandbox/test_site/site/layout_test
+- spec/sandbox/test_site/site/page_with_error
+- spec/sandbox/test_site/site/page_with_partial_error
+- spec/sandbox/test_site/site/stylesheets/application.css
+- spec/sandbox/test_site/site/sub_folder/another_sub_folder.
+- spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html
+- spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html.html
+- spec/sandbox/test_site/site/sub_folder/index.html
+- spec/sandbox/test_site/src/helpers/application_helper.rb
+- spec/sandbox/test_site/src/layouts/alternate_layout.haml
+- spec/sandbox/test_site/src/layouts/application.haml
+- spec/sandbox/test_site/src/layouts/projects.haml
+- spec/sandbox/test_site/src/pages/hello_world.erb
+- spec/sandbox/test_site/src/pages/index.haml
+- spec/sandbox/test_site/src/pages/layout_test.haml
+- spec/sandbox/test_site/src/pages/page_with_error.haml
+- spec/sandbox/test_site/src/pages/page_with_partial_error.haml
+- spec/sandbox/test_site/src/partials/menu.haml
+- spec/sandbox/test_site/src/partials/partial_with_error.haml
+- spec/sandbox/test_site/src/stylesheets/application.sass
+- spec/sandbox/test_site/src/stylesheets/css_with_error.sass
+- spec/sandbox/test_site/src/stylesheets/nested/a_nested_stylesheet.sass
+- spec/sandbox/test_site/src/stylesheets/partials/_forms.sass
+- spec/server_spec.rb
+- spec/setup_spec.rb
+- spec/spec_helper.rb
+- spec/template_error_spec.rb
 has_rdoc: true
 homepage: http://staticmatic.net
 licenses: []
@@ -126,13 +128,13 @@ signing_key:
 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
+- spec/base_spec.rb
+- spec/helpers_spec.rb
+- spec/render_spec.rb
+- spec/rescue_spec.rb
+- spec/sandbox/test_site/configuration.rb
+- spec/sandbox/test_site/src/helpers/application_helper.rb
+- spec/server_spec.rb
+- spec/setup_spec.rb
+- spec/spec_helper.rb
+- spec/template_error_spec.rb

data/test/base_test.rb

@@ -1,13 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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/server_test.rb

@@ -1,12 +0,0 @@
-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/test_helper.rb

@@ -1,20 +0,0 @@
-require 'rubygems'
-require 'stringio'
-require 'test/unit'
-
-require File.dirname(__FILE__) + '/../lib/staticmatic'
-
-TEST_SITE_PATH = File.join(File.dirname(__FILE__), "sandbox", "test_site")
-
-class Test::Unit::TestCase
-  def self.should(description, &block)
-    test_name = "test_should_#{description.gsub(/[\s]/,'_')}".to_sym
-    raise "#{test_name} is already defined in #{self}" if self.instance_methods.include?(test_name.to_s)
-    define_method(test_name, &block)
-  end
-end
-
-def setup_staticmatic
-  @staticmatic = StaticMatic::Base.new(TEST_SITE_PATH)
-end
-