olelo 0.9.10 → 0.9.11

data/README.creole

@@ -92,6 +92,39 @@ export OLELO_CONFIG=/home/olelo/olelo_config.yml
 
 You can also use the '$OLELO_CONFIG' environment variable if you want to run multiple Ōlelo instances with different configurations, for example to serve different pages from different repositories.
 
+== Setting up a private wiki using Apache
+
+Assuming the wiki server is running on localhost:5000 (e.g. unicorn), we can redirect Apache requests by adding the following
+lines to your virtual host. This works also with https.
+
+{{{
+# Private wiki
+ProxyPass /wiki http://localhost:5000
+ProxyPassReverse /wiki http://localhost:5000
+ProxyPreserveHost On
+ProxyRequests Off
+RequestHeader set X-Forwarded-Proto https
+<Proxy *>
+  Order deny,allow
+  Allow from all
+</Proxy>
+}}}
+
+In your Ōlelo 'config.yml' you should set the following options:
+
+{{{
+base_path: '/wiki'
+
+# Enable the private wiki plugin
+disabled_plugins:
+  - security/readonly_wiki
+  #- security/private_wiki
+  - editor/recaptcha
+
+authentication:
+  enable_signup: false
+}}}
+
 == Dependencies
 
 If you installed Ōlelo as gem or used Bundler you don't really have to care about the dependencies. The standard installation provides the core dependencies and a good selection of optional dependencies.
