dassets 0.15.0 → 0.15.1

data/lib/dassets/source_proxy.rb

@@ -23,23 +23,23 @@ class Dassets::SourceProxy
   end
 
   def key
-    "#{self.digest_path} -- #{self.mtime}"
+    "#{digest_path} -- #{mtime}"
   end
 
   def content
-    @content_cache[self.key] ||= source_content
+    @content_cache[key] ||= source_content
   end
 
   def fingerprint
-    @fingerprint_cache[self.key] ||= source_fingerprint
+    @fingerprint_cache[key] ||= source_fingerprint
   end
 
   def mtime
-    @source_files.map{ |f| f.mtime }.compact.max
+    @source_files.map(&:mtime).compact.max
   end
 
   def response_headers
-    @source_files.inject(Hash.new){ |hash, f| hash.merge!(f.response_headers) }
+    @source_files.inject({}){ |hash, f| hash.merge!(f.response_headers) }
   end
 
   def exists?
@@ -49,7 +49,7 @@ class Dassets::SourceProxy
   private
 
   def source_content
-    @source_files.map{ |f| f.compiled }.join("\n")
+    @source_files.map(&:compiled).join("\n")
   end
 
   def source_fingerprint
@@ -57,9 +57,9 @@ class Dassets::SourceProxy
   end
 
   def get_source_files(digest_path, **options)
-    Dassets.config.combinations[digest_path.to_s].map { |source_digest_path|
+    Dassets.config.combinations[digest_path.to_s].map do |source_digest_path|
       Dassets::SourceFile.find_by_digest_path(source_digest_path, **options)
-    }
+    end
   end
 end
 

data/lib/dassets/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dassets
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end

data/test/helper.rb

@@ -1,5 +1,7 @@
-# this file is automatically required when you run `assert`
-# put any test helpers here
+# frozen_string_literal: true
+
+# This file is automatically required when you run `assert`
+# put any test helpers here.
 
 # add the root dir to the load path
 $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
@@ -12,20 +14,30 @@ require "test/support/factory"
 require "pathname"
 TEST_SUPPORT_PATH = Pathname.new(File.expand_path("../support", __FILE__))
 
-ENV["DASSETS_TEST_MODE"]   = "yes"
+ENV["DASSETS_TEST_MODE"] = "yes"
 
 require "dassets"
 
 @dumb_engine =
   Class.new(Dassets::Engine) do
-    def ext(in_ext); ""; end
-    def compile(input); "#{input}\nDUMB"; end
+    def ext(_in_ext)
+      ""
+    end
+
+    def compile(input)
+      "#{input}\nDUMB"
+    end
   end
 
 @useless_engine =
   Class.new(Dassets::Engine) do
-    def ext(in_ext); "no-use"; end
-    def compile(input); "#{input}\nUSELESS"; end
+    def ext(_in_ext)
+      "no-use"
+    end
+
+    def compile(input)
+      "#{input}\nUSELESS"
+    end
   end
 
 Dassets.configure do |c|

data/test/support/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sinatra/base"
 
 class SinatraApp < Sinatra::Base

data/test/support/factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert/factory"
 
 module Factory

data/test/system/rack_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "dassets"
 
@@ -39,7 +41,8 @@ module Dassets
       assert_that(resp.body).is_empty
     end
 
-    should "return a partial content response on valid partial content requests" do
+    should "return a partial content response on valid partial content "\
+           "requests" do
       content = Dassets["file1.txt"].content
       size    = Factory.integer(content.length)
       # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
@@ -59,7 +62,8 @@ module Dassets
       assert_that(resp.body).equals(Dassets["file1.txt"].content)
     end
 
-    should "return a full response on multiple-range partial content requests" do
+    should "return a full response on multiple-range partial content "\
+           "requests" do
       # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
       env = { "HTTP_RANGE" => "bytes=0-1,2-3" }
       resp = get "/file1-daa05c683a4913b268653f7a7e36a5b4.txt", {}, env
@@ -106,9 +110,13 @@ module Dassets
 
     should "return a successful response" do
       resp =
-        get("/file1-daa05c683a4913b268653f7a7e36a5b4.txt", {}, {
-          "HTTP_IF_MODIFIED_SINCE" => Dassets["file1.txt"].mtime.to_s
-        })
+        get(
+          "/file1-daa05c683a4913b268653f7a7e36a5b4.txt",
+          {},
+          {
+            "HTTP_IF_MODIFIED_SINCE" => Dassets["file1.txt"].mtime.to_s,
+          },
+        )
 
       assert_that(resp.status).equals(304)
       assert_that(resp.body).is_empty

data/test/unit/asset_file_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "dassets/asset_file"
 
