olelo 0.9.14 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa782b9e3ea47992610cfa33f1bddaacace33dd0
-  data.tar.gz: 9120ed9f7337dabe28f14d678b1cbf67f97057d7
+  metadata.gz: dcf56a3f895102507ed214a48852d7719b34a87f
+  data.tar.gz: 91d7c9a7eb3d9cfbc958304e09ba827e62995ac8
 SHA512:
-  metadata.gz: 881647481ee59f6ba41cc9d246517098033a1ff92ea9fb54931d9af6a373aa84f2c76ccd40df73aabde4dd274b0b11d5093b374bbd5f96231446ceb5f94824bf
-  data.tar.gz: fb868fbed460dfdad246636d524bcdc411f7f972221b77edb6110833dba490e7e109bb120e4b0b36f0d3fa4cbdb18550a9706729278c85dca0678dfb614bc661
+  metadata.gz: 2b5ae3b55f623132d9f8a8f1e8469a4ae454b56af7723e3eb6afc345c7f2925d5a09989333a81ae44a6dd07cbdd2bc6784cae4143070851865d6011be1ad82d7
+  data.tar.gz: 4461656d97821c1a4a849bf1ccbf0f04bf252cad4fe8b03c419cadd412d720d978e47ccff7917e0fbb56e8ce0aae47bb5140efc184412da32c38ca96fd5002c4

data/README.creole

@@ -80,7 +80,16 @@ For production purposes, I recommend that you deploy the wiki with [[http://unic
 $ unicorn path-to/config.ru
 }}}
 
-Unicorn is a very flexible ruby application server and Ōlelo runs very well on it. You can adapt the number of Unicorn workers depending on the load you expect. It is a good idea to observe the Unicorn workers as described in https://github.com/blog/519-unicorn-god and kill missbehaving workers if necessary.
+Unicorn is a very flexible ruby application server and Ōlelo runs very well on it. You can adapt the number of Unicorn workers depending on the load you expect. It is a good idea to observe the Unicorn workers as described in https://github.com/blog/519-unicorn-god and kill missbehaving workers if necessary. You can call this snippet in a cronjob which terminates all workers gracefully that need more than 100M.
+
+{{{
+#!/bin/bash
+ps -e -www -o pid,rss,command | grep '[u]nicorn worker' | while read -r -a a; do
+        pid=${a[0]}
+        mem=${a[1]}
+        [[ "$mem" -gt 100000 ]] && kill -s QUIT $pid
+done
+}}}
 
 == Configuration
 

data/config/aspects.rb

@@ -53,7 +53,7 @@ regexp :mediawiki_nowiki,  /<nowiki>.*?<\/nowiki>/m,    '<notags>\0</notags>'
 #
 ################################################################################
 
-interwiki_map = YAML.load_file(File.join(Config['config_path'], 'interwiki.yml'))
+interwiki_map = Util.yaml_load_file(File.join(Config['config_path'], 'interwiki.yml'))
 
 ################################################################################
 # Creole aspects configuration

data/lib/olelo.rb

@@ -4,7 +4,7 @@ require 'digest/md5'
 require 'digest/sha2'
 require 'open3'
 require 'set'
-require 'yaml'
+require 'psych'
 require 'mimemagic'
 require 'socket'
 require 'multi_json'

data/lib/olelo/config.rb

@@ -42,7 +42,7 @@ module Olelo
     end
 
     def load!(file)
-      update(YAML.load_file(file))
+      update(Util.yaml_load_file(file))
     end
 
     def each(&block)

data/lib/olelo/initializer.rb

@@ -23,7 +23,7 @@ module Olelo
 
     def init_locale
       Locale.locale = Config['locale']
-      Locale.add(YAML.load_file(File.join(File.dirname(__FILE__), 'locale.yml')))
+      Locale.add(yaml_load_file(File.join(File.dirname(__FILE__), 'locale.yml')))
     end
 
     def init_templates
@@ -38,7 +38,7 @@ module Olelo
       # Load locale provided by plugin
       Plugin.after(:load) do
         virtual_fs.glob('locale.yml') do |fs, name|
