olelo 0.9.1 → 0.9.2

data/lib/olelo/application.rb

@@ -11,7 +11,8 @@ module Olelo
     attr_reader :page
     attr_setter :on_error
 
-    has_around_hooks :request, :routing, :action, :title, :footer, :login_buttons, :edit_buttons
+    has_around_hooks :request, :routing, :action, :title, :footer, :login_buttons,
+                     :edit_buttons, :attributes_buttons, :upload_buttons
     has_hooks :auto_login, :render, :menu, :head, :script
 
     class<< self
@@ -236,8 +237,11 @@ module Olelo
 
     def post_upload
       raise 'No file' if !params[:file]
-      raise :version_conflict.t if !page.new? && page.version.to_s != params[:version]
-      page.content = params[:file][:tempfile]
+      page.content = params[:file][:tempfile].read
+      check do |errors|
+        errors << :version_conflict.t if !page.new? && page.version.to_s != params[:version]
+        errors << :no_changes.t if !page.modified?
+      end
       page.save
       Page.commit(:page_uploaded.t(:page => page.title))
     end
@@ -270,7 +274,7 @@ module Olelo
     end
 
     post '/(:path)', :tail => true do
-      action, @close = params[:action].to_s.split('-')
+      action, @close = params[:action].to_s.split('-', 2)
       if respond_to? "post_#{action}"
         on_error :edit
         Page.transaction do

data/lib/olelo/extensions.rb

@@ -150,14 +150,6 @@ class Hash
 end
 
 class Object
-  # Metaclass of object
-  #
-  # @return [Class]
-  #
-  def metaclass
-    (class << self; self; end)
-  end
-
   # Returns true if object is empty or false
   #
   # @return [Boolean]

data/lib/olelo/helper.rb

@@ -232,7 +232,7 @@ module Olelo
 
     def action?(action)
       if params[:action]
-        params[:action].split('-').include?(action.to_s)
+        params[:action].split('-', 2).first == action.to_s
       else
         unescape(request.path_info).starts_with?("/#{action}")
       end
@@ -264,7 +264,7 @@ module Olelo
         end
       base_path = if page && page.root?
         url = request.base_url
-        url << '/version'/page.tree_version if !page.head?
+        url << '/' << 'version'/page.tree_version if !page.head?
         %{<base href="#{escape_html url}/"/>}.html_safe
       end
       [base_path, @@theme_link, @@script_link, *invoke_hook(:head)].join.html_safe

data/lib/olelo/version.rb

@@ -1,3 +1,3 @@
 module Olelo
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/olelo.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors           = ['Daniel Mendler']
   s.email             = ['mail@daniel-mendler.de']
   s.summary           = 'Olelo is a git-based wiki.'
-  s.summary           = 'Olelo is a git-based wiki which supports many markup languages, tags, embedded TeX and much more. It can be extended through plugins.'
+  s.description       = 'Olelo is a git-based wiki which supports many markup languages, tags, embedded TeX and much more. It can be extended through plugins.'
   s.homepage          = 'http://gitwiki.org/'
   s.rubyforge_project = s.name
 

data/plugins/editor/locale.yml

@@ -1,17 +1,14 @@
 en:
-  captcha: 'Captcha:'
   enter_captcha: 'Please enter the captcha.'
   captcha_invalid: Invalid captcha
   captcha_valid: Valid captcha
   preview: Preview
 de:
-  captcha: 'Captcha:'
   enter_captcha: 'Bitte geben Sie ein Captcha ein.'
   captcha_invalid: 'Ungültiges Captcha'
   captcha_valid: 'Gültiges Captcha'
   preview: Vorschau
 cs_CZ:
-  captcha: 'Captcha:'
   enter_captcha: 'Vložte laskavě captcha kód.'
   captcha_invalid: 'Neplatný captcha kód'
   captcha_valid: 'Platný captcha kód'

data/plugins/editor/recaptcha.rb

@@ -5,10 +5,6 @@ RECAPTCHA_PUBLIC = Config['recaptcha.public']
 RECAPTCHA_PRIVATE = Config['recaptcha.private']
 
 class ::Olelo::Application
