staticmatic 0.8.10 → 0.9.0

data/test/helpers_test.rb

@@ -8,16 +8,154 @@ class HelpersTest < Test::Unit::TestCase
   def setup
     @staticmatic = StaticMatic::Base.new(File.dirname(__FILE__) + '/sandbox/test_site')
   end
-  
+
+  # Stylesheets tests
   def test_should_generate_stylesheet_links
-    assert_match "href=\"/stylesheets\/application.css\"", stylesheets
+    set_current_page("/index.html")
+    expected_output = %q{<link href="stylesheets/application.css" media="all"}
+    assert_match expected_output, stylesheets
+
+    expected_output = %q{<link href="stylesheets/application.css" media="print"}
+    assert_match expected_output, stylesheets(:media => :print)
+
+    expected_output = %q{<link href="stylesheets/application.css" media="all"}
+    assert_match expected_output, stylesheets(:application)
+
+    expected_output = %q{<link href="stylesheets/application.css" media="print"}
+    assert_match expected_output, stylesheets(:application, :media => :print)
+
+    set_current_page("/subdir/index.html")
+    expected_output = %q{<link href="../stylesheets/application.css"}
+    assert_match expected_output, stylesheets
+
+    set_current_page("/subdir/other/index.html")
+    expected_output = %q{<link href="../../stylesheets/application.css"}
+    assert_match expected_output, stylesheets
   end
   
+  # Link tests
   def test_should_autolink_page
-    expected_output = %q{<a href="/test.html">Test</a>}
+    set_current_page("/index.html")
+    expected_output = %q{<a href="test.html">Test</a>}
+    assert_match expected_output, link("Test")
+
+    set_current_page("/subdir/index.html")
+    expected_output = %q{<a href="../test.html">Test</a>}
+    assert_match expected_output, link("Test")
+
+    set_current_page("/subdir/other/index.html")
+    expected_output = %q{<a href="../../test.html">Test</a>}
     assert_match expected_output, link("Test")
   end
