Merge pull request #109 from shreve/support-config-baseurl

Find destination path from _config.yml

lib/jekyll_auth/config.rb

@@ -5,21 +5,26 @@ def self.config_file
     File.join(Dir.pwd, "_config.yml")
   end
 
+  def self.jekyll_config
+    @config ||= YAML.safe_load_file(config_file)
+  rescue StandardError
+    {}
+  end
+
   def self.config
-    @config ||= begin
-      config = YAML.safe_load_file(config_file)
-      config["jekyll_auth"] || {}
-    rescue StandardError
-      {}
-    end
+    jekyll_config.fetch("jekyll_auth", {})
+  end
+
+  def self.destination
+    jekyll_config.fetch("destination", File.expand_path("_site", Dir.pwd))
   end
 
   def self.whitelist
-    whitelist = JekyllAuth.config["whitelist"]
+    whitelist = config["whitelist"]
     Regexp.new(whitelist.join("|")) unless whitelist.nil?
   end
 
   def self.ssl?
-    !!JekyllAuth.config["ssl"]
+    !!config["ssl"]
   end
 end

lib/jekyll_auth/jekyll_site.rb

@@ -3,12 +3,12 @@
 class JekyllAuth
   class JekyllSite < Sinatra::Base
     register Sinatra::Index
-    set :public_folder, File.expand_path("_site", Dir.pwd)
+    set :public_folder, File.expand_path(JekyllAuth.destination, Dir.pwd)
     use_static_index "index.html"
 
     not_found do
       status 404
-      four_oh_four = File.expand_path("_site/404.html", Dir.pwd)
+      four_oh_four = File.expand_path(settings.public_folder + "/404.html", Dir.pwd)
       File.read(four_oh_four) if File.exist?(four_oh_four)
     end
   end