olelo 0.9.5 → 0.9.6

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
 matrix:
   allow_failures:
     - rvm: rbx-19mode
+    - rvm: ruby-head
 # HACK: Fix problems with native libraries on ruby-head
 before_install:
   - gem install rugged -v 0.17.0.b7 -- --with-cflags='--std=gnu99'

data/config.ru

@@ -11,7 +11,7 @@ require 'rack/relative_redirect'
 require 'rack/static_cache'
 require 'olelo'
 require 'olelo/middleware/degrade_mime_type'
-require 'olelo/middleware/flash'
+require 'olelo/middleware/ua_header'
 require 'olelo/middleware/force_encoding'
 require 'securerandom'
 
@@ -79,7 +79,7 @@ Olelo::Initializer.initialize(logger)
 # end
 
 use Rack::Runtime
-use Rack::ShowExceptions if !Olelo::Config['production']
+use Rack::ShowExceptions unless Olelo::Config['production']
 
 if Olelo::Config['rack.deflater']
   use Rack::Deflater
@@ -88,6 +88,7 @@ end
 use Rack::StaticCache, urls: ['/static'], root: app_path
 use Rack::Session::Cookie, key: 'olelo.session', secret: Olelo::Config['rack.session_secret']
 use Olelo::Middleware::DegradeMimeType
+use Olelo::Middleware::UAHeader
 
 class LoggerOutput
   def initialize(logger); @logger = logger; end
@@ -96,9 +97,8 @@ end
 
 use Rack::MethodOverride
 use Rack::CommonLogger, LoggerOutput.new(logger)
-use Olelo::Middleware::ForceEncoding
-use Olelo::Middleware::Flash, set_accessors: %w(error warn info)
 use Rack::RelativeRedirect
+use Olelo::Middleware::ForceEncoding
 run Olelo::Application.new
 
 logger.info "Olelo started in #{Olelo::Config['production'] ? 'production' : 'development'} mode"

data/config/config.yml.default

@@ -115,6 +115,7 @@ disabled_plugins:
   - editor/recaptcha
   - editor/ace
   - filters/remind
+  - tags/fortune
 
 ##################################################
 # Rack middleware configurations

data/lib/olelo/helper.rb

@@ -28,10 +28,90 @@ module Olelo
   end
 
   module FlashHelper
+    # Implements bracket accessors for storing and retrieving flash entries.
+    class FlashHash
+      class << self
+        def define_accessors(*accessors)
+          accessors.compact.each do |key|
+            key = key.to_sym
+            class_eval do
+              define_method(key) {|*a| a.size > 0 ? (self[key] = a[0]) : self[key] }
+              define_method("#{key}=") {|val| self[key] = val }
+              define_method("#{key}!") {|val| cache[key] = val }
+            end
+          end
+        end
+
+        def define_set_accessors(*accessors)
+          accessors.compact.each do |key|
+            key = key.to_sym
+            class_eval do
+              define_method(key) {|*val| val.size > 0 ? (self[key] ||= Set.new).merge(val) : self[key] }
+              define_method("#{key}!") {|*val| val.size > 0 ? (cache[key] ||= Set.new).merge(val) : cache[key] }
+            end
+          end
+        end
+      end
+
+      define_set_accessors :error, :warn, :info
+
+      def initialize(session)
+        @session = session
+        raise 'No session available' if !session
+      end
+
+      # Remove an entry from the session and return its value. Cache result in
+      # the instance cache.
+      def [](key)
+        key = key.to_sym
+        cache[key] ||= values.delete(key)
+      end
+
+      # Store the entry in the session, updating the instance cache as well.
+      def []=(key,val)
+        key = key.to_sym
+        cache[key] = values[key] = val
+      end
+
+      # Store a flash entry for only the current request, swept regardless of
+      # whether or not it was actually accessed
+      def now
+        cache
+      end
+
+      # Checks for the presence of a flash entry without retrieving or removing
+      # it from the cache or store.
+      def include?(key)
+        key = key.to_sym
+        cache.keys.include?(key) || values.keys.include?(key)
+      end
+
+      # Clear the hash
+      def clear
+        cache.clear
+        @session.delete(:olelo_flash)
+      end
+
+      private
+
+      # Maintain an instance-level cache of retrieved flash entries. These
+      # entries will have been removed from the session, but are still available
+      # through the cache.
+      def cache
+        @cache ||= {}
+      end
+
+      # Helper to access flash entries from session value. This key
+      # is used to prevent collisions with other user-defined session values.
+      def values
+        @session[:olelo_flash] ||= {}
+      end
+    end
+
     include Util
 
     def flash