-  
+
+  def test_should_not_change_url_with_protocol
+    expected_output = %q{<a href="mailto:joe@mailinator.com">Email Joe</a>}
+    assert_match expected_output, link("Email Joe", "mailto:joe@mailinator.com")
+
+    %w(http https ftp gopher ssh telnet).each do |protocol|
+      expected_output = "<a href=\"#{protocol}://www.google.com\">Google</a>"
+      assert_match expected_output, link("Google", "#{protocol}://www.google.com")
+    end
+  end
+
+  def test_should_not_change_url_with_existing_relative_path
+    ['/index.html', '/subdir/index.html', '/subdir/other/index.html'].each do |the_current_page|
+      set_current_page(the_current_page)
+
+      ['/foo.html', './foo.html', '../other/foo.html'].each do |the_path| 
+        expected_output = "<a href=\"#{the_path}\">Foo</a>"
+        assert_match expected_output, link("Foo", the_path)
+      end
+    end
+  end
+
+  def test_should_not_change_anchor_url
+    ['/index.html', '/subdir/index.html', '/subdir/other.html'].each do |the_current_page|
+      set_current_page(the_current_page)
+
+      expected_output = %q{<a href="#myanchor">Foo</a>}
+      assert_match expected_output, link("Foo", "#myanchor")
+    end
+  end
+
+  def test_should_strip_html_extension_from_page_links
+    @staticmatic.configuration.use_extensions_for_page_links = false
+
+    set_current_page("/index.html")
+    expected_output = %q{<a href="other">Other</a>}
+    assert_match expected_output, link("Other")
+
+    set_current_page("/subdir/index.html")
+    expected_output = %q{<a href="../other">Other</a>}
+    assert_match expected_output, link("Other")
+
+    set_current_page("/subdir/other/index.html")
+    expected_output = %q{<a href="../../other">Other</a>}
+    assert_match expected_output, link("Other")
+
+    set_current_page("/index.html")
+    expected_output = %q{<a href="/other">Other</a>}
+    assert_match expected_output, link("Other", "/other.html")
+
+    expected_output = %q{<a href="/foo/">Foo</a>}
+    assert_match expected_output, link("Foo", "/foo/index.html")
+
+    expected_output = %q{<a href="/">Home</a>}
+    assert_match expected_output, link("Home", "/")
+  end
+
+  def test_should_not_strip_extension_from_non_page_links
+    @staticmatic.configuration.use_extensions_for_page_links = false
+
+    set_current_page("/index.html")
+    expected_output = %q{<a href="other.zip">Other</a>}
+    assert_match expected_output, link("Other", "other.zip")
+
+    set_current_page("/subdir/index.html")
+    expected_output = %q{<a href="../other.zip">Other</a>}
+    assert_match expected_output, link("Other", "other.zip")
+
+    set_current_page("/subdir/other/index.html")
+    expected_output = %q{<a href="../../other.zip">Other</a>}
+    assert_match expected_output, link("Other", "other.zip")
+
+    set_current_page("/index.html")
+    expected_output = %q{<a href="/other.zip">Other</a>}
+    assert_match expected_output, link("Other", "/other.zip")
+
+    expected_output = %q{<a href="http://www.google.com/index.html">Google</a>}
+    assert_match expected_output, link("Google", "http://www.google.com/index.html")
+  end
+
+  def test_should_prefix_relative_path_while_generating_file_name
+    ['/other.html', '/subdir/index.html', '/subdir/other/filename.html'].each do |the_current_page|
+      set_current_page(the_current_page)
+
+      ['Other', 'Other File', 'Other / File', 'Other /File/'].each do |link_name|
+        ['../', './', '/', '/foo/','../bar/'].each do |relative_path| 
+          expected_output = %Q{<a href="#{relative_path}#{urlify(link_name)}.html">#{link_name}</a>}
+          assert_match expected_output, link("#{relative_path}#{link_name}")
+        end
+      end
+    end
+  end
+
+  def test_should_not_prefix_relative_path_while_generating_file_name
+    set_current_page("/other.html")
+
+    expected_output = %q{<a href="testlink.html">Test/Link</a>}
+    assert_match expected_output, link('Test/Link')
+
+    set_current_page("/subdir/index.html")
+    expected_output = %q{<a href="../testlink.html">Test/Link</a>}
+    assert_match expected_output, link('Test/Link')
+
+    set_current_page("/subdir/other/filename.html")
+    expected_output = %q{<a href="../../testlink.html">Test/Link</a>}
+    assert_match expected_output, link('Test/Link')
+  end
+
+  # Tag tests
   def test_should_generate_tag_with_block
     expected_output = %q{<a href="/test.html" title="My Test Link">Test</a>}
     assert_match expected_output, tag(:a, :href => "/test.html", :title => 'My Test Link') { "Test" }
@@ -28,64 +166,119 @@ class HelpersTest < Test::Unit::TestCase
     assert_match expected_output, tag(:br)
   end
   
+  # Urlify tests
   def test_should_urlify_string
     assert_equal "stephens_haml_and_sass_project", urlify("Stephen's Haml & Sass Project")
+    assert_equal "testlink", urlify("Test/Link")
   end
   
+  # Text_field tests
   def test_should_generate_input
     expected_output = %q{<input type="text" value="blah" name="test"/>}
     assert_tags_match expected_output, text_field("test", "blah")
   end
-  
+
+  # Javascripts tests
   def test_should_generate_js_links
-    expected_output = %q{src="/javascripts/test.js"}
+    set_current_page('/index.html')
+    expected_output = %q{src="javascripts/test.js"}
+    assert_match expected_output, javascripts('test')
+
+    expected_output = %q{src="javascripts/test.js"}
+    assert_match expected_output, javascripts(:test)
+
+    set_current_page('/subdir/index.html')
+    expected_output = %q{src="../javascripts/test.js"}
+    assert_match expected_output, javascripts('test')
+
+    set_current_page('/subdir/other/index.html')
+    expected_output = %q{src="../../javascripts/test.js"}
     assert_match expected_output, javascripts('test')
   end
+
+  def test_should_not_change_js_link_with_existing_relative_url
+    ['/index.html', '/subdir/index.html', '/subdir/other/index.html'].each do |the_current_page|
+      set_current_page(the_current_page)
+
+      ['/my_javascript.js', './my_javascript.js', '../other/my_javascript.js'].each do |the_path|
+        expected_output = "src=\"#{the_path}\""
+        assert_match expected_output, javascripts(the_path)
+      end
+    end
+  end
+
+  def test_should_generate_absolute_js_link
+    ['/index.html', '/subdir/index.html', '/subdir/other/foo.html'].each do |the_current_page|
+      set_current_page(the_current_page)
+
+      ['http://staticmatic.rubyforge.org/javascripts/test.js', 'https://staticmatic.rubyforge.org/javascripts/test.js'].each do |the_path|
+        expected_output = "src=\"#{the_path}\""
+        assert_match expected_output, javascripts(the_path)
+      end
+   end
+  end
   
-  # Soon...
+  # Partials tests
   def test_should_include_partial_template
+    @staticmatic.instance_eval { def current_file() "/index.haml"; end }
+    set_current_page("/index.html")
     expected_output = "My Menu"
-    # TODO: make this pass again - current_file is nil because this is not called in the framework
-    # assert_match expected_output, partial("menu")
-    assert true
+    assert_match expected_output, partial("menu")
   end
   
-  # Image tag tests
+  # Image tests
   def test_should_generate_basic_img_tag
-    expected_output = %q{<img src="/images/test.gif" alt="Test"/>}
+    set_current_page("/index.html")
+    expected_output = %q{<img src="images/test.gif" alt="Test"/>}
+    assert_tags_match expected_output, img('test.gif')
+
+    set_current_page("/subdir/index.html")
+    expected_output = %q{<img src="../images/test.gif" alt="Test"/>}
+    assert_tags_match expected_output, img('test.gif')
+
+    set_current_page("/subdir/other/index.html")
+    expected_output = %q{<img src="../../images/test.gif" alt="Test"/>}
     assert_tags_match expected_output, img('test.gif')
   end
 
   def test_should_generate_img_tag_with_options
-    expected_output = %q{<img src="/images/test.gif" alt="Testing the alt" class="testClass"/>}
+    set_current_page("/index.html")
+    expected_output = %q{<img src="images/test.gif" alt="Testing the alt" class="testClass"/>}
     assert_tags_match expected_output, img('test.gif', {:alt => 'Testing the alt', :class => 'testClass'})
   end
   
   def test_should_generate_img_tag_with_sub_directory
-    expected_output = %q{<img src="/images/about_us/test.gif" alt="Test"/>}
+    set_current_page("/index.html")
+    expected_output = %q{<img src="images/about_us/test.gif" alt="Test"/>}
     assert_tags_match expected_output, img('about_us/test.gif')
   end
   
   def test_should_generate_img_tag_with_src_left_as_is
-    expected_output = %q{<img src="/images/test_image.gif" alt="Test image"/>}
-    assert_tags_match expected_output, img('/images/test_image.gif')
+    ['/index.html', '/subdir/index.html', '/subdir/other/index.html'].each do |the_current_page|
+      set_current_page(the_current_page)
+
+      ['/images/test_image.gif', './test_image.gif', '../test_image.gif'].each do |the_path|
+        expected_output = "<img src=\"#{the_path}\" alt=\"Test image\"/>"
+        assert_tags_match expected_output, img(the_path)
+      end
+    end
   end
   
   def test_should_generate_absolute_img_tag
-    expected_output = %q{<img src="http://staticmatic.rubyforge.org/images/bycurve21.gif" alt="Bycurve21"/>}
-    assert_tags_match expected_output, img('http://staticmatic.rubyforge.org/images/bycurve21.gif')
+    ['/index.html', '/subdir/foo.html', '/subdir/other/index.html'].each do |the_current_page|
+      set_current_page(the_current_page)
+
+      ['http://staticmatic.rubyforge.org/images/bycurve21.gif', 'https://staticmatic.rubyforge.org/images/bycurve21.gif'].each do |the_path| 
+        expected_output = "<img src=\"#{the_path}\" alt=\"Bycurve21\"/>"
+        assert_tags_match expected_output, img(the_path)
+      end
+    end
   end
   
-  def test_should_generate_relative_img_tag_based_on_config
-    @staticmatic.configuration.use_relative_paths_for_images = true
-    expected_output = %q{<img src="images/test.gif" alt="Test"/>}
-    assert_tags_match expected_output, img('test.gif')
-  end
+  private
 
-  def test_should_generate_absolute_img_tag_regardles_of_config
-    @staticmatic.configuration.use_relative_paths_for_images = true
-    expected_output = %q{<img src="http://staticmatic.rubyforge.org/images/bycurve21.gif" alt="Bycurve21"/>}
-    assert_tags_match expected_output, img('http://staticmatic.rubyforge.org/images/bycurve21.gif')
+  def set_current_page(page)
+    @staticmatic.instance_variable_set("@current_page", page)
   end
 
 end

data/test/version_test.rb

@@ -0,0 +1,26 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/staticmatic'
+
+class StaticMaticVersionTest < Test::Unit::TestCase
+  def setup
+    @base_dir = File.dirname(__FILE__) + '/sandbox/tmp'
+  end
+
+  def test_version_requirements_met
+    assert_equal false, StaticMatic::VERSION.requirements_met?("#{StaticMatic::VERSION::MAJOR+1}.0.0")
+    assert_equal false, StaticMatic::VERSION.requirements_met?("#{StaticMatic::VERSION::MAJOR}.#{StaticMatic::VERSION::MINOR+1}.0")
+    assert_equal false, StaticMatic::VERSION.requirements_met?("#{StaticMatic::VERSION::MAJOR}.#{StaticMatic::VERSION::MINOR}.#{StaticMatic::VERSION::TINY+1}")
+    assert_equal true, StaticMatic::VERSION.requirements_met?("#{StaticMatic::VERSION::MAJOR-1}.9999.9999")
+    assert_equal true, StaticMatic::VERSION.requirements_met?("#{StaticMatic::VERSION::MAJOR}.#{StaticMatic::VERSION::MINOR-1}.9999")
+    assert_equal true, StaticMatic::VERSION.requirements_met?("#{StaticMatic::VERSION::MAJOR}.#{StaticMatic::VERSION::MINOR}.#{StaticMatic::VERSION::TINY-1}")
+    assert_equal true, StaticMatic::VERSION.requirements_met?("#{StaticMatic::VERSION::MAJOR}.#{StaticMatic::VERSION::MINOR}.#{StaticMatic::VERSION::TINY}")
+
+    assert_equal false, StaticMatic::VERSION.requirements_met?(:major => StaticMatic::VERSION::MAJOR+1)
+    assert_equal false, StaticMatic::VERSION.requirements_met?(:major => StaticMatic::VERSION::MAJOR, :minor => StaticMatic::VERSION::MINOR+1)
+    assert_equal false, StaticMatic::VERSION.requirements_met?(:major => StaticMatic::VERSION::MAJOR, :minor => StaticMatic::VERSION::MINOR, :tiny => StaticMatic::VERSION::TINY+1)
+    assert_equal true, StaticMatic::VERSION.requirements_met?(:major => StaticMatic::VERSION::MAJOR-1, :minor => 9999, :tiny => 9999)
+    assert_equal true, StaticMatic::VERSION.requirements_met?(:major => StaticMatic::VERSION::MAJOR, :minor => StaticMatic::VERSION::MINOR-1, :tiny => 9999)
+    assert_equal true, StaticMatic::VERSION.requirements_met?(:major => StaticMatic::VERSION::MAJOR, :minor => StaticMatic::VERSION::MINOR, :tiny => StaticMatic::VERSION::TINY-1)
+    assert_equal true, StaticMatic::VERSION.requirements_met?(:major => StaticMatic::VERSION::MAJOR, :minor => StaticMatic::VERSION::MINOR, :tiny => StaticMatic::VERSION::TINY)
+  end
+end

data/website/site/download.html

@@ -1,78 +1,84 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
-  <head>
-    <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
-    <title>StaticMatic</title>
-    <link media="all" href="/stylesheets/application.css" rel="stylesheet"/>
-  </head>
-  <body>
-    <div id='container'>
-      <div id='header'>
-        <div class='bycurve21'>
-          <a href="http://www.curve21.com"><img alt="/images/bycurve21" src="/images/bycurve21.gif"/>
-          </a>
-        </div>
-        <div class='title'>StaticMatic</div>
-      </div>
-      <div id='menu'>
-        <ul>
-          <li><a href="/">Home</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/how_to_use.html">How to use</a></li>
-          <li>
-            <a href="http://rubyforge.org/projects/staticmatic">Development</a>
-          </li>
-          <li>
-            <a href="http://groups.google.co.uk/group/staticmatic">Community</a>
-          </li>
-          <li><a href="/faq.html">FAQ</a></li>
-        </ul>
-      </div>
-      <div id='content_wrapper'>
-        <div id='side'>
-          <div id='news'>
-            <div class='heading'>News</div>
-            <div class='title'>0.8.8 Released!</div>
-            <p>
-              Complete with:
-            </p>
-            <ul>
-              <li>Helpers</li>
-              <li>Configuration</li>
-            </ul>
-            <a href="/releases/0_8_8.html">And More!</a>
-          </div>
-        </div>
-        <div id='content'>
-          <h1>Download</h1>
-          <p>
-            The simplest way to get StaticMatic is via RubyGems:
-          </p>
-          <div class='code'>gem install staticmatic</div>
-          <h3>Source Code</h3>
-          <p>
-            You can get the source code from
-            <a href="http://rubyforge.org/projects/staticmatic/">RubyForge</a>
-            :
-          </p>
-          <div class='code'>
-            svn checkout svn://rubyforge.org/var/svn/staticmatic/trunk staticmatic
-          </div>
-        </div>
-      </div>
-      <div id='footer'>
-        <p>
-          Made with StaticMatic, Hosted by
-          <a href="http://rubyforge.org">RubyForge</a>
-        </p>
-      </div>
-      <script src='http://www.google-analytics.com/urchin.js' type='text/javascript'>
-        _hamlspace = "";
-      </script>
-      <script type='text/javascript'>
-        _uacct = "UA-775359-8";
-        urchinTracker();
-      </script>
-    </div>
-  </body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
+  <head>
+    <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
+    <title>StaticMatic</title>
+    <link href="stylesheets/application.css" media="all" rel="stylesheet"/>
+    <link href="stylesheets/application.css" media="screen" rel="stylesheet"/>
+  </head>
+  <body>
+    <div id='container'>
+      <div id='header'>
+        <div class='bycurve21'>
+          <a href="http://www.curve21.com"><img alt="Bycurve21" src="images/bycurve21.gif"/></a>
+        </div>
+        <div class='title'>StaticMatic</div>
+      </div>
+      <div id='menu'>
+        <ul>
+          <li><a href="/">Home</a></li>
+          <li><a href="download.html">Download</a></li>
+          <li><a href="how_to_use.html">How to use</a></li>
+          <li>
+            <a href="http://groups.google.co.uk/group/staticmatic">Community</a>
+          </li>
+          <li><a href="faq.html">FAQ</a></li>
+          <li>
+            <a href="http://rubyforge.org/tracker/?func=browse&amp;group_id=3712&amp;atid=14306">Report Bug</a>
+          </li>
+          <li>
+            <a href="http://rubyforge.org/projects/staticmatic">Development</a>
+          </li>
+        </ul>
+      </div>
+      <div id='content_wrapper'>
+        <div id='side'>
+          <div id='news'>
+            <div class='heading'>News</div>
+            <div class='title'>0.9.0 Released!</div>
+            <p>Complete with:</p>
+            <ul>
+              <li>&quot;Local&quot; links are always relative</li>
+              <li>
+                Ability to strip .html and index.html from link tag urls
+              </li>
+              <li>configuration.sass_options</li>
+            </ul>
+            <a href="/releases/0_9_0.html">And More!</a>
+          </div>
+        </div>
+        <div id='content'>
+          <h1>Download</h1>
+          <p>
+            The simplest way to get StaticMatic is via RubyGems:
+          </p>
+          <div class='code'>gem install staticmatic</div>
+          <h3>Source Code</h3>
+          <p>
+            You can get the source code from
+            <a href="http://rubyforge.org/projects/staticmatic/">RubyForge</a>
+            :
+          </p>
+          <div class='code'>
+            svn checkout svn://rubyforge.org/var/svn/staticmatic/trunk staticmatic
+          </div>
+        </div>
+      </div>
+      <div id='footer'>
+        <p>
+          Made with StaticMatic
+          0.9.0
+          , Hosted by
+          <a href="http://rubyforge.org">RubyForge</a>
+        </p>
+      </div>
+      <script src='http://www.google-analytics.com/urchin.js' type='text/javascript'>
+        _hamlspace = "";
+      </script>
+      <script type='text/javascript'>
+        _uacct = "UA-775359-8";
+        urchinTracker();
+      </script>
+    </div>
+  </body>
+</html>