gollum-lib 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e62158d0795431631a6a845ac26a221535c8604
-  data.tar.gz: 35c5ad577b84b262fd492dfc2e5b30f92d5f97ee
+  metadata.gz: d4dcf391053842849c400121f0f21c035094742f
+  data.tar.gz: 58367a8f8ded27b4ef7457e48fae7f6019a3141e
 SHA512:
-  metadata.gz: 54dd123e3f0cc5c2dc7df860a289d1ca3a46edd360c4d8ecf0dabf3e9d6ee3b2e68383c4b21b3d87f82e1309df3cfd24515e07e7b219a518557e1043ea2dbaa2
-  data.tar.gz: 5bd2a239672e66b8a0364acdee7806e1be851b821dfb5b471328d8ffeb8e8581bfea27ee5641363138898e4a6c51530fd5c0a948277190cfe779f11f558716af
+  metadata.gz: 42e1d2261b367bb8b65b1ced6497ad11597f4d07c8a7a69cf33856da53663e1ef984c632bc645bf4543f7e1a84819bb83a283e70eb2ca028344fd00673a9b4c7
+  data.tar.gz: 67c364841f195db1e110fa453ee35e5b2f22029204d10090638fed88560edd353de91fde9bc7fad8993342104ca31a53ea0009c3cfe72d6b834188fff555ff8b

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec

data/Rakefile

@@ -119,13 +119,16 @@ task :release => :build do
     exit!
   end
   sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git pull"
+  sh "git pull --rebase origin master"
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
 end
 
+desc 'Publish to rubygems. Same as release'
+task :publish => :release
+
 desc 'Build gem'
 task :build => :gemspec do
   sh "mkdir -p pkg"

data/gollum-lib.gemspec

@@ -1,53 +1,54 @@
 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.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '0.0.1'
-  s.required_ruby_version = ">= 1.9"
+  s.required_ruby_version = '>= 1.9'
 
   s.name              = 'gollum-lib'
-  s.version           = '2.0.0'
-  s.date              = '2014-02-20'
+  s.version           = '3.0.0'
+  s.date              = '2014-04-05'
   s.rubyforge_project = 'gollum-lib'
   s.license           = 'MIT'
 
-  s.summary     = "A simple, Git-powered wiki."
-  s.description = "A simple, Git-powered wiki with a sweet API and local frontend."
+  s.summary     = 'A simple, Git-powered wiki.'
+  s.description = 'A simple, Git-powered wiki with a sweet API and local frontend.'
 
-  s.authors  = ["Tom Preston-Werner", "Rick Olson"]
+  s.authors  = ['Tom Preston-Werner', 'Rick Olson']
   s.email    = 'tom@github.com'
   s.homepage = 'http://github.com/gollum/gollum-lib'
 
   s.require_paths = %w[lib]
 
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency('gitlab-grit', '2.6.0')
-  s.add_dependency('github-markup', ['>= 0.7.5', '< 1.0.0'])
-  s.add_dependency('rouge', '~> 1.3.1')
-  s.add_dependency('sanitize', '~> 2.0.6')
-  s.add_dependency('nokogiri', '~> 1.6.0')
-  s.add_dependency('stringex', '~> 2.1.0')
+  s.add_dependency 'gitlab-grit', '~> 2.6.5'
+  s.add_dependency 'rouge', '~> 1.3.3'
+  s.add_dependency 'nokogiri', '~> 1.6.1'
+  s.add_dependency 'stringex', '~> 2.5.1'
+  s.add_dependency 'sanitize', '~> 2.1.0'
+  s.add_dependency 'github-markup', '~> 1.1.0'
 
-  s.add_development_dependency('github-markdown', '~> 0.5.3')
-  s.add_development_dependency('RedCloth', '~> 4.2.9')
-  s.add_development_dependency('mocha', '~> 0.13.2')
-  s.add_development_dependency('org-ruby', '~> 0.8.1')
-  s.add_development_dependency('shoulda', '~> 3.4.0')
-  s.add_development_dependency('wikicloth', '~> 0.8.0')
-  s.add_development_dependency('rake', '~> 10.0.3')
-  s.add_development_dependency('pry', '~> 0.9.12')
+  s.add_development_dependency 'org-ruby', '~> 0.9.3'
+  s.add_development_dependency 'github-markdown', '~> 0.6.5'
+  s.add_development_dependency 'RedCloth', '~> 4.2.9'
+  s.add_development_dependency 'mocha', '~> 1.0.0'
+  s.add_development_dependency 'shoulda', '~> 3.5.0'
+  s.add_development_dependency 'wikicloth', '~> 0.8.1'
+  s.add_development_dependency 'rake', '~> 10.2.2'
+  s.add_development_dependency 'pry', '~> 0.9.12'
   # required by pry
