gollum-lib 1.0.6 → 1.0.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTQzN2UwNTQyMWZjMWIyYTAwMWIxYzQ3NDVkOGJkZGI0MWFjYmEwOA==
-  data.tar.gz: !binary |-
-    MDYzOThmMzJhNGZhNmIxZDRjODNkYWVlNjI2OWYzZmFjYmU3N2U1Mw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZjA1NDUyODg1ODc1ZTg2NmNhNDliMmUwY2E0ZDg2ODUwZDI1OWViNjYwZGJh
-    MDIyZGIxOGMwNDdhODdkODRhM2I1MGY0MDlkODJiYjMyMzZkNmNjYWRkODE1
-    ZDQ3ODdlMzM4N2YwY2FlYWJjYzhhYTE0ZmI2ZjZiNWVmZmIzZTE=
-  data.tar.gz: !binary |-
-    MTVhYmU0MzJlNzkzMjE4YjQ3ZGE0ZGMzODQ1Zjg1YjlmY2M0MzBmMTM5NzQ5
-    ZTRhZjU0Njk0ZGZhMTI1NGU1OGZhNDVhMDRmZjYzZDk0ODBhOGZkYzdiY2E3
-    MDdlZTY5OGM4ZDNjNTE0ODRmOTY5MjdiYWEyMzk3ZTFhY2NmN2M=
+SHA1:
+  metadata.gz: 35ebdb8ba4cc3642ec522e5d2c870e0811a38b2b
+  data.tar.gz: f5ac6eb2c128a51e4701d03f128c1615133cbdd6
+SHA512:
+  metadata.gz: d5f9b3f0ea4c798b4a0a3c8832491a7050d07e6df417db3a960511a571febc1b81fdc44bbc9825e5704ea2266925f73324517104dae29d434cc3e893c202aa00
+  data.tar.gz: 822d1e3e012f4ac9aa082f00504793b8efcb7b1244eeeaa07c8e05fa018fb1c7f950876614128132ba2964c2257892177790f51cf8647a55a8fb3afd20a07f4a

data/gollum-lib.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9"
 
   s.name              = 'gollum-lib'
-  s.version           = '1.0.6'
-  s.date              = '2013-08-10'
+  s.version           = '1.0.7'
+  s.date              = '2013-10-15'
   s.rubyforge_project = 'gollum-lib'
   s.license           = 'MIT'
 
@@ -22,14 +22,14 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency('grit', '~> 2.5.0')
+  s.add_dependency('gitlab-grit', '~> 2.5.0')
   s.add_dependency('github-markup', ['>= 0.7.5', '< 1.0.0'])
-  s.add_dependency('github-markdown', '~> 0.5.3')
   s.add_dependency('pygments.rb', '~> 0.5.2')
   s.add_dependency('sanitize', '~> 2.0.6')
   s.add_dependency('nokogiri', '~> 1.6.0')
   s.add_dependency('stringex', '~> 2.0.5')
 
+  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')

data/lib/gollum-lib.rb

@@ -31,7 +31,7 @@ $KCODE = 'U' if RUBY_VERSION[0,3] == '1.8'
 
 module Gollum
   module Lib
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
   end
 
   def self.assets_path

data/lib/gollum-lib/committer.rb

@@ -120,7 +120,13 @@ module Gollum
 
       fullpath = fullpath.force_encoding('ascii-8bit') if fullpath.respond_to?(:force_encoding)
 
-      index.add(fullpath, @wiki.normalize(data))
+      begin
+        data = @wiki.normalize(data)
+      rescue ArgumentError => err
+        # Swallow errors that arise from data being binary
+        raise err unless err.message.include?('invalid byte sequence')
+      end
+      index.add(fullpath, data)
     end
 
     # Update the given file in the repository's working directory if there

data/lib/gollum-lib/file.rb

@@ -113,11 +113,15 @@ module Gollum
       return false if commit.sha != @wiki.repo.head.commit.sha
 
       # This will try to resolve symbolic links, as well
-      pathname = Pathname.new(::File.join(@wiki.repo.path, '..', name))
-      realpath = pathname.realpath
-      return false unless realpath.exist?
-
-      @on_disk_path = realpath.to_s
+      pathname = Pathname.new(::File.expand_path(::File.join(@wiki.repo.path, '..', name)))
+      if pathname.symlink?
+        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
+      else
+        @on_disk_path = pathname.to_path
+      end
       return true
     end
 

data/lib/gollum-lib/git_access.rb

@@ -18,7 +18,7 @@ module Gollum
       rescue Grit::InvalidGitRepositoryError
         raise Gollum::InvalidGitRepositoryError
       rescue Grit::NoSuchPathError
-        raise Gollum::NoSuchPatherror
+        raise Gollum::NoSuchPathError
       end
       clear
     end
@@ -153,8 +153,8 @@ module Gollum
     #
     # Returns a String SHA.
     def ref_to_sha!(ref)
-      @repo.git.rev_list({:max_count=>1}, ref)
-    rescue Grit::GitRuby::Repository::NoSuchShaFound
+      commit = @repo.commit(ref)
+      commit ? commit.id : nil
     end
 
     # Looks up the Git blobs for a given commit.
@@ -163,15 +163,13 @@ module Gollum
     #
     # Returns an Array of BlobEntry instances.
     def tree!(sha)
-      tree  = @repo.git.native(:ls_tree,
-        {:r => true, :l => true, :z => true}, sha)
-      if tree.respond_to?(:force_encoding)
-        tree.force_encoding("UTF-8")
-      end
-      items = tree.split("\0").inject([]) do |memo, line|
-        memo << parse_tree_line(line)
+      tree = @repo.lstree(sha, {:recursive => true})
+      items = []
+      tree.each do |entry|
+        if entry[:type] == 'blob'
+          items << BlobEntry.new(entry[:sha], entry[:path], entry[:size], entry[:mode].to_i(8)) 
+        end
       end
-
       if dir = @page_file_dir
         regex = /^#{dir}\//
         items.select { |i| i.path =~ regex }

data/lib/gollum-lib/markup.rb

@@ -71,10 +71,13 @@ module Gollum
     # encoding  - Encoding Constant or String.
     #
     # Returns the formatted String content.
-    def render(no_follow = false, encoding = nil)
+    def render(no_follow = false, encoding = nil, include_levels = 10)
       sanitize = no_follow ?
         @wiki.history_sanitizer :
         @wiki.sanitizer
+        
+      @encoding = encoding
+      @include_levels = include_levels
 
       data = @data.dup
       data = extract_metadata(data)
@@ -88,7 +91,7 @@ module Gollum
           raise "There was an error converting #{@name} to HTML."
         end
       rescue Object => e
-        data = %{<p class="gollum-error">#{e.message}</p>}
+        data = html_error(e.message)
       end
       data = process_tags(data)
       data = process_code(data, encoding)
@@ -238,6 +241,8 @@ module Gollum
         %{[[#{tag}]]}
       elsif tag =~ /^_$/
         %{<div class="clearfloats"></div>}
+      elsif html = process_include_tag(tag)
+        html
       elsif html = process_image_tag(tag)
         html
       elsif html = process_file_link_tag(tag)
@@ -246,6 +251,35 @@ module Gollum
         process_page_link_tag(tag)
       end
     end
+    
+    # Render a (presumably) non-fatal error as HTML
+    #
+    def html_error(message)
+      "<p class=\"gollum-error\">#{message}</p>"
+    end
+
+    # Attempt to process the tag as an include tag
+    #
+    # tag - The String tag contents (the  stuff inside the double brackets).
+    #
+    # Returns the String HTML if the tag is a valid image tag or nil
+    #   if it is not.
+    #
+    def process_include_tag(tag)
+      return unless /^include:/.match(tag)
+      page_name = tag[8..-1]
+
+      if @include_levels > 0
+        page = @wiki.page(page_name)
+        if page
+          page.formatted_data(@encoding, @include_levels-1)
+        else
+          html_error("Cannot include #{process_page_link_tag(page_name)} - does not exist yet")
+        end
+      else
+        html_error("Too many levels of included pages, will not include #{process_page_link_tag(page_name)}")
+      end
+    end
 
     # Attempt to process the tag as an image tag.
     #

data/lib/gollum-lib/page.rb

@@ -215,8 +215,8 @@ module Gollum
     # encoding - Encoding Constant or String.
     #
     # Returns the String data.
-    def formatted_data(encoding = nil, &block)
-      @blob && markup_class.render(historical?, encoding) do |doc|
+    def formatted_data(encoding = nil, include_levels = 10, &block)
+      @blob && markup_class.render(historical?, encoding, include_levels) do |doc|
         @doc = doc
         yield doc if block_given?
       end
@@ -266,7 +266,7 @@ module Gollum
     #           :page     - The Integer page number (default: 1).
     #           :per_page - The Integer max count of items to return.
     #           :follow   - Follow's a file across renames, but falls back
-    #                       to a slower Grit native call.  (default: false)
+    #                       to a slower Grit native call (implicit in repo.git.log).  (default: false)
     #
     # Returns an Array of Grit::Commit.
     def versions(options = {})
@@ -274,7 +274,7 @@ module Gollum
         options[:pretty] = 'raw'
         options.delete :max_count
         options.delete :skip
-        log = @wiki.repo.git.native "log", options, @wiki.ref, "--", @path
+        log = @wiki.repo.git.log(options, @wiki.ref, "--", @path)
         Grit::Commit.list_from_string(@wiki.repo, log)
       else
         @wiki.repo.log(@wiki.ref, @path, log_pagination_options(options))

data/lib/gollum-lib/wiki.rb

@@ -751,11 +751,11 @@ module Gollum
     # Returns a String of the reverse Diff to apply.
     def full_reverse_diff_for(page, sha1, sha2 = nil)
       sha1, sha2 = "#{sha1}^", sha1 if sha2.nil?
-      args = [{:R => true}, sha1, sha2]
       if page
-        args << '--' << (page.respond_to?(:path) ? page.path : page.to_s)
+        path = (page.respond_to?(:path) ? page.path : page.to_s)
+        return repo.diff(sha2, sha1, path).first.diff
       end
-      repo.git.native(:diff, *args)
+      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: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,320 +9,320 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: gitlab-grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.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.7.5
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: github-markdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.5
+- !ruby/object:Gem::Dependency
+  name: github-markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.9
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: org-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: wikicloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !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
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !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
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
 - !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
 description: A simple, Git-powered wiki with a sweet API and local frontend.
@@ -365,23 +365,24 @@ 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.0.6
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 2
 summary: A simple, Git-powered wiki.
 test_files: []
+has_rdoc: