dassets 0.14.4 → 0.15.3

data/test/unit/server/request_tests.rb

@@ -1,107 +1,104 @@
-require 'assert'
-require 'dassets/server/request'
+# frozen_string_literal: true
 
-require 'dassets'
-require 'dassets/asset_file'
+require "assert"
+require "dassets/server/request"
 
-class Dassets::Server::Request
+require "dassets/asset_file"
 
+class Dassets::Server::Request
   class UnitTests < Assert::Context
     desc "Dassets::Server::Request"
+    subject{ @req }
+
     setup do
-      @path = '/file1-daa05c683a4913b268653f7a7e36a5b4.txt'
-      @req = file_request('GET', @path)
+      @path = "/file1-daa05c683a4913b268653f7a7e36a5b4.txt"
+      @req = file_request("GET", @path)
     end
-    subject{ @req }
 
     should have_imeths :dassets_base_url
     should have_imeths :for_asset_file?, :asset_path, :asset_file
 
-    should "know its base url" do
-      assert_equal Dassets.config.base_url.to_s, subject.dassets_base_url
-    end
-
-    should "know its path info" do
-      assert_equal @path, subject.path_info
-    end
-
-    should "know its asset_path" do
-      assert_equal 'file1.txt', subject.asset_path
-    end
-
-    should "know its asset_file" do
-      assert_equal Dassets['file1.txt'], subject.asset_file
+    should "know its attributes" do
+      assert_that(subject.dassets_base_url).equals(Dassets.config.base_url.to_s)
+      assert_that(subject.path_info).equals(@path)
+      assert_that(subject.asset_path).equals("file1.txt")
+      assert_that(subject.asset_file).equals(Dassets["file1.txt"])
     end
 
     should "know if it is for an asset file" do
       # find nested path with matching fingerprint
-      req = file_request('GET', '/nested/file3-d41d8cd98f00b204e9800998ecf8427e.txt')
-      assert req.for_asset_file?
+      req =
+        file_request(
+          "GET",
+          "/nested/file3-d41d8cd98f00b204e9800998ecf8427e.txt",
+        )
+      assert_that(req.for_asset_file?).is_true
 
       # find not nested path with matching fingerprint
-      req = file_request('HEAD', '/file1-daa05c683a4913b268653f7a7e36a5b4.txt')
-      assert req.for_asset_file?
+      req = file_request("HEAD", "/file1-daa05c683a4913b268653f7a7e36a5b4.txt")
+      assert_that(req.for_asset_file?).is_true
 
-      # find even if fingerprint is *not* matching - just need to have any fingerprint
-      req = file_request('GET', '/file1-d41d8cd98f00b204e9800998ecf8427e.txt')
-      assert req.for_asset_file?
+      # find even if fingerprint is *not* matching - just need to have any
+      # fingerprint
+      req = file_request("GET", "/file1-d41d8cd98f00b204e9800998ecf8427e.txt")
+      assert_that(req.for_asset_file?).is_true
 
       # not find an invalid fingerprint
-      req = file_request('GET', '/file1-abc123.txt')
-      assert_not req.for_asset_file?
+      req = file_request("GET", "/file1-abc123.txt")
+      assert_that(req.for_asset_file?).is_false
 
       # not find a missing fingerprint
-      req = file_request('HEAD', '/file1.txt')
-      assert_not req.for_asset_file?
+      req = file_request("HEAD", "/file1.txt")
+      assert_that(req.for_asset_file?).is_false
 
       # not find an unknown file with a missing fingerprint
-      req = file_request('GET', '/some-file.txt')
-      assert_not req.for_asset_file?
+      req = file_request("GET", "/some-file.txt")
+      assert_that(req.for_asset_file?).is_false
 
-      # complain with an unknown file with a valid fingerprint
-      req = file_request('GET', '/some-file-daa05c683a4913b268653f7a7e36a5b4.txt')
-      assert_raises(Dassets::AssetFileError){ req.for_asset_file? }
+      # not find an unknown file with a valid fingerprint
+      req =
+        file_request("GET", "/some-file-daa05c683a4913b268653f7a7e36a5b4.txt")
+      assert_that(req.for_asset_file?).is_false
     end
 
-    should "return an asset path and complain if request not for asset file" do
-      req = file_request('GET', '/some-file.txt')
+    should "return an empty path and file if request not for an asset file" do
+      req = file_request("GET", "/some-file.txt")
 
-      assert_equal '', req.asset_path
-      assert_raises(Dassets::AssetFileError){ req.asset_file }
+      assert_that(req.asset_path).equals("")
+      assert_that(req.asset_file).equals(Dassets::AssetFile.new(""))
     end
 
-    protected
+    private
 
     def file_request(method, path_info)
