gollum 2.7.0 → 3.0.0

data/lib/gollum/views/compare.rb

@@ -47,43 +47,45 @@ module Precious
       end
 
       @left_diff_line_number = nil
+
       def left_diff_line_number(id, line)
         if line =~ /^@@/
-          m, li = *line.match(/\-(\d+)/)
+          m, li                  = *line.match(/\-(\d+)/)
           @left_diff_line_number = li.to_i
-          @current_line_number = @left_diff_line_number
-          ret = '...'
+          @current_line_number   = @left_diff_line_number
+          ret                    = '...'
         elsif line[0] == ?-
-          ret = @left_diff_line_number.to_s
+          ret                    = @left_diff_line_number.to_s
           @left_diff_line_number += 1
-          @current_line_number = @left_diff_line_number - 1
+          @current_line_number   = @left_diff_line_number - 1
         elsif line[0] == ?+
           ret = ' '
         else
-          ret = @left_diff_line_number.to_s
+          ret                    = @left_diff_line_number.to_s
           @left_diff_line_number += 1
-          @current_line_number = @left_diff_line_number - 1
+          @current_line_number   = @left_diff_line_number - 1
         end
         ret
       end
 
       @right_diff_line_number = nil
+
       def right_diff_line_number(id, line)
         if line =~ /^@@/
-          m, ri = *line.match(/\+(\d+)/)
+          m, ri                   = *line.match(/\+(\d+)/)
           @right_diff_line_number = ri.to_i
-          @current_line_number = @right_diff_line_number
-          ret = '...'
+          @current_line_number    = @right_diff_line_number
+          ret                     = '...'
         elsif line[0] == ?-
           ret = ' '
         elsif line[0] == ?+
-          ret = @right_diff_line_number.to_s
+          ret                     = @right_diff_line_number.to_s
           @right_diff_line_number += 1
-          @current_line_number = @right_diff_line_number - 1
+          @current_line_number    = @right_diff_line_number - 1
         else
-          ret = @right_diff_line_number.to_s
+          ret                     = @right_diff_line_number.to_s
           @right_diff_line_number += 1
-          @current_line_number = @right_diff_line_number - 1
+          @current_line_number    = @right_diff_line_number - 1
         end
         ret
       end

data/lib/gollum/views/edit.rb

@@ -6,10 +6,10 @@ module Precious
 
       attr_reader :page, :content
 
-       # return path set in app.rb not @page.path
-       def path
-         @path
-       end
+      # return path set in app.rb not @page.path
+      def path
+        @path
+      end
 
       def title
         "#{@page.title}"

data/lib/gollum/views/editable.rb

@@ -4,7 +4,7 @@ module Precious
       Gollum::Markup.formats.map do |key, val|
         { :name     => val[:name],
           :id       => key.to_s,
-          :selected => selected == key}
+          :selected => selected == key }
       end.sort do |a, b|
         a[:name].downcase <=> b[:name].downcase
       end

data/lib/gollum/views/file_view.rb

@@ -10,8 +10,8 @@ module Precious
       def has_results
         !@results.empty?
       end
-      
-      def no_results 
+
+      def no_results
         @results.empty?
       end
     end

data/lib/gollum/views/history.rb

@@ -13,16 +13,16 @@ module Precious
         i = @versions.size + 1
         @versions.map do |v|
           i -= 1
