dragonfly 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16341445bb67f27ae4dc7492244b038df290440a5f4b64d71cca3c637fd8b4d0
-  data.tar.gz: '0285f83e005198572fb9a52dea16eef2acca80ded36e9fa905b88d66701221fe'
+  metadata.gz: 53b6c0b281a6030e69614429aa17a2f7e86e0037bffa2b7346e37c950444c563
+  data.tar.gz: 101cc564359bef667df565eec4ee6a8e4d00aad2f2f792c8cf0313e939ebfa67
 SHA512:
-  metadata.gz: ea5f8440e718e3521eaca6824b3dd600817994ed144b5c69a9e609fa24ff8e9583a415a9a2ee9a309e7f622d7d33e0712525ce18ed020942a1585b80ef889cef
-  data.tar.gz: 1c81c3c4ed0bfe6421d3ca6ca69432929a4e8233b468d582586fca5d308758bbc9c6042d830e42bd4421c198452df019e802fcf151c277e3ac7248942cf30af0
+  metadata.gz: 1afbcdd97912f2ec6bf7ba49261f885e0ddf0c4df16b1fd8b76824d6a87e1dca3be024fe666f7eb961269017f5af841aaaebe4bb7c21396f0f15db76fc7791ed
+  data.tar.gz: f26309d103bc2101287cf5e9c5cf9915defe5072275ea36b9b3cc1fa579a34c84723b48244c3ede6d49dbad71915b2267840077401a67bb8a1b585e1cc8edb66

data/History.md

@@ -1,3 +1,9 @@
+# 1.4.1 (2025-01-03)
+
+## Fixes
+
+- Added ostruct dependency as Ruby 3.5 will remove it from stdlib
+
 # 1.4.0 (2021-05-19)
 
 ## Changes
@@ -6,7 +12,7 @@
 
 ## Fixes
 
-- Better security for all job steps with parameter validations
+- Better security for all job steps with parameter validations - addresses CVE-2021-33564
 
 # 1.3.0 (2021-01-09)
 

data/README.md