-          Locale.add(YAML.load(fs.read(name)))
+          Locale.add(yaml_load(fs.read(name)))
         end
       end
 

data/lib/olelo/util.rb

@@ -50,6 +50,25 @@ module Olelo
       raise MultiError, errors if !errors.empty?
     end
 
+    def yaml_load_file(file)
+      File.open(file, 'r:bom|utf-8') {|f| yaml_load(f.read) }
+    end
+
+    if Psych.respond_to? :safe_load
+      def yaml_load(content)
+        Psych.safe_load(content)
+      end
+    else
+      puts 'WARNING: Psych doesn\'t support safe_load. Potentially unsafe YAML files might be loaded.'
+      def yaml_load(content)
+        Psych.load(content)
+      end
+    end
+
+    def yaml_dump(object)
+      Psych.dump(object)
+    end
+
     # Like CGI.escape but escapes space not as +
     def escape(s)
       s = s.to_s

data/lib/olelo/version.rb

@@ -1,3 +1,3 @@
 module Olelo
-  VERSION = '0.9.14'
+  VERSION = '0.9.15'
 end

data/olelo.gemspec

@@ -12,29 +12,31 @@ Gem::Specification.new do |s|
   s.description       = 'Olelo is a git-based wiki which supports many markup languages, tags, embedded TeX and much more. It can be extended through plugins.'
   s.homepage          = 'http://gitwiki.org/'
   s.rubyforge_project = s.name
+  s.license = 'MIT'
 
   s.files         = `git ls-files | grep -P -v '^tools/'`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w(lib)
 
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 1.9.3'
 
-  s.add_runtime_dependency('RedCloth', ['~> 4.2.9'])
-  s.add_runtime_dependency('creole', ['~> 0.5.0'])
-  s.add_runtime_dependency('evaluator', ['~> 0.1.6'])
-  s.add_runtime_dependency('mimemagic', ['~> 0.2.0'])
-  s.add_runtime_dependency('multi_json', ['~> 1.7.3'])
-  s.add_runtime_dependency('nokogiri', ['~> 1.6.0'])
-  s.add_runtime_dependency('rack', ['~> 1.5.0'])
-  s.add_runtime_dependency('redcarpet', ['~> 3.0.0'])
-  s.add_runtime_dependency('rugged', ['~> 0.19.0'])
-  s.add_runtime_dependency('slim', ['~> 2.0.0'])
-  s.add_runtime_dependency('moneta', ['~> 0.7.0'])
-  s.add_runtime_dependency('rouge', ['~> 0.3.6'])
-  s.add_runtime_dependency('rack-protection', ['~> 1.5.0'])
+  s.add_runtime_dependency('RedCloth', '~> 4.2.9')
+  s.add_runtime_dependency('creole', '~> 0.5.0')
+  s.add_runtime_dependency('evaluator', '~> 0.1.6')
+  s.add_runtime_dependency('mimemagic', '~> 0.2.0')
+  s.add_runtime_dependency('multi_json', '~> 1.7.3')
+  s.add_runtime_dependency('nokogiri', '~> 1.6.0')
+  s.add_runtime_dependency('rack', '~> 1.5.0')
+  s.add_runtime_dependency('redcarpet', '~> 3.0.0')
+  s.add_runtime_dependency('rugged', '~> 0.19.0')
+  s.add_runtime_dependency('slim', '~> 2.0.0')
+  s.add_runtime_dependency('psych', '~> 2.0.0')
+  s.add_runtime_dependency('moneta', '~> 0.7.0')
+  s.add_runtime_dependency('rouge', '~> 0.3.6')
+  s.add_runtime_dependency('rack-protection', '~> 1.5.0')
 
-  s.add_development_dependency('bacon', ['~> 1.1.0'])
-  s.add_development_dependency('rack-test', ['~> 0.6.2'])
-  s.add_development_dependency('rake', ['>= 0.8.7'])
-  s.add_development_dependency('sass', ['~> 3.2.3'])
+  s.add_development_dependency('bacon', '~> 1.1.0')
+  s.add_development_dependency('rack-test', '~> 0.6.2')
+  s.add_development_dependency('rake', '>= 0.8.7')
+  s.add_development_dependency('sass', '~> 3.2.3')
 end