-      require 'dassets/server/request'
       Dassets::Server::Request.new({
-        'REQUEST_METHOD' => method,
-        'PATH_INFO'      => path_info
+        "REQUEST_METHOD" => method,
+        "PATH_INFO" => path_info,
       })
     end
-
   end
 
   class BaseUrlTests < UnitTests
     desc "when a base url is configured"
+
     setup do
       @orig_base_url = Dassets.config.base_url
       @new_base_url  = Factory.url
       Dassets.config.base_url(@new_base_url)
     end
+
     teardown do
       Dassets.config.set_base_url(@orig_base_url)
     end
 
     should "have the same base url as is configured" do
-      assert_equal @new_base_url.to_s, subject.dassets_base_url
+      assert_that(subject.dassets_base_url).equals(@new_base_url.to_s)
     end
 
     should "remove the configured base url from the path info" do
-      assert_equal @path, file_request('GET', @path).path_info
-      assert_equal @path, file_request('GET', "#{@new_base_url}#{@path}").path_info
+      assert_that(file_request("GET", @path).path_info).equals(@path)
+      assert_that(file_request("GET", "#{@new_base_url}#{@path}").path_info)
+        .equals(@path)
     end
-
   end
-
 end

data/test/unit/server/response_tests.rb

@@ -1,74 +1,80 @@
-require 'assert'
-require 'dassets/server/response'
+# frozen_string_literal: true
 
-require 'rack/utils'
-require 'dassets'
-require 'dassets/asset_file'
+require "assert"
+require "dassets/server/response"
 
-class Dassets::Server::Response
+require "rack/utils"
+require "dassets/asset_file"
 
+class Dassets::Server::Response
   class UnitTests < Assert::Context
     desc "Dassets::Server::Response"
+    subject{ @response }
+
     setup do
-      @env        = {}
-      @asset_file = Dassets['file1.txt']
+      @env = {}
+      @asset_file = Dassets["file1.txt"]
 
       @response = Dassets::Server::Response.new(@env, @asset_file)
     end
-    subject{ @response }
 
     should have_readers :asset_file, :status, :headers, :body
     should have_imeths :to_rack
 
     should "handle not modified files" do
-      env = { 'HTTP_IF_MODIFIED_SINCE' => @asset_file.mtime }
+      env = { "HTTP_IF_MODIFIED_SINCE" => @asset_file.mtime }
       resp = Dassets::Server::Response.new(env, @asset_file)
 
-      assert_equal 304, resp.status
-      assert_equal [],  resp.body
-
-      exp_headers = Rack::Utils::HeaderHash.new('Last-Modified' => @asset_file.mtime.to_s)
-      assert_equal exp_headers, resp.headers
+      assert_that(resp.status).equals(304)
+      assert_that(resp.body).equals([])
 
-      assert_equal [304, exp_headers.to_hash, []], resp.to_rack
+      exp_headers =
+        Rack::Utils::HeaderHash.new("Last-Modified" => @asset_file.mtime.to_s)
+      assert_that(resp.headers).equals(exp_headers)
+      assert_that(resp.to_rack).equals([304, exp_headers.to_hash, []])
     end
 
     should "handle found files" do
       resp = Dassets::Server::Response.new(@env, @asset_file)
 
-      assert_equal 200, resp.status
+      assert_that(resp.status).equals(200)
 
       exp_body = Body.new(@env, @asset_file)
-      assert_equal exp_body, resp.body
+      assert_that(resp.body).equals(exp_body)
 
-      exp_headers = @asset_file.response_headers.merge({
-        'Content-Type'   => 'text/plain',
-        'Content-Length' => Rack::Utils.bytesize(@asset_file.content).to_s,
-        'Last-Modified'  => @asset_file.mtime.to_s
-      })
-      assert_equal exp_headers, resp.headers
+      exp_headers =
+        @asset_file.response_headers.merge({
+          "Content-Type" => "text/plain",
+          "Content-Length" => @asset_file.size.to_s,
+          "Last-Modified" => @asset_file.mtime.to_s,
+        })
+      assert_that(resp.headers).equals(exp_headers)
 
-      assert_equal [200, exp_headers, exp_body], resp.to_rack
+      assert_that(resp.to_rack).equals([200, exp_headers, exp_body])
     end
 
     should "have an empty body for found files with a HEAD request" do
-      env = { 'REQUEST_METHOD' => 'HEAD' }
+      env = { "REQUEST_METHOD" => "HEAD" }
       resp = Dassets::Server::Response.new(env, @asset_file)
 
-      assert_equal 200, resp.status
-      assert_equal [], resp.body
+      assert_that(resp.status).equals(200)
+      assert_that(resp.body).equals([])
     end
 
     should "handle not found files" do
