omnigollum 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e71dec029dc000cf53c14360c11a05eef251188
-  data.tar.gz: 174f16d40ad98606bbd574f2381d988d49220496
+  metadata.gz: 6396807c5a761a22a4ab521b16f75e6230790d31
+  data.tar.gz: 8b4186aeb1b6ffb668d77577abba4e435afe002f
 SHA512:
-  metadata.gz: 805e92e761842820825f42ffb31cf741a27ad58a3b806200849f941c5d8587ed14bc97e330600d29dbc057ae8607df7f93ab09ad8c5e8ae9faf12ec37e65480a
-  data.tar.gz: 1a39c99a8756d102e4623e2d81488ddd4063d9faa3e342a3bc1219e9ba8e004016afaf401ffb81688c21138df8f54f63c1c23e45b77575d56db726686a0f5e15
+  metadata.gz: f5d2d3801ee342075fedef2af9a22b8eb61e8fb491314633b997ef6799cf5657d82762a15cd5929ba8976ed5b7fe9a9a891d604843dc45384f0a53d144c063ce
+  data.tar.gz: 187c2f407ab69cfe16329cc51ea74be6ab4ca31482008a0465578eb3247a287de9b0cdc313b401fcac99d8236ff81ddff27b4cebb0d25ade6feb85291b800254

data/Readme.md

@@ -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/30857db6ba5a2100c0d392cb0de205e644430d13
+status widget in the top right corner of the page https://github.com/arr2036/gollum/commit/dd1fdad59d9f12bfe637704c0101af96aaa1a7e4
 
 
 

data/lib/omnigollum.rb

@@ -88,7 +88,7 @@ module Omnigollum
           origin = '/'
         end
 
-        redirect options[:route_prefix] + '/auth/' + options[:provider_names].first.to_s + "?origin=" +
+        redirect (request.script_name || '') + options[:route_prefix] + '/auth/' + options[:provider_names].first.to_s + "?origin=" +
            CGI.escape(origin)
       else
          auth_config
@@ -150,6 +150,7 @@ module Omnigollum
       :provider_names => [],
       :authorized_users => [],
       :author_format => Proc.new { |user| user.nickname ? user.name + ' (' + user.nickname + ')' : user.name },
+      :author_email => Proc.new { |user| user.email }
     }
 
     def initialize
@@ -256,9 +257,17 @@ module Omnigollum
           if !request.env['omniauth.auth'].nil?
             user = Omnigollum::Models::OmniauthUser.new(request.env['omniauth.auth'], options)
 
+            case (authorized_users = options[:authorized_users])
+            when Regexp
+              user_authorized = (user.email =~ authorized_users)
+            when Array
+              user_authorized = authorized_users.include?(user.email) || authorized_users.include?(user.nickname)
+            else
+              user_authorized = true
+            end
+
             # Check authorized users
-            if !options[:authorized_users].empty? && !options[:authorized_users].include?(user.email) &&
-               !options[:authorized_users].include?(user.nickname)
+            if !user_authorized
               @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?
@@ -270,7 +279,7 @@ module Omnigollum
             # Update gollum's author hash, so commits are recorded correctly
             session['gollum.author'] = {
               :name => options[:author_format].call(user),
-              :email => user.email
+              :email => options[:author_email].call(user)
             }
 
             redirect request.env['omniauth.origin']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnigollum
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Arran Cudbard-Bell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Omnigollum makes it easy to use OmniAuth with Gollum