-      env['olelo.flash']
+      @flash ||= FlashHash.new(env['rack.session'])
     end
 
     def flash_messages
@@ -246,7 +326,7 @@ module Olelo
       @@script_link ||=
         begin
           path = build_path "static/script.js?#{File.mtime(File.join(Config['app_path'], 'static', 'script.js')).to_i}"
-          %{<script src="#{escape_html path}" type="text/javascript"/>}
+          %{<script src="#{escape_html path}" type="text/javascript"></script>}
         end
       base_path = if page && page.root?
         url = request.base_url

data/lib/olelo/middleware/ua_header.rb

@@ -0,0 +1,15 @@
+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

data/lib/olelo/version.rb

@@ -1,3 +1,3 @@
 module Olelo
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

data/plugins/filters/main.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 description 'Filter pipeline aspect'
 dependencies 'aspects'
 
@@ -41,7 +42,7 @@ class Filter
 
   # Print filter definition. For debugging purposes.
   def definition
-    previous ? "#{previous.definition} > #{name}" : name
+    previous ? "#{previous.definition} → #{name}" : name
   end
 
   # Register a filter class

data/plugins/misc/system.rb

@@ -156,11 +156,13 @@ ul.tabs
       thead
         tr
           th Name
+          th Accepted mime types
           th Filters
       tbody
       - Olelo::Plugin::Aspects::Aspect.aspects.values.flatten.select {|aspect| Olelo::Plugin::Filters::FilterAspect === aspect }.sort_by(&:name).each do |aspect|
         tr
           td= aspect.name
+          td= aspect.accepts ? aspect.accepts.inspect : '*'
           td= aspect.definition
 - if defined?(Olelo::Plugin::Tags::Tag)
   #tab-tags.tab

data/plugins/misc/variables.rb

@@ -25,6 +25,6 @@ end
 # Export variables to javascript for client extensions
 Application.hook :head, 1 do
   vars = page ? params.merge(PLUGIN.exported_variables(page)) : params
