paperweight 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c3a418afa5d783b26a30c395d25027a6520661087e828d13ae522a57c72d84a
-  data.tar.gz: b137292e157766a5ac5bb6c5dd583a05d98cc44ec8f9a40039f65ede48f70d48
+  metadata.gz: b4088736d7d52a74d52cd5406056eb0cf6e60a583162741c36fc71ca70c9217f
+  data.tar.gz: 6c19dd7d3fdf2736c6869261d6b0e17bd39ce4e7c7bb8d24bf943478f82fd915
 SHA512:
-  metadata.gz: 334f233a0b66cd999ed338c09c9a77dd28b2866677c9a1935d7e6c33a8a63f9a28daf1d093698a4ee321707d3ac337dafb76cbadb5774d4658d64a71cabfe080
-  data.tar.gz: bf8736c8fdcf75f40c8bc52187f5b9c5fd18de0f283acae419ceb3c5bc77eea037f6810c1a78d069216aeb853c7f8b5278a4a7f36683a7529df132ded2da7461
+  metadata.gz: ca88b6907567fefe7d6d4cca3da64230aba3745e1fad9a9bc2d01436b8e6cc172cdd8e40060058452472d178dd2bda1602871cf58eea3e511de402dca24db9f4
+  data.tar.gz: 464cf9f8e0b8f811268855631e5f29dcb56f203d51b376a121510ef525d6186842e482c0d3270f19bfbb932e2d7bd70ea30e0c46f2b316814ae5448c5d04a0b4

data/.github/main.workflow

@@ -3,7 +3,13 @@ workflow "Main" {
   resolves = "Publish"
 }
 
+action "Bundler" {
+  uses = "docker://culturehq/actions-bundler:latest"
+  runs = "gem install bundler"
+}
+
 action "Install" {
+  needs = "Bundler"
   uses = "docker://culturehq/actions-bundler:latest"
   args = "install"
 }

data/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.2.0] - 2019-02-27
+### Added
+- Support a `download_attempts` configuration option for retrying the download. Currently defaults to 1 to maintain backwards compatability.
+
 ## [1.1.0] - 2019-01-08
 ### Added
 - Support the `after_download` option on `paperweight`-enabled attachments that takes a callable and calls it when the post process job has completed.
@@ -27,9 +31,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ### Added
 - The ability to configure the `max_size` value (the maximum download size) using the `Paperweight.configure` method.
 
-[Unreleased]: https://github.com/CultureHQ/paperweight/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/CultureHQ/paperweight/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/CultureHQ/paperweight/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/CultureHQ/paperweight/compare/v1.0.2...v1.1.0
 [1.0.2]: https://github.com/CultureHQ/paperweight/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/CultureHQ/paperweight/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/CultureHQ/paperweight/compare/v0.2.0...v1.0.0
-[0.2.0]: https://github.com/CultureHQ/paperweight/compare/v0.1.2...v0.2.0
+[0.2.0]: https://github.com/CultureHQ/paperweight/compare/780202...v0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paperweight (1.1.0)
+    paperweight (1.2.0)
       paperclip (>= 5)
       rails (>= 5)
 
@@ -52,17 +52,17 @@ GEM
     arel (9.0.0)
     ast (2.4.0)
     builder (3.2.3)
-    bundler-audit (0.6.0)
-      bundler (~> 1.2)
+    bundler-audit (0.6.1)
+      bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
     climate_control (0.2.0)
     concurrent-ruby (1.1.4)
     crass (1.0.4)
     docile (1.3.1)
     erubi (1.8.0)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.5.1)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
     json (2.1.0)
@@ -82,7 +82,7 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.3.1)
-    nokogiri (1.10.0)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     paperclip (6.1.0)
       activemodel (>= 4.2.0)
@@ -90,10 +90,11 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
+    psych (3.1.0)
     rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -123,11 +124,12 @@ GEM
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rubocop (0.62.0)
+    rubocop (0.65.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
+      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
@@ -160,14 +162,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0)
   bundler-audit (~> 0.6)
   minitest (~> 5.11)
   paperweight!
   rake (~> 12.3)
-  rubocop (~> 0.62)
+  rubocop (~> 0.65)
   simplecov (~> 0.16)
-  sqlite3 (~> 1.3)
+  sqlite3 (= 1.3.13)
 
 BUNDLED WITH
-   1.17.2
+   2.0.1

data/README.md

@@ -65,12 +65,14 @@ You can provide additional configuration options through the `Paperweight.config
 
 ```ruby
 Paperweight.configure do |config|
+  config.download_attempts = 10
   config.max_size = 20 * 1024 * 1024
 end
 ```
 
 The current configuration options include:
 
+* `download_attempts` - defaults to 1
 * `max_size` - defaults to 10 MB
 
 ## Development

data/lib/paperweight/configuration.rb

@@ -4,9 +4,10 @@
 module Paperweight
   # Allows configuring certain attributes about how to process attachments.
   class Configuration
-    attr_accessor :max_size
+    attr_accessor :download_attempts, :max_size
 
     def initialize
+      @download_attempts = 1
       @max_size = 10 * 1024 * 1024
     end
   end

data/lib/paperweight/download.rb

@@ -6,6 +6,7 @@ module Paperweight
     Error = Class.new(StandardError)
 
     DOWNLOAD_ERRORS = [
+      Errno::ECONNREFUSED,  # invalid url
       SocketError,          # domain not found
       OpenURI::HTTPError,   # response status 4xx or 5xx
       RuntimeError,         # redirection errors (e.g. redirection loop)

data/lib/paperweight/post_process_job.rb

@@ -7,6 +7,12 @@ module Paperweight
 
     discard_on ActiveJob::DeserializationError
 
+    rescue_from Download::Error do |error|
+      raise error if executions >= Paperweight.config.download_attempts
+
+      retry_job(wait: (executions**4) + 2)
+    end
+
     def perform(model, name)
       name = AttachmentName.new(name)
       image_url = model.public_send(name.processing)

data/lib/paperweight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Paperweight
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/paperweight.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'paperclip', '>= 5'
   spec.add_dependency 'rails', '>= 5'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'bundler-audit', '~> 0.6'
   spec.add_development_dependency 'minitest', '~> 5.11'
   spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rubocop', '~> 0.62'
+  spec.add_development_dependency 'rubocop', '~> 0.65'
   spec.add_development_dependency 'simplecov', '~> 0.16'
-  spec.add_development_dependency 'sqlite3', '~> 1.3'
+  spec.add_development_dependency 'sqlite3', '= 1.3.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperweight
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.62'
+        version: '0.65'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.62'
+        version: '0.65'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.13
 description: 
 email:
 - kevin.deisz@gmail.com
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: An opinionated Paperclip.