olelo 0.9.3 → 0.9.4

data/lib/olelo/application.rb

@@ -7,7 +7,7 @@ module Olelo
     include Routing
     include ApplicationHelper
 
-    patterns :path => Page::PATH_PATTERN
+    patterns path: Page::PATH_PATTERN
     attr_reader :page
     attr_setter :on_error
 
@@ -31,8 +31,6 @@ module Olelo
 
     # Executed before each request
     before :routing do
-      Olelo.logger.debug env
-
       User.current = User.find(session[:olelo_user])
       if !User.current
         invoke_hook(:auto_login)
@@ -54,23 +52,23 @@ module Olelo
 
     hook :menu do |menu|
       if menu.name == :actions && page && !page.new?
-        menu.item(:view, :href => build_path(page.path), :accesskey => 'v')
-        edit_menu = menu.item(:edit, :href => build_path(page, :action => :edit), :accesskey => 'e', :rel => 'nofollow')
-        edit_menu.item(:new, :href => build_path(page, :action => :new), :accesskey => 'n', :rel => 'nofollow')
+        menu.item(:view, href: build_path(page.path), accesskey: 'v')
+        edit_menu = menu.item(:edit, href: build_path(page, action: :edit), accesskey: 'e', rel: 'nofollow')
+        edit_menu.item(:new, href: build_path(page, action: :new), accesskey: 'n', rel: 'nofollow')
         if !page.root?
-          edit_menu.item(:move, :href => build_path(page, :action => :move), :rel => 'nofollow')
-          edit_menu.item(:delete, :href => build_path(page, :action => :delete), :rel => 'nofollow')
+          edit_menu.item(:move, href: build_path(page, action: :move), rel: 'nofollow')
+          edit_menu.item(:delete, href: build_path(page, action: :delete), rel: 'nofollow')
         end
-        history_menu = menu.item(:history, :href => build_path(page, :action => :history), :accesskey => 'h')
+        history_menu = menu.item(:history, href: build_path(page, action: :history), accesskey: 'h')
 
         if @menu_versions
           head = !page.head? && (Olelo::Page.find(page.path) rescue nil)
           if page.previous_version || head || page.next_version
-            history_menu.item(:older, :href => build_path(page, original_params.merge(:version => page.previous_version)),
-                              :accesskey => 'o') if page.previous_version
-            history_menu.item(:head, :href => build_path(page.path, original_params), :accesskey => 'c') if head
-            history_menu.item(:newer, :href => build_path(page, original_params.merge(:version => page.next_version)),
-                              :accesskey => 'n') if page.next_version
+            history_menu.item(:older, href: build_path(page, original_params.merge(version: page.previous_version)),
+                              accesskey: 'o') if page.previous_version
+            history_menu.item(:head, href: build_path(page.path, original_params), accesskey: 'c') if head
+            history_menu.item(:newer, href: build_path(page, original_params.merge(version: page.next_version)),
+                              accesskey: 'n') if page.next_version
           end
         end
       end
@@ -79,8 +77,8 @@ module Olelo
     # Handle 404s
     error NotFound do |error|
       Olelo.logger.debug(error)
-      cache_control :no_cache => true
-      halt render(:not_found, :locals => {:error => error})
+      cache_control no_cache: true
+      halt render(:not_found, locals: {error: error})
     end
 
     error StandardError do |error|
@@ -94,8 +92,8 @@ module Olelo
     # Show wiki error page
     error Exception do |error|
       Olelo.logger.error(error)
-      cache_control :no_cache => true
-      halt render(:error, :locals => {:error => error})
+      cache_control no_cache: true
+      halt render(:error, locals: {error: error})
     end
 
     get '/login' do
@@ -150,7 +148,7 @@ module Olelo
         raise NotFound
       end
       @version = @diff.to
-      cache_control :version => @version
+      cache_control version: @version
       render :changes
     end
 
@@ -162,7 +160,7 @@ module Olelo
       @history = page.history((@page_nr - 1) * per_page, limit)
       @page_count = @page_nr + @history.length / per_page
       @history = @history[0...per_page]