@@ -47,7 +47,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.2.2'
+gem 'dragonfly', '~> 1.4.0'
 ```
 
 Require with
@@ -72,6 +72,10 @@ See [the Add-ons wiki](http://github.com/markevans/dragonfly/wiki/Dragonfly-add-
 
 Please feel free to contribute!!
 
+Security notice!
+=================
+If you have set `verify_urls` to `false` (which is **not** recommended) then you should upgrade to version `1.4.x` for a security fix ([CVE-2021-33564](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-33564)).
+
 Issues
 ======
 Please use the <a href="http://github.com/markevans/dragonfly/issues">github issue tracker</a> if you have any issues.

data/dev/test.ru

@@ -24,7 +24,7 @@ class App
     end
     [
       200,
-      {'Content-Type' => 'text/html'},
+      {'content-type' => 'text/html'},
       [%(
         <style>
           form, input {

data/dragonfly.gemspec

@@ -25,9 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("rack", ">= 1.3")
   spec.add_runtime_dependency("multi_json", "~> 1.0")
   spec.add_runtime_dependency("addressable", "~> 2.3")
+  spec.add_runtime_dependency("ostruct", "~> 0.6.1")
 
   # Development dependencies
-  spec.add_development_dependency("rspec", "~> 2.5")
+  spec.add_development_dependency("rspec", "~> 3.0")
   spec.add_development_dependency("webmock")
   spec.add_development_dependency("activemodel")
   if RUBY_PLATFORM == "java"

data/lib/dragonfly/middleware.rb

@@ -10,7 +10,8 @@ module Dragonfly
 
     def call(env)
       response = Dragonfly.app(@dragonfly_app_name).call(env)
-      if response[1]['X-Cascade'] == 'pass'
+      headers = response[1].transform_keys(&:downcase)
+      if headers['x-cascade'] == 'pass'
         @app.call(env)
       else
         response

data/lib/dragonfly/response.rb

@@ -26,10 +26,10 @@ module Dragonfly
         end
       rescue Job::Fetch::NotFound => e
         Dragonfly.warn(e.message)
-        [404, {"Content-Type" => "text/plain"}, ["Not found"]]
+        [404, {"content-type" => "text/plain"}, ["Not found"]]
       rescue RuntimeError => e
         Dragonfly.warn("caught error - #{e.message}")
-        [500, {"Content-Type" => "text/plain"}, ["Internal Server Error"]]
+        [500, {"content-type" => "text/plain"}, ["Internal Server Error"]]
       end
       log_response(response)
       response
@@ -65,8 +65,8 @@ module Dragonfly
 
     def method_not_allowed_headers
       {
-        'Content-Type' => 'text/plain',
-        'Allow' => 'GET, HEAD'
+        'content-type' => 'text/plain',
+        'allow' => 'GET, HEAD'
       }
     end
 
@@ -78,16 +78,16 @@ module Dragonfly
 
     def standard_headers
       {
-        "Content-Type" => job.mime_type,
-        "Content-Length" => job.size.to_s,
-        "Content-Disposition" => filename_string
+        "content-type" => job.mime_type,
+        "content-length" => job.size.to_s,
+        "content-disposition" => filename_string
       }
     end
 
     def cache_headers
       {
-        "Cache-Control" => "public, max-age=31536000", # (1 year)
-        "ETag" => %("#{job.signature}")
+        "cache-control" => "public, max-age=31536000", # (1 year)
+        "etag" => %("#{job.signature}")
       }
     end
 

data/lib/dragonfly/routed_endpoint.rb

@@ -45,7 +45,7 @@ module Dragonfly
     end
 
     def plain_response(status, message)
-      [status, {"Content-Type" => "text/plain"}, [message]]
+      [status, {"content-type" => "text/plain"}, [message]]
     end
   end
 end

data/lib/dragonfly/server.rb

@@ -59,18 +59,18 @@ module Dragonfly
           response.to_response
         end
       else
-        [404, {'Content-Type' => 'text/plain', 'X-Cascade' => 'pass'}, ['Not found']]
+        [404, {'content-type' => 'text/plain', 'x-cascade' => 'pass'}, ['Not found']]
       end
     rescue Job::NoSHAGiven => e
-      [400, {"Content-Type" => 'text/plain'}, ["You need to give a SHA parameter"]]
+      [400, {"content-type" => 'text/plain'}, ["You need to give a SHA parameter"]]
     rescue Job::IncorrectSHA => e
-      [400, {"Content-Type" => 'text/plain'}, ["The SHA parameter you gave is incorrect"]]
+      [400, {"content-type" => 'text/plain'}, ["The SHA parameter you gave is incorrect"]]
     rescue JobNotAllowed => e
       Dragonfly.warn(e.message)
-      [403, {"Content-Type" => 'text/plain'}, ["Forbidden"]]
+      [403, {"content-type" => 'text/plain'}, ["Forbidden"]]
     rescue Serializer::BadString, Serializer::MaliciousString, Job::InvalidArray => e
       Dragonfly.warn(e.message)
-      [404, {'Content-Type' => 'text/plain'}, ['Not found']]
+      [404, {'content-type' => 'text/plain'}, ['Not found']]
     end
 
     def url_for(job, opts={})
@@ -111,8 +111,8 @@ module Dragonfly
             V
       DRAGONFLY
       [200, {
-        'Content-Type' => 'text/plain',
-        'Content-Size' => body.bytesize.to_s
+        'content-type' => 'text/plain',
+        'content-size' => body.bytesize.to_s
         },
         [body]
       ]

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/dragonfly/app_spec.rb

@@ -138,7 +138,7 @@ describe Dragonfly::App do
       }.should raise_error(NotImplementedError)
     end
     it "should correctly call it if the datastore provides it" do
-      @app.datastore.should_receive(:url_for).with('some_uid', :some => :opts).and_return 'http://egg.head'
+      @app.datastore.should_receive(:url_for).with('some_uid', {:some => :opts}).and_return 'http://egg.head'
       @app.remote_url_for('some_uid', :some => :opts).should == 'http://egg.head'
     end
   end

data/spec/dragonfly/configurable_spec.rb

@@ -65,7 +65,7 @@ describe Dragonfly::Configurable do
       configurer = Dragonfly::Configurable::Configurer.new do
         meth :jobby, :nobby
       end
-      obj.should_receive(:jobby).with('beans', :make => 5)
+      obj.should_receive(:jobby).with('beans', {:make => 5})
       obj.should_receive(:nobby).with(['nuts'])
       configurer.configure(obj) do
         jobby 'beans', :make => 5
@@ -79,7 +79,7 @@ describe Dragonfly::Configurable do
       end
       egg = double('egg')
       obj.should_receive(:egg).and_return(egg)
-      egg.should_receive(:jobby).with('beans', :make => 5)
+      egg.should_receive(:jobby).with('beans', {:make => 5})
       configurer.configure(obj) do
         jobby 'beans', :make => 5
       end
@@ -93,7 +93,7 @@ describe Dragonfly::Configurable do
 
     it "provides 'plugin' for using plugins" do
       pluggy = double('plugin')
-      pluggy.should_receive(:call).with(obj, :a, 'few' => ['args'])
+      pluggy.should_receive(:call).with(obj, :a, {'few' => ['args']})
       configurer.configure(obj) do
         plugin pluggy, :a, 'few' => ['args']
       end
@@ -101,7 +101,7 @@ describe Dragonfly::Configurable do
 
     it "allows using 'plugin' with symbols" do
       pluggy = double('plugin')
-      pluggy.should_receive(:call).with(obj, :a, 'few' => ['args'])
+      pluggy.should_receive(:call).with(obj, :a, {'few' => ['args']})
       configurer.register_plugin(:pluggy){ pluggy }
       configurer.configure(obj) do
         plugin :pluggy, :a, 'few' => ['args']

data/spec/dragonfly/content_spec.rb

@@ -320,7 +320,7 @@ describe Dragonfly::Content do
     end
 
     it "allows passing options" do
-      app.datastore.should_receive(:write).with(content, :hello => 'there')
+      app.datastore.should_receive(:write).with(content, {:hello => 'there'})
       content.store(:hello => 'there')
     end
   end

data/spec/dragonfly/file_data_store_spec.rb

@@ -9,11 +9,11 @@ describe Dragonfly::FileDataStore do
   end
 
   def assert_exists(path)
-    File.exists?(path).should be_truthy
+    File.exist?(path).should be_truthy
   end
 
   def assert_does_not_exist(path)
-    File.exists?(path).should be_falsey
+    File.exist?(path).should be_falsey
   end
 
   def assert_contains(dir, filepattern)

data/spec/dragonfly/job/fetch_url_spec.rb

@@ -21,7 +21,7 @@ describe Dragonfly::Job::FetchUrl do
   end
 
   it "should set the mime_type when returned by the request" do
-    stub_request(:get, %r{http://thing\.com.*}).to_return(:body => '<ok />', :headers => {'Content-Type' => 'text/html'})
+    stub_request(:get, %r{http://thing\.com.*}).to_return(:body => '<ok />', :headers => {'content-type' => 'text/html'})
     expect(job.fetch_url('http://place.com').mime_type).to eq('application/octet-stream')
     expect(job.fetch_url('http://thing.com').mime_type).to eq('text/html')
   end

data/spec/dragonfly/job_endpoint_spec.rb

@@ -50,22 +50,22 @@ describe Dragonfly::JobEndpoint do
   it "should return a correct response to a successful GET request" do
     response = make_request(@job)
     response.status.should == 200
-    response['ETag'].should =~ /^"\w+"$/
-    response['Cache-Control'].should == "public, max-age=31536000"
-    response['Content-Type'].should == 'text/plain'
-    response['Content-Length'].should == '6'
-    response['Content-Disposition'].should == 'filename="gung.txt"'
+    response['etag'].should =~ /^"\w+"$/
+    response['cache-control'].should == "public, max-age=31536000"
+    response['content-type'].should == 'text/plain'
+    response['content-length'].should == '6'
+    response['content-disposition'].should == 'filename="gung.txt"'
     response.body.should == 'GUNGLE'
   end
 
   it "should return the correct headers and no content to a successful HEAD request" do
     response = make_request(@job, :method => :head)
     response.status.should == 200
-    response['ETag'].should =~ /^"\w+"$/
-    response['Cache-Control'].should == "public, max-age=31536000"
-    response['Content-Type'].should == 'text/plain'
-    response['Content-Length'].should == '6'
-    response['Content-Disposition'].should == 'filename="gung.txt"'
+    response['etag'].should =~ /^"\w+"$/
+    response['cache-control'].should == "public, max-age=31536000"
+    response['content-type'].should == 'text/plain'
+    response['content-length'].should == '6'
+    response['content-disposition'].should == 'filename="gung.txt"'
     response.body.should == ''
   end
 
@@ -74,8 +74,8 @@ describe Dragonfly::JobEndpoint do
     it "should return a 405 error for a #{method} request" do
       response = make_request(@job, :method => method)
       response.status.should == 405
-      response['Allow'].should == "GET, HEAD"
-      response['Content-Type'].should == 'text/plain'
+      response['allow'].should == "GET, HEAD"
+      response['content-type'].should == 'text/plain'
       response.body.should == "method not allowed"
     end
 
@@ -102,12 +102,12 @@ describe Dragonfly::JobEndpoint do
 
     it "doesn't encode utf8 characters" do
       response = make_request(@job)
-      response['Content-Disposition'].should == 'filename="güng.txt"'
+      response['content-disposition'].should == 'filename="güng.txt"'
     end
 
     it "does encode them if the request is from IE" do
       response = make_request(@job, 'HTTP_USER_AGENT' => "Mozilla/5.0 (Windows; U; MSIE 7.0; Windows NT 6.0; el-GR)")
-      response['Content-Disposition'].should == 'filename="g%C3%BCng.txt"'
+      response['content-disposition'].should == 'filename="g%C3%BCng.txt"'
     end
   end
 
@@ -121,7 +121,7 @@ describe Dragonfly::JobEndpoint do
   describe "ETag" do
     it "should return an ETag" do
       response = make_request(@job)
-      response.headers['ETag'].should =~ /^"\w+"$/
+      response.headers['etag'].should =~ /^"\w+"$/
     end
 
     [
@@ -134,8 +134,8 @@ describe Dragonfly::JobEndpoint do
         @job.should_receive(:signature).at_least(:once).and_return('dingle')
         response = make_request(@job, 'HTTP_IF_NONE_MATCH' => header)
         response.status.should == 304
-        response['ETag'].should == '"dingle"'
-        response['Cache-Control'].should == "public, max-age=31536000"
+        response['etag'].should == '"dingle"'
+        response['cache-control'].should == "public, max-age=31536000"
         response.body.should be_empty
       end
     end
@@ -151,25 +151,25 @@ describe Dragonfly::JobEndpoint do
       @app.configure{ response_header 'This-is', 'brill' }
     end
     it "should allow specifying custom headers" do
-      make_request(@job).headers['This-is'].should == 'brill'
+      make_request(@job).headers['this-is'].should == 'brill'
     end
     it "should not interfere with other headers" do
-      make_request(@job).headers['Content-Length'].should == '6'
+      make_request(@job).headers['content-length'].should == '6'
     end
     it "should allow overridding other headers" do
-      @app.response_headers['Cache-Control'] = 'try me'
-      make_request(@job).headers['Cache-Control'].should == 'try me'
+      @app.response_headers['cache-control'] = 'try me'
+      make_request(@job).headers['cache-control'].should == 'try me'
     end
     it "should allow giving a proc" do
-      @app.response_headers['Cache-Control'] = proc{|job, request, headers|
-        [job.basename.reverse.upcase, request['a'], headers['Cache-Control'].chars.first].join(',')
+      @app.response_headers['cache-control'] = proc{|job, request, headers|
+        [job.basename.reverse.upcase, request.params['a'], headers['cache-control'].chars.first].join(',')
       }
       response = make_request(@job, 'QUERY_STRING' => 'a=egg')
-      response['Cache-Control'].should == 'GNUG,egg,p'
+      response['cache-control'].should == 'GNUG,egg,p'
     end
     it "should allow removing by setting to nil" do
-      @app.response_headers['Cache-Control'] = nil
-      make_request(@job).headers.should_not have_key('Cache-Control')
+      @app.response_headers['cache-control'] = nil
+      make_request(@job).headers.should_not have_key('cache-control')
     end
   end
 

data/spec/dragonfly/middleware_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'rack'
 
 def dummy_rack_app
-  lambda{|env| [200, {"Content-Type" => "text/html"}, ["dummy_rack_app body"]] }
+  lambda{|env| [200, {"content-type" => "text/html"}, ["dummy_rack_app body"]] }
 end
 
 describe Dragonfly::Middleware do
@@ -19,9 +19,18 @@ describe Dragonfly::Middleware do
       end
     end
 
-    it "should pass through if the app returns X-Cascade: pass" do
+    it "should pass through if the app returns x-cascade: pass" do
       Dragonfly.app.should_receive(:call).and_return(
-        [404, {"Content-Type" => 'text/plain', 'X-Cascade' => 'pass'}, ['Not found']]
+        [404, {"content-type" => 'text/plain', 'x-cascade' => 'pass'}, ['Not found']]
+      )
+      response = make_request(@stack, '/media/hello.png?howare=you')
+      response.body.should == 'dummy_rack_app body'
+      response.status.should == 200
+    end
+
+    it "should still pass through using deprecated uppercase X-Cascade: pass" do
+      Dragonfly.app.should_receive(:call).and_return(
+        [404, {"content-type" => 'text/plain', 'X-Cascade' => 'pass'}, ['Not found']]
       )
       response = make_request(@stack, '/media/hello.png?howare=you')
       response.body.should == 'dummy_rack_app body'
@@ -30,7 +39,7 @@ describe Dragonfly::Middleware do
 
     it "should return a 404 if the app returns a 404" do
       Dragonfly.app.should_receive(:call).and_return(
-        [404, {"Content-Type" => 'text/plain'}, ['Not found']]
+        [404, {"content-type" => 'text/plain'}, ['Not found']]
       )
       response = make_request(@stack, '/media/hello.png?howare=you')
       response.status.should == 404
@@ -38,7 +47,7 @@ describe Dragonfly::Middleware do
 
     it "should return as per the dragonfly app if the app returns a 200" do
       Dragonfly.app.should_receive(:call).and_return(
-        [200, {"Content-Type" => 'text/plain'}, ['ABCD']]
+        [200, {"content-type" => 'text/plain'}, ['ABCD']]
       )
       response = make_request(@stack, '/media/hello.png?howare=you')
       response.status.should == 200
@@ -57,7 +66,7 @@ describe Dragonfly::Middleware do
     it "should use the specified dragonfly app" do
       Dragonfly.app.should_not_receive(:call)
       Dragonfly.app(:images).should_receive(:call).and_return([
-        200, {"Content-Type" => 'text/plain'}, ['booboo']
+        200, {"content-type" => 'text/plain'}, ['booboo']
       ])
       response = make_request(@stack, '/media/hello.png?howare=you')
       response.body.should == 'booboo'

data/spec/dragonfly/model/active_record_spec.rb

@@ -9,7 +9,7 @@ unless RUBY_PLATFORM == "java"
     let! :dragonfly_app do test_app(:test_ar) end
 
     before :all do
-      @connection = ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+      ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
       ActiveRecord::Migration.verbose = false
 
@@ -27,7 +27,7 @@ unless RUBY_PLATFORM == "java"
 
     after :all do
       Photo.destroy_all
-      ActiveRecord::Base.remove_connection(@connection)
+      ActiveRecord::Base.remove_connection()
     end
 
     describe "destroying" do

data/spec/dragonfly/model/model_spec.rb

@@ -367,7 +367,7 @@ describe "models" do
     describe "remote_url" do
       it "should give the remote url if the uid is set" do
         @item.preview_image_uid = 'some/uid'
-        @app.should_receive(:remote_url_for).with('some/uid', :some => 'param').and_return('http://egg.nog')
+        @app.should_receive(:remote_url_for).with('some/uid', {:some => 'param'}).and_return('http://egg.nog')
         @item.preview_image.remote_url(:some => 'param').should == 'http://egg.nog'
       end
       it "should return nil if the content is not yet saved" do

data/spec/dragonfly/server_spec.rb

@@ -81,7 +81,7 @@ describe Dragonfly::Server do
           response.status.should == 404
           response.body.should == 'Not found'
           response.content_type.should == 'text/plain'
-          response.headers['X-Cascade'].should == 'pass'
+          response.headers['x-cascade'].should == 'pass'
         end
       end
 
@@ -90,7 +90,7 @@ describe Dragonfly::Server do
         response.status.should == 404
         response.body.should == 'Not found'
         response.content_type.should == 'text/plain'
-        response.headers['X-Cascade'].should be_nil
+        response.headers['x-cascade'].should be_nil
       end
 
       it "should return a 404 when the url isn't known at all" do
@@ -98,7 +98,7 @@ describe Dragonfly::Server do
         response.status.should == 404
         response.body.should == 'Not found'
         response.content_type.should == 'text/plain'
-        response.headers['X-Cascade'].should == 'pass'
+        response.headers['x-cascade'].should == 'pass'
       end
 
       it "should return a 404 when the url is a well-encoded but bad array" do
@@ -107,7 +107,7 @@ describe Dragonfly::Server do
         response.status.should == 404
         response.body.should == 'Not found'
         response.content_type.should == 'text/plain'
-        response.headers['X-Cascade'].should be_nil
+        response.headers['x-cascade'].should be_nil
       end
 
       it "should return a 403 Forbidden when someone uses fetch_url" do

data/spec/dragonfly/temp_object_spec.rb

@@ -111,14 +111,14 @@ describe Dragonfly::TempObject do
       describe "to_file" do
         before(:each) do
           @filename = 'tmp/eggnog.txt'
-          FileUtils.rm_f(@filename) if File.exists?(@filename)
+          FileUtils.rm_f(@filename) if File.exist?(@filename)
         end
         after(:each) do
-          FileUtils.rm_f(@filename) if File.exists?(@filename)
+          FileUtils.rm_f(@filename) if File.exist?(@filename)
         end
         it "should write to a file" do
           @temp_object.to_file(@filename)
-          File.exists?(@filename).should be_truthy
+          File.exist?(@filename).should be_truthy
         end
         it "should write the correct data to the file" do
           @temp_object.to_file(@filename)
@@ -140,12 +140,12 @@ describe Dragonfly::TempObject do
         it "should create intermediate subdirs" do
           filename = 'tmp/gog/mcgee'
           @temp_object.to_file(filename)
-          File.exists?(filename).should be_truthy
+          File.exist?(filename).should be_truthy
           FileUtils.rm_rf('tmp/gog')
         end
         it "should allow not creating intermediate subdirs" do
           filename = 'tmp/gog/mcgee'
-          expect{ @temp_object.to_file(filename, :mkdirs => false) }.to raise_error()
+          expect{ @temp_object.to_file(filename, :mkdirs => false) }.to raise_error(/No such file or directory/)
         end
       end
 

data/spec/functional/to_response_spec.rb

@@ -15,7 +15,7 @@ describe "getting rack response directly" do
     response.should be_a(Array)
     response.length.should == 3
     response[0].should == 200
-    response[1]['Content-Type'].should == 'application/octet-stream'
+    response[1]['content-type'].should == 'application/octet-stream'
     response[2].data.should == 'bunheads'
   end
 
@@ -24,7 +24,7 @@ describe "getting rack response directly" do
     response.should be_a(Array)
     response.length.should == 3
     response[0].should == 405
-    response[1]['Content-Type'].should == 'text/plain'
+    response[1]['content-type'].should == 'text/plain'
     response[2].should == ["method not allowed"]
   end
 

data/spec/functional/urls_spec.rb

@@ -6,7 +6,7 @@ describe "urls" do
     Dragonfly::Response.should_receive(:new).with(
       satisfy{|job| job.to_a == array },
       instance_of(Hash)
-    ).and_return(double('response', :to_response => [200, {'Content-Type' => 'text/plain'}, ["OK"]]))
+    ).and_return(double('response', :to_response => [200, {'content-type' => 'text/plain'}, ["OK"]]))
   end
 
   let (:app) {

data/spec/spec_helper.rb

@@ -17,6 +17,12 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 SAMPLES_DIR = Pathname.new(File.expand_path("../../samples", __FILE__))
 
 RSpec.configure do |c|
+  c.expect_with(:rspec) do |expectations|
+    expectations.syntax = [:should, :expect]
+  end
+  c.mock_with(:rspec) do |mocks|
+    mocks.syntax = [:should, :expect]
+  end
   c.include ModelHelpers
   c.include RackHelpers
 end

data/spec/support/image_matchers.rb

@@ -22,7 +22,7 @@ end
     match do |actual|
       value.should === image_properties(actual)[property]
     end
-    failure_message_for_should do |actual|
+    failure_message do |actual|
       "expected image to have #{property} #{value.inspect}, but it had #{image_properties(actual)[property].inspect}"
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Mark Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2025-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,20 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.