Tag 1.4.3

README.md

@@ -475,3 +475,9 @@ your changes merged back into core is as follows:
 1. If necessary, rebase your commits into logical chunks, without errors
 1. Push the branch up to GitHub
 1. Send a pull request to the github/gollum project.
+
+## RELEASING
+
+    $ rake gemspec
+    $ gem build gollum.gemspec
+    $ gem push gollum-X.Y.Z.gem

gollum.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'gollum'
-  s.version           = '1.4.1'
+  s.version           = '1.4.3'
-  s.date              = '2012-04-10'
+  s.date              = '2012-04-25'
   s.rubyforge_project = 'gollum'
 
   s.summary     = "A simple, Git-powered wiki."
@@ -56,25 +56,25 @@ Gem::Specification.new do |s|
     lib/gollum/committer.rb
     lib/gollum/file.rb
     lib/gollum/frontend/app.rb
-    lib/gollum/frontend/public/css/dialog.css
+    lib/gollum/frontend/public/gollum/css/dialog.css
-    lib/gollum/frontend/public/css/editor.css
+    lib/gollum/frontend/public/gollum/css/editor.css
-    lib/gollum/frontend/public/css/gollum.css
+    lib/gollum/frontend/public/gollum/css/gollum.css
-    lib/gollum/frontend/public/css/ie7.css
+    lib/gollum/frontend/public/gollum/css/ie7.css
-    lib/gollum/frontend/public/css/template.css
+    lib/gollum/frontend/public/gollum/css/template.css
-    lib/gollum/frontend/public/images/icon-sprite.png
+    lib/gollum/frontend/public/gollum/images/icon-sprite.png
-    lib/gollum/frontend/public/javascript/editor/gollum.editor.js
+    lib/gollum/frontend/public/gollum/javascript/editor/gollum.editor.js
-    lib/gollum/frontend/public/javascript/editor/langs/asciidoc.js
+    lib/gollum/frontend/public/gollum/javascript/editor/langs/asciidoc.js
-    lib/gollum/frontend/public/javascript/editor/langs/creole.js
+    lib/gollum/frontend/public/gollum/javascript/editor/langs/creole.js
-    lib/gollum/frontend/public/javascript/editor/langs/markdown.js
+    lib/gollum/frontend/public/gollum/javascript/editor/langs/markdown.js
-    lib/gollum/frontend/public/javascript/editor/langs/org.js
+    lib/gollum/frontend/public/gollum/javascript/editor/langs/org.js
-    lib/gollum/frontend/public/javascript/editor/langs/pod.js
+    lib/gollum/frontend/public/gollum/javascript/editor/langs/pod.js
-    lib/gollum/frontend/public/javascript/editor/langs/rdoc.js
+    lib/gollum/frontend/public/gollum/javascript/editor/langs/rdoc.js
-    lib/gollum/frontend/public/javascript/editor/langs/textile.js
+    lib/gollum/frontend/public/gollum/javascript/editor/langs/textile.js
-    lib/gollum/frontend/public/javascript/gollum.dialog.js
+    lib/gollum/frontend/public/gollum/javascript/gollum.dialog.js
-    lib/gollum/frontend/public/javascript/gollum.js
+    lib/gollum/frontend/public/gollum/javascript/gollum.js
-    lib/gollum/frontend/public/javascript/gollum.placeholder.js
+    lib/gollum/frontend/public/gollum/javascript/gollum.placeholder.js
-    lib/gollum/frontend/public/javascript/jquery.color.js
+    lib/gollum/frontend/public/gollum/javascript/jquery.color.js
-    lib/gollum/frontend/public/javascript/jquery.js
+    lib/gollum/frontend/public/gollum/javascript/jquery.js
     lib/gollum/frontend/templates/compare.mustache
     lib/gollum/frontend/templates/create.mustache
     lib/gollum/frontend/templates/edit.mustache

lib/gollum.rb

@@ -21,7 +21,11 @@ require File.expand_path('../gollum/tex', __FILE__)
 require File.expand_path('../gollum/web_sequence_diagram', __FILE__)
 
 module Gollum
-  VERSION = '1.4.1'
+  VERSION = '1.4.3'
+
+  def self.assets_path
+    ::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))
+  end
 
   class Error < StandardError; end
 

lib/gollum/frontend/app.rb

@@ -13,7 +13,7 @@ module Precious
     dir = File.dirname(File.expand_path(__FILE__))
 
     # We want to serve public assets for now
-    set :public_folder, "#{dir}/public"
+    set :public_folder, "#{dir}/public/gollum"
     set :static,         true
     set :default_markup, :markdown
 

lib/gollum/sanitization.rb

@@ -30,7 +30,7 @@ module Gollum
                 'compact', 'coords', 'datetime', 'dir',
                 'disabled', 'enctype', 'for', 'frame',
                 'headers', 'height', 'hreflang',
-                'hspace', 'ismap', 'label', 'lang',
+                'hspace', 'id', 'ismap', 'label', 'lang',
                 'longdesc', 'maxlength', 'media', 'method',
                 'multiple', 'name', 'nohref', 'noshade',
                 'nowrap', 'prompt', 'readonly', 'rel', 'rev',

test/test_markup.rb

@@ -546,29 +546,29 @@ np.array([[2,2],[1,3]],np.float)
     compare(content, output, 'org')
   end
 
-  # test "id with prefix ok" do
+  test "id with prefix ok" do
-  #   content = "h2(example#wiki-foo). xxxx"
+    content = "h2(example#wiki-foo). xxxx"
-  #   output = %(<h2 class="example" id="wiki-foo">xxxx</h2>)
+    output = %(<h2 class="example" id="wiki-foo">xxxx</h2>)
-  #   compare(content, output, :textile)
+    compare(content, output, :textile)
-  # end
+  end
 
-  # test "id prefix added" do
+  test "id prefix added" do
-  #   content = "h2(#foo). xxxx[1]\n\nfn1.footnote"
+    content = "h2(#foo). xxxx[1]\n\nfn1.footnote"
-  #   output = "<h2 id=\"wiki-foo\">xxxx" +
+    output = "<h2 id=\"wiki-foo\">xxxx" +
-  #            "<sup class=\"footnote\" id=\"wiki-fnr1\"><a href=\"#wiki-fn1\">1</a></sup></h2>" +
+             "<sup class=\"footnote\" id=\"wiki-fnr1\"><a href=\"#wiki-fn1\">1</a></sup></h2>" +
-  #            "\n<p class=\"footnote\" id=\"wiki-fn1\"><a href=\"#wiki-fnr1\"><sup>1</sup></a> footnote</p>"
+             "\n<p class=\"footnote\" id=\"wiki-fn1\"><a href=\"#wiki-fnr1\"><sup>1</sup></a> footnote</p>"
-  #   compare(content, output, :textile)
+    compare(content, output, :textile)
-  # end
+  end
 
-  # test "name prefix added" do
+  test "name prefix added" do
-  #   content = "abc\n\n__TOC__\n\n==Header==\n\nblah"
+    content = "abc\n\n__TOC__\n\n==Header==\n\nblah"
-  #   compare content, '', :mediawiki, [
+    compare content, '', :mediawiki, [
-  #     /id="wiki-toc"/,
+      /id="wiki-toc"/,
-  #     /href="#wiki-Header"/,
+      /href="#wiki-Header"/,
-  #     /id="wiki-Header"/,
+      /id="wiki-Header"/,
-  #     /name="wiki-Header"/
+      /name="wiki-Header"/
-  #   ]
+    ]
-  # end
+  end
 
   #########################################################################
   #