-  before :edit_buttons do
-    %{<br/><label for="recaptcha">#{:captcha.t}</label><br/><div id="recaptcha"></div><br/>} if flash[:show_captcha]
-  end
-
   hook :script do
     %{<script type="text/javascript" src="http://www.google.com/recaptcha/api/js/recaptcha_ajax.js"/>
 <script type="text/javascript">
@@ -22,13 +18,21 @@ class ::Olelo::Application
 </script>} if flash[:show_captcha]
   end
 
-  redefine_method :post_edit do
-    if captcha_valid?
-      super()
-    else
-      flash.info! :enter_captcha.t
-      flash.now[:show_captcha] = true
-      halt render(:edit)
+  %w(edit attributes upload).each do |action|
+    before "#{action}_buttons" do
+      if flash[:show_captcha] && action?(action)
+        %{<br/><div id="recaptcha"></div><br/>}
+      end
+    end
+
+    redefine_method "post_#{action}" do
+      if captcha_valid?
+        super()
+      else
+        flash.info! :enter_captcha.t
+        flash.now[:show_captcha] = true
+        halt render(:edit)
+      end
     end
   end
 

data/plugins/login/locale.yml

@@ -0,0 +1,6 @@
+en:
+  persistent_login:     'Persistent login'
+de:
+  persistent_login:     'Dauerhaft anmelden'
+cs_CZ:
+  persistent_login:     'Trvalé přihlášení'

data/plugins/misc/system.rb

@@ -44,10 +44,6 @@ ul.tabs
     tr
       td Memory usage:
       td #{@memory} MiB
-    - if defined?(Olelo::Worker)
-      tr
-        td Worker jobs
-        td= Olelo::Worker.jobs
 #tab-configuration.tab
   h2 Configuration
   table

data/plugins/repositories/gitrb_repository.rb

@@ -88,7 +88,6 @@ class GitrbRepository < Repository
   # @override
   def set_content(path, content)
     check_path(path)
-    content = content.read if content.respond_to? :read
     expand_tree(path)
     object = @git.root[path]
     if object && object.type == :tree

data/plugins/repositories/rugged_repository.rb

@@ -193,7 +193,6 @@ class RuggedRepository < Repository
 
   def set_content(path, content)
     check_path(path)
-    content = content.read if content.respond_to? :read
     expand_tree(path)
     object = work_tree[path]
     if object && object.type == :tree

data/plugins/security/locale.yml

@@ -3,19 +3,16 @@ en:
   attribute_acl_create: 'Create subpages'
   attribute_acl_delete: 'Delete subpages'
   group_acl:            'Access control lists'
-  persistent_login:     'Persistent login'
   login_first:          'You have to login first'
 de:
   attribute_acl_write:  'Schreibzugriff'
   attribute_acl_create: 'Unterseiten anlegen'
   attribute_acl_delete: 'Unterseiten löschen'
   group_acl:            'Zugriffslisten'
-  persistent_login:     'Dauerhaft anmelden'
   login_first:          'Sie müssen sich zuerst anmelden'
 cs_CZ:
   attribute_acl_write:  'Právo zápisu'
   attribute_acl_create: 'Vytvářet podstránky'
   attribute_acl_delete: 'Mazat podstránky'
   group_acl:            'Řízení přístupů (ACL)'
-  persistent_login:     'Trvalé přihlášení'
   login_first:          'Musíte se nejprve přihlásit'

data/views/edit.slim

@@ -42,10 +42,11 @@ form action=build_path(page.new? ? nil : page.path) method='post' enctype='multi
     label for='upload-file' = :file.t
     &file#upload-file.observe name='file'
     br
-    button&submit name='action' value='upload' = :save.t
-    button&submit name='action' value='upload-close' = :save_and_close.t
-    button&reset = :reset.t
-    br
+    = render_block :upload_buttons do
+      button&submit name='action' value='upload' = :save.t
+      button&submit name='action' value='upload-close' = :save_and_close.t
+      button&reset = :reset.t
+      br
 form action=build_path(page.new? ? nil : page.path) method='post'
   #tab-attributes.tab.fieldset
     h2= :attributes.t
@@ -58,8 +59,9 @@ form action=build_path(page.new? ? nil : page.path) method='post'
       &hidden name='version' value=page.version
     = flash_messages :attributes
     = page.attribute_editor
-    .indent
-      button&submit name='action' value='attributes' = :save.t
-      button&submit name='action' value='attributes-close' = :save_and_close.t
-      button&reset = :reset.t
-    br
+    = render_block :attributes_buttons do
+      .indent
+        button&submit name='action' value='attributes' = :save.t
+        button&submit name='action' value='attributes-close' = :save_and_close.t
+        button&reset = :reset.t
+      br

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: olelo
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9036000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+  version_requirements: *9036000
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9035100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+  version_requirements: *9035100
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9034140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.2
+  version_requirements: *9034140
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9114880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 1.5.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
+  version_requirements: *9114880
 - !ruby/object:Gem::Dependency
   name: mimemagic
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9114140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: 0.1.9
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.9
+  version_requirements: *9114140
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9113600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.1
+  version_requirements: *9113600
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9112980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.1
+  version_requirements: *9112980
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9111460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,15 +98,10 @@ dependencies:
         version: 0.17.0b6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.17.0b6
+  version_requirements: *9111460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9110780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +109,10 @@ dependencies:
         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
+  version_requirements: *9110780
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9110120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,13 +120,9 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-description: 
+  version_requirements: *9110120
+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:
 - mail@daniel-mendler.de
 executables:
@@ -239,6 +190,9 @@ files:
 - plugins/aspects/source.rb
 - plugins/aspects/subpages.rb
 - plugins/aspects/text.rb
+- plugins/authentication/portal.rb
+- plugins/authentication/stack.rb
+- plugins/authentication/yamlfile.rb
 - plugins/blog/blog.css
 - plugins/blog/blog.scss
 - plugins/blog/locale.yml
@@ -273,6 +227,9 @@ files:
 - plugins/gallery/gallery.css
 - plugins/gallery/gallery.scss
 - plugins/gallery/main.rb
+- plugins/login/basic_auth.rb
+- plugins/login/locale.yml
+- plugins/login/persistent.rb
 - plugins/misc/fancybox/images/blank.gif
 - plugins/misc/fancybox/images/fancy_close.png
 - plugins/misc/fancybox/images/fancy_loading.png
@@ -309,14 +266,9 @@ files:
 - plugins/repositories/locale.yml
 - plugins/repositories/rugged_repository.rb
 - plugins/security/acl.rb
-- plugins/security/basic_auth.rb
 - plugins/security/locale.yml
-- plugins/security/persistent_login.rb
-- plugins/security/portal.rb
 - plugins/security/private_wiki.rb
 - plugins/security/readonly_wiki.rb
-- plugins/security/stack.rb
-- plugins/security/yamlfile.rb
 - plugins/tags/code.rb
 - plugins/tags/footnotes.rb
 - plugins/tags/gist-embed.css
@@ -480,9 +432,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: olelo
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Olelo is a git-based wiki which supports many markup languages, tags, embedded
-  TeX and much more. It can be extended through plugins.
+summary: Olelo is a git-based wiki.
 test_files: []