@@ -110,6 +143,7 @@ Some dependencies are optional, for example depending on the markup you want to
 * [[http://www.imagemagick.org/|ImageMagick for image resizing]]
 * [[http://nokogiri.org/|Nokogiri for auto-generated table of contents]]
 * [[http://pygments.org/|Pygments for syntax highlighting of code blocks]]
+* [[https://github.com/minad/juno/|Juno Storage Interface]]
 
 == Development
 

data/config.ru

@@ -30,14 +30,14 @@ if Dir.pwd == app_path
   puts "Serving from Olelo application directory #{app_path}"
   data_path = File.join(app_path, '.wiki')
   Olelo::Config.instance['repository.git'] = { path: ::File.join(data_path, 'repository'), bare: false }
-  Olelo::Config.instance['cache_store'] = { type: 'file', 'file.root' => ::File.join(data_path, 'cache') }
+  Olelo::Config.instance['cache_store'] = { type: 'HashFile', 'HashFile.dir' => ::File.join(data_path, 'cache') }
   Olelo::Config.instance['authentication.yamlfile.store'] = ::File.join(data_path, 'users.yml')
   Olelo::Config.instance['log.file'] = ::File.join(data_path, 'log')
 elsif File.directory?(::File.join(Dir.pwd, '.git'))
   puts "Serving out of repository #{Dir.pwd}"
   data_path = File.join(Dir.pwd, '.wiki')
   Olelo::Config.instance['repository.git'] = { path: Dir.pwd, bare: false }
-  Olelo::Config.instance['cache_store'] = { type: 'file', 'file.root' => ::File.join(data_path, 'cache') }
+  Olelo::Config.instance['cache_store'] = { type: 'HashFile', 'HashFile.dir' => ::File.join(data_path, 'cache') }
   Olelo::Config.instance['authentication.yamlfile.store'] = ::File.join(data_path, 'users.yml')
   Olelo::Config.instance['log.file'] = ::File.join(data_path, 'log')
 elsif !config_file

data/config/config.yml.default

@@ -25,16 +25,16 @@ sidebar_page:    'Sidebar'
 base_path:      '/'
 
 # Main cache store. Uncomment this!
-# Available caches: memory, file, memcached, pstore
+# Available caches: Memory, File, Memcached, PStore, ... (see juno gem)
 #cache_store:
-#  type:   file
-#  file:
-#    root: '/home/user/wiki/cache'
-#  memcached:
+#  type:   HashFile
+#  HashFile:
+#    dir: '/home/user/wiki/cache'
+#  Memcached:
 #    prefix: ''
 #    server: localhost:11211
-#  memory:
-#  pstore:
+#  Memory:
+#  PStore:
 #    file: '/home/user/wiki/cache.pstore'
 
 # Default math renderer
@@ -117,6 +117,7 @@ disabled_plugins:
   - editor/ace
   - filters/remind
   - tags/fortune
+  - blog
 
 ##################################################
 # Rack middleware configurations

data/lib/olelo/helper.rb

@@ -213,7 +213,7 @@ module Olelo
       end
 
       unless options.empty?
-        query = build_query(options)
+        query = Rack::Utils.build_query(options)
         path += '?' + query unless query.empty?
       end
       '/' + (Config['base_path'] / path)
@@ -326,11 +326,10 @@ module Olelo
 <link rel="stylesheet" href="#{escape_html build_static_path("themes/#{Config['theme']}/style.css")}" type="text/css"/>
 <script src="#{escape_html build_static_path("script.js")}" type="text/javascript"></script>}
       # Add base path to root page to fix links in history browsing and for wikis with base_path
-      base_path = if page && page.root?
-        url = request.base_url
-        url << Config['base_path'] if Config['base_path'] != '/'
-        url << '/' << 'version'/page.tree_version if !page.head?
-        %{<base href="#{escape_html url}/"/>}.html_safe
+      base_path = if request.path_info =~ %r{^/version/[^/]+$} ||
+                      (request.path_info == '/' && Config['base_path'] != '/')
+        url = request.base_url << [Config['base_path'], '/', request.path_info, '/'].join.gsub(%r{/+}, '/')
+        %{<base href="#{escape_html url}"/>}
       end
       [base_path, @@head_links, *invoke_hook(:head)].join.html_safe
     end

data/lib/olelo/util.rb

@@ -125,24 +125,6 @@ module Olelo
       s
     end
 
-    # Build query from parameter hash
-    #
-    # Similar to {Rack::Utils#build_query} but sorts parameters.
-    # This allows the query string to be used as key for caching etc.
-    #
-    # @param [Hash] params Parameter hash
-    # @return [String] query string
-    #
-    def build_query(params)
-      params.map {|k,v| [k.to_s, v ] }.sort.map do |k, v|
-        if v.class == Array
-          build_query(v.map { |x| [k, x] })
-        else
-          "#{escape(k)}=#{escape(v.to_s)}"
-        end
-      end.join('&')
-    end
-
     # Creates deep copy of object by abusing `Marshal`
     # This method is slow and not adequate for huge objects.
     # It can only copy objects which are serializable.

data/lib/olelo/version.rb

@@ -1,3 +1,3 @@
 module Olelo
-  VERSION = '0.9.10'
+  VERSION = '0.9.11'
 end

data/olelo.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('redcarpet', ['~> 2.2.2'])
   s.add_runtime_dependency('rugged', ['~> 0.17.0.b7'])
   s.add_runtime_dependency('slim', ['~> 1.3.3'])
+  s.add_runtime_dependency('juno', ['~> 0.2.0'])
 
   s.add_development_dependency('bacon', ['~> 1.1.0'])
   s.add_development_dependency('rack-test', ['~> 0.6.2'])

data/plugins/aspects/feed.rb

@@ -13,7 +13,7 @@ Aspect.create(:feed, cacheable: true, hidden: true) do
     page_nr = [context.params[:page].to_i, 1].max
     history = page.history((page_nr - 1) * per_page, per_page)
 
-    title = page.root? ? Config['Title'] : page.title
+    title = page.root? ? Config['title'] : page.title
     feed = {
       self_link: url + build_path(page, {aspect: 'feed', format: format}.reject{ |k,v| v.blank? }),
       generator: 'Ōlelo',

data/plugins/aspects/main.rb

@@ -147,7 +147,7 @@ end
 # Plug-in the aspect subsystem
 module ::Olelo::PageHelper
   def render_page(page)
-    cache("include-#{page.path}-#{page.etag}", update: no_cache?, defer: true) do
+    cache(['include', page.path, page.etag], update: no_cache?, defer: true) do
       begin
         context = Context.new(page: page, params: {included: true})
         Aspect.find!(page, layout: true).call(context, page)
@@ -163,7 +163,7 @@ class ::Olelo::Application
   def show_page
     params[:aspect] ||= 'subpages' if params[:path].to_s.ends_with? '/'
     @selected_aspect, layout, header, content =
-    cache("aspect-#{page.path}-#{page.etag}-#{build_query(params)}", update: no_cache?, defer: true) do |cache|
+    cache(['aspect', page.path, page.etag, params], update: no_cache?, defer: true) do |cache|
       aspect = Aspect.find!(page, name: params[:aspect])
       cache.disable! if !aspect.cacheable?
       context = Context.new(page: page, params: params, request: request)
@@ -186,7 +186,7 @@ class ::Olelo::Application
 
   hook :menu do |menu|
     if menu.name == :actions && view_menu = menu[:view]
-      view_menu.append(cache("aspect-menu-#{page.path}-#{page.etag}-#{@selected_aspect}", update: no_cache?, defer: true) do
+      view_menu.append(cache(['aspect-menu', page.path, page.etag, @selected_aspect], update: no_cache?, defer: true) do
         aspects = Aspect.find_all(page).select {|a| !a.hidden? || a.name == @selected_aspect || a.name == page.attributes['aspect'] }.map do |a|
           [Locale.translate("aspect_#{a.name}", fallback: titlecase(a.name)), a]
         end.sort_by(&:first)
@@ -205,7 +205,7 @@ class ::Olelo::Application
     if block || content
       super(content, &block)
     elsif page
-      cache("footer-#{page.path}-#{page.etag}", update: no_cache?) { super() }
+      cache(['footer', page.path, page.etag], update: no_cache?) { super() }
     else
       super()
     end

data/plugins/blog/main.rb

@@ -10,7 +10,7 @@ end
 Tags::Tag.define 'menu', optional: 'path', description: 'Show blog menu', dynamic: true do |context, attrs, content|
   page = Page.find(attrs[:path]) rescue nil
   if page
-    cache("blog-#{page.path}-#{page.etag}", update: no_cache?(context.request.env), defer: true) do
+    cache(['blog', page.path, page.etag], update: no_cache?(context.request.env), defer: true) do
       years = {}
       page.children.each do |child|
         (years[child.version.date.year] ||= [])[child.version.date.month] = true

data/plugins/filters/fix_image_links.rb

@@ -5,7 +5,7 @@ Filter.create :fix_image_links do |context, content|
   doc = XML::Fragment(content)
   linked_images = doc.css('a img')
   doc.css('img').each do |image|
-    path = image['src']
+    path = image['src'] || next
     unless path =~ %r{^w+://} || path.starts_with?(build_path('_')) ||
         (path.starts_with?('/') && !path.starts_with?(build_path('')))
       unless path.include?('aspect=')

data/plugins/history/main.rb

@@ -53,7 +53,7 @@ class ::Olelo::Application
       history_menu = menu.item(:history, href: build_path(page, action: :history), accesskey: 'h')
 
       if @history_versions_menu
-        history_menu.append(cache("history-menu-#{page.path}-#{page.etag}", update: no_cache?, defer: true) do
+        history_menu.append(cache(['history-menu', page.path, page.etag], update: no_cache?, defer: true) do
           head = !page.head? && (Olelo::Page.find(page.path) rescue nil)
           items = []
           if page.previous_version || head || page.next_version

data/plugins/misc/variables.rb

@@ -32,7 +32,7 @@ end
 Application.hook :head, 1 do
   vars = params.merge(PLUGIN.exported_global_variables)
   if page
-    vars.merge!(cache("variables-#{page.path}-#{page.etag}", update: no_cache?, defer: true) do
+    vars.merge!(cache(['variables', page.path, page.etag], update: no_cache?, defer: true) do
       PLUGIN.exported_page_variables(page)
     end)
   end

data/plugins/utils/cache.rb

@@ -1,5 +1,6 @@
 description  'Caching support'
-dependencies 'utils/worker', 'utils/store'
+dependencies 'utils/worker'
+require 'juno'
 
 class Cache
   def initialize(store = nil)
@@ -40,7 +41,18 @@ class Cache
   end
 
   def default_store
-    @@store ||= Store.create(Config['cache_store'])
+    @@store ||=
+      begin
+        type = Config['cache_store.type'].to_sym
+        config = Config['cache_store'][type].to_hash
+        # FIXME: Deprecated :file store config
+        if type == :file
+          puts 'WARNING: You are using the deprecated \'file\' store as cache_store in your configuration.'
+          type = :HashFile
+          config[:dir] = config.delete(:root)
+        end
+        Juno.new(type, config)
+      end
   end
 
   class Disabler

data/test/request_test.rb

@@ -22,9 +22,9 @@ describe 'requests' do
       views_path:        File.join(@app_path, 'views'),
       theme:             'atlantis',
       cache_store:       {
-        type: 'file',
-        file: {
-          root: File.join(@test_path, 'cache')
+        type: 'HashFile',
+        HashFile: {
+          dir: File.join(@test_path, 'cache')
         }
       },
       base_path:          '/',

data/test/util_test.rb

@@ -42,10 +42,6 @@ describe 'Olelo::Util' do
     Olelo::Util.sha256('test').should.equal '9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08'
   end
 
-  it 'should have #build_query' do
-    Olelo::Util.build_query(a: 1, b: [1, 2, 3]).should.equal 'a=1&b=1&b=2&b=3'
-  end
-
   it 'should have #truncate' do
     Olelo::Util.truncate('Annabel Lee It was many and many a year ago', 11).should.equal 'Annabel Lee...'
     Olelo::Util.truncate('In a kingdom by the sea', 39).should.equal 'In a kingdom by the sea'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: olelo
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &13186180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *13186180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.2.9
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &13185500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *13185500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: evaluator
-  requirement: &13184880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *13184880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: mimemagic
-  requirement: &13184340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *13184340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &13183520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 1.3.7
   type: :runtime
   prerelease: false
-  version_requirements: *13183520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &13182660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 1.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *13182660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &13181580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *13181580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &13180940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *13180940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &13180280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +149,15 @@ dependencies:
         version: 0.17.0.b7
   type: :runtime
   prerelease: false
-  version_requirements: *13180280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.17.0.b7
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &13179700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +165,31 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *13179700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: juno
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &13179060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +197,15 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *13179060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &13178400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +213,15 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *13178400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13249720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +229,15 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *13249720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &13248580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +245,12 @@ dependencies:
         version: 3.2.3
   type: :development
   prerelease: false
-  version_requirements: *13248580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
 description: Olelo is a git-based wiki which supports many markup languages, tags,
   embedded TeX and much more. It can be extended through plugins.
 email:
@@ -359,7 +445,6 @@ files:
 - plugins/utils/pygments.scss
 - plugins/utils/semaphore.rb
 - plugins/utils/shell.rb
-- plugins/utils/store.rb
 - plugins/utils/worker.rb
 - plugins/utils/xml.rb
 - static/favicon.png
@@ -480,7 +565,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: olelo
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Olelo is a git-based wiki.

data/plugins/utils/store.rb

@@ -1,336 +0,0 @@
-description 'Key/value store'
-require 'delegate'
-
-# Simple interface to key/value stores with Hash-like interface.
-#
-# Store supports a subset of the Moneta interface,
-# Moneta can be used as a drop-in replacement.
-# It is recommended to wrap the moneta store in a Store::Delegated
-# to only expose the Store interface.
-#
-# @abstract
-class Store
-  extend Factory
-
-  # Exists the value with key
-  #
-  # @param [String] key
-  # @return [Boolean]
-  # @api public
-  # @abstract
-  def key?(key)
-    raise NotImplementedError
-  end
-
-  # Read value with key. Return nil if the key doesn't exist
-  #
-  # @param [String] key
-  # @return [Object] value
-  # @api public
-  # @abstract
-  def [](key)
-    raise NotImplementedError
-  end
-
-  # Write value with key
-  #
-  # @param [String] key
-  # @param [Object] value
-  # @return value
-  # @api public
-  # @abstract
-  def []=(key, value)
-    raise NotImplementedError
-  end
-
-  # Delete the key from the store and return the current value
-  #
-  # @param [String] key
-  # @return [Object] current value
-  # @api public
-  # @abstract
-  def delete(key)
-    raise NotImplementedError
-  end
-
-  # Clear all keys in this store
-  #
-  # @return [void]
-  # @api public
-  # @abstract
-  def clear
-    raise NotImplementedError
-  end
-
-  protected
-
-  # Serialize value
-  #
-  # @param [Object] value Serializable object
-  # @return [String] serialized object
-  # @api private
-  def serialize(value)
-    Marshal.dump(value)
-  end
-
-  # Deserialize value
-  #
-  # @param [String] value Serialized object
-  # @return [Object] Deserialized object
-  # @api private
-  def deserialize(value)
-    value && Marshal.load(value)
-  end
-
-  # Create store instance
-  #
-  # @param [Config] Store configuration
-  # @return [Store]
-  # @api public
-  def self.create(config)
-    self[config[:type]].new(config[config[:type]])
-  end
-
-  # Delegated store
-  Delegated = DelegateClass(Store)
-
-  # Memory based store (uses hash)
-  class Memory < Delegated
-    def initialize(config)
-      super({})
-    end
-  end
-
-  register :memory, Memory
-
-  # Memcached client
-  class Memcached < Delegated
-    def initialize(config)
-      super(Native.new(config))
-    rescue LoadError
-      super(Ruby.new(config))
-    end
-
-    # Uses the memcached gem
-    class Native < Store
-      include Util
-
-      def initialize(config)
-        require 'memcached'
-        @server = ::Memcached.new(config[:server], prefix_key: (config[:prefix] rescue nil))
-      end
-
-      # @override
-      def key?(key)
-        @server.get(md5(key), false)
-        true
-      rescue ::Memcached::NotFound
-        false
-      end
-
-      # @override
-      def [](key)
-        @server.get(md5(key))
-      rescue ::Memcached::NotFound
-      end
-
-      # @override
-      def []=(key, value)
-        @server.set(md5(key), value)
-        value
-      end
-
-      # @override
-      def delete(key)
-        key = md5(key)
-        value = @server.get(key)
-        @server.delete(key)
-        value
-      rescue ::Memcached::NotFound
-      end
-
-      # @override
-      def clear
-        @server.flush
-      end
-    end
-
-    # Uses the dalli gem (memcache-client successor)
-    class Ruby < Store
-      include Util
-
-      def initialize(config)
-        require 'dalli'
-        @server = ::Dalli::Client.new(config[:server], namespace: (config[:prefix] rescue nil))
-      end
-
-      # @override
-      def key?(key)
-        !@server.get(md5(key)).nil?
-      end
-
-      # @override
-      def [](key)
-        deserialize(@server.get(md5(key)))
-      end
-
-      # @override
-      def []=(key, value)
-        @server.set(md5(key), serialize(value))
-        value
-      end
-
-      # @override
-      def delete(key)
-        key = md5(key)
-        value = deserialize(@server.get(key))
-        @server.delete(key)
-        value
-      end
-
-      # @override
-      def clear
-        @server.flush_all
-      end
-    end
-  end
-
-  register :memcached, Memcached
-
-  # PStore based store
-  class PStore < Store
-    def initialize(config)
-      require 'pstore'
-      FileUtils.mkpath(::File.dirname(config[:file]))
-      # Create a thread-safe pstore
-      @store = ::PStore.new(config[:file], true)
-    end
-
-    # @override
-    def key?(key)
-      @store.transaction(true) { @store.root?(key) }
-    end
-
-    # @override
-    def [](key)
-      @store.transaction(true) { @store[key] }
-    end
-
-    # @override
-    def []=(key, value)
-      @store.transaction { @store[key] = value }
-    end
-
-    # @override
-    def delete(key)
-      @store.transaction { @store.delete(key) }
-    end
-
-    # @override
-    def clear
-      @store.transaction do
-        @store.roots.each do |key|
-          @store.delete(key)
-        end
-      end
-    end
-  end
-
-  register :pstore, PStore
-
-  # GDBM based store
-  class GDBM < Store
-    def initialize(config)
-      require 'gdbm'
-      FileUtils.mkpath(::File.dirname(config[:db]))
-      @db = ::GDBM.new(config[:db])
-    end
-
-    # @override
-    def key?(key)
-      @db.has_key?(key)
-    end
-
-    # @override
-    def [](key)
-      deserialize(@db[key])
-    end
-
-    # @override
-    def []=(key, value)
-      @db[key] = serialize(value)
-    end
-
-    # @override
-    def delete(key)
-      @db.delete(key)
-    end
-
-    # @override
-    def clear
-      @db.clear
-    end
-  end
-
-  register :gdbm, GDBM
-
-  # File based store
-  class File < Store
-    def initialize(config)
-      @root = config[:root]
-    end
-
-    # @override
-    def key?(key)
-      ::File.exist?(store_path(key))
-    end
-
-    # @override
-    def [](key)
-      deserialize(::File.read(store_path(key)))
-    rescue Errno::ENOENT
-    end
-
-    # @override
-    def []=(key, value)
-      temp_file = ::File.join(@root, "value-#{$$}-#{Thread.current.object_id}")
-      FileUtils.mkpath(@root)
-      ::File.open(temp_file, 'wb') {|file| file.write(serialize(value)) }
-      path = store_path(key)
-      FileUtils.mkpath(::File.dirname(path))
-      ::File.unlink(path) if ::File.exist?(path)
-      ::File.rename(temp_file, path)
-    rescue
-      ::File.unlink(temp_file) rescue nil
-    ensure
-      value
-    end
-
-    # @override
-    def delete(key)
-      value = self[key]
-      ::File.unlink(store_path(key))
-      value
-    rescue Errno::ENOENT
-    end
-
-    # @override
-    def clear
-      temp_dir = "#{@root}-#{$$}-#{Thread.current.object_id}"
-      ::File.rename(@root, temp_dir)
-      FileUtils.rm_rf(temp_dir)
-    rescue Errno::ENOENT
-    end
-
-    protected
-
-    def store_path(key)
-      key = Util.md5(key)
-      ::File.join(@root, key[0..1], key[2..-1])
-    end
-  end
-
-  register :file, File
-end
-
-Olelo::Store = Store