-      assert_raises(Dassets::AssetFileError) do
-        Dassets['not-found-file.txt']
-      end
-    end
+      af   = Dassets.asset_file("not-found-file.txt")
+      resp = Dassets::Server::Response.new(@env, af)
 
+      assert_that(resp.status).equals(404)
+      assert_that(resp.body).equals(["Not Found"])
+      assert_that(resp.headers).equals(Rack::Utils::HeaderHash.new)
+      assert_that(resp.to_rack).equals([404, {}, ["Not Found"]])
+    end
   end
 
   class PartialContentTests < UnitTests
     desc "for a partial content request"
+
     setup do
       @body = Body.new(@env, @asset_file)
       Assert.stub(Body, :new).with(@env, @asset_file){ @body }
@@ -81,55 +87,54 @@ class Dassets::Server::Response
     end
 
     should "be a partial content response" do
-      assert_equal 206, subject.status
+      assert_that(subject.status).equals(206)
 
-      assert_includes 'Content-Range', subject.headers
-      assert_equal @body.content_range, subject.headers['Content-Range']
+      assert_that(subject.headers).includes("Content-Range")
+      assert_that(subject.headers["Content-Range"]).equals(@body.content_range)
     end
-
   end
 
   class BodyTests < UnitTests
     desc "Body"
+    subject{ @body }
+
     setup do
       @body = Body.new(@env, @asset_file)
     end
-    subject{ @body }
 
     should have_readers :asset_file, :size, :content_range
     should have_imeths :partial?, :range_begin, :range_end
     should have_imeths :each
 
     should "know its chunk size" do
-      assert_equal 8192, Body::CHUNK_SIZE
+      assert_that(Body::CHUNK_SIZE).equals(8192)
     end
 
     should "know its asset file" do
-      assert_equal @asset_file, subject.asset_file
+      assert_that(subject.asset_file).equals(@asset_file)
     end
 
     should "know if it is equal to another body" do
       same_af_same_range = Body.new(@env, @asset_file)
       Assert.stub(same_af_same_range, :range_begin){ subject.range_begin }
       Assert.stub(same_af_same_range, :range_end){ subject.range_end }
-      assert_equal same_af_same_range, subject
+      assert_that(subject).equals(same_af_same_range)
 
-      other_af_same_range = Body.new(@env, Dassets['file2.txt'])
+      other_af_same_range = Body.new(@env, Dassets["file2.txt"])
       Assert.stub(other_af_same_range, :range_begin){ subject.range_begin }
       Assert.stub(other_af_same_range, :range_end){ subject.range_end }
-      assert_not_equal other_af_same_range, subject
+      assert_that(subject).does_not_equal(other_af_same_range)
 
       same_af_other_range = Body.new(@env, @asset_file)
 
       Assert.stub(same_af_other_range, :range_begin){ Factory.integer }
       Assert.stub(same_af_other_range, :range_end){ subject.range_end }
-      assert_not_equal same_af_other_range, subject
+      assert_that(subject).does_not_equal(same_af_other_range)
 
       Assert.stub(same_af_other_range, :range_begin){ subject.range_begin }
       Assert.stub(same_af_other_range, :range_end){ Factory.integer }
-      assert_not_equal same_af_other_range, subject
+      assert_that(subject).does_not_equal(same_af_other_range)
     end
-
   end
 
   class BodyIOTests < BodyTests
@@ -137,132 +142,130 @@ class Dassets::Server::Response
       @min_num_chunks = 3
       @num_chunks     = @min_num_chunks + Factory.integer(3)
 
-      content = 'a' * (@num_chunks * Body::CHUNK_SIZE)
+      content = "a" * (@num_chunks * Body::CHUNK_SIZE)
       Assert.stub(@asset_file, :content){ content }
     end
-
   end
 
   class NonPartialBodyTests < BodyIOTests
     desc "for non/multi/invalid partial content requests"
+
     setup do
-      range = [nil, 'bytes=', 'bytes=0-1,2-3', 'bytes=3-2', 'bytes=abc'].sample
-      env = range.nil? ? {} : { 'HTTP_RANGE' => range }
+      range = [nil, "bytes=", "bytes=0-1,2-3", "bytes=3-2", "bytes=abc"].sample
+      env = range.nil? ? {} : { "HTTP_RANGE" => range }
       @body = Body.new(env, @asset_file)
     end
 
     should "not be partial" do
-      assert_false subject.partial?
+      assert_that(subject.partial?).is_false
     end
 
     should "be the full content size" do
-      assert_equal @asset_file.size, subject.size
+      assert_that(subject.size).equals(@asset_file.size)
     end
 
     should "have no content range" do
