carrierwave-attachmentscanner 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3747ea9b16fe64ca851ea8918f87d952930791e9
-  data.tar.gz: 9fc0592f74f6fd310255c30ca669a25975cd7e18
+SHA256:
+  metadata.gz: e45e9670c42891a1125493b4514306d2a8590020e25a87b96173902c62f602e7
+  data.tar.gz: d79657584dd306cbbf610e7f39ca2aa974ec32f0c548df798dc04cf6fbfba54f
 SHA512:
-  metadata.gz: 21a01293633e09a2d047c35539357e6c591ac1f5e1ad3db4a22c84e331b7cc0ecab2c985dff2efd032f55ecfb603388ff4fc196b620f5c2d560d788a38a94165
-  data.tar.gz: 8a8d1813ac8e5eecb57b5e74d0345a2ec77407705fa0b430580ab0428dd919307d8c5538278fdab3fa35c43987561703f343192a040b76b526d1be2cf0364d7b
+  metadata.gz: b813f19ddb824b56dac47c9c1345200c46a66cd3019ebebd6c343003b849b7858772134d33f387856eda75e7caa61e3bc67bf507ee3bff655c5742f2a71ff097
+  data.tar.gz: d410885ff1717f3780a0a7692e6aaa9e6d6fa9fcf4d8877e3c22e1fd4feff723586fad81bba8159b13eceaedf586a97fb7f9379632f91ad7e7bc82fa430ecf99

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: bundler
+    directory: /
+    schedule:
+      interval: weekly
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly

data/.github/workflows/specs.yml

@@ -0,0 +1,31 @@
+name: Specs
+
+on:
+  push:
+    branches: [master, main]
+  pull_request:
+    branches: [master, main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['ruby', 'head']
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Run specs
+        env:
+          ATTACHMENT_SCANNER_URL: ${{ secrets.ATTACHMENT_SCANNER_URL || 'https://us-east-1.attachmentscanner.com' }}
+          ATTACHMENT_SCANNER_API_TOKEN: ${{ secrets.ATTACHMENT_SCANNER_API_TOKEN }}
+        run: bundle exec rspec

data/.gitignore

@@ -21,3 +21,4 @@ Gemfile.lock
 
 # Docker is being used in development but we're not ready to push this yet.
 Dockerfile
+docker-compose.yml

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in carrierwave-attachmentscan.gemspec
+# Specify your gem's dependencies in carrierwave-attachmentscanner.gemspec
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Carrierwave::Attachmentscanner
 
-[![Build Status](https://travis-ci.org/attachmentscanner/carrierwave-attachmentscanner.svg?branch=master)](https://travis-ci.org/attachmentscanner/carrierwave-attachmentscanner)
+[![Specs](https://github.com/attachmentscanner/carrierwave-attachmentscanner/actions/workflows/specs.yml/badge.svg?branch=main)](https://github.com/attachmentscanner/carrierwave-attachmentscanner/actions/workflows/specs.yml) [![Ruby](https://img.shields.io/badge/ruby-%3E%3D%203.x-red?logo=ruby)](https://www.ruby-lang.org/)
 
 Carrierwave::Attachmentscanner allows you to scan any file uploaded by
 [CarrierWave](https://github.com/carrierwaveuploader/carrierwave) for viruses or

data/carrierwave-attachmentscanner.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Scan carrierwave attachments using AttachmentScanner}
   spec.description   = %q{Automatically sends carrierwave uploads to AttachmentScanner to search for
     viruses, malware and other malicious files. }
-  spec.homepage      = "http://www.attachmentscanner.com"
+  spec.homepage      = "https://www.attachmentscanner.com"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "carrierwave"
-  spec.add_dependency "faraday"
-  spec.add_dependency "faraday_middleware"
+  spec.add_dependency "faraday", "~> 2.0"
+  spec.add_dependency "faraday-multipart"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/carrierwave/attachmentscanner/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module AttachmentScanner
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/carrierwave/attachmentscanner.rb

@@ -1,12 +1,12 @@
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/multipart'
 require 'carrierwave/attachmentscanner/version'
 
 module CarrierWave
   module AttachmentScanner
-    Config = Struct.new(:url, :api_token, :enabled, :logger)
+    Config = Struct.new(:url, :api_token, :enabled, :logger, :timeout)
                    .new(ENV['ATTACHMENT_SCANNER_URL'], ENV['ATTACHMENT_SCANNER_API_TOKEN'],
-                     true, Logger.new(STDOUT))
+                     true, Logger.new(STDOUT), 60)
 
     DISABLED_WARNING = "[CarrierWave::AttachmentScanner] Disabled".freeze
 
@@ -62,7 +62,7 @@ module CarrierWave
 
     def send_to_scanner(new_file)
       # Needed to support the case that a StringIO is being passed.
-      # Passes the root StringIO to Faraday::UploadIO unless we think this is a
+      # Passes the root StringIO to Faraday::FilePart unless we think this is a
       # file (i.e. has path) in which case we pass the file.
       # We can't pass the SanitizedFile as it implements read without arguments.
       root_file = new_file
@@ -70,16 +70,18 @@ module CarrierWave
       file_or_path = root_file.respond_to?(:path) ? new_file.path : root_file
 
       Config.logger.info("[CarrierWave::AttachmentScanner] scanning #{new_file.filename}")
-      upload = Faraday::UploadIO.new(file_or_path, new_file.content_type, new_file.filename)
+      upload = Faraday::FilePart.new(file_or_path, new_file.content_type, new_file.filename)
       response = scan_connection.post('/requests', file: upload)
       response.body
     end
 
     def scan_connection
       Faraday.new(Config.url) do |f|
+        f.options[:open_timeout] = Config.timeout
+        f.options[:timeout] = Config.timeout
         f.request :multipart
         f.request :url_encoded
-        f.authorization :Bearer, Config.api_token
+        f.request :authorization, 'Bearer', -> { Config.api_token }
         f.response :json
         f.response :raise_error
         f.adapter :net_http

data/lib/generators/carrierwave_attachmentscanner/config/templates/config.rb.erb

@@ -11,4 +11,7 @@ CarrierWave::AttachmentScanner.configure do |config|
 
   # Disable in test and development environments
   # config.enabled = false if Rails.env.development? || Rails.env.test?
+
+  # Set a custom timeout for connections. Defaults to 60 seconds
+  # config.timeout = 60
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-attachmentscanner
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Smith
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2026-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -28,18 +28,18 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/specs.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -114,7 +116,7 @@ files:
 - lib/carrierwave/attachmentscanner/version.rb
 - lib/generators/carrierwave_attachmentscanner/config/config_generator.rb
 - lib/generators/carrierwave_attachmentscanner/config/templates/config.rb.erb
-homepage: http://www.attachmentscanner.com
+homepage: https://www.attachmentscanner.com
 licenses:
 - MIT
 metadata: {}
@@ -133,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Scan carrierwave attachments using AttachmentScanner