bankrupt 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9d75977ce24ba0712d558d3ab5003c1877e5f2099af75911788f3f0ef7fd53
-  data.tar.gz: 7996990b475cc9cca5df4aade17e7a2815bab0ab85edb6d76fd3083f4cfef4d3
+  metadata.gz: b7605a8034097043298a51ba0cea61725c7befef7e7c1456c5dfa80cdeb500a6
+  data.tar.gz: cde2061f0af7b265d5d7cf347318598c2ea8145d566d9fcfed48b4cf4814f492
 SHA512:
-  metadata.gz: 15dd67b22ac708a464dfce8b95214661bb1fc90dc10e7ad4199aa685582cd9a5acf48f19ff8459494e19cdc7f3ec79b7de00bb3a3c346ba509e753e19a4ffcd6
-  data.tar.gz: 2af9d31bfcc234aa2e845b0a34b9fc718f71f86af0361356c0e088a0410f58136952dc7d18ac8ab2e34336b9e82cbc8ea3654d6b1b929ce462571a37fbc755e4
+  metadata.gz: d392a244a8aebfbd509e9af128b14795aaf241d6c75b10db9794579f5bb2cbd18e6664b248ac82b39f77d972503438dbbe9d56285e10adbc42c01df5ac2f48c4
+  data.tar.gz: bfba6c8fd639df3b8a5f9dcf3a80f3e62893a1dea003e0087ebda7ed7feff1b308935880ade03de7a859e5f6964587058c9c2f48b2c31eaddc789dfc8b391afa

data/.github/workflows/default.yml

@@ -0,0 +1,23 @@
+---
+name: CI
+on: push
+
+jobs:
+  main:
+    name: ${{ matrix.ruby }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6, 2.7, 3.0]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: bundle exec rubocop
+      - run: bundle exec rspec
+      - run: bundle exec yard
+      - run: gem build bankrupt.gemspec

data/.github/workflows/publish.yml

@@ -0,0 +1,33 @@
+---
+name: Publish Rubygem
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  main:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+      - run: gem build bankrupt.gemspec
+
+      - name: setup credentials
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:github: ${GH_API_KEY}\n" > $HOME/.gem/credentials
+          printf -- ":rubygems_api_key: ${RUBYGEMS_API_KEY}\n" >> $HOME/.gem/credentials
+        env:
+          GH_API_KEY: Bearer ${{ secrets.GITHUB_TOKEN }}
+          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+
+      - name: publish to rubygems
+        run: |
+          gem push *.gem
+      - name: publish to github packages
+        run: |
+          gem push --key github --host https://rubygems.pkg.github.com/${{ github.repository_owner }} *.gem

data/.rubocop.yml

@@ -1,12 +1,18 @@
 ---
-require: rubocop-rspec
+require:
+  - rubocop-rake
+  - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4.0
+  NewCops: enable
+  TargetRubyVersion: 2.5.0
 
 Layout/ExtraSpacing:
   AllowForAlignment: false
 
+Layout/LineLength:
+  Max: 80
+
 Metrics/AbcSize:
   Max: 20
 
@@ -23,6 +29,7 @@ RSpec/DescribeClass:
     - 'spec/bankrupt/tasks_spec.rb'
 
 RSpec/ExampleLength:
+  Max: 6
   Exclude:
     - 'spec/bankrupt/tasks_spec.rb'
 
@@ -35,3 +42,6 @@ RSpec/MultipleExpectations:
 
 RSpec/NestedGroups:
   Max: 6
