rack-jekyll 0.3.7 → 0.4.0

data/README.markdown

@@ -69,6 +69,16 @@ It now can read the `_config.yml` file for destination path. Read [Jekyll Config
 
 You can create a new file: `404.html` with YAML Front Matter. See my [Heroku Demo 404](http://bry4n.heroku.com/show/me/404/)
 
+## Contributors
+* adaoraul (Adão Raul)
+* Nerian (Gonzalo Rodríguez-Baltanás Díaz)
+* scottwater (Scott Watermasysk)
+* thedjinn (Emil Loer)
+* bry4n (Bryan Goines)
+* thibaudgg (Thibaud Guillaume-Gentil)
+* bemurphy (Brendon Murphy)
+* imajes (James Cox)
+* mattr- (Matt Rogers)
 
 ## Contribution
 

data/lib/rack/jekyll.rb

@@ -4,39 +4,66 @@ require "rack/request"
 require "rack/response"
 require File.join(File.dirname(__FILE__), 'jekyll', 'helpers')
 require File.join(File.dirname(__FILE__), 'jekyll', 'version')
+require File.join(File.dirname(__FILE__), 'jekyll', 'ext')
 
 module Rack
   class Jekyll
     @compiling = false
-    
+
     def initialize(opts = {})
       config_file = '_config.yml'
       if ::File.exist?(config_file)
         config = YAML.load_file(config_file)
-        @path = (config[:destination].nil? && "_site") || config[:destination]
+        @path = (config['destination'].nil? && "_site") || config['destination']
 
         @files = ::Dir[@path + "/**/*"].inspect
         @files unless ENV['RACK_DEBUG']
       end
-      
+
       @mimes = Rack::Mime::MIME_TYPES.map{|k,v| /#{k.gsub('.','\.')}$/i }
-      
+      require "jekyll"
+      options = ::Jekyll.configuration(opts)
+      site = ::Jekyll::Site.new(options)
       if ::Dir[@path + "/**/*"].empty?
-        require "jekyll"
-        options = ::Jekyll.configuration(opts)
-        site = ::Jekyll::Site.new(options)
         site.process
-        
         @compiling = true
       else
         @compiling = false
       end
+      if options['auto']
+        require 'directory_watcher'
+        require 'pathname'
+        source, destination = options['source'], options['destination']
+        puts "Auto-regenerating enabled: #{source} -> #{destination}"
+
+        dw = DirectoryWatcher.new(source)
+        dw.interval = 1
+        dw.glob = globs(source)
+
+        dw.add_observer do |*args|
+          t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          puts "[#{t}] regeneration: #{args.size} files changed"
+          site.process
+        end
+
+        dw.start
+      end
+    end
+
+    def globs(source)
+      Dir.chdir(source) do
+        dirs = Dir['*'].select { |x| Pathname(x).directory? }
+        dirs -= ['_site']
+        dirs = dirs.map { |x| "#{x}/**/*" }
+        dirs += ['*']
+      end
     end
-    
+
     def call(env)
       @request = Rack::Request.new(env)
       @response = Rack::Response.new
       path_info = @request.path_info
+      @files = ::Dir[@path + "/**/*"].inspect if @files == "[]"
       if @files.include?(path_info)
         if path_info =~ /(\/?)$/
           if @mimes.collect {|regex| path_info =~ regex }.compact.empty?
@@ -48,22 +75,26 @@ module Rack
         file  = file_info(@path + path_info)
         body = file[:body]
         time = file[:time]
+        hdrs = { 'Last-Modified'  => time }
 
         if time == @request.env['HTTP_IF_MODIFIED_SINCE']
-          [@response.status, {'Last-Modified' => time}, []]
+          [304, hdrs, []]
         else
-          [@response.status, {"Content-Type" => mime, "Content-length" => body.length.to_s, 'Last-Modified' => time}, [body]]
+          hdrs.update({ 'Content-length' => body.bytesize.to_s,
+                        'Content-Type'   => mime, } )
+          [@response.status, hdrs, [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-length" => body.length.to_s}, [body]]
+          [status, {"Content-Type" => mime, "Content-length" => body.bytesize.to_s}, [body]]
         else
-          [200, {"Content-Type" => "text/plain"}, ["This site is currently generating pages. Please reload this page after 10 secs."]]
+          @compiling = ::Dir[@path + "/**/*"].empty?
+          [200, {"Content-Type" => "text/plain"}, ["This site is currently generating pages. Please reload this page after a couple of seconds."]]
         end
       end
-    end    
+    end
   end
-end
+end

data/lib/rack/jekyll/ext.rb

@@ -0,0 +1,7 @@
+class String
+  if RUBY_VERSION < "1.9"
+    def bytesize
+      size
+    end
+  end
+end

data/lib/rack/jekyll/helpers.rb

@@ -2,7 +2,7 @@ module Rack
   class Jekyll
     def mime(path_info)
       if path_info !~ /html$/i
-        ext = $1 if path_info =~ /(\.\S+)$/
+        ext = $1 if path_info =~ /(\.[\S&&[^.]]+)$/
         Mime.mime_type((ext.nil? ? ".html" : ext))
       else
         Mime.mime_type(".html")
@@ -16,4 +16,4 @@ module Rack
       end
     end
   end
-end
+end

data/lib/rack/jekyll/test.rb

@@ -1,12 +1,13 @@
 require "rack"
 require "rack/request"
 require "rack/response"
+require File.join(File.dirname(__FILE__), 'ext')
 
 module Rack
   class Jekyll
     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}
+        @files = %w{_fake/ _fake/index.html _fake/3/2/1/helloworld/index.html _fake/css/test.css _fake/js/test.js _fake/js/test.min.js}
         @mimes = Rack::Mime::MIME_TYPES.reject{|k,v|k=~%r{html?}}.map{|k,v|%r{#{k.gsub('.','\.')}$}i}
       end
     
@@ -25,16 +26,16 @@ module Rack
           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]]
+            [200, {"Content-Type" => mime, "Content-length" => body.bytesize.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)
-          [status, {"Content-Type" => mime, "Content-Type" => body.length.to_s}, [body]]
+          [status, {"Content-Type" => mime, "Content-Type" => body.bytesize.to_s}, [body]]
         end
       end
       def mime(path_info)
-        ext = $1 if path_info =~ /(\.\S+)$/
+        ext = $1 if path_info =~ /(\.[\S&&[^.]]+)$/
         Mime.mime_type((ext.nil? ? ".html" : ext))
       end
     end

data/lib/rack/jekyll/version.rb

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

metadata

@@ -1,92 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-jekyll
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  version: 0.3.7
 platform: ruby
-authors: 
+authors:
 - Bryan Goines
-- "Ad\xC3\xA3o Raul"
+- Adão Raul
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jekyll
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.2
+      - !ruby/object:Gem::Version
+        version: 0.12.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.2.1
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Transform your jekyll based app into a Rack application
-email: bryan@ffiirree.com
+email: adao.raul@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - LICENSE
 - lib/rack/jekyll.rb
 - lib/rack/jekyll/test.rb
 - lib/rack/jekyll/helpers.rb
 - lib/rack/jekyll/version.rb
+- lib/rack/jekyll/ext.rb
 homepage: http://github.com/adaoraul/rack-jekyll
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 849397492136401640
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: rack-jekyll
-rubygems_version: 1.8.4
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: rack-jekyll
 test_files: []
-