-  s.add_development_dependency('rb-readline', '~> 0.4.2')
+  s.add_development_dependency 'rb-readline', '~> 0.5.1'
+  # updating minitest-reporters requires a new minitest which fails with gollum's tests.
   s.add_development_dependency 'minitest-reporters', '~> 0.14.16'
-  s.add_development_dependency('nokogiri-diff', '~> 0.1.2')
+  s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
   # required by guard
-  s.add_development_dependency('guard', '~> 1.8.0')
-  s.add_development_dependency('guard-minitest', '~> 0.5.0')
-  s.add_development_dependency('rb-inotify', '~> 0.9.0')
-  s.add_development_dependency('rb-fsevent', '~> 0.9.3')
-  s.add_development_dependency('rb-fchange', '~> 0.0.6')
-
+  s.add_development_dependency 'guard', '~> 2.6.0'
+  s.add_development_dependency 'guard-minitest', '~> 2.2.0'
+  s.add_development_dependency 'rb-inotify', '~> 0.9.3'
+  s.add_development_dependency 'rb-fsevent', '~> 0.9.4'
+  s.add_development_dependency 'rb-fchange', '~> 0.0.6'
+  s.add_development_dependency 'twitter_cldr', '~> 2.4.2'
   # = MANIFEST =
   s.files = %w[
     Gemfile

data/lib/gollum-lib.rb

@@ -27,21 +27,21 @@ require File.expand_path('../gollum-lib/filter', __FILE__)
 
 # Set ruby to UTF-8 mode
 # This is required for Ruby 1.8.7 which gollum still supports.
-$KCODE = 'U' if RUBY_VERSION[0,3] == '1.8'
+$KCODE = 'U' if RUBY_VERSION[0, 3] == '1.8'
 
 module Gollum
   module Lib
-    VERSION = '2.0.0'
+    VERSION = '3.0.0'
   end
 
   def self.assets_path
     ::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))
   end
-  
+
   def self.set_git_timeout(time)
     Grit::Git.git_timeout = time
   end
-  
+
   def self.set_git_max_filesize(size)
     Grit::Git.git_max_size = size
   end
@@ -60,9 +60,9 @@ module Gollum
       super(message || "Cannot write #{@dir}/#{@attempted_path}, found #{@dir}/#{@existing_path}.")
     end
   end
-  
-  class InvalidGitRepositoryError < StandardError ; end
-  class NoSuchPathError < StandardError ; end
-  
+
+  class InvalidGitRepositoryError < StandardError; end
+  class NoSuchPathError < StandardError; end
+
 end
 

data/lib/gollum-lib/blob_entry.rb

@@ -38,7 +38,7 @@ module Gollum
     # Returns an unbaked Grit::Blob instance.
     def blob(repo)
       @blob ||= Grit::Blob.create(repo,
-        :id => @sha, :name => name, :size => @size, :mode => @mode)
+                                  :id => @sha, :name => name, :size => @size, :mode => @mode)
     end
 
     # Gets a Page instance for this blob.
@@ -47,8 +47,8 @@ module Gollum
     #
     # Returns a Gollum::Page instance.
     def page(wiki, commit)
-      blob = self.blob(wiki.repo)
-      page = wiki.page_class.new(wiki).populate(blob, self.dir)
+      blob         = self.blob(wiki.repo)
+      page         = wiki.page_class.new(wiki).populate(blob, self.dir)
       page.version = commit
       page
     end
@@ -59,8 +59,8 @@ module Gollum
     #
     # Returns a Gollum::File instance.
     def file(wiki, commit)
-      blob = self.blob(wiki.repo)
-      file = wiki.file_class.new(wiki).populate(blob, self.dir)
+      blob         = self.blob(wiki.repo)
+      file         = wiki.file_class.new(wiki).populate(blob, self.dir)
       file.version = commit
       file
     end

data/lib/gollum-lib/committer.rb

@@ -39,7 +39,7 @@ module Gollum
     def index
       @index ||= begin
         idx = @wiki.repo.index
-        if tree   = options[:tree]
+        if tree = options[:tree]
           idx.read_tree(tree)
         elsif parent = parents.first
           idx.read_tree(parent.tree.id)
