dassets 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51a6c8bbf4e5b1a6cebb52c6da1ce5a6eae5714cf8cd410d2aa06a79737fc9b5
-  data.tar.gz: f97b79e8148698de5d6a1cd97419e34b416a1a03c4d9773e742614403fd9180d
+  metadata.gz: 8d2158827f5cdbb5f779c9c3647a0f358bec9bffa62f5fefbf8b2b83f654d21a
+  data.tar.gz: 84e0a6194cb0e506431750155dea71e3cc7cc0c62ac68a1ce8155454a5348f84
 SHA512:
-  metadata.gz: a8310a78cfbbcb27795f0319303f1471625edb03e10a747e52c195a85f0b791adc41ed52a45aa4756525d67160bcbc50d788a45076f52f60513bd51ac5b63932
-  data.tar.gz: f01e81b5758d052dcf8b5e602eb1798e206ff1cb5c9ab8d80dfaf90c83841ce278e83e8dd3577f976c37fd05a073b66ff7cd57e27d3c11bfff092a1fdb93a967
+  metadata.gz: b05667686c621b41c5cd0bd80242a58b74f58da3867180b039130e1898b7fcd8f49ee010c3007ad49e19d3cc748aa363c4f90170be6132797ddfb7c522e8a05b
+  data.tar.gz: 1827b4f16b9f9d786306c8aef467a63b040830931b3481affe7af2954e7df11ebe5557cabe016b4d1ed0375923e18b9aa8c7906d8e55dae859f205d9e9bb2c34

data/Gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 ruby "~> 2.5"
 
 gemspec
 
-gem "pry", "~> 0.12.2"
+gem "pry"

data/dassets.gemspec

@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "dassets/version"
@@ -8,20 +10,22 @@ Gem::Specification.new do |gem|
   gem.version     = Dassets::VERSION
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
-  gem.summary     = %q{Digested asset files}
-  gem.description = %q{Digest and serve HTML asset files}
+  gem.summary     = "Digested asset files"
+  gem.description = "Digest and serve HTML asset files"
   gem.homepage    = "http://github.com/redding/dassets"
   gem.license     = "MIT"
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files = `git ls-files | grep "^[^.]"`.split($INPUT_RECORD_SEPARATOR)
+
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.required_ruby_version = "~> 2.5"
 
-  gem.add_development_dependency("assert",           ["~> 2.19.0"])
-  gem.add_development_dependency("assert-rack-test", ["~> 1.1.0"])
+  gem.add_development_dependency("much-style-guide", ["~> 0.6.0"])
+  gem.add_development_dependency("assert",           ["~> 2.19.3"])
+  gem.add_development_dependency("assert-rack-test", ["~> 1.1.1"])
   gem.add_development_dependency("sinatra",          ["~> 2.1"])
 
   gem.add_dependency("rack", ["~> 2.1"])

data/lib/dassets.rb

@@ -13,17 +13,17 @@ module Dassets
   end
 
   def self.configure(&block)
-    block.call(self.config)
+    block.call(config)
   end
 
   def self.init
     @asset_files ||= {}
-    @source_files = SourceFiles.new(self.config.sources)
+    @source_files = SourceFiles.new(config.sources)
   end
 
   def self.reset
     @asset_files = {}
-    self.config.reset
+    config.reset
   end
 
   def self.asset_file(digest_path)
@@ -31,7 +31,7 @@ module Dassets
   end
 
   def self.[](digest_path)
-    self.asset_file(digest_path).tap do |af|
+    asset_file(digest_path).tap do |af|
       if af.fingerprint.nil?
         msg =
           +"error digesting `#{digest_path}`.\n\nMake sure Dassets has " \
@@ -47,7 +47,7 @@ module Dassets
           values = Dassets.combinations[key].sort
           msg << (
             ["#{bullet}#{values.first}"] +
-            (values[1..-1] || []).map{ |v| "#{" "*bullet.size}#{v}" }
+            (values[1..-1] || []).map{ |v| "#{" " * bullet.size}#{v}" }
           ).join("\n")
           msg << "\n\n"
         end
@@ -66,7 +66,7 @@ module Dassets
   end
 
   def self.combinations
-    self.config.combinations
+    config.combinations
   end
 
   module SourceFiles

data/lib/dassets/asset_file.rb

@@ -5,6 +5,7 @@ require "rack/utils"
 require "rack/mime"
 
 module Dassets; end
+
 class Dassets::AssetFile
   attr_reader :digest_path, :dirname, :extname, :basename, :source_proxy
 
@@ -22,40 +23,40 @@ class Dassets::AssetFile
   end
 
   def digest!
-    return if !self.exists?
-    Dassets.config.file_store.save(self.url){ self.content }
+    return unless exists?
+    Dassets.config.file_store.save(url){ content }
   end
 
   def url
-    path_basename = "#{@basename}-#{self.fingerprint}#{@extname}"
+    path_basename = "#{@basename}-#{fingerprint}#{@extname}"
     path =
-      File.join(@dirname, path_basename).sub(/^\.\//, "").sub(/^\//, "")
+      File.join(@dirname, path_basename).sub(%r{^\./}, "").sub(%r{^/}, "")
     "#{dassets_base_url}/#{path}"
   end
   alias_method :href, :url
 
   def fingerprint
-    return nil if !self.exists?
+    return nil unless exists?
     @source_proxy.fingerprint
   end
 
   def content
-    return nil if !self.exists?
+    return nil unless exists?
     @source_proxy.content
   end
 
   def mtime
-    return nil if !self.exists?
+    return nil unless exists?
     @source_proxy.mtime.httpdate
   end
 
   def size
-    return nil if !self.exists?
-    self.content.bytesize
+    return nil unless exists?
+    content.bytesize
   end
 
   def mime_type
-    return nil if !self.exists?
+    return nil unless exists?
     Rack::Mime.mime_type(@extname)
   end
 
@@ -67,10 +68,10 @@ class Dassets::AssetFile
     @source_proxy.exists?
   end
 
-  def ==(other_asset_file)
-    other_asset_file.kind_of?(Dassets::AssetFile) &&
-    self.digest_path == other_asset_file.digest_path &&
-    self.fingerprint == other_asset_file.fingerprint
+  def ==(other)
+    other.is_a?(Dassets::AssetFile) &&
+    digest_path == other.digest_path &&
+    fingerprint == other.fingerprint
   end
 
   private

data/lib/dassets/config.rb

@@ -6,12 +6,13 @@ require "dassets/file_store"
 require "dassets/source"
 
 module Dassets; end
+
 class Dassets::Config
   attr_reader :sources, :combinations
 
   def initialize
     super
-    self.reset
+    reset
 
     @content_cache     = Dassets::NoCache.new
     @fingerprint_cache = Dassets::NoCache.new
@@ -20,12 +21,12 @@ class Dassets::Config
 
   def reset
     @sources      = []
-    @combinations = Hash.new { |h, k| [k] } # digest pass-thru if none defined
+    @combinations = Hash.new{ |_h, k| [k] } # digest pass-thru if none defined
     @file_store   = Dassets::NullFileStore.new
   end
 
   def base_url(value = nil)
-    set_base_url(value) if !value.nil?
+    set_base_url(value) unless value.nil?
     @base_url
   end
 
@@ -34,9 +35,9 @@ class Dassets::Config
   end
 
   def file_store(value = nil)
-    if !value.nil?
+    unless value.nil?
       @file_store =
-        if value.kind_of?(Dassets::FileStore)
+        if value.is_a?(Dassets::FileStore)
           value
         else
           Dassets::FileStore.new(value)
@@ -46,12 +47,12 @@ class Dassets::Config
   end
 
   def content_cache(cache = nil)
-    @content_cache = cache if !cache.nil?
+    @content_cache = cache unless cache.nil?
     @content_cache
   end
 
   def fingerprint_cache(cache = nil)
-    @fingerprint_cache = cache if !cache.nil?
+    @fingerprint_cache = cache unless cache.nil?
     @fingerprint_cache
   end
 

data/lib/dassets/file_store.rb

@@ -14,10 +14,10 @@ class Dassets::FileStore
 
   def save(url_path, &block)
     @save_mutex.synchronize do
-      store_path(url_path).tap { |path|
+      store_path(url_path).tap do |path|
         FileUtils.mkdir_p(File.dirname(path))
-        File.open(path, "w") { |f| f.write(block.call) }
-      }
+        File.open(path, "w"){ |f| f.write(block.call) }
+      end
     end
   end
 
@@ -31,7 +31,7 @@ class Dassets::NullFileStore < Dassets::FileStore
     super("")
   end
 
-  def save(url_path, &block)
+  def save(url_path)
     # No-op, just return the store path like the base does.
     store_path(url_path)
   end

data/lib/dassets/server.rb

@@ -6,6 +6,7 @@ require "dassets/server/response"
 # Rack middleware for serving Dassets asset files
 
 module Dassets; end
+
 class Dassets::Server
   def initialize(app)
     @app = app

data/lib/dassets/server/request.rb

@@ -4,6 +4,7 @@ require "rack"
 
 module Dassets; end
 class Dassets::Server; end
+
 class Dassets::Server::Request < Rack::Request
   # The HTTP request method. This is the standard implementation of this
   # method but is respecified here due to libraries that attempt to modify
@@ -46,7 +47,7 @@ class Dassets::Server::Request < Rack::Request
 
   def path_digest_match
     @path_digest_match ||= begin
-      path_info.match(/\/(.+)-[a-f0-9]{32}(\..+|)$/i) || NullDigestMatch.new
+      path_info.match(%r{/(.+)-[a-f0-9]{32}(\..+|)$}i) || NullDigestMatch.new
     end
   end
 

data/lib/dassets/server/response.rb

@@ -6,6 +6,7 @@ require "rack/mime"
 
 module Dassets; end
 class Dassets::Server; end
+
 class Dassets::Server::Response
   attr_reader :asset_file, :status, :headers, :body
 
@@ -30,13 +31,15 @@ class Dassets::Server::Response
       body = Body.new(env, @asset_file)
       [
         body.partial? ? 206 : 200,
-        Rack::Utils::HeaderHash.new.merge(@asset_file.response_headers).tap do |h|
-          h["Last-Modified"]  = mtime.to_s
-          h["Content-Type"]   = @asset_file.mime_type.to_s
-          h["Content-Length"] = body.size.to_s
-          h["Content-Range"]  = body.content_range if body.partial?
-        end,
-        env["REQUEST_METHOD"] == "HEAD" ? [] : body
+        Rack::Utils::HeaderHash
+          .new
+          .merge(@asset_file.response_headers).tap do |h|
+            h["Last-Modified"]  = mtime.to_s
+            h["Content-Type"]   = @asset_file.mime_type.to_s
+            h["Content-Length"] = body.size.to_s
+            h["Content-Range"]  = body.content_range if body.partial?
+          end,
+        env["REQUEST_METHOD"] == "HEAD" ? [] : body,
       ]
     end
   end
@@ -48,14 +51,14 @@ class Dassets::Server::Response
   # This class borrows from the body range handling in Rack::File and adapts
   # it for use with Dasset's asset files and their generic string content.
   class Body
-    CHUNK_SIZE = (8*1024).freeze # 8k
+    CHUNK_SIZE = (8 * 1024) # 8k
 
     attr_reader :asset_file, :size, :content_range
 
     def initialize(env, asset_file)
       @asset_file = asset_file
       @range, @content_range = get_range_info(env, @asset_file)
-      @size = self.range_end - self.range_begin + 1
+      @size = range_end - range_begin + 1
     end
 
     def partial?
@@ -73,7 +76,7 @@ class Dassets::Server::Response
     def each
       StringIO.open(@asset_file.content, "rb") do |io|
         io.seek(@range.begin)
-        remaining_len = self.size
+        remaining_len = size
         while remaining_len > 0
           part = io.read([CHUNK_SIZE, remaining_len].min)
           break if part.nil?
@@ -85,16 +88,16 @@ class Dassets::Server::Response
     end
 
     def inspect
-      "#<#{self.class}:#{"0x0%x" % (self.object_id << 1)} " \
-        "digest_path=#{self.asset_file.digest_path} " \
-        "range_begin=#{self.range_begin} range_end=#{self.range_end}>"
+      "#<#{self.class}:#{"0x0%x" % (object_id << 1)} " \
+        "digest_path=#{asset_file.digest_path} " \
+        "range_begin=#{range_begin} range_end=#{range_end}>"
     end
 
-    def ==(other_body)
-      if other_body.is_a?(self.class)
-        self.asset_file  == other_body.asset_file  &&
-        self.range_begin == other_body.range_begin &&
-        self.range_end   == other_body.range_end
+    def ==(other)
+      if other.is_a?(self.class)
+        asset_file  == other.asset_file  &&
+        range_begin == other.range_begin &&
+        range_end   == other.range_end
       else
         super
       end
@@ -105,16 +108,22 @@ class Dassets::Server::Response
     def get_range_info(env, asset_file)
       content_size = asset_file.size
       # legacy rack version, just return full size
-      return full_size_range_info(content_size) if !Rack::Utils.respond_to?(:byte_ranges)
+      unless Rack::Utils.respond_to?(:byte_ranges)
+        return full_size_range_info(content_size)
+      end
+
       ranges = Rack::Utils.byte_ranges(env, content_size)
       # No ranges or multiple ranges are not supported, just return full size
-      return full_size_range_info(content_size) if ranges.nil? || ranges.empty? || ranges.length > 1
+      if ranges.nil? || ranges.empty? || ranges.length > 1
+        return full_size_range_info(content_size)
+      end
+
       # single range
       [ranges[0], "bytes #{ranges[0].begin}-#{ranges[0].end}/#{content_size}"]
     end
 
     def full_size_range_info(content_size)
-      [(0..content_size-1), nil]
+      [(0..content_size - 1), nil]
     end
   end
 end

data/lib/dassets/source.rb

@@ -3,6 +3,7 @@
 require "dassets/engine"
 
 module Dassets; end
+
 class Dassets::Source
   attr_reader :path, :engines, :response_headers
 
@@ -10,7 +11,7 @@ class Dassets::Source
     @path             = path.to_s
     @filter           = proc{ |paths| paths }
     @engines          = Hash.new{ |hash, key| hash[key] = [] }
-    @response_headers = Hash.new
+    @response_headers = {}
   end
 
   def filter(&block)

data/lib/dassets/source_file.rb

@@ -6,6 +6,7 @@ require "dassets/asset_file"
 require "dassets/source_proxy"
 
 module Dassets; end
+
 class Dassets::SourceFile
   def self.find_by_digest_path(path, **options)
     Dassets.source_files[path] || Dassets::NullSourceFile.new(path, **options)
@@ -23,13 +24,13 @@ class Dassets::SourceFile
   # configured source) in `find_by_digest_path` above.
   def source
     @source ||=
-      Dassets.config.sources.select { |source|
+      Dassets.config.sources.select{ |source|
         @file_path =~ /^#{slash_path(source.path)}/
       }.last
   end
 
   def asset_file
-    @asset_file ||= Dassets::AssetFile.new(self.digest_path)
+    @asset_file ||= Dassets::AssetFile.new(digest_path)
   end
 
   def digest_path
@@ -37,26 +38,28 @@ class Dassets::SourceFile
       begin
         digest_basename =
           @ext_list
-            .reduce([]) { |digest_ext_list, ext|
+            .reduce([]){ |digest_ext_list, ext|
               digest_ext_list <<
-                self.source.engines[ext].reduce(ext) { |ext_acc, engine|
+                source.engines[ext].reduce(ext)do |ext_acc, engine|
                   engine.ext(ext_acc)
-                }
+                end
             }
             .reject(&:empty?)
             .reverse
             .join(".")
 
-        File.join([digest_dirname(@file_path), digest_basename].reject(&:empty?))
+        File.join(
+          [digest_dirname(@file_path), digest_basename].reject(&:empty?),
+        )
       end
   end
 
   def compiled
-    @ext_list.reduce(read_file(@file_path)) { |file_acc, ext|
-      self.source.engines[ext].reduce(file_acc) { |ext_acc, engine|
+    @ext_list.reduce(read_file(@file_path)) do |file_acc, ext|
+      source.engines[ext].reduce(file_acc) do |ext_acc, engine|
         engine.compile(ext_acc)
-      }
-    }
+      end
+    end
   end
 
   def exists?
@@ -68,12 +71,12 @@ class Dassets::SourceFile
   end
 
   def response_headers
-    self.source.nil? ? Hash.new : self.source.response_headers
+    source.nil? ? {} : source.response_headers
   end
 
-  def ==(other_source_file)
-    if other_source_file.is_a?(self.class)
-      self.file_path == other_source_file.file_path
+  def ==(other)
+    if other.is_a?(self.class)
+      file_path == other.file_path
     else
       super
     end
@@ -83,7 +86,7 @@ class Dassets::SourceFile
 
   # remove the source path from the dirname (if it exists)
   def digest_dirname(file_path)
-    slash_path(File.dirname(file_path)).sub(slash_path(self.source.path), "")
+    slash_path(File.dirname(file_path)).sub(slash_path(source.path), "")
   end
 
   def slash_path(path)
@@ -122,9 +125,9 @@ class Dassets::NullSourceFile < Dassets::SourceFile
     @source_proxy.mtime
   end
 
-  def ==(other_source_file)
-    if other_source_file.is_a?(self.class)
-      self.file_path == other_source_file.file_path
+  def ==(other)
+    if other.is_a?(self.class)
+      file_path == other.file_path
     else
       super
     end