rack-jekyll 0.3.4 → 0.3.5

data/lib/rack/jekyll/test.rb

@@ -21,7 +21,12 @@ module Rack
           end
           mime = mime(path_info)
           body = "Jekyll/Rack"
-          [200, {"Content-Type" => mime, "Content-length" => body.length.to_s}, [body]]
+          time = "Thu, 01 Apr 2010 15:27:52 GMT"
+          if time == request.env['HTTP_IF_MODIFIED_SINCE']
+            [304, {'Last-Modified' => time}, []]
+          else
+            [200, {"Content-Type" => mime, "Content-length" => body.length.to_s, "Last-Modified" => "Thu, 01 Apr 2010 15:27:52 GMT"}, [body]]
+          end
         else
           status, body, path_info = [404,"Not found","404.html"]
           mime = mime(path_info)

data/lib/rack/jekyll/version.rb

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

data/lib/rack/jekyll.rb

@@ -9,14 +9,15 @@ module Rack
       if ::File.exist?(Dir.pwd + "/_config.yml")
         @config = ::YAML.load(::File.read(Dir.pwd + "/_config.yml"))
         @config = (@config.class == FalseClass ? {} : @config)
-        if @config[:desination].nil?
-          @path = opts[:desination].nil? ? "_site" : opts[:desination]
+        if @config[:destination].nil?
+          @path = opts[:destination].nil? ? "_site" : opts[:destination]
         else
           opts.merge!(@config)
-          @path = @config[:desination].nil? ? "_site" : @config[:desination]
+          @path = @config[:destination].nil? ? "_site" : @config[:destination]
         end
       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?
@@ -41,10 +42,19 @@ module Rack
           end
         end
         mime = mime(path_info)
-        body = content(::File.expand_path(@path + path_info))
-        [200, {"Content-Type" => mime, "Content-length" => body.length.to_s}, [body]]
+
+        file  = file_info(@path + path_info)
+        body = file[:body]
+        time = file[:time]
+
+        if time == request.env['HTTP_IF_MODIFIED_SINCE']
+          [304, {'Last-Modified' => time}, []]
+        else
+          [200, {"Content-Type" => mime, "Content-length" => body.length.to_s, 'Last-Modified' => time}, [body]]
+        end
+
       else
-        status, body, path_info = ::File.exist?(@path+"/404.html") ? [200,content(@path+"/404.html"),"404.html"] : [404,"Not found","404.html"]
+        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]]
@@ -53,9 +63,14 @@ module Rack
         end
       end
     end
-    def content(file)
-      ::File.read(file)
+
+    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+)$/

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Bryan Goines
@@ -9,39 +14,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 -06:00
+date: 2010-04-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jekyll
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Transform your jekyll based app into a Rack application
 email: bryan@ffiirree.com
 executables: []
@@ -56,7 +67,7 @@ files:
 - lib/rack/jekyll.rb
 - lib/rack/jekyll/test.rb
 - lib/rack/jekyll/version.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/bry4n/rack-jekyll
 licenses: []
 
@@ -69,18 +80,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rack-jekyll
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 1
 summary: rack-jekyll