-          { :id       => v.id,
-            :id7      => v.id[0..6],
-            :num      => i,
-            :selected => @page.version.id == v.id,
-            :author   => v.author.name.respond_to?(:force_encoding) ? v.author.name.force_encoding('UTF-8') : v.author.name,
-            :message  => v.message.respond_to?(:force_encoding) ? v.message.force_encoding('UTF-8') : v.message,
-            :date     => v.authored_date.strftime("%B %d, %Y"),
-            :gravatar => Digest::MD5.hexdigest(v.author.email.strip.downcase),
+          { :id        => v.id,
+            :id7       => v.id[0..6],
+            :num       => i,
+            :selected  => @page.version.id == v.id,
+            :author    => v.author.name.respond_to?(:force_encoding) ? v.author.name.force_encoding('UTF-8') : v.author.name,
+            :message   => v.message.respond_to?(:force_encoding) ? v.message.force_encoding('UTF-8') : v.message,
+            :date      => v.authored_date.strftime("%B %d, %Y"),
+            :gravatar  => Digest::MD5.hexdigest(v.author.email.strip.downcase),
             :identicon => self._identicon_code(v.author.email),
-            :date_full=> v.authored_date,
+            :date_full => v.authored_date,
           }
         end
       end
@@ -36,16 +36,16 @@ module Precious
 
       def string_to_code string
         # sha bytes
-        b = [Digest::SHA1.hexdigest(string)[0,20]].pack('H*').bytes.to_a
+        b = [Digest::SHA1.hexdigest(string)[0, 20]].pack('H*').bytes.to_a
         # Thanks donpark's IdenticonUtil.java for this.
         # Match the following Java code
         # ((b[0] & 0xFF) << 24) | ((b[1] & 0xFF) << 16) |
         #	 ((b[2] & 0xFF) << 8) | (b[3] & 0xFF)
 
         return left_shift(b[0], 24) |
-               left_shift(b[1], 16) |
-               left_shift(b[2], 8)  |
-               b[3] & 0xFF
+            left_shift(b[1], 16) |
+            left_shift(b[2], 8) |
+            b[3] & 0xFF
       end
 
       def _identicon_code(blob)
@@ -53,7 +53,7 @@ module Precious
       end
 
       def use_identicon
-          @page.wiki.user_icons == 'identicon'
+        @page.wiki.user_icons == 'identicon'
       end
 
       def partial(name)

data/lib/gollum/views/page.rb

@@ -4,9 +4,9 @@ module Precious
       include HasPage
 
       attr_reader :content, :page, :header, :footer
-      DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
+      DATE_FORMAT    = "%Y-%m-%d %H:%M:%S"
       DEFAULT_AUTHOR = 'you'
-      @@to_xml =  { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
+      @@to_xml       = { :save_with => Nokogiri::XML::Node::SaveOptions::DEFAULT_XHTML ^ 1, :indent => 0, :encoding => 'UTF-8' }
 
       def title
         h1 = @h1_title ? page_header_from_content(@content) : false
@@ -23,14 +23,14 @@ module Precious
 
       def author
         page_versions = @page.versions
-        first = page_versions ? page_versions.first : false
+        first         = page_versions ? page_versions.first : false
         return DEFAULT_AUTHOR unless first
         first.author.name.respond_to?(:force_encoding) ? first.author.name.force_encoding('UTF-8') : first.author.name
       end
 
       def date
         page_versions = @page.versions
-        first = page_versions ? page_versions.first : false
+        first         = page_versions ? page_versions.first : false
         return Time.now.strftime(DATE_FORMAT) unless first
         first.authored_date.strftime(DATE_FORMAT)
       end
@@ -50,7 +50,7 @@ module Precious
       def allow_uploads
         @allow_uploads
       end
-      
+
       def upload_dest
         @upload_dest
       end
@@ -80,7 +80,7 @@ module Precious
       def footer_format
         has_footer && @footer.format.to_s
       end
-      
+
       def bar_side
         @bar_side.to_s
       end
@@ -153,7 +153,7 @@ module Precious
       # Extracts title from page if present.
       #
       def page_header_from_content(content)
-        doc = build_document(content)
+        doc   = build_document(content)
         title = find_header_node(doc).inner_text.strip
         title = nil if title.empty?
         title
@@ -162,11 +162,11 @@ module Precious
       # Returns page content without title if it was extracted.
       #
       def content_without_page_header(content)
-        doc = build_document(content)
+        doc   = build_document(content)
         title = find_header_node(doc)
         title.remove unless title.empty?
         # .inner_html will cause href escaping on UTF-8
-        doc.css("div#gollum-root").children.to_xml( @@to_xml )
+        doc.css("div#gollum-root").children.to_xml(@@to_xml)
       end
     end
   end

data/lib/gollum/views/pages.rb

@@ -11,7 +11,7 @@ module Precious
 
       def breadcrumb
         if @path
-          path = Pathname.new(@path)
+          path       = Pathname.new(@path)
           breadcrumb = [%{<a href="#{@base_url}/pages/">Home</a>}]
           path.descend do |crumb|
             title = crumb.basename
@@ -34,7 +34,7 @@ module Precious
           folder_links = []
 
           @results.map { |page|
-            page_path = page.path.sub(/^#{@path}\//,'')
+            page_path = page.path.sub(/^#{@path}\//, '')
 
             if page_path.include?('/')
               folder      = page_path.split('/').first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,132 +9,160 @@ 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: gollum-lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: github-markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.99.4
-    - - <
+        version: 0.99.5
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.99.4
-    - - <
+        version: 0.99.5
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: useragent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !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: 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: 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
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: A simple, Git-powered wiki with a sweet API and local frontend.
 email: tom@github.com
 executables:
@@ -163,6 +191,11 @@ files:
 - lib/gollum/public/gollum/css/ie7.css
 - lib/gollum/public/gollum/css/print.css
 - lib/gollum/public/gollum/css/template.css
+- lib/gollum/public/gollum/fonts/FontAwesome.otf
+- lib/gollum/public/gollum/fonts/fontawesome-webfont.eot
+- lib/gollum/public/gollum/fonts/fontawesome-webfont.svg
+- lib/gollum/public/gollum/fonts/fontawesome-webfont.ttf
+- lib/gollum/public/gollum/fonts/fontawesome-webfont.woff
 - lib/gollum/public/gollum/images/dirty-shade.png
 - lib/gollum/public/gollum/images/fileview/document.png
 - lib/gollum/public/gollum/images/fileview/folder-horizontal.png
@@ -641,30 +674,28 @@ files:
 - licenses/unity_asset_pool/COPYRIGHT
 - openrc/conf.d/gollum
 - openrc/init.d/gollum
-- templates/formatting.html
-- templates/helper_wiki.rb
 homepage: http://github.com/gollum/gollum
 licenses:
 - MIT
 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
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 2
 summary: A simple, Git-powered wiki.