gollum-lib 1.0.3 → 1.0.4

data/gollum-lib.gemspec

@@ -2,11 +2,11 @@ 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 = '0.0.1'
-  s.required_ruby_version = ">= 1.8.7"
+  s.required_ruby_version = ">= 1.9"
 
   s.name              = 'gollum-lib'
-  s.version           = '1.0.3'
-  s.date              = '2013-06-18'
+  s.version           = '1.0.4'
+  s.date              = '2013-07-20'
   s.rubyforge_project = 'gollum-lib'
   s.license           = 'MIT'
 
@@ -25,10 +25,10 @@ Gem::Specification.new do |s|
   s.add_dependency('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.0')
-  s.add_dependency('sanitize', ['~> 2.0.3', '< 2.0.4']) # sanitize 2.0.4 depends on nokogiri ~> 1.6.0
-  s.add_dependency('nokogiri', ['~> 1.5.9', '< 1.6.0']) # nokogiri 1.6.0 drops support for Ruby 1.8
-  s.add_dependency('stringex', '~> 1.5.1')
+  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('RedCloth', '~> 4.2.9')
   s.add_development_dependency('mocha', '~> 0.13.2')

data/lib/gollum-lib.rb

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

data/lib/gollum-lib/committer.rb

@@ -133,7 +133,7 @@ module Gollum
     # Returns nothing.
     def update_working_dir(dir, name, format)
       unless @wiki.repo.bare
-        if @wiki.page_file_dir
+        if @wiki.page_file_dir && dir !~ /^#{@wiki.page_file_dir}/
           dir = dir.size.zero? ? @wiki.page_file_dir : ::File.join(@wiki.page_file_dir, dir)
         end
 

data/lib/gollum-lib/file.rb

@@ -1,4 +1,6 @@
 # ~*~ encoding: utf-8 ~*~
+require 'pathname'
+
 module Gollum
   class File
     Wiki.file_class = self

data/lib/gollum-lib/markup.rb

@@ -650,9 +650,10 @@ module Gollum
     #
     #########################################################################
 
-    # Extract metadata for data and build metadata table. Metadata
-    # is content found between markers, and must
-    # be a valid YAML mapping.
+    # Extract metadata for data and build metadata table.  Metadata consists of
+    # key/value pairs in "key:value" format found between markers.  Each
+    # key/value pair must be on its own line.  Internal whitespace in keys and
+    # values is preserved, but external whitespace is ignored.
     #
     # Because ri and ruby 1.8.7 are awesome, the markers can't
     # be included in this documentation without triggering
@@ -661,8 +662,18 @@ module Gollum
     #
     # Returns the String of formatted data with metadata removed.
     def extract_metadata(data)
-      @metadata = {}
-      data
+      @metadata ||= {}
+      # The markers are `<!-- ---` and `-->`
+      data.gsub(/\<\!--+\s+---(.*?)--+\>/m) do
+        # Split untrusted input on newlines, then remove bits that look like
+        # HTML elements before parsing each line.
+        $1.split("\n").each do |line|
+          line.gsub!(/<[^>]*>/, '')
+          k, v = line.split(':', 2)
+          @metadata[k.strip] = (v ? v.strip : '') if k
+        end
+        ''
+      end
     end
 
     # Hook for getting the formatted value of extracted tag data.

data/lib/gollum-lib/wiki.rb

@@ -182,6 +182,7 @@ module Gollum
     #           :bar_side      - Where the sidebar should be displayed, may be:
     #                             - :left
     #                             - :right
+    #           :allow_uploads - Set to true to allow file uploads.
     #
     # Returns a fresh Gollum::Repo.
     def initialize(path, options = {})
@@ -221,6 +222,7 @@ module Gollum
       @bar_side             = options.fetch :sidebar, :right
       @user_icons           = ['gravatar', 'identicon'].include?( options[:user_icons] ) ?
                               options[:user_icons] : 'none'
+      @allow_uploads        = options.fetch :allow_uploads, false
     end
 
     # Public: check whether the wiki's git repo exists on the filesystem.
@@ -682,6 +684,9 @@ module Gollum
     # Start with collapsed file view. Default: false
     attr_reader :collapse_tree
 
+    # Toggles file upload functionality.
+    attr_reader :allow_uploads
+
     # Normalize the data.
     #
     # data - The String data to be normalized.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -73,7 +73,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
@@ -89,10 +89,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,19 +97,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.9
-    - - <
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
@@ -121,9 +112,6 @@ dependencies:
     none: false
     requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.9
-    - - <
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
@@ -133,7 +121,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,7 +129,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -428,7 +416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -442,4 +430,3 @@ signing_key:
 specification_version: 2
 summary: A simple, Git-powered wiki.
 test_files: []
-has_rdoc: