stoor 0.1.7 → 0.1.8

data/config.ru

@@ -53,6 +53,15 @@ use Rack::Session::Cookie, :domain => domain, :key => 'rack.session', :secret =>
 use Rack::CommonLogger, access_logger
 use Stoor::Logger, log_stream, Logger::INFO
 if repo_exists
+  Stoor::GithubAuth.set :github_options, {
+    scopes:    'user:email',
+    client_id: ENV['STOOR_GITHUB_CLIENT_ID'],
+    secret:    ENV['STOOR_GITHUB_CLIENT_SECRET']
+  }
+  Stoor::GithubAuth.set :stoor_options, {
+    github_team_id:      ENV['STOOR_GITHUB_TEAM_ID'],
+    github_email_domain: ENV['STOOR_GITHUB_EMAIL_DOMAIN']
+  }
   use Stoor::GithubAuth
   use Stoor::GitConfig, gollum_path
   use Stoor::TransformContent,

data/lib/stoor/github_auth.rb

@@ -1,15 +1,15 @@
 module Stoor
   class GithubAuth < Sinatra::Base
 
-    set :github_options, {
-      :scopes    => "user,user:email",
-      :client_id => ENV['STOOR_GITHUB_CLIENT_ID'],
-      :secret    => ENV['STOOR_GITHUB_CLIENT_SECRET']
-    }
-
     register Sinatra::Auth::Github
     register Mustache::Sinatra
 
+#    def initialize(*)
+#      @github_options = {}
+#      @stoor_options = {}
+#      super
+#    end
+
     get '/logout' do
       logout!
       mustache :logout
@@ -18,25 +18,35 @@ module Stoor
     get '/*' do
       session['stoor.github.authorized'] = nil
 
-      pass unless ENV['STOOR_GITHUB_CLIENT_ID'] && ENV['STOOR_GITHUB_CLIENT_SECRET']
+      pass unless github_options[:client_id] && github_options[:secret]
 
       pass if request.path_info =~ /\./
 
       authenticate!
-      if ENV['STOOR_GITHUB_TEAM_ID']
-        github_team_authenticate!(ENV['STOOR_GITHUB_TEAM_ID'])
+      if stoor_options[:github_team_id]
+        github_team_authenticate!(stoor_options[:github_team_id])
       end
 
       session['stoor.github.authorized'] = 'yes'
 
       email = nil
       emails = github_user.api.emails
-      if ENV['STOOR_GITHUB_EMAIL_DOMAIN']
-        email = emails.find { |e| e =~ /#{ENV['STOOR_GITHUB_EMAIL_DOMAIN']}/ }
+      if stoor_options[:github_email_domain]
+        email = emails.find { |e| e =~ /#{stoor_options[:github_email_domain]}/ }
       end
       email ||= emails.first
       session['gollum.author'] = { :name => github_user.name, :email => email }
       pass
     end
+
+    private
+
+    def github_options
+      @github_options ||= settings.github_options || {}
+    end
+
+    def stoor_options
+      @stoor_options ||= settings.stoor_options || {}
+    end
   end
 end

data/lib/stoor/version.rb

@@ -1,3 +1,3 @@
 module Stoor
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/lib/stoor/github_auth_spec.rb

@@ -22,6 +22,15 @@ module Stoor
     ENV['STOOR_WIKI_PATH'] = './repo'
 
     before do
+      Stoor::GithubAuth.set :github_options, {
+        scopes: 'user:email',
+        client_id: ENV['STOOR_GITHUB_CLIENT_ID'],
+        secret: ENV['STOOR_GITHUB_CLIENT_SECRET']
+      }
+      Stoor::GithubAuth.set :stoor_options, {
+        github_team_id: ENV['STOOR_GITHUB_TEAM_ID'],
+        github_email_domain: ENV['STOOR_GITHUB_EMAIL_DOMAIN']
+      }
       Stoor::GithubAuth.send(:enable, :sessions)
       @user = make_user(ENV['STOOR_TESTING_USER'], [ 'effie@example.com', 'effie@7fff.com', 'john@7fff.com' ])
       login_as @user
@@ -38,11 +47,12 @@ module Stoor
     end
 
     it 'Sets the gollum.user according to domain if specified' do
-      save = ENV['STOOR_GITHUB_EMAIL_DOMAIN']
-      ENV['STOOR_GITHUB_EMAIL_DOMAIN'] = '7fff.com'
+      Stoor::GithubAuth.set :stoor_options, {
+        github_team_id: ENV['STOOR_GITHUB_TEAM_ID'],
+        github_email_domain: '7fff.com'
+      }
       get '/'
       expect(last_request.env['rack.session']['gollum.author']).to eq(name: 'Effie Klinker', email: 'effie@7fff.com')
-      ENV['STOOR_GITHUB_EMAIL_DOMAIN'] = save
     end
 
     it 'logs the user out' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stoor
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin