gollum-lib 2.0.0 → 3.0.0

data/lib/gollum-lib/wiki.rb

@@ -41,33 +41,33 @@ module Gollum
       # Default: Gollum::Page.
       def page_class
         @page_class ||
-          if superclass.respond_to?(:page_class)
-            superclass.page_class
-          else
-            ::Gollum::Page
-          end
+            if superclass.respond_to?(:page_class)
+              superclass.page_class
+            else
+              ::Gollum::Page
+            end
       end
 
       # Gets the file class used by all instances of this Wiki.
       # Default: Gollum::File.
       def file_class
         @file_class ||
-          if superclass.respond_to?(:file_class)
-            superclass.file_class
-          else
-            ::Gollum::File
-          end
+            if superclass.respond_to?(:file_class)
+              superclass.file_class
+            else
+              ::Gollum::File
+            end
       end
 
       # Gets the markup class used by all instances of this Wiki.
       # Default: Gollum::Markup
       def markup_classes
         @markup_classes ||=
-          if superclass.respond_to?(:markup_classes)
-            superclass.markup_classes
-          else
-            Hash.new(::Gollum::Markup)
-          end
+            if superclass.respond_to?(:markup_classes)
+              superclass.markup_classes
+            else
+              Hash.new(::Gollum::Markup)
+            end
       end
 
       # Gets the default markup class used by all instances of this Wiki.
@@ -100,18 +100,18 @@ module Gollum
       def history_sanitization
         if @history_sanitization.nil?
           @history_sanitization = sanitization ?
-            sanitization.history_sanitization  :
-            false
+              sanitization.history_sanitization :
+              false
         end
         @history_sanitization
       end
     end
 
-    self.default_ref = 'master'
+    self.default_ref             = 'master'
     self.default_committer_name  = 'Anonymous'
     self.default_committer_email = 'anon@anon.com'
 
-    self.default_ws_subs = ['_','-']
+    self.default_ws_subs = ['_', '-']
     self.default_options = {}
 
     # The String base path to prefix to internal links. For example, when set
@@ -150,7 +150,7 @@ module Gollum
 
     # Gets side on which the sidebar should be shown
     attr_reader :bar_side
-    
+
     # An array of symbols which refer to classes under Gollum::Filter,
     # each of which is an element in the "filtering chain".  See
     # the documentation for Gollum::Filter for more on how this chain
@@ -230,12 +230,12 @@ module Gollum
       @h1_title             = options.fetch :h1_title, false
       @index_page           = options.fetch :index_page, 'Home'
       @bar_side             = options.fetch :sidebar, :right
-      @user_icons           = ['gravatar', 'identicon'].include?( options[:user_icons] ) ?
-                              options[:user_icons] : 'none'
+      @user_icons           = ['gravatar', 'identicon'].include?(options[:user_icons]) ?
+          options[:user_icons] : 'none'
       @allow_uploads        = options.fetch :allow_uploads, false
       @per_page_uploads     = options.fetch :per_page_uploads, false
       @filter_chain         = options.fetch :filter_chain,
-                              [:Metadata, :PlainText, :TOC, :RemoteCode, :Code, :Sanitize, :WSD, :Tags, :Render]
+                                            [:Metadata, :PlainText, :TOC, :RemoteCode, :Code, :Sanitize, :WSD, :Tags, :Render]
     end
 
     # Public: check whether the wiki's git repo exists on the filesystem.
@@ -326,7 +326,7 @@ module Gollum
       dir.gsub!(' ', '-')
 
       multi_commit = !!commit[:committer]
-      committer = multi_commit ? commit[:committer] : Committer.new(self, commit)
+      committer    = multi_commit ? commit[:committer] : Committer.new(self, commit)
 
       filename = Gollum::Page.cname(name)
 
@@ -364,12 +364,12 @@ module Gollum
 
       (target_dir, target_name) = ::File.split(rename)
       (source_dir, source_name) = ::File.split(page.path)
-      source_name = page.filename_stripped
+      source_name               = page.filename_stripped
 
       # File.split gives us relative paths with ".", commiter.add_to_index doesn't like that.
