gollum-bibanon 1.4.2 → 1.4.3

data/HISTORY.md

@@ -7,26 +7,6 @@
   * 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,40 +16,6 @@ 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.gemspec → gollum-bibanon.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.3.5'
+  s.rubygems_version = '1.4.3'
 
   s.name              = 'gollum-bibanon'
-  s.version           = '1.4.2'
-  s.date              = '2012-02-04'
-  s.rubyforge_project = 'gollum'
+  s.version           = '1.4.3'
+  s.date              = '2012-03-22'
+  s.rubyforge_project = 'gollum-bibanon'
 
   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, adds OmniGollum support, and other cool stuff."
+  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.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-bibanon', [">= 0.11.2", "< 1.0.0"])
+  s.add_dependency('mustache', [">= 0.11.2", "< 1.0.0"])
   s.add_dependency('sanitize', "~> 2.0.0")
   s.add_dependency('nokogiri', "~> 1.4")
-  s.add_dependency('redcarpet', "~> 1.17.2")
+  s.add_dependency('redcarpet')
 
   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.gemspec
+    gollum-bibanon.gemspec
     lib/gollum.rb
     lib/gollum/blob_entry.rb
     lib/gollum/committer.rb
@@ -101,7 +101,6 @@ Gem::Specification.new do |s|
     lib/gollum/page.rb
     lib/gollum/pagination.rb
     lib/gollum/sanitization.rb
-    lib/gollum/tex.rb
     lib/gollum/wiki.rb
     templates/formatting.html
     test/examples/lotr.git/COMMIT_EDITMSG

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.4.2'
+  VERSION = '1.3.1'
 
   class Error < StandardError; end
 

data/lib/gollum/frontend/app.rb

@@ -49,7 +49,7 @@ module Precious
         @content = page.raw_data
         mustache :edit
       else
-        redirect "/create/#{CGI.escape(@name)}"
+        mustache :create
       end
     end
 
@@ -68,17 +68,7 @@ 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)
@@ -87,7 +77,7 @@ module Precious
 
       begin
         wiki.write_page(name, format, params[:content], commit_message)
-        redirect "/#{CGI.escape(Gollum::Page.cname(name))}"
+        redirect "/#{CGI.escape(name)}"
       rescue Gollum::DuplicatePageError => e
         @message = "Duplicate page: #{e.message}"
         mustache :error
@@ -209,7 +199,8 @@ module Precious
         content_type file.mime_type
         file.raw_data
       else
-        redirect "/create/#{CGI.escape(name)}"
+        @name = name
+        mustache :create
       end
     end
 
@@ -223,12 +214,7 @@ module Precious
     end
 
     def commit_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
+      { :message => params[:message] }
     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', 'magnet', :relative]},
+      'a'   => {'href' => ['http', 'https', 'mailto', 'ftp', 'irc', :relative]},
       'img' => {'src'  => ['http', 'https', :relative]}
     }.freeze
 

data/test/test_app.rb

@@ -85,44 +85,6 @@ 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

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: gollum-bibanon
 version: !ruby/object:Gem::Version 
-  hash: 3
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 2
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -17,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-04 00:00:00 Z
+date: 2012-03-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit
@@ -27,11 +22,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 4
-        - 1
         version: 2.4.1
   type: :runtime
   version_requirements: *id001
@@ -43,19 +33,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
         version: 0.7.0
     - - <
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id002
@@ -67,11 +47,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
         version: 0.2.0
   type: :runtime
   version_requirements: *id003
@@ -83,11 +58,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
         version: 0.3.0
   type: :runtime
   version_requirements: *id004
@@ -99,34 +69,20 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mustache-bibanon
+  name: mustache
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 11
-        - 2
         version: 0.11.2
     - - <
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id006
@@ -138,11 +94,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :runtime
   version_requirements: *id007
@@ -154,10 +105,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
         version: "1.4"
   type: :runtime
   version_requirements: *id008
@@ -167,14 +114,9 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 87
-        segments: 
-        - 1
-        - 17
-        - 2
-        version: 1.17.2
+        version: "0"
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -185,9 +127,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id010
@@ -199,9 +138,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id011
@@ -213,9 +149,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id012
@@ -227,9 +160,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id013
@@ -241,9 +171,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id014
@@ -255,11 +182,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
         version: 0.6.3
   type: :development
   version_requirements: *id015
@@ -271,15 +193,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
         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, adds OmniGollum support, and other cool stuff.
+description: A simple, Git-powered wiki with a sweet API and local frontend, modded for the Bibliotheca Anonoma. Uses the latest edition of Gollum.
 email: cockmomgler@gmail.com
 executables: 
 - gollum
@@ -297,7 +214,7 @@ files:
 - Rakefile
 - bin/gollum
 - docs/sanitization.md
-- gollum.gemspec
+- gollum-bibanon.gemspec
 - lib/gollum.rb
 - lib/gollum/blob_entry.rb
 - lib/gollum/committer.rb
@@ -348,7 +265,6 @@ files:
 - lib/gollum/page.rb
 - lib/gollum/pagination.rb
 - lib/gollum/sanitization.rb
-- lib/gollum/tex.rb
 - lib/gollum/wiki.rb
 - templates/formatting.html
 - test/examples/lotr.git/COMMIT_EDITMSG
@@ -466,23 +382,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
-rubyforge_project: gollum
-rubygems_version: 1.8.11
+rubyforge_project: gollum-bibanon
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 2
 summary: A simple, Git-powered wiki, with Bibanon mods.

data/lib/gollum/tex.rb

@@ -1,89 +0,0 @@
-require 'fileutils'
-require 'shellwords'
-require 'tmpdir'
-require 'posix/spawn'
-
-module Gollum
-  module Tex
-    class Error < StandardError; end
-
-    extend POSIX::Spawn
-
-    Template = <<-EOS
-\\documentclass[12pt]{article}
-\\usepackage{color}
-\\usepackage[dvips]{graphicx}
-\\pagestyle{empty}
-\\pagecolor{white}
-\\begin{document}
-{\\color{black}
-\\begin{eqnarray*}
-%s
-\\end{eqnarray*}}
-\\end{document}
-    EOS
-
-    class << self
-      attr_accessor :latex_path, :dvips_path, :convert_path
-    end
-
-    self.latex_path   = 'latex'
-    self.dvips_path   = 'dvips'
-    self.convert_path = 'convert'
-
-    def self.check_dependencies!
-      return if @dependencies_available
-
-      if `which latex` == ""
-        raise Error, "`latex` command not found"
-      end
-
-      if `which dvips` == ""
-        raise Error, "`dvips` command not found"
-      end
-
-      if `which convert` == ""
-        raise Error, "`convert` command not found"
-      end
-
-      if `which gs` == ""
-        raise Error, "`gs` command not found"
-      end
-
-      @dependencies_available = true
-    end
-
-    def self.render_formula(formula)
-      check_dependencies!
-
-      Dir.mktmpdir('tex') do |path|
-        tex_path = ::File.join(path, 'formula.tex')
-        dvi_path = ::File.join(path, 'formula.dvi')
-        eps_path = ::File.join(path, 'formula.eps')
-        png_path = ::File.join(path, 'formula.png')
-
-        ::File.open(tex_path, 'w') { |f| f.write(Template % formula) }
-
-        result = sh latex_path, '-interaction=batchmode', 'formula.tex', :chdir => path
-        raise Error, "`latex` command failed: #{result}" unless ::File.exist?(dvi_path)
-
-        result = sh dvips_path, '-o', eps_path, '-E', dvi_path
-        raise Error, "`dvips` command failed: #{result}" unless ::File.exist?(eps_path)
-        result = sh convert_path, '+adjoin',
-          '-antialias',
-          '-transparent', 'white',
-          '-density', '150x150',
-          eps_path, png_path
-        raise Error, "`convert` command failed: #{result}" unless ::File.exist?(png_path)
-
-        ::File.read(png_path)
-      end
-    end
-
-    private
-      def self.sh(*args)
-        pid = spawn *args
-        Process::waitpid(pid)
-      end
-  end
-end