@@ -8,13 +10,14 @@ require "dassets/source_proxy"
 class Dassets::AssetFile
   class UnitTests < Assert::Context
     desc "Dassets::AssetFile"
-    subject { @asset_file }
+    subject{ @asset_file }
 
     setup do
       @asset_file = Dassets::AssetFile.new("file1.txt")
     end
 
-    should have_readers :digest_path, :dirname, :extname, :basename, :source_proxy
+    should have_readers :digest_path, :dirname, :extname, :basename
+    should have_readers :source_proxy
     should have_imeths  :digest!, :url, :href, :fingerprint, :content
     should have_imeths  :mtime, :size, :mime_type, :exists?, :==
 
@@ -30,7 +33,7 @@ class Dassets::AssetFile
       assert_that(subject.size).equals(subject.content.bytesize)
       assert_that(subject.mime_type).equals("text/plain")
       assert_that(subject.response_headers)
-      .equals(subject.source_proxy.response_headers)
+        .equals(subject.source_proxy.response_headers)
       assert_that(subject.exists?).is_true
 
       null_file = Dassets::AssetFile.new("")
@@ -79,7 +82,7 @@ class Dassets::AssetFile
 
     should "build it's url/href from the file, fingerpint, and "\
            "any configured base url" do
-      assert_that(subject.url).matches(/^\/file1-[a-f0-9]{32}\.txt$/)
+      assert_that(subject.url).matches(%r{^/file1-[a-f0-9]{32}\.txt$})
       assert_that(subject.href).matches(subject.url)
 
       nested = Dassets::AssetFile.new("nested/file1.txt")
@@ -89,7 +92,8 @@ class Dassets::AssetFile
       base_url = Factory.url
       Assert.stub(Dassets.config, :base_url){ base_url }
 
-      assert_that(subject.url).matches(/^#{base_url}\/file1-[a-f0-9]{32}\.txt$/)
+      assert_that(subject.url)
+        .matches(%r{^#{base_url}/file1-[a-f0-9]{32}\.txt$})
       assert_that(subject.href).matches(subject.url)
 
       assert_that(nested.url).equals("#{base_url}/nested/file1-.txt")

data/test/unit/cache_tests.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "assert"
 require "dassets/cache"
 
 class Dassets::MemCache
   class UnitTests < Assert::Context
     desc "Dassets::MemCache"
-    subject { Dassets::MemCache.new }
+    subject{ Dassets::MemCache.new }
 
     should have_imeths :keys, :[], :[]=
 
@@ -19,7 +21,7 @@ end
 class Dassets::NoCache
   class UnitTests < Assert::Context
     desc "Dassets::NoCache"
-    subject { Dassets::NoCache.new }
+    subject{ Dassets::NoCache.new }
 
     should have_imeths :keys, :[], :[]=
 

data/test/unit/config_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "dassets/config"
 
@@ -7,7 +9,7 @@ require "dassets/file_store"
 class Dassets::Config
   class UnitTests < Assert::Context
     desc "Dassets::Config"
-    subject { @config }
+    subject{ @config }
 
     setup do
       @config = Dassets::Config.new
@@ -101,7 +103,7 @@ class Dassets::Config
 
     should "register new sources with the `source` method" do
       path = Factory.path
-      filter = proc{ |paths| [] }
+      filter = proc{ |_paths| [] }
       subject.source(path){ |s| s.filter(&filter) }
 
       assert_that(subject.sources.size).equals(1)
@@ -110,7 +112,8 @@ class Dassets::Config
       assert_that(subject.sources.first.filter).equals(filter)
     end
 
-    should "know its combinations and return the keyed digest path by default" do
+    should "know its combinations and return the keyed digest path by "\
+           "default" do
       assert_that(subject.combinations).is_kind_of(::Hash)
       assert_that(subject.combinations["some/digest.path"])
         .equals(["some/digest.path"])

data/test/unit/dassets_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "dassets"
 
@@ -7,7 +9,7 @@ require "dassets/asset_file"
 module Dassets
   class UnitTests < Assert::Context
     desc "Dassets"
-    subject { Dassets }
+    subject{ Dassets }
 
     should have_imeths :config, :configure, :init, :reset
     should have_imeths :asset_file, :[], :source_files, :combinations
@@ -18,7 +20,7 @@ module Dassets
 
     should "know how to reset itself" do
       config_reset_called = false
-      Assert.stub(subject.config, :reset) { config_reset_called = true }
+      Assert.stub(subject.config, :reset){ config_reset_called = true }
 
       file1 = subject["nested/file3.txt"]
 
@@ -45,11 +47,11 @@ module Dassets
     end
 
     should "complain if digest path is not found using the index operator" do
-      assert_that(-> {
+      assert_that(->{
         subject.asset_file("path/not/found.txt")
       }).does_not_raise
 
-      assert_that { subject["path/not/found.txt"] }.raises(AssetFileError)
+      assert_that{ subject["path/not/found.txt"] }.raises(AssetFileError)
     end
 
     should "know its list of configured source files" do

data/test/unit/engine_tests.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "assert"
 require "dassets/engine"
 
 class Dassets::Engine
   class UnitTests < Assert::Context
     desc "Dassets::Engine"
-    subject { Dassets::Engine.new }
+    subject{ Dassets::Engine.new }
 
     should have_reader :opts
     should have_imeths :ext, :compile
@@ -15,8 +17,8 @@ class Dassets::Engine
     end
 
     should "raise NotImplementedError on `ext` and `compile`" do
-      assert_that { subject.ext("foo") }.raises(NotImplementedError)
-      assert_that { subject.compile("some content") }
+      assert_that{ subject.ext("foo") }.raises(NotImplementedError)
+      assert_that{ subject.compile("some content") }
         .raises(NotImplementedError)
     end
   end

data/test/unit/file_store_tests.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require "assert"
 require "dassets/file_store"
 
 class Dassets::FileStore
   class UnitTests < Assert::Context
     desc "Dassets::FileStore"
-    subject { Dassets::FileStore.new(@root.to_s) }
+    subject{ Dassets::FileStore.new(@root.to_s) }
 
     setup do
       @root      = TEST_SUPPORT_PATH.join("public")
@@ -32,7 +34,7 @@ class Dassets::FileStore
       content = Factory.text
       assert_that(@root_path).is_not_a_file
 
-      path = subject.save(@url_path) { content }
+      path = subject.save(@url_path){ content }
 
       assert_that(path).equals(@root_path)
       assert_that(@root_path).is_a_file
@@ -44,7 +46,7 @@ end
 class Dassets::NullFileStore
   class UnitTests < Assert::Context
     desc "Dassets::NullFileStore"
-    subject { Dassets::NullFileStore.new }
+    subject{ Dassets::NullFileStore.new }
 
     setup do
       @root      = TEST_SUPPORT_PATH.join("public")

data/test/unit/server/request_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "dassets/server/request"
 
@@ -6,7 +8,7 @@ require "dassets/asset_file"
 class Dassets::Server::Request
   class UnitTests < Assert::Context
     desc "Dassets::Server::Request"
-    subject { @req }
+    subject{ @req }
 
     setup do
       @path = "/file1-daa05c683a4913b268653f7a7e36a5b4.txt"
@@ -28,7 +30,7 @@ class Dassets::Server::Request
       req =
         file_request(
           "GET",
-          "/nested/file3-d41d8cd98f00b204e9800998ecf8427e.txt"
+          "/nested/file3-d41d8cd98f00b204e9800998ecf8427e.txt",
         )
       assert_that(req.for_asset_file?).is_true
 
@@ -36,7 +38,8 @@ class Dassets::Server::Request
       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
+      # 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
 
@@ -70,7 +73,7 @@ class Dassets::Server::Request
     def file_request(method, path_info)
       Dassets::Server::Request.new({
         "REQUEST_METHOD" => method,
-        "PATH_INFO"      => path_info
+        "PATH_INFO" => path_info,
       })
     end
   end

data/test/unit/server/response_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "assert"
 require "dassets/server/response"
 
@@ -7,7 +9,7 @@ require "dassets/asset_file"
 class Dassets::Server::Response
   class UnitTests < Assert::Context
     desc "Dassets::Server::Response"
-    subject { @response }
+    subject{ @response }
 
     setup do
       @env = {}
@@ -42,9 +44,9 @@ class Dassets::Server::Response
 
       exp_headers =
         @asset_file.response_headers.merge({
-          "Content-Type"   => "text/plain",
+          "Content-Type" => "text/plain",
           "Content-Length" => @asset_file.size.to_s,
-          "Last-Modified"  => @asset_file.mtime.to_s,
+          "Last-Modified" => @asset_file.mtime.to_s,
         })
       assert_that(resp.headers).equals(exp_headers)
 
@@ -94,7 +96,7 @@ class Dassets::Server::Response
 
   class BodyTests < UnitTests
     desc "Body"
-    subject { @body }
+    subject{ @body }
 
     setup do
       @body = Body.new(@env, @asset_file)
@@ -189,14 +191,14 @@ class Dassets::Server::Response
       @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}" }
     end
   end
 
   class PartialBodyTests < PartialBodySetupTests
-    subject { @body }
+    subject{ @body }
 
     setup do
       @body = Body.new(@env, @asset_file)