rack-jekyll 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c907df8de234f7065a12637743064344d3422664
-  data.tar.gz: a19269d5a37bc93b98d71894b833b272eff44193
+  metadata.gz: ff66ebdda97455aea827328639ec115c78ea52ca
+  data.tar.gz: e250fa094a11503db4a51a6e360ee5bfa5022119
 SHA512:
-  metadata.gz: f570ae029c2ac5f496fc29d7a17edec2b0a44561820f004961fb86a0a635ae9cc4e6061130f37c409c76997e1bbe63ca8542adcb4bc0f7bb603fd8136bdd30d8
-  data.tar.gz: aaa2be27ebaac8503902bf941964b560646a45c00198f70fb8ff2818dc515ffc6a24f75d0a06b23c83242e55200997118dc9b125f8647a456d07487d1be5aef4
+  metadata.gz: 6872f504907bb61f822d9b37aa2db5272e8b6e4d5969de0728947d800914545689b856dbd5db061f72dc847766998fe164303fef0e08cc77a11055e494830d5d
+  data.tar.gz: 126d49203f5fb68b8d6297ab9c8af1f92c607016e507b17c0b14adfb13e5fe3abcde81c7a2253b06ee8a72a6cd9031b147b491dd1c157365ec2ad32d4ae813ce

data/Rakefile

@@ -1,5 +1,9 @@
+require 'rubygems'
+require 'rubygems/specification'
+require 'rubygems/package_task'
 require 'rake/testtask'
-
+#require 'extensions/all'
+require_relative 'lib/rack/jekyll'
 
 task :default => :test
 

data/lib/rack/jekyll.rb

@@ -1,9 +1,11 @@
 require "rack"
 require "jekyll"
-
-require_relative "jekyll/filehandler"
-require_relative "jekyll/utils"
-require_relative "jekyll/version"
+require "rack/request"
+require "rack/response"
+require File.join(File.dirname(__FILE__), 'jekyll', 'filehandler')
+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
@@ -75,9 +77,9 @@ module Rack
       filename = @files.get_filename(request.path_info)
 
       if filename
-        media_type = Utils.media_type(filename)
+        mime = mime(filename)
 
-        file = Utils.file_info(filename)
+        file  = file_info(filename)
         body = file[:body]
         time = file[:time]
         hdrs = { "Last-Modified" => time }
@@ -86,7 +88,7 @@ module Rack
           response = [304, hdrs, []]
         else
           hdrs.update({ "Content-Length" => body.bytesize.to_s,
-                        "Content-Type"   => media_type })
+                        "Content-Type"   => mime })
           response = [200, hdrs, [body]]
         end
 
@@ -121,7 +123,7 @@ module Rack
     def custom_404
       filename = @files.get_filename("/404.html")
 
-      filename ? Utils.file_info(filename)[:body] : nil
+      filename ? file_info(filename)[:body] : nil
     end
 
     def remove_body(response)

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

@@ -0,0 +1,16 @@
+module Rack
+  class Jekyll
+    def mime(filename)
+      ext = ::File.extname(filename)
+
+      Rack::Mime.mime_type(ext)
+    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/version.rb

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

data/rack-jekyll.gemspec

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require_relative "lib/rack/jekyll/version"
+require File.join(File.dirname(__FILE__), "lib", "rack", "jekyll", "version")
 
 Gem::Specification.new do |s|
  s.required_rubygems_version = ">= 1.3.6"
@@ -22,16 +22,13 @@ Gem::Specification.new do |s|
              Rakefile
              LICENSE
            } +
-           Dir.glob("lib/**/*") +
-           Dir.glob("example/**/*").reject {|f| f =~ %r(\Aexample/_site/) }
+           Dir.glob("lib/**/*")
  s.test_files = Dir.glob("{test,features}/**/*")
  s.require_paths = ["lib"]
 
- s.extra_rdoc_files = %w[README.markdown LICENSE]
+ s.extra_rdoc_files = ["README.markdown"]
  s.rdoc_options = ['--charset=UTF-8', '--main=README.markdown']
 
- s.required_ruby_version = '>= 1.9.3'
-
  s.add_dependency "jekyll", ">= 1.3"
  s.add_dependency "rack", "~> 1.5"
  s.add_dependency "listen", ">= 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Bryan Goines
@@ -87,26 +87,18 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.markdown
-- LICENSE
 files:
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
-- example/404.md
-- example/_config.yml
-- example/_layouts/default.html
-- example/_layouts/post.html
-- example/_posts/2009-12-21-hello-world.md
-- example/config.ru
-- example/css/site.css
-- example/index.md
 - features/requests.feature
 - features/step_definitions/rack_jekyll_steps.rb
 - features/support/env.rb
 - lib/rack/jekyll.rb
+- lib/rack/jekyll/ext.rb
 - lib/rack/jekyll/filehandler.rb
-- lib/rack/jekyll/utils.rb
+- lib/rack/jekyll/helpers.rb
 - lib/rack/jekyll/version.rb
 - rack-jekyll.gemspec
 - test/helper.rb
@@ -124,7 +116,6 @@ files:
 - test/test_configuration.rb
 - test/test_filehandler.rb
 - test/test_requests.rb
-- test/test_utils.rb
 homepage: https://github.com/adaoraul/rack-jekyll
 licenses: []
 metadata: {}
@@ -138,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -166,7 +157,6 @@ test_files:
 - test/test_configuration.rb
 - test/test_filehandler.rb
 - test/test_requests.rb
-- test/test_utils.rb
 - features/requests.feature
 - features/step_definitions/rack_jekyll_steps.rb
 - features/support/env.rb

data/example/404.md

@@ -1,10 +0,0 @@
----
-layout: default
-title:  404
----
-
-# 404: Not Found
-
-The requested page does not exist.
-
-[Go back to home page](/)

data/example/_config.yml

@@ -1,5 +0,0 @@
-permalink: /:year/:month/:day/:title/
-markdown: kramdown
-
-exclude:
-  - config.ru

data/example/_layouts/default.html

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <link rel="stylesheet" type="text/css" href="/css/site.css">
-  {% if page.title != null %}
-  <title>Rack-Jekyll Demo - {{ page.title }}</title>
-  {% else %}
-  <title>Rack-Jekyll Demo</title>
-  {% endif %}
-</head>
-<body>
-  {{ content }}
-</body>
-</html>

data/example/_layouts/post.html

@@ -1,7 +0,0 @@
----
-layout: default
----
-
-{{ content }}
-
-<p><a href="/">Go back to home page</a></p>

data/example/_posts/2009-12-21-hello-world.md

@@ -1,8 +0,0 @@
----
-layout: post
-title:  Hello World!
----
-
-# Hello World!
-
-A demo blog post for Rack-Jekyll.

data/example/config.ru

@@ -1,6 +0,0 @@
-require_relative "../lib/rack/jekyll"
-
-# Middleware
-use Rack::ShowExceptions  # Nice looking errors
-
-run Rack::Jekyll.new

data/example/css/site.css

@@ -1,6 +0,0 @@
-body {
-  background-color: #f0f0f0;
-  font-family: sans-serif;
-}
-
-.date { color: #808080; }

data/example/index.md

@@ -1,16 +0,0 @@
----
-layout: default
----
-
-# Rack-Jekyll Demo
-
-Blog posts:
-
-<ul>
-  {% for post in site.posts %}
-  <li>
-    <span class="date">{{ post.date | date_to_string }}:</span>
-    <a href="{{ post.url }}">{{ post.title }}</a>
-  </li>
-  {% endfor %}
-</ul>

data/lib/rack/jekyll/utils.rb

@@ -1,21 +0,0 @@
-module Rack
-  class Jekyll
-    module Utils
-
-      def self.media_type(filename)
-        extension = ::File.extname(filename)
-
-        Rack::Mime.mime_type(extension)
-      end
-
-      def self.file_info(path)
-        info = {
-          :body => ::File.read(path),
-          :time => ::File.mtime(path).httpdate
-        }
-
-        info
-      end
-    end
-  end
-end

data/test/test_utils.rb

@@ -1,54 +0,0 @@
-require_relative "helper"
-
-
-describe Rack::Jekyll::Utils do
-
-  before do
-    @utils = Rack::Jekyll::Utils
-  end
-
-
-  describe "when asked for #media_type" do
-
-    it "returns correct type for HTML" do
-      @utils.media_type("index.html").must_equal "text/html"
-    end
-
-    it "returns correct type for HTML with full path" do
-      @utils.media_type("/path/index.html").must_equal "text/html"
-    end
-
-    it "returns correct type for CSS" do
-      @utils.media_type("/path/style.css").must_equal "text/css"
-    end
-
-    it "returns correct type for *.min.js" do
-      @utils.media_type("script.min.js").must_equal "application/javascript"
-    end
-
-    it "returns correct default type for files without extension" do
-      @utils.media_type("README").must_equal "application/octet-stream"
-    end
-
-    it "ignores lower/upper case in file extensions" do
-      @utils.media_type("image.JpG").must_equal "image/jpeg"
-    end
-  end
-
-
-  describe "when asked for #file_info" do
-
-    before do
-      @filename = __FILE__
-      @info = @utils.file_info(@filename)
-    end
-
-    it "has the file content" do
-      @info[:body].must_equal ::File.read(@filename)
-    end
-
-    it "has the modification time in httpdate format" do
-      @info[:time].must_equal ::File.mtime(@filename).httpdate
-    end
-  end
-end