rack-jekyll 0.3.5 → 0.3.7

data/lib/rack/jekyll/helpers.rb

@@ -0,0 +1,19 @@
+module Rack
+  class Jekyll
+    def mime(path_info)
+      if path_info !~ /html$/i
+        ext = $1 if path_info =~ /(\.\S+)$/
+        Mime.mime_type((ext.nil? ? ".html" : ext))
+      else
+        Mime.mime_type(".html")
+      end
+    end
+
+    def file_info(path)
+      expand_path = ::File.expand_path(path)
+      ::File.open(expand_path, 'r') do |f|
+        {:body => f.read, :time => f.mtime.httpdate, :expand_path => expand_path}
+      end
+    end
+  end
+end

data/lib/rack/jekyll/test.rb

@@ -37,6 +37,6 @@ module Rack
         ext = $1 if path_info =~ /(\.\S+)$/
         Mime.mime_type((ext.nil? ? ".html" : ext))
       end
-   end
+    end
   end
 end

data/lib/rack/jekyll/version.rb

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

data/lib/rack/jekyll.rb

@@ -1,40 +1,42 @@
 require "rack"
+require "yaml"
 require "rack/request"
 require "rack/response"
+require File.join(File.dirname(__FILE__), 'jekyll', 'helpers')
+require File.join(File.dirname(__FILE__), 'jekyll', 'version')
 
 module Rack
   class Jekyll
+    @compiling = false
     
     def initialize(opts = {})
-      if ::File.exist?(Dir.pwd + "/_config.yml")
-        @config = ::YAML.load(::File.read(Dir.pwd + "/_config.yml"))
-        @config = (@config.class == FalseClass ? {} : @config)
-        if @config[:destination].nil?
-          @path = opts[:destination].nil? ? "_site" : opts[:destination]
-        else
-          opts.merge!(@config)
-          @path = @config[:destination].nil? ? "_site" : @config[:destination]
-        end
+      config_file = '_config.yml'
+      if ::File.exist?(config_file)
+        config = YAML.load_file(config_file)
+        @path = (config[:destination].nil? && "_site") || config[:destination]
+
+        @files = ::Dir[@path + "/**/*"].inspect
+        @files unless ENV['RACK_DEBUG']
       end
-      @files = ::Dir[@path + "/**/*"].inspect
-      p @files if ENV['RACK_DEBUG'] == "true"
+      
       @mimes = Rack::Mime::MIME_TYPES.map{|k,v| /#{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
+        require "jekyll"
+        options = ::Jekyll.configuration(opts)
+        site = ::Jekyll::Site.new(options)
+        site.process
+        
+        @compiling = true
+      else
+        @compiling = false
       end
     end
+    
     def call(env)
-      request = Request.new(env)
-      path_info = request.path_info
+      @request = Rack::Request.new(env)
+      @response = Rack::Response.new
+      path_info = @request.path_info
       if @files.include?(path_info)
         if path_info =~ /(\/?)$/
           if @mimes.collect {|regex| path_info =~ regex }.compact.empty?
@@ -47,37 +49,21 @@ module Rack
         body = file[:body]
         time = file[:time]
 
-        if time == request.env['HTTP_IF_MODIFIED_SINCE']
-          [304, {'Last-Modified' => time}, []]
+        if time == @request.env['HTTP_IF_MODIFIED_SINCE']
+          [@response.status, {'Last-Modified' => time}, []]
         else
-          [200, {"Content-Type" => mime, "Content-length" => body.length.to_s, 'Last-Modified' => time}, [body]]
+          [@response.status, {"Content-Type" => mime, "Content-length" => body.length.to_s, 'Last-Modified' => time}, [body]]
         end
 
       else
         status, body, path_info = ::File.exist?(@path+"/404.html") ? [404,file_info(@path+"/404.html")[:body],"404.html"] : [404,"Not found","404.html"]
         mime = mime(path_info)
         if !@compiling
-          [status, {"Content-Type" => mime, "Content-Type" => body.length.to_s}, [body]]
+          [status, {"Content-Type" => mime, "Content-length" => 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 file_info(path)
-      expand_path = ::File.expand_path(path)
-      ::File.open(expand_path, 'r') do |f|
-        {:body => f.read, :time => f.mtime.httpdate, :expand_path => expand_path}
-      end
-    end
-
-    def mime(path_info)
-      if path_info !~ /html$/i
-        ext = $1 if path_info =~ /(\.\S+)$/
-        Mime.mime_type((ext.nil? ? ".html" : ext))
-      else
-        Mime.mime_type(".html")
-      end
-    end
+    end    
   end
-end
+end

metadata

@@ -1,55 +1,48 @@
 --- !ruby/object:Gem::Specification 
 name: rack-jekyll
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 5
-  version: 0.3.5
+  prerelease: 
+  version: 0.3.7
 platform: ruby
 authors: 
 - Bryan Goines
+- "Ad\xC3\xA3o Raul"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -05:00
-default_executable: 
+date: 2011-07-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jekyll
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 0.6.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 1.2.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bacon
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -66,9 +59,9 @@ files:
 - LICENSE
 - lib/rack/jekyll.rb
 - lib/rack/jekyll/test.rb
+- lib/rack/jekyll/helpers.rb
 - lib/rack/jekyll/version.rb
-has_rdoc: true
-homepage: http://github.com/bry4n/rack-jekyll
+homepage: http://github.com/adaoraul/rack-jekyll
 licenses: []
 
 post_install_message: 
@@ -77,25 +70,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: rack-jekyll
-rubygems_version: 1.3.6
+rubygems_version: 1.8.4
 signing_key: 
-specification_version: 1
+specification_version: 3
 summary: rack-jekyll
 test_files: []