-  vars = vars.merge('user_logged_in' => !User.logged_in?, 'user_name' => User.current.name)
+  vars = vars.merge('user_name' => User.current.name) if User.logged_in?
   %{<script type="text/javascript">Olelo = #{escape_javascript MultiJson.dump(vars)};</script>}
 end

data/plugins/repositories/rugged_repository.rb

@@ -392,13 +392,11 @@ class RuggedRepository < Repository
 
   def path_changed?(c, path)
     return true if path.blank?
-    new = [(c.tree.path(path) rescue nil),
-           (c.tree.path(path + ATTRIBUTE_EXT) rescue nil),
-           (c.tree.path(path + CONTENT_EXT) rescue nil)]
-    (new.first && c.parents.empty?) || c.parents.any? do |parent|
-      new != [(parent.tree.path(path) rescue nil),
-              (parent.tree.path(path + ATTRIBUTE_EXT) rescue nil),
-              (parent.tree.path(path + CONTENT_EXT) rescue nil)]
+    ref1, ref2, ref3 = nil, nil, nil
+    (c.parents.empty? && (ref1 ||= c.tree.path(path) rescue {})) || c.parents.any? do |parent|
+      (ref1 ||= c.tree.path(path) rescue {}) != (parent.tree.path(path) rescue {}) ||
+        (ref2 ||= c.tree.path(path + ATTRIBUTE_EXT) rescue {}) != (parent.tree.path(path + ATTRIBUTE_EXT) rescue {}) ||
+        (ref3 ||= c.tree.path(path + CONTENT_EXT) rescue {}) != (parent.tree.path(path + CONTENT_EXT) rescue {})
     end
   end
 

data/plugins/tags/fortune.rb

@@ -0,0 +1,6 @@
+description 'Prints a fortune message (Dynamic example tag for development)'
+
+Tag.define :fortune, :autoclose => true, :description => 'Show fortune message', :dynamic => true do |context, attrs|
+  text = `fortune`
+  "<blockquote>#{escape_html(text)}</blockquote>" if valid_xml_chars?(text)
+end

data/plugins/tags/main.rb

@@ -350,4 +350,3 @@ end
 Tag.define :notags, description: 'Disable tag processing', immediate: true do |context, attrs, content|
   content
 end
-

data/plugins/tags/math.rb

@@ -101,7 +101,7 @@ class ::Olelo::Application
   hook :head do
     if page && Config['math_renderer'] == 'mathjax'
       %{<script type="text/x-mathjax-config">MathJax.Hub.Config({ TeX: { extensions: ['autoload-all.js'] } });</script>
-<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"/>}
+<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>}
     end
   end
 

data/plugins/utils/assets.rb

@@ -21,7 +21,7 @@ class ::Olelo::Application
     end
     if js
       path = build_path "_/assets/assets.js?#{js.first.to_i}"
-      result << %{<script src="#{escape_html path}" type="text/javascript"/>}
+      result << %{<script src="#{escape_html path}" type="text/javascript"></script>}
     end
     result
   end

data/static/script.js

@@ -295,8 +295,8 @@ arguments)},_keyEvent:function(n,s){if(!this.isMultiLine||this.menu.element.is("
 (n>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(n){this._superApply(arguments);this.options.disabled||this.cancelSearch||this.liveRegion.text(n&&n.length?this.options.messages.results(n.length):this.options.messages.noResults)}})})(jQuery);(function(i){function v(o){if(typeof o!="string"&&typeof o!="number")throw new TypeError("Key name must be string or numeric");}function n(){try{s.oleloStorage=JSON.stringify(z)}catch(o){}}var s={},z={};try{if(window.localStorage)s=window.localStorage;if(s.oleloStorage)z=JSON.parse(s.oleloStorage)}catch(r){}i.storage={set:function(o,x){v(o);z[o]=x;n();return x},get:function(o,x){v(o);if(o in z)return z[o];return typeof x=="undefined"?null:x},remove:function(o){v(o);if(o in z){delete z[o];n();return true}return false}}})(jQuery);(function(i){function v(z,r){var o=s[z];return o&&o[r]}var n=null,s={};i.translations=function(z){for(var r in z)if(s[r])for(var o in z[r])s[r][o]=z[r][o];else s[r]=z[r]};i.t=function(z,r){if(!n){var o=i("html");n=o.attr("lang")||o.attr("xml:lang")||"en"}var x;o=v(n,z);if(!o&&(x=n.indexOf("-")))o=v(n.substr(0,x),z);if(o){for(var E in r)o=o.replace(RegExp("#{"+E+"}","g"),r[E]);return o}return"#"+z}})(jQuery);(function(i){function v(){var z=false;switch(this.type){case "checkbox":case "radio":z=this.checked!=this.defaultChecked;break;case "hidden":case "password":case "text":case "textarea":case "file":z=this.value!=this.defaultValue;break;case "select-one":case "select-multiple":for(var r=0;r<this.options.length&&!z;++r)z=this.options[r].selected!=this.options[r].defaultSelected;break}i("label[for="+this.id+"]").toggleClass("unsaved",z);i(this).toggleClass("unsaved",z)}function n(z){i("input.observe, textarea.observe, select.observe").each(function(){v.call(this)});
 return i(".unsaved",z).size()!==0}i.translations({en:{confirmUnsaved:"The page was not saved. Continue?",pageUnsaved:"The page was not saved."},de:{confirmUnsaved:"Die Seite wurde nicht gespeichert. Fortsetzen?",pageUnsaved:"Die Seite wurde nicht gespeichert."},cs:{confirmUnsaved:"Str\u00e1nka nebyla ulo\u017eena. Pokra\u010dovat?",pageUnsaved:"Str\u00e1nka nebyla ulo\u017eena."},fr:{confirmUnsaved:"La page n'a pas \u00e9t\u00e9 enregistr\u00e9e. Voulez vous continuer ?",pageUnsaved:"La page n'a pas \u00e9t\u00e9 enregistr\u00e9e."}});
 i.fn.confirmUnsaved=function(){return!n(this)||confirm(i.t("confirmUnsaved"))};i(document).on("change autocompletechange","input.observe, textarea.observe, select.observe",v);var s=false;i(document).on("submit","form",function(){s=true}).bind("reset",function(){i(".unsaved",this).removeClass("unsaved")});i(window).bind("beforeunload",function(){if(!s&&n(document))return i.t("pageUnsaved")})})(jQuery);(function(i){i.fn.historyTable=function(){function v(){var o=[];z.each(function(){this.checked&&o.push(this.name)});return o}i("thead tr",this).prepend('<th class="compare"><button>&#177;</button></th>');i("tbody tr",this).each(function(){var o=i(this).attr("id").substr(8);i(this).prepend('<td class="compare"><input type="checkbox" name="'+o+'"/></td>')});var n=i.storage.get("historyTable");if(n)for(var s=0;s<n.length;++s)i("input[name="+n[s]+"]").attr("checked","checked");var z=i("tbody input",this),
-r=i("th button",this);r.click(function(){var o=v();i.storage.set("historyTable",o);location.href=location.pathname.replace("/history","/compare/"+o[o.length-1]+"..."+o[0])});i("td input",this).change(function(){v().length>1?r.removeAttr("disabled"):r.attr("disabled","disabled")}).change()}})(jQuery);(function(i){i.fn.pagination=function(v){function n(z){s.load(z+(z.indexOf("?")<0?"?":"&")+"no_layout=1",function(){s.trigger("pageLoaded",[z])})}var s=this;i(document).on("click",v,function(){i(this).addClass("loading");History.enabled?History.pushState(null,document.title,this.href):n(this.href);return false});i(window).bind("statechange",function(){var z=History.getState();n(z.url)})}})(jQuery);(function(i){i.fn.tabWidget=function(v){var n=v&&v.store,s=null;i("> a[href^='#']",this).click(function(){if(s.data("tab")==i(this).data("tab"))return false;if(!s.data("tab").confirmUnsaved())return false;s.data("tab").hide();s.parent().removeClass("selected");s=i(this);s.data("tab").show();s.parent().addClass("selected");n&&i.storage.set(n,s.data("tab").attr("id"));return false});if(n)if(v=i.storage.get(n))s=i("> a[href='#"+v+"']",this);if(!s||s.size()===0)s=i(this).filter(".selected").find("> a[href^='#']");
-if(!s||s.size()===0)s=i(this).filter(":first").find("> a[href^='#']");i("> a[href^='#']",this).each(function(){var z=i(this.href.match(/(#.*)$/)[1]);z.hide();i(this).data("tab",z)});this.removeClass("selected");s.parent().addClass("selected");s.data("tab").show()}})(jQuery);(function(i){function v(n){n=Math.floor(((new Date).getTime()-new Date(n*1E3))/6E4);if(n<=0)return i.t("less_than_a_minute_ago");if(n==1)return i.t("a_minute_ago");if(n<45)return i.t("n_minutes_ago",{n:n});if(n<90)return i.t("one_hour_ago");if(n<1440)return i.t("n_hours_ago",{n:Math.round(n/60)});if(n<2880)return i.t("one_day_ago");if(n<43200)return i.t("n_days_ago",{n:Math.round(n/1440)});if(n<86400)return i.t("one_month_ago");if(n<525960)return i.t("n_months_ago",{n:Math.round(n/43200)});if(n<1051920)return i.t("one_year_ago");
+r=i("th button",this);r.click(function(){var o=v();i.storage.set("historyTable",o);location.href=location.pathname.replace("/history","/compare/"+o[o.length-1]+"..."+o[0])});i("td input",this).change(function(){v().length>1?r.removeAttr("disabled"):r.attr("disabled","disabled")}).change()}})(jQuery);(function(i){i.fn.pagination=function(v){function n(z){s.load(z+(z.indexOf("?")<0?"?":"&")+"no_layout=1",function(){s.trigger("pageLoaded",[z])})}var s=this;i(document).on("click",v,function(){i(this).addClass("loading");History.enabled?History.pushState(null,document.title,this.href):n(this.href);return false});i(window).bind("statechange",function(){var z=History.getState();n(z.url)})}})(jQuery);(function(i){i.fn.tabWidget=function(v){var n=v&&v.store,s=null;i("> a[href^='#']",this).click(function(){if(s.data("tab")==i(this).data("tab"))return false;if(!s.data("tab").confirmUnsaved())return false;s.data("tab").hide();s.parent().removeClass("selected");s=i(this);s.data("tab").show();s.parent().addClass("selected");n&&i.storage.set(n,s.data("tab").attr("id"));return false}).each(function(){var z=i(this.href.match(/(#.*)$/)[1]);z.hide();i(this).data("tab",z)});if(n)if(v=i.storage.get(n))s=i("> a[href='#"+
+v+"']",this);if(!s||s.size()===0)s=i(this).filter(".selected").find("> a[href^='#']");if(!s||s.size()===0)s=i(this).filter(":first").find("> a[href^='#']");if(s&&s.data("tab")){s.parent().addClass("selected");s.data("tab").show()}}})(jQuery);(function(i){function v(n){n=Math.floor(((new Date).getTime()-new Date(n*1E3))/6E4);if(n<=0)return i.t("less_than_a_minute_ago");if(n==1)return i.t("a_minute_ago");if(n<45)return i.t("n_minutes_ago",{n:n});if(n<90)return i.t("one_hour_ago");if(n<1440)return i.t("n_hours_ago",{n:Math.round(n/60)});if(n<2880)return i.t("one_day_ago");if(n<43200)return i.t("n_days_ago",{n:Math.round(n/1440)});if(n<86400)return i.t("one_month_ago");if(n<525960)return i.t("n_months_ago",{n:Math.round(n/43200)});if(n<1051920)return i.t("one_year_ago");
 return i.t("over_n_years_ago",{n:Math.round(n/525960)})}i.translations({en:{less_than_a_minute_ago:"less than a minute ago",a_minute_ago:"a minute ago",n_minutes_ago:"#{n} minutes ago",one_hour_ago:"1 hour ago",n_hours_ago:"#{n} hours ago",one_day_ago:"1 day ago",n_days_ago:"#{n} days ago",one_month_ago:"1 month ago",n_months_ago:"#{n} months ago",one_year_ago:"1 year ago",over_n_years_ago:"over #{n} years ago"},de:{less_than_a_minute_ago:"vor weniger als einer Minute",a_minute_ago:"vor einer Minute",
 n_minutes_ago:"vor #{n} Minuten",one_hour_ago:"vor einer Stunde",n_hours_ago:"vor #{n} Stunden",one_day_ago:"vor einem Tag",n_days_ago:"vor #{n} Tagen",one_month_ago:"vor einem Monat",n_months_ago:"vor #{n} Monaten",one_year_ago:"vor einem Jahr",over_n_years_ago:"vor \u00fcber #{n} Jahren"},cs:{less_than_a_minute_ago:"m\u00e9n\u011b ne\u017e 1 minuta",a_minute_ago:"p\u0159ed minutou",n_minutes_ago:"p\u0159ed #{n} minutami",one_hour_ago:"p\u0159ed hodinou",n_hours_ago:"p\u0159ed #{n} hodinami",one_day_ago:"jeden den",
 n_days_ago:"p\u0159ed #{n} dny",one_month_ago:"jeden m\u011bs\u00edc",n_months_ago:"p\u0159ed #{n} m\u011bs\u00edci",one_year_ago:"1 rok",over_n_years_ago:"p\u0159ed #{n} lety"},fr:{less_than_a_minute_ago:"il y a moins d'une minute",a_minute_ago:"il y a une minute",n_minutes_ago:"il y a #{n} minutes",one_hour_ago:"il y a 1 heure",n_hours_ago:"il y a #{n} heures",one_day_ago:"il y a 1 jour",n_days_ago:"il y a #{n} jours",one_month_ago:"il y a 1 mois",n_months_ago:"il y a #{n} mois",one_year_ago:"il y a 1 an",

data/static/script/14-olelo.tabwidget.js

@@ -4,9 +4,8 @@
     $.fn.tabWidget = function(options) {
         var store = options && options.store;
 	var selected = null;
-
-        // Handle tab clicks
 	$("> a[href^='#']", this).click(function() {
+            // Handle tab clicks
 	    if (selected.data('tab') == $(this).data('tab')) {
 		return false;
 	    }
@@ -22,6 +21,11 @@
 		$.storage.set(store, selected.data('tab').attr('id'));
 	    }
 	    return false;
+	}).each(function() {
+	    // Hide tabs
+	    var tab = $(this.href.match(/(#.*)$/)[1]);
+	    tab.hide();
+	    $(this).data('tab', tab);
 	});
 
         // Get selected tab from store
@@ -42,16 +46,10 @@
             selected = $(this).filter(':first').find("> a[href^='#']");
 	}
 
-        // Find all tabs and hide them
-	$("> a[href^='#']", this).each(function() {
-	    var tab = $(this.href.match(/(#.*)$/)[1]);
-	    tab.hide();
-	    $(this).data('tab', tab);
-	});
-
 	// Show initially selected tab
-	this.removeClass('selected');
-	selected.parent().addClass('selected');
-	selected.data('tab').show();
+	if (selected && selected.data('tab')) {
+	    selected.parent().addClass('selected');
+	    selected.data('tab').show();
+	}
     };
 })(jQuery);

data/test/request_test.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'olelo/middleware/flash'
 require 'olelo/middleware/force_encoding'
 require 'olelo/middleware/degrade_mime_type'
 require 'rack/relative_redirect'
@@ -75,7 +74,6 @@ describe 'requests' do
       use Rack::MethodOverride
       use Olelo::Middleware::ForceEncoding
       use Olelo::Middleware::DegradeMimeType
-      use Olelo::Middleware::Flash, set_accessors: %w(error warn info)
       #use Rack::RelativeRedirect
       run Olelo::Application.new
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: olelo
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &6959180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *6959180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &6957600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *6957600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &6956440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *6956440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &6955340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *6955340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: mimemagic
-  requirement: &7036260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *7036260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &7035140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *7035140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &7034360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *7034360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &7033500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: 0.17.0.b7
   type: :runtime
   prerelease: false
-  version_requirements: *7033500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.17.0.b7
 - !ruby/object:Gem::Dependency
   name: evaluator
-  requirement: &7032780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +149,15 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *7032780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7031960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *7031960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &7031420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *7031420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &7030900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +197,15 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *7030900
+  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: &7030300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +213,12 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *7030300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 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:
@@ -190,8 +255,8 @@ files:
 - lib/olelo/locale.yml
 - lib/olelo/menu.rb
 - lib/olelo/middleware/degrade_mime_type.rb
-- lib/olelo/middleware/flash.rb
 - lib/olelo/middleware/force_encoding.rb
+- lib/olelo/middleware/ua_header.rb
 - lib/olelo/page.rb
 - lib/olelo/patch.rb
 - lib/olelo/plugin.rb
@@ -303,6 +368,7 @@ files:
 - plugins/security/readonly_wiki.rb
 - plugins/tags/code.rb
 - plugins/tags/footnotes.rb
+- plugins/tags/fortune.rb
 - plugins/tags/gist-embed.css
 - plugins/tags/gist.rb
 - plugins/tags/html.rb
@@ -467,7 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: olelo
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Olelo is a git-based wiki.

data/lib/olelo/middleware/flash.rb

@@ -1,97 +0,0 @@
-module Olelo
-  module Middleware
-    class Flash
-      # Implements bracket accessors for storing and retrieving flash entries.
-      class FlashHash
-        def initialize(session)
-          @session = session
-          raise 'No session available' if !session
-        end
-
-        # Remove an entry from the session and return its value. Cache result in
-        # the instance cache.
-        def [](key)
-          key = key.to_sym
-          cache[key] ||= values.delete(key)
-        end
-
-        # Store the entry in the session, updating the instance cache as well.
-        def []=(key,val)
-          key = key.to_sym
-          cache[key] = values[key] = val
-        end
-
-        # Store a flash entry for only the current request, swept regardless of
-        # whether or not it was actually accessed
-        def now
-          cache
-        end
-
-        # Checks for the presence of a flash entry without retrieving or removing
-        # it from the cache or store.
-        def include?(key)
-          key = key.to_sym
-          cache.keys.include?(key) || values.keys.include?(key)
-        end
-
-        # Clear the hash
-        def clear
-          cache.clear
-          @session.delete(:olelo_flash)
-        end
-
-        # Hide the underlying olelo.flash session key and only expose values stored
-        # in the flash.
-        def inspect
-          "#<FlashHash @values=#{values.inspect} @cache=#{cache.inspect}>"
-        end
-
-        # Human readable for logging.
-        def to_s
-          values.inspect
-        end
-
-        private
-
-        # Maintain an instance-level cache of retrieved flash entries. These
-        # entries will have been removed from the session, but are still available
-        # through the cache.
-        def cache
-          @cache ||= {}
-        end
-
-        # Helper to access flash entries from olelo.flash session value. This key
-        # is used to prevent collisions with other user-defined session values.
-        def values
-          @session[:olelo_flash] ||= {}
-        end
-      end
-
-      def initialize(app, options = {})
-        @app = app
-        @hash = Class.new(FlashHash)
-        [*options[:accessors]].compact.each do |key|
-          key = key.to_sym
-          @hash.class_eval do
-            define_method(key) {|*a| a.size > 0 ? (self[key] = a[0]) : self[key] }
-            define_method("#{key}=") {|val| self[key] = val }
-            define_method("#{key}!") {|val| cache[key] = val }
-          end
-        end
-        [*options[:set_accessors]].compact.each do |key|
-          key = key.to_sym
-          @hash.class_eval do
-            define_method(key) {|*val| val.size > 0 ? (self[key] ||= Set.new).merge(val) : self[key] }
-            define_method("#{key}!") {|*val| val.size > 0 ? (cache[key] ||= Set.new).merge(val) : cache[key] }
-          end
-        end
-      end
-
-      def call(env)
-        session = env['rack.session']
-        env['olelo.flash'] ||= @hash.new(session)
-        @app.call(env)
-      end
-    end
-  end
-end