@@ -53,7 +53,7 @@ module Gollum
     # Returns a Grit::Actor.
     def actor
       @actor ||= begin
-        @options[:name]  = @wiki.default_committer_name  if @options[:name].to_s.empty?
+        @options[:name]  = @wiki.default_committer_name if @options[:name].to_s.empty?
         @options[:email] = @wiki.default_committer_email if @options[:email].to_s.empty?
         Grit::Actor.new(@options[:name], @options[:email])
       end
@@ -92,7 +92,7 @@ module Gollum
 
       path = @wiki.page_file_name(name, format)
 
-      dir = '/' if dir.strip.empty?
+      dir  = '/' if dir.strip.empty?
 
       fullpath = ::File.join(*[@wiki.page_file_dir, dir, path].compact)
       fullpath = fullpath[1..-1] if fullpath =~ /^\//
@@ -107,7 +107,7 @@ module Gollum
         tree.blobs.each do |blob|
           next if page_path_scheduled_for_deletion?(index.tree, fullpath)
 
-          existing_file = blob.name.downcase.sub(/\.\w+$/, '')
+          existing_file     = blob.name.downcase.sub(/\.\w+$/, '')
           existing_file_ext = ::File.extname(blob.name).sub(/^\./, '')
 
           new_file_ext = ::File.extname(path).sub(/^\./, '')
@@ -145,17 +145,17 @@ module Gollum
         end
 
         path =
-          if dir == ''
-            @wiki.page_file_name(name, format)
-          else
-            ::File.join(dir, @wiki.page_file_name(name, format))
-          end
+            if dir == ''
+              @wiki.page_file_name(name, format)
+            else
+              ::File.join(dir, @wiki.page_file_name(name, format))
+            end
 
         path = path.force_encoding('ascii-8bit') if path.respond_to?(:force_encoding)
 
         Dir.chdir(::File.join(@wiki.repo.path, '..')) do
           if file_path_scheduled_for_deletion?(index.tree, path)
-            @wiki.repo.git.rm({'f' => true}, '--', path)
+            @wiki.repo.git.rm({ 'f' => true }, '--', path)
           else
             @wiki.repo.git.checkout({}, 'HEAD', '--', path)
           end
@@ -198,7 +198,7 @@ module Gollum
       parts = path.split('/')
       if parts.size == 1
         deletions = map.keys.select { |k| !map[k] }
-        downfile = parts.first.downcase.sub(/\.\w+$/, '')
+        downfile  = parts.first.downcase.sub(/\.\w+$/, '')
         deletions.any? { |d| d.downcase.sub(/\.\w+$/, '') == downfile }
       else
         part = parts.shift

data/lib/gollum-lib/file.rb

@@ -11,10 +11,10 @@ module Gollum
     #
     # Returns a newly initialized Gollum::File.
     def initialize(wiki)
-      @wiki = wiki
-      @blob = nil
-      @path = nil
-      @on_disk = false
+      @wiki         = wiki
+      @blob         = nil
+      @path         = nil
+      @on_disk      = false
       @on_disk_path = nil
     end
 
@@ -31,7 +31,7 @@ module Gollum
     #
     # Returns the String url_path
     def escaped_url_path
-      CGI.escape(self.url_path).gsub('%2F','/')
+      CGI.escape(self.url_path).gsub('%2F', '/')
     end
 
     # Public: The on-disk filename of the file.
@@ -41,6 +41,7 @@ module Gollum
       return @path if on_disk?
       @blob && @blob.name
     end
+
     alias filename name
 
     # Public: The raw contents of the page.
@@ -90,9 +91,9 @@ module Gollum
     #
     # Returns the populated Gollum::File.
     def populate(blob, path=nil)
-      @blob = blob
-      @path = "#{path}/#{blob.name}"[1..-1]
-      @on_disk = false
+      @blob         = blob
+      @path         = "#{path}/#{blob.name}"[1..-1]
+      @on_disk      = false
       @on_disk_path = nil
       self
     end
@@ -115,7 +116,7 @@ module Gollum
       # This will try to resolve symbolic links, as well
       pathname = Pathname.new(::File.expand_path(::File.join(@wiki.repo.path, '..', name)))
       if pathname.symlink?
-        source = ::File.readlink(pathname.to_path)
+        source   = ::File.readlink(pathname.to_path)
         realpath = ::File.join(::File.dirname(pathname.to_path), source)
         return false unless realpath && ::File.exist?(realpath)
         @on_disk_path = realpath.to_s

data/lib/gollum-lib/file_view.rb