-      cache_control :version => page.version
+      cache_control version: page.version
       render :history
     end
 
@@ -183,12 +181,12 @@ module Olelo
         destination = params[:destination].cleanpath
         raise :reserved_path.t if self.class.reserved_path?(destination)
         page.move(destination)
-        Page.commit(:page_moved.t(:page => page.path, :destination => destination))
+        Page.commit(:page_moved.t(page: page.path, destination: destination))
         redirect build_path(page.path)
       end
     end
 
-    get '/compare/:versions(/:path)', :versions => '(?:\w+)\.{2,3}(?:\w+)' do
+    get '/compare/:versions(/:path)', versions: '(?:\w+)\.{2,3}(?:\w+)' do
       @page = Page.find!(params[:path])
       versions = params[:versions].split(/\.{2,3}/)
       begin
@@ -202,11 +200,12 @@ module Olelo
 
     get '/compare(/:path)' do
       versions = params[:versions] || []
-      redirect build_path(params[:path], :action => versions.size < 2 ? :history : "compare/#{versions.first}...#{versions.last}")
+      redirect build_path(params[:path], action: versions.size < 2 ? :history : "compare/#{versions.first}...#{versions.last}")
     end
 
     get '/edit(/:path)' do
       @page = Page.find!(params[:path])
+      flash.info!(:info_binary.t(page: page.title, type: "#{page.mime.comment} (#{page.mime})")) unless page.mime.text?
       render :edit
     end
 
@@ -220,7 +219,7 @@ module Olelo
     def post_edit
       raise 'No content' if !params[:content]
       params[:content].gsub!("\r\n", "\n")
-      message = :page_edited.t(:page => page.title)
+      message = :page_edited.t(page: page.title)
       message << " - #{params[:comment]}" if !params[:comment].blank?
 
       page.content = if params[:pos]
@@ -249,7 +248,7 @@ module Olelo
         errors << :no_changes.t if !page.modified?
       end
       page.save
-      Page.commit(:page_uploaded.t(:page => page.title))
+      Page.commit(:page_uploaded.t(page: page.title))
     end
 
     def post_attributes
@@ -260,31 +259,31 @@ module Olelo
         errors << :no_changes.t if !page.modified?
       end
       page.save
-      Page.commit(:attributes_edited.t(:page => page.title))
+      Page.commit(:attributes_edited.t(page: page.title))
     end
 
     def show_page
       @menu_versions = true
-      render(:show, :locals => {:content => page.try(:content)})
+      render(:show, locals: {content: page.try(:content)})
     end
 
-    get '/(:path)', :tail => true do
+    get '/(:path)', tail: true do
       begin
         @page = Page.find!(params[:path])
-        cache_control :version => page.version
+        cache_control version: page.version
         show_page
       rescue NotFound
-        redirect build_path(params[:path], :action => :new)
+        redirect build_path(params[:path], action: :new)
       end
     end
 
     get '/version/:version(/:path)' do
       @page = Page.find!(params[:path], params[:version])
-      cache_control :version => page.version
+      cache_control version: page.version
       show_page
     end
 
-    post '/(:path)', :tail => true do
+    post '/(:path)', tail: true do
       action, @close = params[:action].to_s.split('-', 2)
       if respond_to? "post_#{action}"
         on_error :edit
@@ -306,12 +305,12 @@ module Olelo
       end
     end
 
-    delete '/:path', :tail => true do
+    delete '/:path', tail: true do
       Page.transaction do
         @page = Page.find!(params[:path])
           on_error :delete
         page.delete
-        Page.commit(:page_deleted.t(:page => page.path))
+        Page.commit(:page_deleted.t(page: page.path))
         render :deleted
       end
     end

data/lib/olelo/attributes.rb

@@ -19,12 +19,12 @@ module Olelo
       end
 
       def label
-        @label ||= Locale.translate(key, :fallback => titlecase(name))
+        @label ||= Locale.translate(key, fallback: titlecase(name))
       end
 
       def label_tag
         type = self.class.name.split('::').last.downcase
