gollum-bibanon 1.4.3 → 1.4.4

data/HISTORY.md

@@ -7,6 +7,26 @@
   * Include the language of the code snippet when making a uniquely
     identifiable sha of a code snippet while rendering a page.
 
+# 1.4.1 (Bibanon mod) / 2012-02-05
+
+* Major Enhancements
+  * reversing mediawiki_compat
+* Minor Enhancements
+  * Fixed incorrect redirect in new versions of sinatra
+* Bug Fixes
+  * fixed sanitization bug
+
+# 1.4.0 (Bibanon mod) / 2012-02-04
+
+* Major Enhancements
+  * Removed Mathjax support
+* Minor Enhancements
+  * Underscore support in wikipages (for Mediawiki)
+  * Adds OmniAuth username to commit message.
+  * Magnet, IRC, and FTP links now allowed.
+* Bug Fixes
+  * Some mods to make OmniAuth work better with Gollum (using OmniGollum)
+
 # 1.3.1 / 2011-07-21
 
 * Major Enhancements

data/README.md

@@ -16,6 +16,40 @@ number of ways depending on your needs. You can edit your wiki locally:
 Gollum follows the rules of [Semantic Versioning](http://semver.org/) and uses
 [TomDoc](http://tomdoc.org/) for inline documentation.
 
+### Bibanon
+
+This is a fork of Gollum used by the Bibliotheca Anonoma. It adds some extra functionality:
+
+* [OmniAuth integration](https://github.com/github/gollum/pull/181) - Adds support for OmniGollum.
+* [OmniAuth User Commit Message](https://github.com/treeofsephiroth/gollum/commit/8400ad0749288f658f735625b7c39550134f7586) Adds the username from OmniAuth to a commit message.
+  * [Gollum Pull Request](https://github.com/github/gollum/pull/166)
+* [Fix `undefined method 'new' for Redcarpet:Module`](https://github.com/github/gollum/pull/271) - Forces the gem to use a working copy of redcarpet, rather than the new one.
+* [Fix spaces in filenames breaking redirect](https://github.com/github/gollum/pull/249) - New edition of Sinatra uses + signs instead of dashes, breaking redirects.
+* Magnet links - Now allowed.
+
+### Wishlist
+
+Functionalities we hope to implement in the future.
+
+* Custom CSS - Instead of modding the CSS stylesheet bundled with Gollum, it would be nice to work like Ikiwiki and use a "local.css" file in the git repo, if it exists. It would also be cool if we made a tag that specified custom CSS for a single page.
+  * [Ikiwiki CSS extension](http://ikiwiki.info/css/)
+
+* Extensions - Would make it possible to safely add extra functionality to wikilink tags, similar to that of Mediawiki Templates or ikiwiki plugins.
+  * [Basic support for extensions on Gollum](https://github.com/github/gollum/pull/58)
+  * [Gists embed implementation](https://github.com/github/gollum/issues/208)
+
+* Shift JIS extension - Tag to tell gollum to use [monafont](http://monafont.sourceforge.net/index-e.html) on selected text. Should probably use @font-face.
+  * [Font Face Guide](http://sixrevisions.com/css/font-face-guide/)
+  * [Mozilla Font Face Guide](https://developer.mozilla.org/en/CSS/@font-face)
+  * It might help to see how [Google Webfont](https://www.google.com/webfonts) works and implement it in Gollum's CSS
+
+* Page Locking - Would add ability to lock certain pages to editing. An example would be ikiwiki's page locking mechanism.
+  * [Ikiwiki Lockedit plugin](http://ikiwiki.info/plugins/lockedit/)
+* File Uploading - Would add the ability to upload some files through the web interface, and implement restrictions to allow only certain extensions of a certain size. 
+  * [Ikiwiki Attachments](http://ikiwiki.info/plugins/attachment/)
+  * [Ikiwiki File Checking](http://ikiwiki.info/plugins/filecheck/)
+* Untrusted Git Push - Yes, this would be perfectly safe. Ikiwiki has the ability to accept commits from anyone in the world. What makes this safe is Ikiwiki's pre-commit checks, which check page locks and upload restrictions to block any change that cannot be done with the web interface.
+  * [Ikiwiki Implementation](http://ikiwiki.info/tips/untrusted_git_push/)
 
 ## INSTALLATION
 

data/{gollum-bibanon.gemspec → gollum.gemspec}

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.4.3'
+  s.rubygems_version = '1.3.5'
 
   s.name              = 'gollum-bibanon'
-  s.version           = '1.4.3'
+  s.version           = '1.4.4'
   s.date              = '2012-03-22'
-  s.rubyforge_project = 'gollum-bibanon'
+  s.rubyforge_project = 'gollum'
 
   s.summary     = "A simple, Git-powered wiki, with Bibanon mods."
-  s.description = "A simple, Git-powered wiki with a sweet API and local frontend, modded for the Bibliotheca Anonoma. Uses the latest edition of Gollum."
+  s.description = "A simple, Git-powered wiki with a sweet API and local frontend, modded for the Bibliotheca Anonoma. Uses the latest edition of Gollum, adds OmniGollum support, and other cool stuff."
 
   s.authors  = ["Tom Preston-Werner", "Rick Olson", "Tenshi Hinanawi"]
   s.email    = 'cockmomgler@gmail.com'
@@ -27,10 +27,10 @@ Gem::Specification.new do |s|
   s.add_dependency('pygments.rb', "~> 0.2.0")
   s.add_dependency('posix-spawn', "~> 0.3.0")
   s.add_dependency('sinatra', "~> 1.0")
-  s.add_dependency('mustache', [">= 0.11.2", "< 1.0.0"])
+  s.add_dependency('mustache-bibanon', [">= 0.11.2", "< 1.0.0"])
   s.add_dependency('sanitize', "~> 2.0.0")
   s.add_dependency('nokogiri', "~> 1.4")
-  s.add_dependency('redcarpet')
+  s.add_dependency('redcarpet', "~> 1.17.2")
 
   s.add_development_dependency('RedCloth')
   s.add_development_dependency('mocha')
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
     Rakefile
     bin/gollum
     docs/sanitization.md
-    gollum-bibanon.gemspec
+    gollum.gemspec
     lib/gollum.rb
     lib/gollum/blob_entry.rb
     lib/gollum/committer.rb

data/lib/gollum.rb

@@ -20,7 +20,7 @@ require File.expand_path('../gollum/sanitization', __FILE__)
 require File.expand_path('../gollum/tex', __FILE__)
 
 module Gollum
-  VERSION = '1.3.1'
+  VERSION = '1.4.2'
 
   class Error < StandardError; end
 

data/lib/gollum/frontend/app.rb

@@ -49,7 +49,7 @@ module Precious
         @content = page.raw_data
         mustache :edit
       else
-        mustache :create
+        redirect "/create/#{CGI.escape(@name)}"
       end
     end
 
@@ -68,7 +68,17 @@ module Precious
 
       redirect "/#{CGI.escape(Gollum::Page.cname(name))}"
     end
-
+    
+    get '/create/*' do
+      wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
+      @name = params[:splat].first
+      if wiki.page(@name)
+        redirect "/#{CGI.escape(@name)}"
+      else
+        mustache :create
+      end
+    end
+    
     post '/create' do
       name = params[:page]
       wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
@@ -77,7 +87,7 @@ module Precious
 
       begin
         wiki.write_page(name, format, params[:content], commit_message)
-        redirect "/#{CGI.escape(name)}"
+        redirect "/#{CGI.escape(Gollum::Page.cname(name))}"
       rescue Gollum::DuplicatePageError => e
         @message = "Duplicate page: #{e.message}"
         mustache :error
@@ -199,8 +209,7 @@ module Precious
         content_type file.mime_type
         file.raw_data
       else
-        @name = name
-        mustache :create
+        redirect "/create/#{CGI.escape(name)}"
       end
     end
 
@@ -214,7 +223,12 @@ module Precious
     end
 
     def commit_message
-      { :message => params[:message] }
+      if self.respond_to?('user_authed?') && user_authed?
+        user = get_user
+        return { :message => params[:message], :name => user.name, :email => user.email}
+      else
+        return { :message => params[:message]}
+      end
     end
   end
 end

data/lib/gollum/sanitization.rb

@@ -43,7 +43,7 @@ module Gollum
 
     # Default whitelisted protocols for URLs.
     PROTOCOLS = {
-      'a'   => {'href' => ['http', 'https', 'mailto', 'ftp', 'irc', :relative]},
+      'a'   => {'href' => ['http', 'https', 'mailto', 'ftp', 'irc', 'magnet', :relative]},
       'img' => {'src'  => ['http', 'https', :relative]}
     }.freeze
 

data/test/test_app.rb

@@ -85,6 +85,44 @@ context "Frontend" do
     assert_equal 'def', page.version.message
   end
 
+  test "redirects to create on non-existant page" do
+    name = "E"
+    get "/#{name}"
+    follow_redirect!
+    assert_equal "/create/#{name}", last_request.fullpath
+    assert last_response.ok?
+  end
+
+  test "edit redirects to create on non-existant page" do
+    name = "E"
+    get "/edit/#{name}"
+    follow_redirect!
+    assert_equal "/create/#{name}", last_request.fullpath
+    assert last_response.ok?
+  end  
+
+  test "create redirects to page if already exists" do
+    name = "A"
+    get "/create/#{name}"
+    follow_redirect!
+    assert_equal "/#{name}", last_request.fullpath
+    assert last_response.ok?
+  end
+
+  test "creates pages with escaped characters in title" do
+    post "/create", :content => 'abc', :page => 'Title with spaces',
+      :format => 'markdown', :message => 'foo'
+    assert_equal 'http://example.org/Title-with-spaces', last_response.headers['Location']
+    get "/Title-with-spaces"
+    assert_match /abc/, last_response.body
+
+    post "/create", :content => 'ghi', :page => 'Title/with/slashes',
+      :format => 'markdown', :message => 'bar'
+    assert_equal 'http://example.org/Title-with-slashes', last_response.headers['Location']
+    get "/Title-with-slashes"
+    assert_match /ghi/, last_response.body
+  end
+
   test "guards against creation of existing page" do
     name = "A"
     post "/create", :content => 'abc', :page => name,

metadata

@@ -2,7 +2,7 @@
 name: gollum-bibanon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -73,7 +73,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mustache
+  name: mustache-bibanon
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -114,9 +114,9 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.17.2
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -196,7 +196,7 @@ dependencies:
         version: 0.9.2
   type: :development
   version_requirements: *id016
-description: A simple, Git-powered wiki with a sweet API and local frontend, modded for the Bibliotheca Anonoma. Uses the latest edition of Gollum.
+description: A simple, Git-powered wiki with a sweet API and local frontend, modded for the Bibliotheca Anonoma. Uses the latest edition of Gollum, adds OmniGollum support, and other cool stuff.
 email: cockmomgler@gmail.com
 executables: 
 - gollum
@@ -214,7 +214,7 @@ files:
 - Rakefile
 - bin/gollum
 - docs/sanitization.md
-- gollum-bibanon.gemspec
+- gollum.gemspec
 - lib/gollum.rb
 - lib/gollum/blob_entry.rb
 - lib/gollum/committer.rb
@@ -391,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: gollum-bibanon
+rubyforge_project: gollum
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 2