-      assert_nil subject.content_range
+      assert_that(subject.content_range).is_nil
     end
 
     should "have the full content size as its range" do
-      assert_equal 0,              subject.range_begin
-      assert_equal subject.size-1, subject.range_end
+      assert_that(subject.range_begin).equals(0)
+      assert_that(subject.range_end).equals(subject.size - 1)
     end
 
     should "chunk the full content when iterated" do
       chunks = []
       subject.each{ |chunk| chunks << chunk }
 
-      assert_equal @num_chunks,               chunks.size
-      assert_equal subject.class::CHUNK_SIZE, chunks.first.size
-      assert_equal @asset_file.content,       chunks.join('')
+      assert_that(chunks.size).equals(@num_chunks)
+      assert_that(chunks.first.size).equals(subject.class::CHUNK_SIZE)
+      assert_that(chunks.join("")).equals(@asset_file.content)
     end
-
   end
 
   class PartialBodySetupTests < BodyIOTests
     desc "for a partial content request"
+
     setup do
       @start_chunk    = Factory.boolean ? 0 : 1
       @partial_begin  = @start_chunk * Body::CHUNK_SIZE
       @partial_chunks = @num_chunks - Factory.integer(@min_num_chunks)
       @partial_size   = @partial_chunks * Body::CHUNK_SIZE
-      @partial_end    = @partial_begin + (@partial_size-1)
+      @partial_end    = @partial_begin + (@partial_size - 1)
 
-      @env = { 'HTTP_RANGE' => "bytes=#{@partial_begin}-#{@partial_end}" }
+      @env = { "HTTP_RANGE" => "bytes=#{@partial_begin}-#{@partial_end}" }
     end
-
   end
 
   class PartialBodyTests < PartialBodySetupTests
+    subject{ @body }
+
     setup do
       @body = Body.new(@env, @asset_file)
     end
-    subject{ @body }
 
     should "be partial" do
-      assert_true subject.partial?
+      assert_that(subject.partial?).is_true
     end
 
     should "be the specified partial size" do
-      assert_equal @partial_size, subject.size
+      assert_that(subject.size).equals(@partial_size)
     end
 
     should "know its content range" do
       exp = "bytes #{@partial_begin}-#{@partial_end}/#{@asset_file.size}"
-      assert_equal exp, subject.content_range
+      assert_that(subject.content_range).equals(exp)
     end
 
     should "have the know its range" do
-      assert_equal @partial_begin, subject.range_begin
-      assert_equal @partial_end,   subject.range_end
+      assert_that(subject.range_begin).equals(@partial_begin)
+      assert_that(subject.range_end).equals(@partial_end)
     end
 
     should "chunk the range when iterated" do
       chunks = []
       subject.each{ |chunk| chunks << chunk }
 
-      assert_equal @partial_chunks,           chunks.size
-      assert_equal subject.class::CHUNK_SIZE, chunks.first.size
+      assert_that(chunks.size).equals(@partial_chunks)
+      assert_that(chunks.first.size).equals(subject.class::CHUNK_SIZE)
 
       exp = @asset_file.content[@partial_begin..@partial_end]
-      assert_equal exp, chunks.join('')
+      assert_that(chunks.join("")).equals(exp)
     end
-
   end
 
   class LegacyRackTests < PartialBodySetupTests
     desc "when using a legacy version of rack that can't interpret byte ranges"
+
     setup do
       Assert.stub(Rack::Utils, :respond_to?).with(:byte_ranges){ false }
       @body = Body.new(@env, @asset_file)
     end
 
     should "not be partial" do
-      assert_false subject.partial?
+      assert_that(subject.partial?).is_false
     end
 
     should "be the full content size" do
-      assert_equal @asset_file.size, subject.size
+      assert_that(subject.size).equals(@asset_file.size)
     end
 
     should "have no content range" do
-      assert_nil subject.content_range
+      assert_that(subject.content_range).is_nil
     end
 
     should "have the full content size as its range" do
-      assert_equal 0,              subject.range_begin
-      assert_equal subject.size-1, subject.range_end
+      assert_that(subject.range_begin).equals(0)
+      assert_that(subject.range_end).equals(subject.size - 1)
     end
 
     should "chunk the full content when iterated" do
       chunks = []
       subject.each{ |chunk| chunks << chunk }
 
-      assert_equal @num_chunks,               chunks.size
-      assert_equal subject.class::CHUNK_SIZE, chunks.first.size
-      assert_equal @asset_file.content,       chunks.join('')
+      assert_that(chunks.size).equals(@num_chunks)
+      assert_that(chunks.first.size).equals(subject.class::CHUNK_SIZE)
+      assert_that(chunks.join("")).equals(@asset_file.content)
     end
-
   end
-
 end