rack-jekyll 0.4.1 → 0.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 65a9a75b71d00f183b26748662eee97d23ab42cf
+  data.tar.gz: af266d768a47a4fc17050955626480e437e67388
+SHA512:
+  metadata.gz: 7be8456d67a62653587ff1282b771abd5899766d0a9a4eb9ff82c467dbb1551a887b7d8baa1c7b31ea0ac387c5088d65857158c226036408651144e3cf116aaf
+  data.tar.gz: b11490d802a8ffc92654dcd6a24fe26f78e7d880364c0df37ba50352c9d116c5ad07972b304897e0ae155fca43b20dd3da82457f3dc46e36d2ef17e838157a42

data/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org/'
+
+group :test do
+  gem "cucumber",    "2.1.0"
+end
+
+gemspec

data/README.markdown

@@ -1,75 +1,86 @@
 Rack-Jekyll
 ===========
 
-Transform your [Jekyll](http://github.com/mojombo/jekyll) app into [Rack](http://github.com/rack/rack) application
+Transform your [Jekyll](https://jekyllrb.com/) app
+into a [Rack](https://github.com/rack/rack) application.
 
-- Can run it with rackup and [shotgun](http://github.com/rtomakyo/shotgun), [unicorn](http://github.com/defunkt/unicorn), and more.
+- You can run it with rackup, [shotgun](https://github.com/rtomayko/shotgun),
+  [unicorn](http://unicorn.bogomips.org/), and more.
+- You can run Rack-Jekyll with any modified Jekyll.
+- You can deploy Rack-Jekyll to Heroku, EC2, Rackspace,
+  dedicated servers, VPS, etc.
 
-- Can run rack-jekyll with any modified jekyll
 
-- Can deploy rack-jekyll on Heroku, EC2, Slicehost, Rackspace Cloud, Dedicated server, VPS, etc..
+## How to use it
 
+A `config.ru` file is required in order to run with shotgun and rackup.
+You can even deploy your Jekyll app to [Heroku](https://www.heroku.com/)!
 
-Heroku Demo: [http://bry4n.heroku.com/](http://bry4n.heroku.com/)
+Copy this into `config.ru` in your Jekyll site's root directory:
 
-### How to use it?
+``` ruby
+require "rack/jekyll"
 
-*config.ru* is required in order to run with shotgun and rackup. Even you can deploy your jekyll app to [Heroku!](http://www.heroku.com/)
+run Rack::Jekyll.new
+```
 
-Copy this and put in config.ru in your jekyll's root directory.
-
-
-config.ru:
-
-    require "rack/jekyll"
-
-    run Rack::Jekyll.new
+That's it.
 
+Heroku provides a read-only filesystem, so you need to generate pages
+and git-commit them *before* you deploy your Jekyll site to Heroku.
 
-That's it.
+ 1. `cd` to your Jekyll directory
+ 2. add a `config.ru` file (see example above)
+ 3. build pages with `jekyll build`
+ 4. add `gem "rack-jekyll"` to your `Gemfile`
+ 5. `git init && git add .`
+ 6. `git commit -m "Initial commit"`
+ 7. `heroku create`
+ 8. `git push heroku master`
 
 
-Heroku is a [read-only filesystem](http://docs.heroku.com/constraints#read-only-filesystem):
+## Configuration
 
-You need to generate pages and git-add pages and git-commit before you deploy your jekyll to Heroku
+Jekyll configuration options can be specified in a `_config.yml` file
+or as Rack-Jekyll initialization options in `config.ru`.
 
-    1) cd to your jekyll directory
+Example:
 
-    2) add config.ru (see example above)
-    
-    3) build pages, type: jekyll
-    
-    4) echo "rack-jekyll" > .gems
-    
-    5) git init && git add .
-    
-    6) git commit -m "first heroku app"
-    
-    7) heroku create
-    
-    8) git push heroku master
+``` ruby
+run Rack::Jekyll.new(:destination => "mysite")
+```
 
+This will set a custom destination path, overriding the default (`_site`)
+and settings from a config file.
 
-## Initialization Options
+See [Jekyll's configuration docs](https://jekyllrb.com/docs/configuration/)
+for more settings.
 
-    :destination          - use the desintation path (default: _site)
+Additional Rack-Jekyll initialization options:
 
+    :config        - use given config file (default: "_config.yml")
+    :force_build   - whether to always generate the site at startup, even
+                     when the destination path is not empty (default: false)
+    :auto          - whether to watch for changes and rebuild (default: false)
 
-*Example:*
+Note that on read-only filesystems a site build will fail,
+so do not set `:force_build => true` in these cases.
 
-    run Rack::Jekyll.new(:destination => "mysite")
 
+## 404 page
 
-## YAML Config
+In your site's root directory you can provide a custom `404.html` file
+with YAML front matter.
 
-It now can read the `_config.yml` file for destination path. Read [Jekyll Configuration](http://wiki.github.com/mojombo/jekyll/configuration)
 
+## Contributing
 
-## 404 page
+Contributions are more than just welcome.
+Fork this repo and create a new branch, then submit a pull request.
 
-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)
@@ -79,7 +90,4 @@ You can create a new file: `404.html` with YAML Front Matter. See my [Heroku Dem
 * bemurphy (Brendon Murphy)
 * imajes (James Cox)
 * mattr- (Matt Rogers)
-
-## Contribution
-
-Contributing this is more than just welcome. Fork this and create a new branch then pull request.
+* stomar (Marcus Stollsteimer)

data/Rakefile

@@ -0,0 +1,42 @@
+require 'rubygems'
+require 'rubygems/specification'
+require 'rubygems/package_task'
+require 'rake/testtask'
+#require 'extensions/all'
+require_relative 'lib/rack/jekyll'
+
+task :default => :test
+
+Rake::TestTask.new do |t|
+  t.pattern = 'test/test_*.rb'
+  t.verbose = true
+  t.warning = true
+end
+
+desc "Build gem"
+task :build do
+  sh "gem build rack-jekyll.gemspec"
+end
+
+desc "Install gem"
+task :install => :build do
+  sh "gem install rack-jekyll-#{Rack::Jekyll.version}.gem"
+end
+
+desc "Push gem to rubygems.org"
+task :push do
+  sh "gem push rack-jekyll-#{Rack::Jekyll.version}.gem"
+end
+
+desc "Clean up gem"
+task :clean do
+  sh "rm *.gem"
+end
+
+desc "Run demo"
+task :demo do
+  puts " ==> Starting demo: http://localhost:3000/"
+  Dir.chdir("example") do
+    sh "rackup -p 3000"
+  end
+end

data/features/requests.feature

@@ -0,0 +1,36 @@
+Feature: Rack-Jekyll
+  In order to ensure results are correct
+  As a Jekyll
+  I want to become a Rack application
+
+  Scenario: Request 200 page
+    Given I have entered the path /
+    When I request a page
+    Then the http status should be 200
+    Then the content-type should be text/html
+    And the content-length should be 24
+    And the data should show <p>Rack-Jekyll Test</p>
+
+  Scenario: Request 304 page
+    Given I have entered the path /
+    When I request a page with a date of Last-Modified
+    Then the http status should be 304
+    And there should be no 'Content-Length' header
+
+  Scenario: Request 404 page
+    Given I have entered the path /show/me/404/
+    When I request a page
+    Then the http status should be 404
+    And the content-type should be text/html
+    And the content-length should be 9
+
+  Scenario: Request static pages
+    Given I have entered the path /css/test.css
+    When I request a page
+    Then the http status should be 200
+    Then the content-type should be text/css
+
+    Given I have entered the path /js/test.js
+    When I request a page
+    Then the http status should be 200
+    Then the content-type should be application/javascript

data/features/step_definitions/rack_jekyll_steps.rb

@@ -0,0 +1,58 @@
+Before do
+  @old_pwd = Dir.pwd
+  FileUtils.mkdir_p(TEMP_DIR)  unless File.exist?(TEMP_DIR)
+  Dir.chdir(TEMP_DIR)
+
+  FileUtils.mkdir_p(SOURCE_DIR)  unless File.exist?(SOURCE_DIR)
+  FileUtils.mkdir_p(DEST_DIR)    unless File.exist?(DEST_DIR)
+
+  @jekyll = Rack::Jekyll.new(:force_build => true,
+                             :source      => SOURCE_DIR,
+                             :destination => DEST_DIR)
+end
+
+After do
+  FileUtils.rm_rf(TEMP_DIR)  if File.exist?(TEMP_DIR)
+  Dir.chdir(@old_pwd)
+end
+
+
+Given /^I have entered the path (.*)$/ do |path|
+  @path = path
+end
+
+
+When /^I request a page$/ do
+  @response = get(@path)
+end
+
+When /^I request a page with a date of Last-Modified$/ do
+  modify_time = get(@path).headers["Last-Modified"]
+  @response = get(@path, {'HTTP_IF_MODIFIED_SINCE' => modify_time})
+end
+
+
+Then /^the http status should be (.*)$/ do |code|
+  assert_equal(code, @response.status.to_s)
+end
+
+Then /^the content\-type should be (.*)$/ do |type|
+  assert_equal(type, @response.headers["Content-Type"])
+end
+
+Then /^the content\-length should be (.*)$/ do |length|
+  assert_equal(length, @response.original_headers["Content-Length"])
+end
+
+Then /^the data should show (.*)$/ do |body|
+  assert_equal(body.chomp, @response.body.chomp)
+end
+
+Then /^there should be no '(.*)' header$/ do |header|
+  refute @response.headers.has_key?(header)
+end
+
+def get(path, headers={})
+  req = Rack::MockRequest.new(@jekyll)
+  req.get(path,headers)
+end

data/features/support/env.rb

@@ -0,0 +1,9 @@
+require "minitest"
+require "rack/mock"
+
+require_relative "../../lib/rack/jekyll"
+
+TEST_DIR   = File.expand_path("../../../test", __FILE__)
+TEMP_DIR   = File.join(TEST_DIR, "tmp")
+SOURCE_DIR = File.join(TEST_DIR, "source")
+DEST_DIR   = File.join(TEMP_DIR, "_site")

data/lib/rack/jekyll.rb

@@ -1,5 +1,5 @@
 require "rack"
-require "yaml"
+require "jekyll"
 require "rack/request"
 require "rack/response"
 require File.join(File.dirname(__FILE__), 'jekyll', 'helpers')
@@ -8,54 +8,65 @@ 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']
+    attr_reader :config, :destination
 
-        @files = ::Dir[@path + "/**/*"].inspect
-        @files unless ENV['RACK_DEBUG']
-      end
+    # Initializes a new Rack::Jekyll site.
+    #
+    # Options:
+    #
+    # +:config+::      use given config file (default: "_config.yml")
+    #
+    # +:force_build+:: whether to always generate the site at startup, even
+    #                  when the destination path is not empty (default: +false+)
+    #
+    # +:auto+::        whether to watch for changes and rebuild (default: +false+)
+    #
+    # Other options are passed on to Jekyll::Site.
+    def initialize(options = {})
+      overrides = options.dup
+      @compiling = false
+      @force_build = overrides.fetch(:force_build, false)
+      @auto        = overrides.fetch(:auto, false)
+
+      overrides.delete(:force_build)
+      overrides.delete(:auto)
+      @config = ::Jekyll.configuration(overrides)
+
+      @destination = @config["destination"]
+      @source      = @config["source"]
+
+      load_file_list
+      puts @files.inspect if ENV['RACK_DEBUG']
 
       @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?
-        site.process
-        @compiling = true
-      else
-        @compiling = false
+
+      @site = ::Jekyll::Site.new(@config)
+
+      if ::Dir[@destination + "/**/*"].empty? || @force_build
+        process("Generating site: #{@source} -> #{@destination}")
       end
-      if options['auto']
-        require 'directory_watcher'
+
+      if @auto
+        require 'listen'
+        require 'listen/version'
         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)
+        puts "Auto-regeneration enabled: #{@source} -> #{@destination}"
+
+        source_abs = ::File.expand_path(@source)
+        dest_abs   = ::File.expand_path(@destination)
+        relative_path_to_dest = Pathname.new(dest_abs)
+                                .relative_path_from(Pathname.new(source_abs))
+                                .to_path
+        ignore_pattern = %r{#{Regexp.escape(relative_path_to_dest)}}
 
-        dw.add_observer do |*args|
+        listener = Listen.to(@source, :ignore => ignore_pattern) do |modified, added, removed|
           t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-          puts "[#{t}] regeneration: #{args.size} files changed"
-          site.process
+          n = modified.length + added.length + removed.length
+          process("[#{t}] Regenerating: #{n} file(s) changed")
         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 += ['*']
+        listener.start  unless Listen::VERSION =~ /\A[0-1]\./
       end
     end
 
@@ -63,8 +74,10 @@ module Rack
       @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)
+      while @compiling
+        sleep 0.1
+      end
+      if @files.inspect.include?(path_info)
         if path_info =~ /(\/?)$/
           if @mimes.collect {|regex| path_info =~ regex }.compact.empty?
             path_info += $1.nil? ? "/index.html" : "index.html"
@@ -72,7 +85,7 @@ module Rack
         end
         mime = mime(path_info)
 
-        file  = file_info(@path + path_info)
+        file  = file_info(@destination + path_info)
         body = file[:body]
         time = file[:time]
         hdrs = { 'Last-Modified'  => time }
@@ -80,21 +93,31 @@ module Rack
         if time == @request.env['HTTP_IF_MODIFIED_SINCE']
           [304, hdrs, []]
         else
-          hdrs.update({ 'Content-length' => body.bytesize.to_s,
+          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"]
+        status, body, path_info = ::File.exist?(@destination+"/404.html") ? [404,file_info(@destination+"/404.html")[:body],"404.html"] : [404,"Not found","404.html"]
         mime = mime(path_info)
-        if !@compiling
-          [status, {"Content-Type" => mime, "Content-length" => body.bytesize.to_s}, [body]]
-        else
-          @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
+
+        [status, {"Content-Type" => mime, "Content-Length" => body.bytesize.to_s}, [body]]
       end
     end
+
+    private
+
+    def load_file_list
+      @files = ::Dir[@destination + "/**/*"]
+    end
+
+    def process(message = nil)
+      @compiling = true
+      puts message  if message
+      @site.process
+      load_file_list
+      @compiling = false
+    end
   end
 end

data/lib/rack/jekyll/version.rb

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

data/rack-jekyll.gemspec

@@ -0,0 +1,41 @@
+# coding: utf-8
+
+require File.join(File.dirname(__FILE__), "lib", "rack", "jekyll", "version")
+
+Gem::Specification.new do |s|
+ s.required_rubygems_version = ">= 1.3.6"
+
+ s.name        = "rack-jekyll"
+ s.version     = Rack::Jekyll.version
+
+ s.summary     = "Transform your Jekyll app into a Rack application."
+ s.description = "Rack-Jekyll transforms your Jekyll app into a Rack application."
+
+ s.authors  = ["Bryan Goines", "Adão Raul"]
+ s.email    = "adao.raul@gmail.com"
+ s.homepage = "https://github.com/adaoraul/rack-jekyll"
+
+ s.files = %w{
+             README.markdown
+             rack-jekyll.gemspec
+             Gemfile
+             Rakefile
+             LICENSE
+           } +
+           Dir.glob("lib/**/*")
+ s.test_files = Dir.glob("{test,features}/**/*")
+ s.require_paths = ["lib"]
+
+ s.extra_rdoc_files = ["README.markdown"]
+ s.rdoc_options = ['--charset=UTF-8', '--main=README.markdown']
+
+ s.add_dependency "jekyll", ">= 1.3"
+ s.add_dependency "rack", "~> 1.5"
+ s.add_dependency "listen", ">= 1.3"
+
+ s.add_development_dependency "rake"
+ s.add_development_dependency "minitest"
+
+ s.platform = Gem::Platform::RUBY
+ s.rubyforge_project = "rack-jekyll"
+end

data/test/helper.rb

@@ -0,0 +1,72 @@
+require "minitest/autorun"
+require "stringio"
+require "time"
+require "rack/mock"
+
+require_relative "../lib/rack/jekyll"
+
+TEST_DIR = File.expand_path("..", __FILE__)
+
+
+def silence_warnings
+  original_verbose, $VERBOSE = $VERBOSE, nil
+
+  yield
+ensure
+  $VERBOSE = original_verbose
+end
+
+def silence_output
+  original_stderr, original_stdout = $stderr, $stdout
+  $stderr, $stdout = StringIO.new, StringIO.new
+
+  yield
+ensure
+  $stderr, $stdout = original_stderr, original_stdout
+end
+
+def without_processing
+  silence_warnings do
+    Jekyll::Site.class_eval do
+      alias :original_process :process
+      def process; end
+    end
+  end
+
+  yield
+ensure
+  silence_warnings do
+    Jekyll::Site.class_eval do
+      alias :process :original_process
+      remove_method :original_process
+    end
+  end
+end
+
+def rack_jekyll(options = {})
+  jekyll = nil
+  silence_output do
+    jekyll = Rack::Jekyll.new(options)
+  end
+
+  jekyll
+end
+
+def rack_jekyll_without_build(options = {})
+  jekyll = nil
+  without_processing do
+    jekyll = rack_jekyll(options)
+  end
+
+  jekyll
+end
+
+def file_must_exist(filename)
+  assert File.exist?(filename),
+         "Expected file `#{filename}' to exist."
+end
+
+def file_wont_exist(filename)
+  assert !File.exist?(filename),
+         "Expected file `#{filename}' to not exist."
+end

data/test/source/_config.yml

@@ -0,0 +1 @@
+fake_option: "ok"

data/test/source/_posts/2015-10-05-hello-world.md

@@ -0,0 +1,3 @@
+---
+---
+Rack-Jekyll post

data/test/source/buenos_dias.md

@@ -0,0 +1,3 @@
+---
+---
+¡Buenos días!

data/test/source/index.md

@@ -0,0 +1,3 @@
+---
+---
+Rack-Jekyll Test

data/test/test_build.rb

@@ -0,0 +1,55 @@
+require_relative "helper"
+
+
+describe "when initializing a Rack::Jekyll instance" do
+
+  before do
+    @tempdir = File.join(TEST_DIR, "tmp")
+    FileUtils.mkdir_p(@tempdir)  unless File.exist?(@tempdir)
+    Dir.chdir(@tempdir)
+
+    @sourcedir = File.join(TEST_DIR, "source")
+    @destdir   = File.join(@tempdir, "_site")
+    FileUtils.mkdir_p(@sourcedir)  unless File.exist?(@sourcedir)
+    FileUtils.mkdir_p(@destdir)    unless File.exist?(@destdir)
+
+    @page      = File.join(@destdir, "index.html")
+    @fake_page = File.join(@destdir, "fake.html")
+  end
+
+  after do
+    FileUtils.rm_rf(@tempdir)  if File.exist?(@tempdir)
+  end
+
+  describe "when non-empty destination directory exists" do
+
+    before do
+      FileUtils.touch(@fake_page)
+    end
+
+    it "should not build the site by default" do
+      file_wont_exist(@page)
+      rack_jekyll(:source      => @sourcedir,
+                  :destination => @destdir)
+      file_wont_exist(@page)
+    end
+
+    it "should build the site when :force_build option is set" do
+      file_wont_exist(@page)
+      rack_jekyll(:force_build => true,
+                  :source      => @sourcedir,
+                  :destination => @destdir)
+      file_must_exist(@page)
+    end
+  end
+
+  describe "when empty destination directory exists" do
+
+    it "should build the site" do
+      file_wont_exist(@page)
+      rack_jekyll(:source      => @sourcedir,
+                  :destination => @destdir)
+      file_must_exist(@page)
+    end
+  end
+end

data/test/test_configuration.rb

@@ -0,0 +1,110 @@
+require_relative "helper"
+
+
+describe "when configuring site" do
+
+  before do
+    @tempdir = File.join(TEST_DIR, "tmp")
+    FileUtils.mkdir_p(@tempdir)  unless File.exist?(@tempdir)
+    Dir.chdir(@tempdir)
+  end
+
+  after do
+    FileUtils.rmdir(@tempdir)  if File.exist?(@tempdir)
+  end
+
+  describe "when no options are given and no config file exists" do
+
+    it "loads the correct default destination" do
+      jekyll = rack_jekyll_without_build
+      jekyll.destination.must_equal File.join(Dir.pwd, "_site")
+    end
+  end
+
+  describe "when using default config file" do
+
+    it "loads the configuration from file" do
+      begin
+        File.open("_config.yml", "w") do |f|
+          f.puts "config_file_opt: ok"
+        end
+
+        jekyll = rack_jekyll_without_build
+        jekyll.config.must_include "config_file_opt"
+        jekyll.config["config_file_opt"].must_equal "ok"
+      ensure
+        FileUtils.rm("_config.yml")
+      end
+    end
+  end
+
+  describe "when using custom config file" do
+
+    it "loads the configuration from file" do
+      begin
+        File.open("_my_config.yml", "w") do |f|
+          f.puts "config_file_opt: ok"
+        end
+
+        jekyll = rack_jekyll_without_build(:config => "_my_config.yml")
+        jekyll.config.must_include "config_file_opt"
+        jekyll.config["config_file_opt"].must_equal "ok"
+      ensure
+        FileUtils.rm("_my_config.yml")
+      end
+    end
+  end
+
+  describe "when initialization options are given" do
+
+    it "has the initialization options" do
+      jekyll = rack_jekyll_without_build(:init_opt => "ok")
+      jekyll.config.must_include "init_opt"
+      jekyll.config["init_opt"].must_equal "ok"
+    end
+
+    it "has the correct destination" do
+      jekyll = rack_jekyll_without_build(:destination => "/project/_site")
+      jekyll.destination.must_equal "/project/_site"
+    end
+
+    it ":auto is not passed on to Jekyll" do
+      jekyll = rack_jekyll_without_build(:auto => "ok")
+      jekyll.config.wont_include "auto"
+    end
+
+    it ":force_build is not passed on to Jekyll" do
+      jekyll = rack_jekyll_without_build(:force_build => "ok")
+      jekyll.config.wont_include "force_build"
+    end
+  end
+
+  describe "when initialization options are given and a config file exists" do
+
+    before do
+      File.open("_config.yml", "w") do |f|
+        f.puts "config_file_opt: ok"
+        f.puts "common_opt:      from config"
+        f.puts "destination:     /project/_site_from_config"
+      end
+    end
+
+    after do
+      FileUtils.rm("_config.yml")
+    end
+
+    it "has all options and initialization options override file options" do
+      jekyll = rack_jekyll_without_build(:init_opt   => "ok",
+                                         :common_opt => "from init")
+      jekyll.config.must_include "init_opt"
+      jekyll.config.must_include "config_file_opt"
+      jekyll.config.must_include "common_opt"
+      jekyll.config["common_opt"].must_equal "from init"
+    end
+
+    it "has the correct destination" do
+      jekyll = rack_jekyll_without_build(:destination => "/project/_site_from_init")
+      jekyll.destination.must_equal "/project/_site_from_init"
+    end
+  end
+end

data/test/test_requests.rb

@@ -0,0 +1,91 @@
+# encoding: UTF-8
+
+require_relative "helper"
+
+
+describe "when handling requests" do
+
+  before do
+    @tempdir = File.join(TEST_DIR, "tmp")
+    FileUtils.mkdir_p(@tempdir)  unless File.exist?(@tempdir)
+    Dir.chdir(@tempdir)
+
+    @sourcedir = File.join(TEST_DIR, "source")
+    @destdir   = File.join(@tempdir, "_site")
+    FileUtils.mkdir_p(@sourcedir)  unless File.exist?(@sourcedir)
+    FileUtils.mkdir_p(@destdir)    unless File.exist?(@destdir)
+
+    @jekyll = rack_jekyll(:force_build => true,
+                          :source      => @sourcedir,
+                          :destination => @destdir)
+    @request = Rack::MockRequest.new(@jekyll)
+  end
+
+  after do
+    FileUtils.rm_rf(@tempdir)  if File.exist?(@tempdir)
+  end
+
+  it "can be created" do
+    @jekyll.wont_be_nil
+    @request.wont_be_nil
+  end
+
+  it "should return correct http status code" do
+    @request.get("/").status.must_equal 200
+    @request.get("/show/me/404").status.must_equal 404
+  end
+
+  it "should return correct http status code for If-Modified-Since" do
+    modify_time = @request.get("/").headers["Last-Modified"]
+    earlier_time = (Time.parse(modify_time) - 3600).httpdate
+
+    @request.get("/", {"HTTP_IF_MODIFIED_SINCE" => modify_time}).status.must_equal 304
+    @request.get("/", {"HTTP_IF_MODIFIED_SINCE" => earlier_time}).status.must_equal 200
+  end
+
+  it "should return correct http status code for If-Modified-Since with 404s" do
+    modify_time = @request.get("/").headers["Last-Modified"]
+    earlier_time = (Time.parse(modify_time) - 3600).httpdate
+
+    @request.get("/show/me/404", {"HTTP_IF_MODIFIED_SINCE" => earlier_time}).status.must_equal 404
+  end
+
+  it "should return correct Content-Type header" do
+    @request.get("/").headers["Content-Type"].must_equal "text/html"
+    @request.get("/css/test.css").headers["Content-Type"].must_equal "text/css"
+    @request.get("/js/test.js").headers["Content-Type"].must_equal "application/javascript"
+    @request.get("/js/test.min.js").headers["Content-Type"].must_equal "application/javascript"
+    @request.get("/show/me/404").headers["Content-Type"].must_equal "text/html"
+  end
+
+  it "should return correct Content-Length header" do
+    @request.get("/").original_headers["Content-Length"].to_i.must_equal 24
+    @request.get("/show/me/404").original_headers["Content-Length"].to_i.must_equal 9
+  end
+
+  it "should return correct Content-Length header for If-Modified-Since" do
+    modify_time = @request.get("/").headers["Last-Modified"]
+    @request.get("/", {"HTTP_IF_MODIFIED_SINCE" => modify_time}).original_headers["Content-Length"].must_be_nil
+  end
+
+  it "should return correct body" do
+    @request.get("/").body.must_equal "<p>Rack-Jekyll Test</p>\n"
+    @request.get("/show/me/404").body.must_equal "Not found"
+  end
+
+
+  describe "when page contains multibyte characters" do
+
+    before do
+      @response = @request.get("/buenos_dias.html")
+    end
+
+    it "should return correct body" do
+      @response.body.must_equal "<p>¡Buenos días!</p>\n"
+    end
+
+    it "should return the bytesize as Content-Length header" do
+      @response.original_headers["Content-Length"].to_i.must_equal 23
+    end
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - Bryan Goines
@@ -10,101 +9,145 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bacon
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   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
+description: Rack-Jekyll transforms your Jekyll app into a Rack application.
 email: adao.raul@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- README.markdown
+- Gemfile
 - LICENSE
+- README.markdown
+- Rakefile
+- features/requests.feature
+- features/step_definitions/rack_jekyll_steps.rb
+- features/support/env.rb
 - lib/rack/jekyll.rb
-- lib/rack/jekyll/test.rb
+- lib/rack/jekyll/ext.rb
 - lib/rack/jekyll/helpers.rb
 - lib/rack/jekyll/version.rb
-- lib/rack/jekyll/ext.rb
-homepage: http://github.com/adaoraul/rack-jekyll
+- rack-jekyll.gemspec
+- test/helper.rb
+- test/source/_config.yml
+- test/source/_posts/2015-10-05-hello-world.md
+- test/source/buenos_dias.md
+- test/source/css/test.css
+- test/source/index.md
+- test/source/js/test.js
+- test/source/js/test.min.js
+- test/test_build.rb
+- test/test_configuration.rb
+- test/test_requests.rb
+homepage: https://github.com/adaoraul/rack-jekyll
 licenses: []
+metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- "--charset=UTF-8"
+- "--main=README.markdown"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1218847350686625781
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: rack-jekyll
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
-summary: rack-jekyll
-test_files: []
+specification_version: 4
+summary: Transform your Jekyll app into a Rack application.
+test_files:
+- test/helper.rb
+- test/source/_config.yml
+- test/source/_posts/2015-10-05-hello-world.md
+- test/source/buenos_dias.md
+- test/source/css/test.css
+- test/source/index.md
+- test/source/js/test.js
+- test/source/js/test.min.js
+- test/test_build.rb
+- test/test_configuration.rb
+- test/test_requests.rb
+- features/requests.feature
+- features/step_definitions/rack_jekyll_steps.rb
+- features/support/env.rb

data/lib/rack/jekyll/test.rb

@@ -1,43 +0,0 @@
-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 _fake/js/test.min.js}
-        @mimes = Rack::Mime::MIME_TYPES.reject{|k,v|k=~%r{html?}}.map{|k,v|%r{#{k.gsub('.','\.')}$}i}
-      end
-    
-      def call(env)
-        request = Request.new(env)
-        path_info = "_fake" + request.path_info
-        if @files.include?(path_info)
-          if path_info =~ /(\/?)$/
-            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"
-          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.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.bytesize.to_s}, [body]]
-        end
-      end
-      def mime(path_info)
-        ext = $1 if path_info =~ /(\.[\S&&[^.]]+)$/
-        Mime.mime_type((ext.nil? ? ".html" : ext))
-      end
-    end
-  end
-end