@@ -10,9 +10,9 @@ module Gollum
     # set pages to wiki.pages and show_all to false
     # set pages to wiki.pages + wiki.files and show_all to true
     def initialize pages, options = {}
-      @pages = pages
+      @pages    = pages
       @show_all = options[:show_all] || false
-      @checked = options[:collapse_tree] ? '' : "checked"
+      @checked  = options[:collapse_tree] ? '' : "checked"
     end
 
     def enclose_tree string
@@ -52,18 +52,18 @@ module Gollum
       else
         url = ::File.join(::File.dirname(page.path), page.filename_stripped)
       end
-      url = url[2..-1] if url[0,2] == './'
+      url = url[2..-1] if url[0, 2] == './'
       url
     end
 
     def render_files
-      html = ''
-      count = @pages.size
+      html         = ''
+      count        = @pages.size
       folder_start = -1
 
       # Process all pages until folders start
-      count.times do | index |
-        page = @pages[ index ]
+      count.times do |index|
+        page = @pages[index]
         path = page.path
 
         unless path.include? '/'
@@ -81,7 +81,7 @@ module Gollum
 
       # Handle special case of only one folder.
       if (count - folder_start == 1)
-        page = @pages[ folder_start ]
+        page = @pages[folder_start]
         html += <<-HTML
         <li>
           <label>#{::File.dirname(page.path)}</label> <input type="checkbox" #{@checked} />
@@ -95,14 +95,14 @@ module Gollum
       end
 
       sorted_folders = []
-      (folder_start).upto count - 1 do | index |
-        sorted_folders += [[ @pages[ index ].path, index ]]
+      (folder_start).upto count - 1 do |index|
+        sorted_folders += [[@pages[index].path, index]]
       end
 
       # http://stackoverflow.com/questions/3482814/sorting-list-of-string-paths-in-vb-net
-      sorted_folders.sort! do |first,second|
-        a = first[0]
-        b = second[0]
+      sorted_folders.sort! do |first, second|
+        a           = first[0]
+        b           = second[0]
 
         # use :: operator because gollum defines its own conflicting File class
         dir_compare = ::File.dirname(a) <=> ::File.dirname(b)
@@ -118,34 +118,34 @@ module Gollum
 
       # keep track of folder depth, 0 = at root.
       cwd_array = []
-      changed = false
+      changed   = false
 
       # process rest of folders
-      (0...sorted_folders.size).each do | index |
-          page =  @pages[ sorted_folders[ index ][ 1 ] ]
-          path = page.path
-          folder = ::File.dirname path
+      (0...sorted_folders.size).each do |index|
+        page   = @pages[sorted_folders[index][1]]
+        path   = page.path
+        folder = ::File.dirname path
 
-          tmp_array = folder.split '/'
+        tmp_array = folder.split '/'
 
-          (0...tmp_array.size).each do | index |
-            if cwd_array[ index ].nil? || changed
-              html += new_sub_folder tmp_array[ index ]
-              next
-            end
+        (0...tmp_array.size).each do |index|
+          if cwd_array[index].nil? || changed
+            html += new_sub_folder tmp_array[index]
+            next
+          end
 
-            if cwd_array[ index ] != tmp_array[ index ]
-              changed = true
-              (cwd_array.size - index).times do
-                html += end_folder
-              end
-              html += new_sub_folder tmp_array[ index ]
+          if cwd_array[index] != tmp_array[index]
+            changed = true
+            (cwd_array.size - index).times do
+              html += end_folder
             end
+            html += new_sub_folder tmp_array[index]
           end
+        end
 
-          html += new_page page
-          cwd_array = tmp_array
-          changed = false
+        html      += new_page page
+        cwd_array = tmp_array
+        changed   = false
       end
 
       # return the completed html

data/lib/gollum-lib/filter.rb

@@ -46,7 +46,7 @@
 module Gollum
   class Filter
     include Gollum::Helpers
-    
+
     # Setup the object.  Sets `@markup` to be the instance of Gollum::Markup that
     # is running this filter chain, and sets `@map` to be an empty hash (for use
     # in your extract/process operations).
@@ -54,7 +54,7 @@ module Gollum
       @markup = markup
       @map    = {}
     end
-    
+
     def extract(_d)
       raise RuntimeError,
             "#{self.class} has not implemented ##extract!"
@@ -64,7 +64,7 @@ module Gollum
       raise RuntimeError,
             "#{self.class} has not implemented ##process!"
     end
-    
+
     protected
     # Render a (presumably) non-fatal error as HTML
     #