omnigollum 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73942537eee3fb79bf6989e56f321c69ae2dc4e7
-  data.tar.gz: 7f320cea5738ca60aea8146b49160fbf8351409a
+  metadata.gz: 7e71dec029dc000cf53c14360c11a05eef251188
+  data.tar.gz: 174f16d40ad98606bbd574f2381d988d49220496
 SHA512:
-  metadata.gz: 5562795daf7d367bea28543e69167da5723568ec167709104004b8de8a7340f70c0db96a1a00e73178cbeff28e325b7b4e66188f7e84b5bd91a5025b4c352b5a
-  data.tar.gz: c4cf2be7e76a75872c114688c1faf826cc3bef2403c908545a77492f4f177c9fe63282c69eb9eb0bc4f8ac826312c30df415b1db8ad9a9260dae856ecf9f9c3e
+  metadata.gz: 805e92e761842820825f42ffb31cf741a27ad58a3b806200849f941c5d8587ed14bc97e330600d29dbc057ae8607df7f93ab09ad8c5e8ae9faf12ec37e65480a
+  data.tar.gz: 1a39c99a8756d102e4623e2d81488ddd4063d9faa3e342a3bc1219e9ba8e004016afaf401ffb81688c21138df8f54f63c1c23e45b77575d56db726686a0f5e15

data/Readme.md

@@ -67,7 +67,7 @@ By default, any authenticated user will be able to access the protected routes.
 options[:authorized_users] = ["example0@example.org", "example1@example.org", "example2@example.org"]
 ```
 
-Instead of setting these directly, you can use an [env var](http://www.12factor.net/config), maybe like this:
+Instead of setting these directly, you can use an env var, maybe like this:
 
 ```ruby
 # in .env, or other
@@ -85,7 +85,7 @@ Precious::App.register Omnigollum::Sinatra
 
 ### Gollum
 You can (optionally) apply the patches here, to get a neat little auth
-status widget in the top right corner of the page https://github.com/arr2036/gollum/commit/32de2cad920ccc6e955b8e19f6e23c2b3b4c8964
+status widget in the top right corner of the page https://github.com/arr2036/gollum/commit/30857db6ba5a2100c0d392cb0de205e644430d13
 
 
 

data/lib/omnigollum.rb

@@ -97,6 +97,13 @@ module Omnigollum
       end
     end
 
+    def show_error
+      options = settings.send(:omnigollum)
+      auth_config
+      require options[:path_views] + '/error'
+      halt mustache Omnigollum::Views::Error
+    end
+
     def commit_message
       if user_authed?
         user = get_user
@@ -124,6 +131,8 @@ module Omnigollum
         '/edit',
         '/rename/*',
         '/rename/',
+        '/upload/*',
+        '/upload/',
         '/delete/*',
         '/delete'],
 
@@ -239,7 +248,7 @@ module Omnigollum
         @title    = 'Authentication failed'
         @subtext = "Provider did not validate your credentials (#{params[:message]}) - please retry or choose another login service"
         @auth_params = "?origin=#{CGI.escape(request.env['omniauth.origin'])}" unless request.env['omniauth.origin'].nil?
-        show_login
+        show_error
       end
 
       app.before options[:route_prefix] + '/auth/:name/callback' do
@@ -253,7 +262,7 @@ module Omnigollum
               @title   = 'Authorization failed'
               @subtext = 'User was not found in the authorized users list'
               @auth_params = "?origin=#{CGI.escape(request.env['omniauth.origin'])}" unless request.env['omniauth.origin'].nil?
-              show_login
+              show_error
             end
 
             session[:omniauth_user] = user
@@ -269,13 +278,13 @@ module Omnigollum
             @title   = 'Authentication failed'
             @subtext = 'Omniauth experienced an error processing your request'
             @auth_params = "?origin=#{CGI.escape(request.env['omniauth.origin'])}" unless request.env['omniauth.origin'].nil?
-            show_login
+            show_error
           end
         rescue StandardError => fail_reason
           @title   = 'Authentication failed'
           @subtext = fail_reason
           @auth_params = "?origin=#{CGI.escape(request.env['omniauth.origin'])}" unless request.env['omniauth.origin'].nil?
-          show_login
+          show_error
         end
       end
 

data/templates/Error.mustache

@@ -0,0 +1,7 @@
+<div id="wiki-wrapper" class="markdown-body">
+<h2>{{title}}</h2>
+<div id="login" class="login_form"> 
+  <h3>{{subtext}}</h3>
+  <a href="{{loginurl}}">Try again</a>
+</div>
+</div>

data/views/error.rb

@@ -0,0 +1,20 @@
+module Omnigollum
+  module Views
+    class Error < Mustache
+      self.template_path = File.expand_path("../../templates", __FILE__)
+      self.template_name = 'Error'
+      
+      def title
+        @title
+      end
+      
+      def subtext
+        @subtext
+      end
+
+      def loginurl
+        @auth[:route_prefix] + 'login' + (defined?(@auth_params) ? @auth_params : '')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnigollum
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Arran Cudbard-Bell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum
@@ -43,14 +43,14 @@ dependencies:
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.99.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.99.5
 description: |
@@ -76,7 +76,9 @@ files:
 - public/images/open_id_logo.png
 - public/images/twitter_logo.png
 - public/images/youtube_logo.png
+- templates/Error.mustache
 - templates/Login.mustache
+- views/error.rb
 - views/login.rb
 homepage: https://github.com/arr2036/omnigollum
 licenses:
@@ -99,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Omnigollum makes it easy to use OmniAuth with Gollum