olelo 0.9.11 → 0.9.12

data/README.creole

@@ -143,7 +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]]
+* [[https://github.com/minad/moneta/|Moneta Storage Interface]]
 
 == Development
 

data/lib/olelo/version.rb

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

data/olelo.gemspec

@@ -23,13 +23,13 @@ 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.3.7'])
+  s.add_runtime_dependency('multi_json', ['~> 1.4.0'])
   s.add_runtime_dependency('nokogiri', ['~> 1.5.5'])
   s.add_runtime_dependency('rack', ['~> 1.4.1'])
   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_runtime_dependency('moneta', ['~> 0.7.0'])
 
   s.add_development_dependency('bacon', ['~> 1.1.0'])
   s.add_development_dependency('rack-test', ['~> 0.6.2'])

data/plugins/login/persistent.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 description  'Persistent login'
+require 'openssl'
 
 class ::Olelo::Application
   TOKEN_NAME = 'olelo.token'
@@ -10,7 +11,8 @@ class ::Olelo::Application
       token = request.cookies[TOKEN_NAME]
       if token
         hash, user = token.split('-', 2)
-        User.current = User.find(user) if sha256(user + Config['rack.session_secret']) == hash
+        User.current = User.find(user) if hash == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('sha256'),
+                                                                          Config['rack.session_secret'], user)
       end
     end
   end
@@ -18,8 +20,9 @@ class ::Olelo::Application
   after :action do |method, path|
     if path == '/login'
       if User.logged_in? && params[:persistent]
-        token = "#{sha256(User.current.name + Config['rack.session_secret'])}-#{User.current.name}"
-        response.set_cookie(TOKEN_NAME, value: token, expires: Time.now + TOKEN_LIFETIME)
+        hash = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('sha256'),
+                                       Config['rack.session_secret'], User.current.name)
+        response.set_cookie(TOKEN_NAME, value: "#{hash}-#{User.current.name}", expires: Time.now + TOKEN_LIFETIME)
       end
     elsif path == '/logout'
       response.delete_cookie(TOKEN_NAME)

data/plugins/utils/cache.rb

@@ -1,6 +1,6 @@
 description  'Caching support'
 dependencies 'utils/worker'
-require 'juno'
+require 'moneta'
 
 class Cache
   def initialize(store = nil)
@@ -51,7 +51,7 @@ class Cache
           type = :HashFile
           config[:dir] = config.delete(:root)
         end
-        Juno.new(type, config)
+        Moneta.new(type, config)
       end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: olelo
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -172,13 +172,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: juno
+  name: moneta
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement