RubyGems - lanyon - Versions diffs - 0.2.3 → 0.3.0 - Mend

lanyon 0.2.3 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c84c1a698fbc54f0d0a02297957a8622036aa30
-  data.tar.gz: 9188437aeac7bc69af55b9e2030f81adc083e0dc
+  metadata.gz: 0e17ba8083556f9aa05105223303a5016d35c989
+  data.tar.gz: abaf22a5ae32d30e79c29d7f981688823f454d50
 SHA512:
-  metadata.gz: ba31536e3c4b1ef74fc1f54acda3c4500788f9dbc0f384ab63e32dad6956d57f74d32100f3c26ccd97fb8fe32e9a43dd02289455ce4a7f6689b2b30a4963a4ac
-  data.tar.gz: c0ba43239bf3ab0026ae81b56054f6a88ae5a8eb18288898a8dfd26e5dce329c79e4c23b89853a70e87fd21c0d457aff32c7a94a0ea5a4a36eac96b66f6639fa
+  metadata.gz: be7b108eb234cdd7670133bbe83f0bf70f16f18f96bb6204983c79cb767b53f46043f887777c25bb7e78338168cf5b8048280e2085286bd1030a4c29a33a17d9
+  data.tar.gz: 7384cc975966d401182b500bdf2cb173d9d5792d4fe1fdc81702b8bc3341f51f83ee7f9cb4d2dbbb69a4075280e5a8236605037e394b7f2dbc01136789a7cbb6

data/History.md ADDED Viewed

@@ -0,0 +1,24 @@
+Release History
+===============
+## 0.3.0
+* Use ETag instead of Last-Modified for caching
+* Allow Jekyll 3
+* Provide a Lanyon.build method
+## 0.2.3
+* Handle URLs with percent-encoded characters
+## 0.2.2
+* Prevent CRLF conversion for served files by using File.binread
+## 0.2.1
+* Sanitize path info to properly handle directory traversal
+## 0.2.0
+First gem release.

data/lanyon.gemspec CHANGED Viewed

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.0.0"
-  s.add_dependency "jekyll", "~> 2.0"
+  s.add_dependency "jekyll", ">= 2.0", "< 4.0"
   s.add_dependency "rack", "~> 1.6"
   s.add_development_dependency "rake", "~> 10.4"
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.files = %w[
       README.md
       LICENSE
+      History.md
       lanyon.gemspec
       Gemfile
       Rakefile
@@ -41,6 +42,6 @@ Gem::Specification.new do |s|
     Dir.glob("test/**/*") +
     Dir.glob("demo/**/*").reject {|f| f =~ %r(\Ademo/_site/) }
-  s.extra_rdoc_files = %w[README.md LICENSE]
+  s.extra_rdoc_files = %w[README.md LICENSE History.md]
   s.rdoc_options = ["--charset=UTF-8", "--main=README.md"]
 end

data/lib/lanyon/application.rb CHANGED Viewed

@@ -43,7 +43,6 @@ module Lanyon
     def response(filename)  # :nodoc:
       response = Rack::Response.new(File.binread(filename))
       response["Content-Type"]  = media_type(filename)
-      response["Last-Modified"] = modification_time(filename)
       response.finish
     end
@@ -61,10 +60,6 @@ module Lanyon
       Rack::Mime.mime_type(extension)
     end
-    def modification_time(filename)  # :nodoc:
-      File.mtime(filename).httpdate
-    end
     def html_wrap(title, content)  # :nodoc:
       <<-document.gsub(/^ {6}/, "")
       <!DOCTYPE html>

data/lib/lanyon/version.rb CHANGED Viewed

@@ -1,4 +1,4 @@
 module Lanyon
-  VERSION  = '0.2.3'
-  DATE     = '2016-02-06'
+  VERSION  = "0.3.0"
+  DATE     = "2016-03-14"
 end

data/lib/lanyon.rb CHANGED Viewed

@@ -49,11 +49,22 @@ module Lanyon
     Rack::Builder.new do
       use Rack::Head
       use Rack::ConditionalGet
+      use Rack::ETag
       run Application.new(router)
     end
   end
+  # Builds the Jekyll site.
+  #
+  # Accepts the same options as ::application,
+  # except for the +:skip_build+ option which is ignored.
+  def self.build(options = {})
+    config = jekyll_config(options)
+    process(config)
+  end
   # @private
   def self.default_options  # :nodoc:
     { :skip_build => false }

data/test/helper.rb CHANGED Viewed

@@ -2,7 +2,6 @@ require "minitest/autorun"
 require "fileutils"
 require "stringio"
 require "rack/mock"
-require "time"
 require "lanyon"

data/test/test_build.rb CHANGED Viewed

@@ -41,4 +41,14 @@ describe "when creating a Lanyon application" do
     file_must_exist(@no_page)
     file_wont_exist(@page)
   end
+  it "does always build the site with ::build" do
+    options = {:skip_build => true}.merge(@dir_options)
+    silence_output do
+      Lanyon.build(options)
+    end
+    file_must_exist(@page)
+    file_wont_exist(@no_page)
+  end
 end

data/test/test_integration.rb CHANGED Viewed

@@ -45,9 +45,8 @@ describe "when handling requests" do
       @response.headers["Content-Type"].must_equal "text/html"
     end
-    it "returns correct Last-Modified header" do
-      mtime = File.mtime(@destdir + "/index.html")
-      @response.headers["Last-Modified"].must_equal mtime.httpdate
+    it "returns an ETag header" do
+      @response.headers["ETag"].wont_be_nil
     end
     it "returns correct body" do
@@ -291,30 +290,33 @@ describe "when handling requests" do
   end
-  describe "when handling If-Modified-Since requests" do
+  describe "when handling caching with ETag" do
     before do
-      modify_time  = @request.get("/").headers["Last-Modified"]
-      earlier_time = (Time.parse(modify_time) - 3600).httpdate
-      @modify_time_header  = { "HTTP_IF_MODIFIED_SINCE" => modify_time }
-      @earlier_time_header = { "HTTP_IF_MODIFIED_SINCE" => earlier_time }
+      etag  = @request.get("/").headers["ETag"]
+      other = @request.get("/no-extension").headers["ETag"]
+      assert  etag.start_with?("W/")
+      assert other.start_with?("W/")
+      @correct_etag = { "HTTP_IF_NONE_MATCH" => etag }
+      @other_etag   = { "HTTP_IF_NONE_MATCH" => other }
     end
     it "returns correct status code for unchanged '/'" do
-      @request.get("/", @modify_time_header).status.must_equal 304
+      @request.get("/", @correct_etag).status.must_equal 304
     end
     it "does not return a Content-Length header for unchanged '/'" do
-      response = @request.get("/", @modify_time_header)
+      response = @request.get("/", @correct_etag)
       response.original_headers["Content-Length"].must_be_nil
     end
-    it "returns correct status code for updated '/'" do
-      @request.get("/", @earlier_time_header).status.must_equal 200
+    it "returns correct status code for changed '/'" do
+      @request.get("/", @other_etag).status.must_equal 200
     end
     it "returns correct status code for 404" do
-      @request.get("/not/a/page", @earlier_time_header).status.must_equal 404
+      @request.get("/not/a/page", @other_etag).status.must_equal 404
     end
   end

metadata CHANGED Viewed

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: lanyon
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Marcus Stollsteimer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -74,9 +80,11 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - LICENSE
+- History.md
 files:
 - ".yardopts"
 - Gemfile
+- History.md
 - LICENSE
 - README.md
 - Rakefile