+
+RSpec/StubbedMock:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+3.0.2

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 This file keeps track of changes between releases for the bankrupt project
 which adheres to [semantic versioning](https://semver.org).
 
+## v3.0.0 2021-08-21
+
+* Drop support for ruby 2.4.x.
+* Mark uploaded assets as `immutable` in the `Cache-Control` header.
+
 ## v2.1.2 2020-01-20
 
 Take options into account to ensure unique asset lookups.

data/README.md

@@ -1,7 +1,7 @@
 # Bankrupt
 
 [![RubyGems](https://img.shields.io/gem/v/bankrupt.svg)](https://rubygems.org/gems/bankrupt)
-[![Build Status](https://travis-ci.org/mfinelli/bankrupt.svg?branch=master)](https://travis-ci.org/mfinelli/bankrupt)
+![Build Status](https://github.com/mfinelli/bankrupt/workflows/CI/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/mfinelli/bankrupt/badge.svg?branch=master)](https://coveralls.io/github/mfinelli/bankrupt?branch=master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/f13a4521623d19c8eb4a/maintainability)](https://codeclimate.com/github/mfinelli/bankrupt/maintainability)
 [![Inline docs](http://inch-ci.org/github/mfinelli/bankrupt.svg?branch=master)](http://inch-ci.org/github/mfinelli/bankrupt)
@@ -156,7 +156,7 @@ end
 ## License
 
 ```
-Copyright 2018-2020 Mario Finelli
+Copyright 2018-2021 Mario Finelli
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -170,5 +170,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ```
-
-TODO: tests to ensure the lookups are separate

data/bankrupt.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description = 'Load files from local disk or from a CDN in production.'
   spec.homepage = 'https://github.com/mfinelli/bankrupt'
   spec.license = 'Apache-2.0'
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'yard'

data/lib/bankrupt.rb

@@ -82,7 +82,7 @@ module Bankrupt
   # @return [String] full path to the asset
   def raw(path)
     details = ASSETS.fetch(path)
-    create_fullpath(path, details[:md5], details[:hashless])
+    create_fullpath(path, details[:md5], hashless: details[:hashless])
   rescue KeyError
     "/#{path}"
   end
@@ -92,7 +92,7 @@ module Bankrupt
   # Return a precomputed asset path if it exists
   #
   # @param path [String] asset on which to perform the lookup
-  # @params options [String] the options string to use in the lookup
+  # @param options [String] the options string to use in the lookup
   # @return [String] the rendered slim template with the asset in place
   def lookup(path, options = nil)
     if actual_options?(options)
@@ -111,7 +111,7 @@ module Bankrupt
   # @param hashless [Boolean] if the file doesn't have the hash appended
   # @return [String] filename with digest e.g, style-123.css (style.css if
   #                  hashless)
-  def append_md5(file, digest, hashless = false)
+  def append_md5(file, digest, hashless: false)
     return file if hashless
 
     [[file.split(ex = File.extname(file)).first, digest].join('-'), ex].join
@@ -123,10 +123,10 @@ module Bankrupt
   # @param md5 [String] md5 hash of the asset
   # @param hashless [Boolean] if the files doesn't have the hash appended
   # @return [String] new, full path to the asset
-  def create_fullpath(path, md5, hashless = false)
+  def create_fullpath(path, md5, hashless: false)
     return "/#{path}" if CDN.empty?
 
-    [CDN, append_md5(path, md5, hashless)].join('/')
+    [CDN, append_md5(path, md5, hashless: hashless)].join('/')
   end
 
   # Generate the asset HTML. If the asset exists in the lookup hash then
@@ -149,7 +149,8 @@ module Bankrupt
     begin
       details = ASSETS.fetch(path)
 
-      fullpath = create_fullpath(path, details[:md5], details[:hashless])
+      fullpath = create_fullpath(path, details[:md5],
+                                 hashless: details[:hashless])
 
       @_assets[lookup_path] = Slim::Template.new { cdn }.render(
         ASSET.new(fullpath, details[:sri])

data/lib/bankrupt/tasks.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2018-2020 Mario Finelli
+# Copyright 2018-2021 Mario Finelli
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ namespace :bankrupt do
         # content_md5: Base64.strict_encode64(asset[:md5]),
         content_length: File.size(f),
         content_type: MiniMime.lookup_by_filename(f).content_type,
-        cache_control: 'public, max-age=31536000',
+        cache_control: 'public, max-age=31536000, immutable',
         server_side_encryption: 'AES256',
         storage_class: 'STANDARD',
         metadata: {
@@ -102,11 +102,11 @@ namespace :bankrupt do
     file_glob = '*.{css,jpg,js,pdf,png,svg,eot,ttf,woff,woff2}'
 
     config = begin
-               YAML.safe_load(File.read(File.join(APP_ROOT, '.bankrupt.yml')),
-                              [], [], true, symbolize_names: true)
-             rescue Errno::ENOENT
-               {}
-             end
+      YAML.safe_load(File.read(File.join(APP_ROOT, '.bankrupt.yml')),
+                     [], [], true, symbolize_names: true)
+    rescue Errno::ENOENT
+      {}
+    end
 
     Dir.glob(File.join(APP_ROOT, 'public', file_glob)).sort.each do |file|
       md5 = Digest::MD5.file(file).to_s
@@ -114,7 +114,7 @@ namespace :bankrupt do
 
       # undo the hash that we have webpack insert (but is important so the
       # final css uses the correct path)
-      if basename.match?(/\-#{md5}\.#{File.extname(file).delete('.')}$/)
+      if basename.match?(/-#{md5}\.#{File.extname(file).delete('.')}$/)
         File.rename(file,
                     (file = File.join(
                       File.dirname(file),
@@ -126,7 +126,7 @@ namespace :bankrupt do
         filename: basename,
         md5: md5,
         babble: Digest::MD5.file(file).bubblebabble,
-        sri: 'sha384-' + Digest::SHA384.file(file).base64digest.to_s
+        sri: "sha384-#{Digest::SHA384.file(file).base64digest}"
       }
 
       Array(config[:hashless]).each do |match|

data/lib/bankrupt/util.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2018 Mario Finelli
+# Copyright 2018-2021 Mario Finelli
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ module Bankrupt
     # @param path [String] path to the manifest
     # @return [Hash] parsed manifest or empty hash on error
     def self.parse_manifest(path)
-      Hash[JSON.parse(File.read(path)).map do |k, v|
-        [k.freeze, Hash[v.map { |l, b| [l.to_sym, b.freeze] }].freeze]
-      end].freeze
+      JSON.parse(File.read(path)).map do |k, v|
+        [k.freeze, v.map { |l, b| [l.to_sym, b.freeze] }.to_h.freeze]
+      end.to_h.freeze
     rescue StandardError
       {}
     end

data/lib/bankrupt/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2018-2020 Mario Finelli
+# Copyright 2018-2021 Mario Finelli
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Bankrupt
-  VERSION = '2.1.2'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bankrupt
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Mario Finelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2021-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -156,6 +156,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -206,10 +220,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/default.yml"
+- ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -231,14 +247,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A sinatra helper to load assets locally and production.

data/.travis.yml

@@ -1,21 +0,0 @@
----
-sudo: false
-
-language: ruby
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-
-before_install:
-  - gem update --system
-  - gem --version
-
-script:
-  - bundle exec rubocop
-  - bundle exec rspec
-  - bundle exec yard
-
-notifications:
-  email: false