-      target_dir = '' if target_dir == '.'
-      source_dir = '' if source_dir == '.'
-      target_dir = target_dir.gsub(/^\//, '')
+      target_dir                = '' if target_dir == '.'
+      source_dir                = '' if source_dir == '.'
+      target_dir                = target_dir.gsub(/^\//, '')
 
       # if the rename is a NOOP, abort
       if source_dir == target_dir and source_name == target_name
@@ -377,10 +377,10 @@ module Gollum
       end
 
       multi_commit = !!commit[:committer]
-      committer = multi_commit ? commit[:committer] : Committer.new(self, commit)
+      committer    = multi_commit ? commit[:committer] : Committer.new(self, commit)
 
       committer.delete(page.path)
-      committer.add_to_index(target_dir, target_name, page.format, page.raw_data, :allow_same_ext)
+      committer.add_to_index(target_dir, target_name, page.format, page.raw_data)
 
       committer.after_commit do |index, sha|
         @access.refresh
@@ -414,21 +414,21 @@ module Gollum
     # Returns the String SHA1 of the newly written version, or the
     # Gollum::Committer instance if this is part of a batch update.
     def update_page(page, name, format, data, commit = {})
-      name   ||= page.name
-      format ||= page.format
+      name     ||= page.name
+      format   ||= page.format
       dir      = ::File.dirname(page.path)
       dir      = '' if dir == '.'
       filename = (rename = page.name != name) ?
-        Gollum::Page.cname(name) : page.filename_stripped
+          Gollum::Page.cname(name) : page.filename_stripped
 
       multi_commit = !!commit[:committer]
-      committer = multi_commit ? commit[:committer] : Committer.new(self, commit)
+      committer    = multi_commit ? commit[:committer] : Committer.new(self, commit)
 
       if !rename && page.format == format
         committer.add(page.path, normalize(data))
       else
         committer.delete(page.path)
-        committer.add_to_index(dir, filename, format, data, :allow_same_ext)
+        committer.add_to_index(dir, filename, format, data)
       end
 
       committer.after_commit do |index, sha|
@@ -459,7 +459,7 @@ module Gollum
     def delete_page(page, commit)
 
       multi_commit = !!commit[:committer]
-      committer = multi_commit ? commit[:committer] : Committer.new(self, commit)
+      committer    = multi_commit ? commit[:committer] : Committer.new(self, commit)
 
       committer.delete(page.path)
 
@@ -496,9 +496,9 @@ module Gollum
         sha2   = nil
       end
 
-      patch     = full_reverse_diff_for(page, sha1, sha2)
-      committer = Committer.new(self, commit)
-      parent    = committer.parents[0]
+      patch                    = full_reverse_diff_for(page, sha1, sha2)
+      committer                = Committer.new(self, commit)
+      parent                   = committer.parents[0]
       committer.options[:tree] = @repo.git.apply_patch(parent.sha, patch)
       return false unless committer.options[:tree]
       committer.after_commit do |index, sha|
@@ -592,12 +592,12 @@ module Gollum
       results = {}
 
       @repo.git.grep(*args).split("\n").each do |line|
-        result = line.split(':')
-        result_1 = result[1]
+        result             = line.split(':')
+        result_1           = result[1]
         # Remove ext only from known extensions.
         # test.pdf => test.pdf, test.md => test
-        file_name = Page::valid_page_name?(result_1) ? result_1.chomp(::File.extname(result_1)) :
-                    result_1
+        file_name          = Page::valid_page_name?(result_1) ? result_1.chomp(::File.extname(result_1)) :
+            result_1
         results[file_name] = result[2].to_i
       end
 
@@ -605,14 +605,14 @@ module Gollum
       # Spaces are converted to dashes when saving pages to disk.
       @repo.git.ls_files({}, "*#{ query.gsub(' ', '-') }*").split("\n").each do |line|
         # Remove ext only from known extensions.
-        file_name = Page::valid_page_name?(line) ? line.chomp(::File.extname(line)) :
-                    line
+        file_name          = Page::valid_page_name?(line) ? line.chomp(::File.extname(line)) :
+            line
         # If there's not already a result for file_name then
         # the value is nil and nil.to_i is 0.
         results[file_name] = results[file_name].to_i + 1;
       end
 
-      results.map do |key,val|
+      results.map do |key, val|
         { :count => val, :name => key }
       end
     end
@@ -655,7 +655,7 @@ module Gollum
         @history_sanitizer ||= options.to_sanitize
       end
     end
-    
+
     # Public: Add an additional link to the filter chain.
     #
     # name - A symbol which represents the name of a class under the
@@ -675,7 +675,7 @@ module Gollum
         raise ArgumentError,
               "Invalid filter name #{name.inspect} (must be a symbol)"
       end
-      
+
       case loc
         when :first
           @filter_chain.unshift(name)
@@ -690,10 +690,10 @@ module Gollum
             raise ArgumentError,
                   "Invalid location specifier"
           end
-          
-          next_to = loc.values.first
+
+          next_to  = loc.values.first
           relative = loc.keys.first
-          
+
           i = @filter_chain.index(next_to)
           if i.nil?
             raise ArgumentError,
@@ -707,7 +707,7 @@ module Gollum
                 "Invalid location specifier"
       end
     end
-    
+
     # Remove the named filter from the filter chain.
     #
     # Returns nothing.  Raises `ArgumentError` if the named filter doesn't
@@ -717,7 +717,7 @@ module Gollum
         raise ArgumentError,
               "Invalid filter name #{name.inspect} (must be a symbol)"
       end
-      
+
       unless @filter_chain.delete(name)
         raise ArgumentError,
               "#{name.inspect} not found in filter chain"
@@ -840,7 +840,7 @@ module Gollum
         path = (page.respond_to?(:path) ? page.path : page.to_s)
         return repo.diff(sha2, sha1, path).first.diff
       end
-      repo.diff(sha2, sha1).map{|d| d.diff}.join("\n")
+      repo.diff(sha2, sha1).map { |d| d.diff }.join("\n")
     end
 
     # Creates a reverse diff for the given SHAs.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,322 +9,330 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.5
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.5
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: rouge
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
-  name: sanitize
+  name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: stringex
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: github-markdown
+  name: org-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: github-markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 0.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.9
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 4.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 4.2.9
 - !ruby/object:Gem::Dependency
-  name: org-ruby
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: wikicloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.2.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.16
 - !ruby/object:Gem::Dependency
   name: nokogiri-diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: rb-fchange
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: twitter_cldr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
 description: A simple, Git-powered wiki with a sweet API and local frontend.
 email: tom@github.com
 executables: []
@@ -373,22 +381,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: gollum-lib
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 2
 summary: A simple, Git-powered wiki.