-        title = Locale.translate("type_#{type}", :fallback => titlecase(type))
+        title = Locale.translate("type_#{type}", fallback: titlecase(type))
         %{<label for="#{key}" title="#{escape_html title}">#{escape_html label}</label>}
       end
 
@@ -119,7 +119,7 @@ module Olelo
         def field_tag(attr)
           %{<input class="observe" type="text" id="#{key}" name="#{key}" value="#{escape_html(values[attr] || attr)}"/>
             <script type="text/javascript">
-            $('##{key}').combobox({ source: #{escape_javascript values.values.sort.to_json} });
+            $('##{key}').combobox({ source: #{escape_javascript MultiJson.dump(values.values.sort)} });
             </script>}
         end
 
@@ -149,7 +149,7 @@ module Olelo
       end
 
       def label
-        @label ||= name.blank? ? '' : Locale.translate("group_#{path}", :fallback => titlecase(name))
+        @label ||= name.blank? ? '' : Locale.translate("group_#{path}", fallback: titlecase(name))
       end
 
       # Build form for this group

data/lib/olelo/extensions.rb

@@ -157,14 +157,7 @@ class Object
   end
 end
 
-class NilClass;   def blank?; true;  end; end
-class FalseClass; def blank?; true;  end; end
-class TrueClass;  def blank?; false; end; end
-
 class String
-  # Faster blank?
-  alias blank? empty?
-
   # Try to force encoding
   #
   # Force encoding of string and revert

data/lib/olelo/helper.rb

@@ -34,11 +34,9 @@ module Olelo
       env['olelo.flash']
     end
 
-    def flash_messages(action = nil)
-      if !action || action?(action)
-        li = [:error, :warn, :info].map {|level| flash[level].to_a.map {|msg| %{<li class="#{level}">#{escape_html msg}</li>} } }.flatten
-        %{<ul class="flash">#{li.join}</ul>}.html_safe if !li.empty?
-      end
+    def flash_messages
+      li = [:error, :warn, :info].map {|level| flash[level].to_a.map {|msg| %{<li class="#{level}">#{escape_html msg}</li>} } }.flatten
+      %{<ul class="flash">#{li.join}</ul>}.html_safe if !li.empty?
     end
   end
 
@@ -50,7 +48,7 @@ module Olelo
       if page
         render_page(page)
       else
-        %{<a href="#{escape_html build_path(path, :action => :new)}">#{escape_html :create_page.t(:page => path)}</a>}
+        %{<a href="#{escape_html build_path(path, action: :new)}">#{escape_html :create_page.t(page: path)}</a>}
       end
     end
 
@@ -62,7 +60,7 @@ module Olelo
       return if page_count <= 1
       li = []
       li << if page_nr > 1
-              %{<a href="#{escape_html build_path(path, options.merge(:page => page_nr - 1))}">&#9666;</a>}
+              %{<a href="#{escape_html build_path(path, options.merge(page: page_nr - 1))}">&#9666;</a>}
             else
               %{<span class="disabled">&#9666;</span>}
             end
@@ -76,20 +74,20 @@ module Olelo
       max = max + 2 < page_count ? max : page_count
       min = min > 3 ? min : 1
       if min != 1
-        li << %{<a href="#{escape_html build_path(path, options.merge(:page => 1))}">1</a>} << %{<span class="ellipsis"/>}
+        li << %{<a href="#{escape_html build_path(path, options.merge(page: 1))}">1</a>} << %{<span class="ellipsis"/>}
       end
       (min..max).each do |i|
         li << if i == page_nr
                 %{<span class="current">#{i}</span>}
               else
-                %{<a href="#{escape_html build_path(path, options.merge(:page => i))}">#{i}</a>}
+                %{<a href="#{escape_html build_path(path, options.merge(page: i))}">#{i}</a>}
               end
       end
       if max != page_count
-        li << %{<span class="ellipsis"/>} << %{<a href="#{escape_html build_path(path, options.merge(:page => page_count))}">#{page_count}</a>}
+        li << %{<span class="ellipsis"/>} << %{<a href="#{escape_html build_path(path, options.merge(page: page_count))}">#{page_count}</a>}
       end
       li << if page_nr < page_count
-              %{<a href="#{escape_html build_path(path, options.merge(:page => page_nr + 1))}">&#9656;</a>}
+              %{<a href="#{escape_html build_path(path, options.merge(page: page_nr + 1))}">&#9656;</a>}
             else
               %{<span class="disabled">&#9656;</span>}
             end
@@ -101,8 +99,8 @@ module Olelo
     end
 
     def format_diff(diff)
-      summary   = PatchSummary.new(:links => true)
-      formatter = PatchFormatter.new(:links => true, :header => true)
+      summary   = PatchSummary.new(links: true)
+      formatter = PatchFormatter.new(links: true, header: true)
       PatchParser.parse(diff.patch, summary, formatter)
       (summary.html + formatter.html).html_safe
     end
@@ -110,11 +108,11 @@ module Olelo
     def breadcrumbs(page)
       path = page.try(:path) || ''
       li = [%{<li>
-<a accesskey="z" href="#{escape_html build_path(nil, :version => page)}">#{escape_html :root.t}</a></li>}]
+<a accesskey="z" href="#{escape_html build_path(nil, version: page)}">#{escape_html :root.t}</a></li>}]
       path.split('/').inject('') do |parent,elem|
         current = parent/elem
         li << %{<li>
-<a href="#{escape_html build_path(current, :version => page)}">#{escape_html elem}</a></li>}
+<a href="#{escape_html build_path(current, version: page)}">#{escape_html elem}</a></li>}
         current
       end
       ('<ul class="breadcrumbs">' << li.join('<li>/</li>') << '</ul>').html_safe
@@ -141,16 +139,6 @@ module Olelo
       end
       '/' + (Config['base_path'] / path)
     end
-
-    def edit_content(page)
-      if params[:content]
-        params[:content]
-      elsif !(String === page.content) || !valid_xml_chars?(page.content)
-	:error_binary.t(:page => page.title, :type => "#{page.mime.comment} (#{page.mime})")
-      else
-        params[:pos] ? page.content[params[:pos].to_i, params[:len].to_i].to_s : page.content
-      end
-    end
   end
 
   module HttpHelper

data/lib/olelo/html_safe.rb

@@ -19,10 +19,6 @@ class String
     end
   end
 
-  def html_safe?
-    false
-  end
-
   def html_safe
     HtmlString.new(self)
   end

data/lib/olelo/locale.yml

@@ -32,13 +32,14 @@ en:
   edit_page_section:      'Editing #{page} (Section)'
   email:                  'E-Mail'
   empty_password:         'Empty password'
-  error_binary:           '#{page} is a binary #{type} and cannot be edited like a text file.'
+  info_binary:            '#{page} is a binary #{type} and cannot be edited like a text file.'
   error_occurred:         'Oh snap! An error occurred.'
   file:                   'File'
   groups:                 'Groups'
   history:                'History'
   history_of:             'History of #{page}'
   invalid_email:          'E-Mail is invalid'
+  invalid_mime_type:      'Invalid mime type'
   invalid_name:           'Name is invalid'
   invalid_path:           'Invalid path'
   last_modified:          'Last modified'
@@ -120,13 +121,14 @@ de:
   edit_page_section:      'Bearbeite #{page} (Bereich)'
   email:                  'E-Mail'
   empty_password:         'Leeres Passwort'
-  error_binary:           '#{page} ist eine Datei mit dem Typ #{type} und kann nicht wie eine Textdatei bearbeitet werden.'
+  info_binary:            '#{page} ist eine Datei mit dem Typ #{type} und kann nicht wie eine Textdatei bearbeitet werden.'
   error_occurred:         'Hoppla! Es ist ein Fehler aufgetreten.'
   file:                   'Datei'
   groups:                 'Gruppen'
   history:                'Historie'
   history_of:             'Historie von #{page}'
   invalid_email:          'E-Mail ist ungültig'
+  invalid_mime_type:      'Mime-Typ ist ungültig'
   invalid_name:           'Name ist ungültig'
   invalid_path:           'Ungültiger Pfad'
   last_modified:          'Letzte Änderung'
@@ -214,13 +216,14 @@ cs_CZ:
   edit_page_section:      'Editovat #{page} (Sekci)'
   email:                  'e-mail'
   empty_password:         'Prázdné heslo'
-  error_binary:           'Stránka #{page} je binární typ #{type} a nemůže být editována jako textový soubor.'
+  info_binary:            'Stránka #{page} je binární typ #{type} a nemůže být editována jako textový soubor.'
   error_occurred:         'Ouvej! Vyskytla se chyba.'
   file:                   'Soubor'
   groups:                 'Skupiny'
   history:                'Historie'
   history_of:             'Historie stránky #{page}'
   invalid_email:          'e-mail je neplatný'
+  invalid_mime_type:      'mime-type je neplatný'
   invalid_name:           'Jméno je neplatné'
   invalid_path:           'Neplatná cesta'
   last_modified:          'Poslední modifikace'

data/lib/olelo/menu.rb

@@ -91,7 +91,7 @@ module Olelo
 
     def build_menu
       attrs = options.dup
-      label = attrs.delete(:label) || Locale.translate("menu_#{path.join('_')}", :fallback => titlecase(name))
+      label = attrs.delete(:label) || Locale.translate("menu_#{path.join('_')}", fallback: titlecase(name))
       klass = [*attrs.delete(:class)].flatten.compact
       klass = klass.empty? ? '' : %{class="#{klass.join(' ')}" }
       attrs = attrs.map {|k,v| %{#{k}="#{escape_html v}"} }.join(' ')

data/lib/olelo/page.rb

@@ -109,7 +109,7 @@ module Olelo
       raise 'Page is new' if new?
       destination = destination.to_s.cleanpath
       Page.check_path(destination)
-      raise :already_exists.t(:page => destination) if Page.find(destination)
+      raise :already_exists.t(page: destination) if Page.find(destination)
       with_hooks(:move, destination) { repository.move(path, destination) }
       after_commit {|tree_version| update(destination, tree_version) }
     end
@@ -158,6 +158,7 @@ module Olelo
         @attributes = a
         @mime = nil
       end
+      raise :invalid_mime_type.t if attributes['mime'] && attributes['mime'] != mime.to_s
     end
 
     def saved_content
@@ -181,7 +182,7 @@ module Olelo
 
     def save
       raise 'Page is not head' unless head?
-      raise :already_exists.t(:page => path) if new? && Page.find(path)
+      raise :already_exists.t(page: path) if new? && Page.find(path)
       with_hooks(:save) do
         repository.set_content(path, content)
         repository.set_attributes(path, attributes)
@@ -229,22 +230,24 @@ module Olelo
     end
 
     def detect_mime
-      return MimeMagic.new(attributes['mime']) if attributes['mime']
-      Config['mime'].each do |mime|
-        mime = if mime == 'extension'
-                 MimeMagic.by_extension(extension)
-               elsif %w(content magic).include?(mime)
-                 if !new?
-                   if content.blank?
-                     children.empty? ? EMPTY_MIME : DIRECTORY_MIME
-                   else
-                     MimeMagic.by_magic(content)
-                   end
-                 end
-               else
-                 MimeMagic.new(mime)
-               end
-        return mime if mime
+      [attributes['mime'], *Config['mime'], 'application/octet-stream'].each do |method|
+        mime =
+          case method
+          when nil
+          when 'extension'
+            MimeMagic.by_extension(extension)
+          when 'content', 'magic'
+            unless new?
+              if content.blank?
+                children.empty? ? EMPTY_MIME : DIRECTORY_MIME
+              else
+                MimeMagic.by_magic(content)
+              end
+            end
+          else
+            MimeMagic.new(method)
+          end
+        return mime if mime && (!mime.text? || valid_xml_chars?(content))
       end
     end