rack-jekyll 0.2 → 0.3

data/lib/rack/jekyll/test.rb

@@ -5,33 +5,32 @@ require "rack/response"
 module Rack
   class Jekyll
     class Test 
-      attr_accessor :config, :url
-      def initialize(config)
-        @url = ''
-        @config = config
+      def initialize
         @files = %w{_fake/ _fake/index.html _fake/3/2/1/helloworld/index.html _fake/css/test.css _fake/js/test.js}
       end
     
       def call(env)
         request = Request.new(env)
         path_info = "_fake" + request.path_info
-        ext = ''
         if @files.include?(path_info)
           if path_info =~ /(\/?)$/
-            if path_info !~ /\.(css|js|jpe?g|gif|png|mov|mp3)$/i
+           if path_info !~ /\.(css|js|jpe?g|gif|png|mov|mp3)$/i
               path_info += $1.nil? ? "/index.html" : "index.html"
-            end
-            ext = $1 if path_info =~ /(\.\S+)$/i 
-          end
-          mime = Mime.mime_type(ext)
-          body = "Jekyll/Rack"
-          [200, {"Content-Type" => mime, "Content-length" => body.length.to_s}, [body]]
+           end
+         end
+         mime = mime(path_info)
+         body = "Jekyll/Rack"
+         [200, {"Content-Type" => mime, "Content-length" => body.length.to_s}, [body]]
         else
-          ext = $1 if path_info =~ /(\.\S+)$/i
-          mime = Mime.mime_type(ext)
-          [404, {"Content-Type" => mime}, ["Not found"]]
+         status, body, path_info = [404,"Not found","404.html"]
+         mime = mime(path_info)
+         [status, {"Content-Type" => mime, "Content-Type" => body.length.to_s}, [body]]
         end
       end
-    end
+      def mime(path_info)
+       ext = $1 if path_info =~ /(\.\S+)$/
+       Mime.mime_type((ext.nil? ? ".html" : ext))
+      end
+   end
   end
 end

data/lib/rack/jekyll.rb

@@ -9,37 +9,40 @@ module Rack
       @path = opts[:path].nil? ? "_site" : opts[:path]
       @files = Dir[@path + "/**/*"].inspect
       if Dir[@path + "/**/*"].empty?
-        system("jekyll #{@path}")
+        begin
+          require "jekyll"
+          options = ::Jekyll.configuration(opts)
+          site = ::Jekyll::Site.new(options)
+          site.process
+        rescue LoadError => boom
+        end
       end
     end
     
     def call(env)
       request = Request.new(env)
       path_info = request.path_info
-      ext = ''
       if @files.include?(path_info)
         if path_info =~ /(\/?)$/
           if path_info !~ /\.(css|js|jpe?g|gif|png|mov|mp3)$/i
             path_info += $1.nil? ? "/index.html" : "index.html"
           end
-          ext = $1 if path_info =~ /(\.\S+)$/i 
         end
-        mime = Mime.mime_type(ext)
-        body = ::File.read(::File.expand_path(@path + path_info))
+        mime = mime(path_info)
+        body = content(::File.expand_path(@path + path_info))
         [200, {"Content-Type" => mime, "Content-length" => body.length.to_s}, [body]]
       else
-        ext = $1 if path_info =~ /(\.\S+)$/i
-        mime = Mime.mime_type(ext)
-        status = 404
-        body = "Not found"
-        if ::File.exist?(@path + "/404.html")
-          status = 200
-          body = ::File.read(@path + "/404.html")
-          mime = Mime.mime_type(".html")
-        end
+        status, body, path_info = ::File.exist?(@path+"/404.html") ? [200,content(@path+"/404.html"),"404.html"] : [404,"Not found","404.html"]
+        mime = mime(path_info)
         [status, {"Content-Type" => mime, "Content-Type" => body.length.to_s}, [body]]
       end
     end
-
+    def content(file)
+      ::File.read(file)
+    end
+    def mime(path_info)
+      ext = $1 if path_info =~ /(\.\S+)$/
+      Mime.mime_type((ext.nil? ? ".html" : ext))
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-jekyll
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Bryan Goines