rack-jekyll 0.3 → 0.3.1

data/README.markdown

@@ -3,7 +3,12 @@ Rack-Jekyll
 
 Transform your [Jekyll](http://github.com/mojombo/jekyll) app into [Rack](http://github.com/rack/rack) application
 
-You can run it with rackup and [shotgun](http://github.com/rtomakyo/shotgun).
+- Can run it with rackup and [shotgun](http://github.com/rtomakyo/shotgun), [unicorn](http://github.com/defunkt/unicorn), and more.
+
+- Can run rack-jekyll with any modified jekyll
+
+- Can deploy rack-jekyll on Heroku, EC2, Slicehost, Rackspace Cloud, Dedicated server, VPS, etc..
+
 
 Heroku Demo: [http://bry4n.heroku.com/](http://bry4n.heroku.com/)
 
@@ -24,7 +29,7 @@ config.ru:
 That's it.
 
 
-Heroku:
+Heroku is a [read-only filesystem](http://docs.heroku.com/constraints#read-only-filesystem):
 
 You need to generate pages and git-add pages and git-commit before you deploy your jekyll to Heroku
 
@@ -34,13 +39,31 @@ You need to generate pages and git-add pages and git-commit before you deploy yo
     
     3) build pages, type: jekyll
     
-    4) git init && git add .
+    4) echo "rack-jekyll" > .gems
+    
+    5) git init && git add config.ru .gems _site/*
     
-    5) git commit -m "first heroku app"
+    6) git commit -m "first heroku app"
     
-    6) heroku create
+    7) heroku create
     
-    7) git push heroku master
+    8) git push heroku master
+
+
+## Initialization Options
+
+    :destination          - use the desintation path (default: _site)
+
+
+*Example:*
+
+    run Rack::Jekyll.new(:destination => "mysite")
+
+
+## YAML Config
+
+It now can read the `_config.yml` file for destination path. Read [Jekyll Configuration](http://wiki.github.com/mojombo/jekyll/configuration)
+
 
 ## 404 page
 

data/lib/rack/jekyll.rb

@@ -6,25 +6,36 @@ module Rack
   class Jekyll
     
     def initialize(opts = {})
-      @path = opts[:path].nil? ? "_site" : opts[:path]
-      @files = Dir[@path + "/**/*"].inspect
-      if Dir[@path + "/**/*"].empty?
+      if ::File.exist?("_config.yml")
+        @config = ::YAML.load(::File.read("_config.yml"))
+        if @config[:desination].nil?
+          @path = opts[:desination].nil? ? "_site" : opts[:desination]
+        else
+          opts.merge!(@config)
+          @path = @config[:desination].nil? ? "_site" : @config[:desination]
+        end
+      end
+      @files = ::Dir[@path + "/**/*"].inspect
+      @mimes = Rack::Mime::MIME_TYPES.reject{|k,v|k=~%r{html?}}.map{|k,v|%r{#{k.gsub('.','\.')}$}i}
+      @compiling = false
+      if ::Dir[@path + "/**/*"].empty?
         begin
           require "jekyll"
           options = ::Jekyll.configuration(opts)
           site = ::Jekyll::Site.new(options)
+          @compiling = true
           site.process
         rescue LoadError => boom
+          @compiling = false
         end
       end
     end
-    
     def call(env)
       request = Request.new(env)
       path_info = request.path_info
       if @files.include?(path_info)
         if path_info =~ /(\/?)$/
-          if path_info !~ /\.(css|js|jpe?g|gif|png|mov|mp3)$/i
+          if @mimes.collect {|regex| path_info =~ regex }.compact.empty?
             path_info += $1.nil? ? "/index.html" : "index.html"
           end
         end
@@ -34,7 +45,11 @@ module Rack
       else
         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]]
+        if !@compiling
+          [status, {"Content-Type" => mime, "Content-Type" => body.length.to_s}, [body]]
+        else
+          [200, {"Content-Type" => "text/plain"}, ["This site is currently generating pages. Please reload this page after 10 secs."]]
+        end
       end
     end
     def content(file)

data/lib/rack/jekyll/test.rb

@@ -7,6 +7,7 @@ module Rack
     class Test 
       def initialize
         @files = %w{_fake/ _fake/index.html _fake/3/2/1/helloworld/index.html _fake/css/test.css _fake/js/test.js}
+        @mimes = Rack::Mime::MIME_TYPES.reject{|k,v|k=~%r{html?}}.map{|k,v|%r{#{k.gsub('.','\.')}$}i}
       end
     
       def call(env)
@@ -14,22 +15,22 @@ module Rack
         path_info = "_fake" + request.path_info
         if @files.include?(path_info)
           if path_info =~ /(\/?)$/
-           if path_info !~ /\.(css|js|jpe?g|gif|png|mov|mp3)$/i
+            if @mimes.collect {|regex| path_info =~ regex }.compact.empty?
               path_info += $1.nil? ? "/index.html" : "index.html"
-           end
-         end
-         mime = mime(path_info)
-         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
-         status, body, path_info = [404,"Not found","404.html"]
-         mime = mime(path_info)
-         [status, {"Content-Type" => mime, "Content-Type" => body.length.to_s}, [body]]
+          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
       def mime(path_info)
-       ext = $1 if path_info =~ /(\.\S+)$/
-       Mime.mime_type((ext.nil? ? ".html" : ext))
+        ext = $1 if path_info =~ /(\.\S+)$/
+        Mime.mime_type((ext.nil? ? ".html" : ext))
       end
    end
   end

data/lib/rack/jekyll/version.rb

@@ -0,0 +1,7 @@
+module Rack
+  class Jekyll
+    def self.version
+      '0.3.1'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-jekyll
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - Bryan Goines
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 -06:00
+date: 2009-12-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - LICENSE
 - lib/rack/jekyll.rb
 - lib/rack/jekyll/test.rb
+- lib/rack/jekyll/version.rb
 has_rdoc: false
 homepage: http://github.com/bry4n/rack-jekyll
 licenses: []