data/plugins/aspects/highlight.rb

@@ -4,11 +4,11 @@ dependencies 'utils/rouge'
 
 Aspect.create(:highlight, priority: 2, layout: true, cacheable: true) do
   def accepts?(page)
-    !page.content.empty? && ::Rouge::Lexer.guess_by_filename(page.name)
+    !page.content.empty? && ::Rouge::Lexer.guesses(:mimetype => page.mime.to_s).size == 1
   end
 
   def call(context, page)
-    ::Rouge.highlight(page.content, ::Rouge::Lexer.guess_by_filename(page.name), 'html')
+    ::Rouge.highlight(page.content, ::Rouge::Lexer.guess_by_mimetype(page.mime.to_s), 'html')
   end
 end
 

data/plugins/filters/link_classifier.rb

@@ -9,7 +9,7 @@ Filter.create :link_classifier do |context, content|
     if href.starts_with?('http://') || href.starts_with?('https://')
       classes << 'external'
     elsif !href.empty? && !href.starts_with?('#')
-      path, query = href.split('?')
+      path, query = href.split(/[?#]/, 2)
       if path.starts_with? Config['base_path']
         path = path[Config['base_path'].length..-1]
       elsif !path.starts_with? '/'

data/plugins/filters/pandoc.rb

@@ -0,0 +1,7 @@
+description 'Pandoc filter'
+require 'pandoc-ruby'
+
+Filter.create :pandoc do |context, content|
+  PandocRuby.convert(content, from: options[:from], to: options[:to])
+end
+

data/plugins/repositories/gitrb_repository.rb

@@ -92,7 +92,7 @@ class GitrbRepository < Repository
   def get_attributes(path, version)
     check_path(path)
     object = get_object(path + ATTRIBUTE_EXT, version)
-    object && object.type == :blob ? YAML.load(object.data) : {}
+    object && object.type == :blob ? yaml_load(object.data) : {}
   end
 
   # @override
@@ -115,7 +115,7 @@ class GitrbRepository < Repository
   # @override
   def set_attributes(path, attributes)
     check_path(path)
-    attributes = attributes.blank? ? nil : YAML.dump(attributes).sub(/\A\-\-\-\s*\n/s, '')
+    attributes = attributes.blank? ? nil : yaml_dump(attributes).sub(/\A\-\-\-\s*\n/s, '')
     expand_tree(path)
     if attributes
       @git.root[path + ATTRIBUTE_EXT] = Gitrb::Blob.new(data: attributes)

data/plugins/repositories/rugged_repository.rb

@@ -203,7 +203,7 @@ class RuggedRepository < Repository
 
   def set_attributes(path, attributes)
     check_path(path)
-    attributes = attributes.blank? ? nil : YAML.dump(attributes).sub(/\A\-\-\-\s*\n/s, '')
+    attributes = attributes.blank? ? nil : yaml_dump(attributes).sub(/\A\-\-\-\s*\n/s, '')
     expand_tree(path)
     if attributes
       work_tree[path + ATTRIBUTE_EXT] = Blob.new(@git, attributes)
@@ -337,7 +337,7 @@ class RuggedRepository < Repository
     raise 'Not a commit' unless Rugged::Commit === commit
     path += ATTRIBUTE_EXT
     object = object_by_path(commit, path)
-    object ? YAML.load(object.content) : {}
+    object ? yaml_load(object.content) : {}
   end
 
   def diff(path, from, to)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: olelo
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors:
 - Daniel Mendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
@@ -150,6 +150,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +366,7 @@ files:
 - plugins/filters/markdown_nowiki.rb
 - plugins/filters/numbering.xsl
 - plugins/filters/orgmode.rb
+- plugins/filters/pandoc.rb
 - plugins/filters/remind/main.rb
 - plugins/filters/remind/rem2html
 - plugins/filters/rubypants.rb
@@ -539,7 +554,8 @@ files:
 - test/templates_test.rb
 - test/util_test.rb
 homepage: http://gitwiki.org/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -549,7 +565,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -557,7 +573,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: olelo
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Olelo is a git-based wiki.