bankrupt 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dca115afeb3234502a119751813a7ae7e0d17ea19a7f0051386544211998eed
-  data.tar.gz: c72b72acc9233dbd5e096896c42649953d3c1bc8facf2ceff649d7d5eb6deae7
+  metadata.gz: c128faa48d53c51a942b44223ae14a559dc3e3ce3addcbb5e54c24a26501d936
+  data.tar.gz: 04e4231a59a84d423b8d08be530b2b043a49cd59a4f71635f183eb75ea92ce26
 SHA512:
-  metadata.gz: 3242ca78af837ea8979f1ad3b0ca329a88f1fe10716fa18ad0607173c0648090b1b3824fc58a087b4723277b1f6f1aa7b02806b3015f3ce1c51b054b8895cbf2
-  data.tar.gz: 7c9c0c97bb5d5ccf6b7c25d15053d8ea932d3ee6b7f8d728ef51e7e3b117f4003267bbc67ef6aa636d3bc76e7d38cb8b2d38771dce4e07152c8f1e94f070dd92
+  metadata.gz: 5365d3ab584d89f8826bc1a93eafd0b3792024e79f8e77e3aa00d750e52974c365d1d22336ddd6e2bb54c1e4c28754437f86ca4303ab16ad6e275cf598f8ca5c
+  data.tar.gz: 7845cf9952c856d2810e598b6e1946c98be58b9d581d59033102e4c6dbc2ad0514330305be609693f14d8096325fa22b7e704e84c59ade72a3591cc4c0853abd

data/.gitignore

@@ -3,6 +3,7 @@
 /coverage
 /doc
 /Gemfile.lock
+/spec/fixtures/tmp
 /vendor/bundle
 /*.gem
 /*.gem.asc

data/.rubocop.yml

@@ -2,22 +2,33 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.3.7
+  TargetRubyVersion: 2.4.0
 
 Layout/ExtraSpacing:
   AllowForAlignment: false
 
 Metrics/BlockLength:
-  Max: 60
+  Max: 80
   Exclude:
     - 'spec/**/*_spec.rb'
 
-Metrics/LineLength:
-  Exclude:
-    - 'spec/bankrupt/util_spec.rb'
-
 Metrics/MethodLength:
   Max: 15
 
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/bankrupt/tasks_spec.rb'
+
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/bankrupt/tasks_spec.rb'
+
+RSpec/MessageSpies:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Exclude:
+    - 'spec/bankrupt/tasks_spec.rb'
+
 RSpec/NestedGroups:
   Max: 6

data/.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 
 language: ruby
 rvm:
-  - 2.3
   - 2.4
   - 2.5
   - 2.6

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 This file keeps track of changes between releases for the bankrupt project
 which adheres to [semantic versioning](https://semver.org).
 
+## v2.0.0 2019-06-12
+
+This major release changes the default cache behavior of assets uploaded to s3
+to make them expire in one year.
+
+* Set cache-control header on objects uploaded to s3 (1 year).
+* Add new rake task to remove old objects (anything not in the current
+  manifest) from s3.
+* Extend test covertage to rake tasks.
+* Drop support for ruby 2.3.x which might be considered breaking, but has
+  actually always been the case just unnoticed until the test coverage was
+  extended and exposed the problem, so I'm considering it a bugfix.
+
 ## v1.1.0 2019-06-05
 
 Add support for `img` tags along with the ability to add other attributes.

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.3.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -22,9 +22,10 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
-  # spec.add_dependency 'aws-sdk-s3', '~> 1.0'
-  # spec.add_dependency 'mini_mime', '~> 1.0'
   spec.add_dependency 'slim', '>= 3.0', '< 5.0'
+  spec.add_development_dependency 'aws-sdk-s3'
+  spec.add_development_dependency 'mini_mime'
+  spec.add_development_dependency 'rake'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls'

data/lib/bankrupt/tasks.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2018 Mario Finelli
+# Copyright 2018-2019 Mario Finelli
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -42,6 +42,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',
         server_side_encryption: 'AES256',
         storage_class: 'STANDARD',
         metadata: {
@@ -53,6 +54,39 @@ namespace :bankrupt do
     end
   end
 
+  desc 'Purge files that no longer exist in the manifest from s3/cloudfront'
+  task purge: [:manifest] do
+    s3 = Aws::S3::Client.new(region: 'eu-west-1')
+
+    r = s3.list_objects_v2(bucket: CDN_BUCKET, prefix: CDN_PREFIX)
+    cdn = r[:contents].collect(&:key)
+
+    local = JSON.parse(File.read(File.join(APP_ROOT, 'tmp', 'assets.json')),
+                       symbolize_names: true).map do |_key, asset|
+      File.join(
+        CDN_PREFIX,
+        [[asset[:filename].split(ex = File.extname(asset[:filename])).first,
+          asset[:md5]].join('-'), ex].join
+      )
+    end
+
+    if local.empty?
+      LOG.error 'Local manifest returned zero assets, not purging anything'
+      exit(1)
+    end
+
+    keys = (cdn - local).map do |key|
+      LOG.info "Going to purge #{key}"
+
+      {
+        key: key
+      }
+    end
+
+    d = s3.delete_objects(bucket: CDN_BUCKET, delete: { objects: keys })
+    LOG.info "Purged #{d.deleted.size} objects from s3"
+  end
+
   desc 'Generate an asset manifest file with sums and hashes'
   task :manifest do
     manifest = {}
@@ -80,7 +114,7 @@ namespace :bankrupt do
       }
     end
 
-    LOG.info "Generated asset manifest with #{manifest.keys.size} entries."
+    LOG.info "Generated asset manifest with #{manifest.keys.size} entries"
 
     FileUtils.mkdir_p(File.join(APP_ROOT, 'tmp'))
     File.write(File.join(APP_ROOT, 'tmp', 'assets.json'),

data/lib/bankrupt/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Bankrupt
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bankrupt
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Mario Finelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -30,6 +30,48 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  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: mini_mime
+  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: 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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="