olelo 0.9.13 → 0.9.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fa782b9e3ea47992610cfa33f1bddaacace33dd0
+  data.tar.gz: 9120ed9f7337dabe28f14d678b1cbf67f97057d7
+SHA512:
+  metadata.gz: 881647481ee59f6ba41cc9d246517098033a1ff92ea9fb54931d9af6a373aa84f2c76ccd40df73aabde4dd274b0b11d5093b374bbd5f96231446ceb5f94824bf
+  data.tar.gz: fb868fbed460dfdad246636d524bcdc411f7f972221b77edb6110833dba490e7e109bb120e4b0b36f0d3fa4cbdb18550a9706729278c85dca0678dfb614bc661

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ruby-head
   - rbx-19mode
 matrix:

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org/'
 gemspec
 

data/README.creole

@@ -3,7 +3,7 @@
 [[http://rubygems.org/gems/olelo|{{https://badge.fury.io/rb/olelo.png|Gem}}]]
 [[https://travis-ci.org/minad/olelo|{{https://secure.travis-ci.org/minad/olelo.png?branch=master|Build Status}}]]
 [[https://gemnasium.com/minad/olelo|{{https://gemnasium.com/minad/olelo.png?travis|Dependency Status}}]]
-[[https://codeclimate.com/github/minad/olelo|{{https://codeclimate.com/badge.png|Code Climate}}]]
+[[https://codeclimate.com/github/minad/olelo|{{https://codeclimate.com/github/minad/moneta.png|Code Climate}}]]
 
 Ōlelo is a wiki that stores pages in a [[http://git-scm.org/|Git]] repository, supports many markup styles and has an extensible, hackable architecture!
 If you want to see a demo installation go to http://www.gitwiki.org/.

data/config.ru

@@ -86,12 +86,14 @@ use Rack::Static, urls: ['/static'], root: app_path
 
 use Rack::Session::Cookie, key: 'olelo.session', secret: Olelo::Config['rack.session_secret']
 
+if Olelo::Config['production']
+  require 'rack/protection'
+  use Rack::Protection
+end
+
 #require 'rack/perftools_profiler'
 #use Rack::PerftoolsProfiler
 
-use Olelo::Middleware::DegradeMimeType
-use Olelo::Middleware::UAHeader
-
 class LoggerOutput
   def initialize(logger); @logger = logger; end
   def write(text); @logger << text; end

data/lib/olelo.rb

@@ -32,7 +32,5 @@ require 'olelo/initializer'
 require 'olelo/application'
 require 'olelo/version'
 
-require 'olelo/middleware/degrade_mime_type'
-require 'olelo/middleware/ua_header'
 require 'olelo/middleware/force_encoding'
 require 'olelo/middleware/static_cache'

data/lib/olelo/application.rb

@@ -37,7 +37,7 @@ module Olelo
         User.current ||= User.anonymous(request)
       end
 
-      response['Content-Type'] = 'application/xhtml+xml;charset=utf-8'
+      response['Content-Type'] = 'text/html;charset=utf-8'
     end
 
     # Executed after each request

data/lib/olelo/extensions.rb

@@ -1,7 +1,4 @@
 class Module
-  # HACK: private_constant was introduced in 1.9.3
-  def private_constant(*args); end unless respond_to?(:private_constant)
-
   # Generate accessor method with question mark
   #
   # @param [String, Symbol...] attrs Attributes to generate setter for

data/lib/olelo/version.rb

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

data/olelo.gemspec

@@ -23,14 +23,15 @@ Gem::Specification.new do |s|
   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.6.0'])
-  s.add_runtime_dependency('nokogiri', ['~> 1.5.5'])
+  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', ['~> 2.2.2'])
-  s.add_runtime_dependency('rugged', ['~> 0.17.0.b7'])
-  s.add_runtime_dependency('slim', ['~> 2.0.0.pre.5'])
+  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.2.13'])
+  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'])

data/plugins/aspects/subpages.rb

@@ -44,7 +44,6 @@ table#subpages
           a.action-delete href=build_path(child, action: :delete) title=:delete.t = :delete.t
 = pagination(@page, @page_count, @page_nr, aspect: 'subpages')
 
-__END__
 @@ locale.yml
 cs:
   actions:         'Akce'

data/plugins/editor/ace/main.rb

@@ -3,5 +3,5 @@ dependencies 'utils/assets'
 export_scripts '*.js'
 
 Application.hook :head do
-  %{<script src="http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js" type="text/javascript"/>}
+  %{<script src="http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js" type="text/javascript"></script>}
 end

data/plugins/editor/recaptcha.rb

@@ -6,11 +6,11 @@ RECAPTCHA_PRIVATE = Config['recaptcha.private']
 
 class ::Olelo::Application
   hook :head do
-    %{<script type="text/javascript" src="http://www.google.com/recaptcha/api/js/recaptcha_ajax.js"/>
+    %{<script type="text/javascript" src="http://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
 <script type="text/javascript">
   $(function() {
     Recaptcha.create('#{RECAPTCHA_PUBLIC}',
-      'recaptcha', {
+      'recaptcha_field', {
         theme: 'clean',
         callback: Recaptcha.focus_response_field
     });
@@ -21,7 +21,7 @@ class ::Olelo::Application
   %w(edit attributes upload).each do |action|
     before "#{action}_buttons" do
       if flash[:show_captcha] && action?(action)
-        %{<br/><div id="recaptcha"></div><br/>}
+        %{<br/><div id="recaptcha_field"></div><br/>}
       end
     end
 

data/plugins/repositories/rugged_repository.rb

@@ -21,7 +21,7 @@ class RuggedRepository < Repository
     end
 
     def save
-      Rugged::Blob.create(@git, @content)
+      @git.write(@content, :blob)
     end
   end
 
@@ -152,19 +152,13 @@ class RuggedRepository < Repository
 
       user = User.current
       author = {email: user.email, name: user.name, time: Time.now }
-      commit = Rugged::Commit.create(@git,
-                                     author: author,
-                                     message: comment,
-                                     committer: author,
-                                     parents: [@head],
-                                     tree: @tree.save)
-
-      raise 'Concurrent transactions' if @head != current_head
-      if current_head
-        @git.head.target = commit
-      else
-        Rugged::Reference.create(@git, "refs/heads/master", commit)
-      end
+      Rugged::Commit.create(@git,
+                            author: author,
+                            message: comment,
+                            committer: author,
+                            parents: [@head],
+                            tree: @tree.save,
+                            update_ref: 'HEAD')
     end
 
     private
@@ -177,7 +171,7 @@ class RuggedRepository < Repository
   def initialize(config)
     @git = Rugged::Repository.new(config[:path])
     Olelo.logger.info "Opening git repository: #{config[:path]}"
-  rescue Rugged::OSError
+  rescue IOError
     Olelo.logger.info "Creating git repository: #{config[:path]}"
     FileUtils.mkpath(config[:path])
     @git = Rugged::Repository.init_at(config[:path], config[:bare])
@@ -419,14 +413,14 @@ class RuggedRepository < Repository
   def oid_by_path(commit, path)
     return commit.tree_oid if path.blank?
     commit.tree.path(path)[:oid]
-  rescue Rugged::IndexerError
+  rescue Rugged::Error
     nil
   end
 
   def object_by_path(commit, path)
     return commit.tree if path.blank?
     @git.lookup(commit.tree.path(path)[:oid])
-  rescue Rugged::IndexerError
+  rescue Rugged::Error
     nil
   end
 

data/plugins/tags/html.rb

@@ -1,42 +1,42 @@
 description 'Safe html tags'
 
 HTML_TAGS = [
-  [:a, {optional: %w(href title)}],
-  [:img, {autoclose: true, optional: %w(src alt title)}],
-  [:br, {autoclose: true}],
-  [:i],
-  [:u],
-  [:b],
-  [:pre],
-  [:kbd],
+  [:a, {optional: %w(href title id)}],
+  [:img, {autoclose: true, optional: %w(src alt title id)}],
+  [:br, {autoclose: true, optional: %w(id)}],
+  [:i, {optional: %w(id)}],
+  [:u, {optional: %w(id)}],
+  [:b, {optional: %w(id)}],
+  [:pre, {optional: %w(id)}],
+  [:kbd, {optional: %w(id)}],
   # provided by syntax highlighter
   # [:code, optional: %w(lang)]
-  [:cite],
-  [:strong],
-  [:em],
-  [:ins],
-  [:sup],
-  [:sub],
-  [:del],
-  [:table],
-  [:tr],
-  [:td, {optional: %w(colspan rowspan)}],
-  [:th],
-  [:ol, {optional: %w(start)}],
-  [:ul],
-  [:li],
-  [:p],
-  [:h1],
-  [:h2],
-  [:h3],
-  [:h4],
-  [:h5],
-  [:h6],
-  [:blockquote, {optional: %w(cite)}],
-  [:div, {optional: %w(style)}],
-  [:span, {optional: %w(style)}],
-  [:video, {optional: %w(autoplay controls height width loop preload src poster)}],
-  [:audio, {optional: %w(autoplay controls loop preload src)}]
+  [:cite, {optional: %w(id)}],
+  [:strong, {optional: %w(id)}],
+  [:em, {optional: %w(id)}],
+  [:ins, {optional: %w(id)}],
+  [:sup, {optional: %w(id)}],
+  [:sub, {optional: %w(id)}],
+  [:del, {optional: %w(id)}],
+  [:table, {optional: %w(id)}],
+  [:tr, {optional: %w(id)}],
+  [:td, {optional: %w(colspan rowspan id)}],
+  [:th, {optional: %w(id)}],
+  [:ol, {optional: %w(start id)}],
+  [:ul, {optional: %w(id)}],
+  [:li, {optional: %w(id)}],
+  [:p, {optional: %w(id)}],
+  [:h1, {optional: %w(id)}],
+  [:h2, {optional: %w(id)}],
+  [:h3, {optional: %w(id)}],
+  [:h4, {optional: %w(id)}],
+  [:h5, {optional: %w(id)}],
+  [:h6, {optional: %w(id)}],
+  [:blockquote, {optional: %w(cite id)}],
+  [:div, {optional: %w(style id)}],
+  [:span, {optional: %w(style id)}],
+  [:video, {optional: %w(autoplay controls height width loop preload src poster id)}],
+  [:audio, {optional: %w(autoplay controls loop preload src id)}]
 ]
 
 HTML_TAGS.each do |name, options|

data/test/request_test.rb

@@ -69,8 +69,6 @@ describe 'requests' do
       use Rack::Session::Pool
       use Rack::MethodOverride
       use Olelo::Middleware::ForceEncoding
-      use Olelo::Middleware::DegradeMimeType
-      use Olelo::Middleware::UAHeader
       #use Rack::RelativeRedirect
       run Olelo::Application.new
     end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: olelo
 version: !ruby/object:Gem::Version
-  version: 0.9.13
-  prerelease: 
+  version: 0.9.14
 platform: ruby
 authors:
 - Daniel Mendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: creole
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: evaluator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,39 +69,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,55 +111,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0.b7
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0.b7
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.5
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.5
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,23 +167,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: rack-protection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -214,7 +202,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -222,7 +209,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,7 +216,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -238,23 +223,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -262,7 +244,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -302,10 +283,8 @@ files:
 - lib/olelo/locale.rb
 - lib/olelo/locale.yml
 - lib/olelo/menu.rb
-- lib/olelo/middleware/degrade_mime_type.rb
 - lib/olelo/middleware/force_encoding.rb
 - lib/olelo/middleware/static_cache.rb
-- lib/olelo/middleware/ua_header.rb
 - lib/olelo/page.rb
 - lib/olelo/patch.rb
 - lib/olelo/plugin.rb
@@ -561,26 +540,25 @@ files:
 - test/util_test.rb
 homepage: http://gitwiki.org/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: olelo
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Olelo is a git-based wiki.
 test_files: []

data/lib/olelo/middleware/degrade_mime_type.rb

@@ -1,20 +0,0 @@
-module Olelo
-  module Middleware
-    class DegradeMimeType
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        status, header, body = @app.call(env)
-        if header['Content-Type'] && header['Content-Type'] =~ %r{\Aapplication/xhtml\+xml(;?.*)\Z}
-          charset = $1
-          if env['HTTP_ACCEPT'].to_s !~ %r{application/xhtml\+xml}
-            header['Content-Type'] = "text/html#{charset}"
-          end
-        end
-        [status, header, body]
-      end
-    end
-  end
-end

data/lib/olelo/middleware/ua_header.rb

@@ -1,16 +0,0 @@
-# From ActionPack
-module Olelo
-  module Middleware
-    class UAHeader
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        status, headers, body = @app.call(env)
-        headers['X-UA-Compatible'] = 'IE=Edge,chrome=1'
-        [status, headers, body]
-      end
-    end
-  end
-end