dragonfly 1.3.0 → 1.4.1

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/param_validators_spec.rb

@@ -0,0 +1,89 @@
+require "spec_helper"
+require "dragonfly/param_validators"
+
+describe Dragonfly::ParamValidators do
+  include Dragonfly::ParamValidators
+
+  describe "validate!" do
+    it "does nothing if the parameter meets the condition" do
+      validate!("thing") { |t| t === "thing" }
+    end
+
+    it "raises if the parameter doesn't meet the condition" do
+      expect {
+        validate!("thing") { |t| t === "ting" }
+      }.to raise_error(Dragonfly::ParamValidators::InvalidParameter)
+    end
+
+    it "does nothing if the parameter is nil" do
+      validate!(nil) { |t| t === "thing" }
+    end
+  end
+
+  describe "validate_all!" do
+    it "allows passing an array of parameters to validate" do
+      validate_all!(["a", "b"]) { |p| /\w/ === p }
+      expect {
+        validate_all!(["a", " "]) { |p| /\w/ === p }
+      }.to raise_error(Dragonfly::ParamValidators::InvalidParameter)
+    end
+  end
+
+  describe "validate_all_keys!" do
+    it "allows passing an array of parameters to validate" do
+      obj = { "a" => "A", "b" => "B" }
+      validate_all_keys!(obj, ["a", "b"]) { |p| /\w/ === p }
+      expect {
+        validate_all_keys!(obj, ["a", "b"]) { |p| /[a-z]/ === p }
+      }.to raise_error(Dragonfly::ParamValidators::InvalidParameter)
+    end
+  end
+
+  describe "is_number" do
+    [3, 3.14, "3", "3.2"].each do |val|
+      it "validates #{val.inspect}" do
+        validate!(val, &is_number)
+      end
+    end
+
+    ["", "3 2", "hello4", {}, []].each do |val|
+      it "validates #{val.inspect}" do
+        expect {
+          validate!(val, &is_number)
+        }.to raise_error(Dragonfly::ParamValidators::InvalidParameter)
+      end
+    end
+  end
+
+  describe "is_word" do
+    ["hello", "helLo", "HELLO"].each do |val|
+      it "validates #{val.inspect}" do
+        validate!(val, &is_word)
+      end
+    end
+
+    ["", "hel%$lo", "hel lo", "hel-lo", {}, []].each do |val|
+      it "validates #{val.inspect}" do
+        expect {
+          validate!(val, &is_word)
+        }.to raise_error(Dragonfly::ParamValidators::InvalidParameter)
+      end
+    end
+  end
+
+  describe "is_words" do
+    ["hello there", "Hi", "  What is Up "].each do |val|
+      it "validates #{val.inspect}" do
+        validate!(val, &is_words)
+      end
+    end
+
+    ["", "hel%$lo", "What's up", "hel-lo", {}, []].each do |val|
+      it "validates #{val.inspect}" do
+        expect {
+          validate!(val, &is_words)
+        }.to raise_error(Dragonfly::ParamValidators::InvalidParameter)
+      end
+    end
+  end
+end

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/shell_commands_spec.rb

@@ -1,33 +1,30 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe "using the shell" do
-
   let (:app) { test_app }
 
   describe "shell injection" do
     it "should not allow it!" do
       app.configure_with(:imagemagick)
       begin
-        app.generate(:plain, 10, 10, 'white').convert("-resize 5x5 ; touch tmp/stuff").apply
+        app.generate(:plain, 10, 10, "white; touch tmp/stuff").apply
       rescue Dragonfly::Shell::CommandFailed
       end
-      File.exist?('tmp/stuff').should be_falsey
+      File.exist?("tmp/stuff").should be_falsey
     end
   end
 
   describe "env variables with imagemagick" do
     it "allows configuring the convert path" do
-      app.configure_with(:imagemagick, :convert_command => '/bin/convert')
+      app.configure_with(:imagemagick, :convert_command => "/bin/convert")
       app.shell.should_receive(:run).with(%r[/bin/convert], hash_including)
-      app.create("").thumb('30x30').apply
+      app.create("").thumb("30x30").apply
     end
 
     it "allows configuring the identify path" do
-      app.configure_with(:imagemagick, :identify_command => '/bin/identify')
+      app.configure_with(:imagemagick, :identify_command => "/bin/identify")
       app.shell.should_receive(:run).with(%r[/bin/identify], hash_including).and_return("JPG 1 1")
       app.create("").width
     end
   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

@@ -2,21 +2,27 @@ require "rubygems"
 require "bundler"
 Bundler.setup(:default, :test)
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'dragonfly'
-require 'fileutils'
-require 'tempfile'
-require 'webmock/rspec'
-require 'pry'
+require "rspec"
+require "dragonfly"
+require "fileutils"
+require "tempfile"
+require "webmock/rspec"
+require "pry"
 
 # Requires supporting files with custom matchers and macros, etc,
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-SAMPLES_DIR = Pathname.new(File.expand_path('../../samples', __FILE__))
+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
@@ -25,8 +31,8 @@ def todo
   raise "TODO"
 end
 
-require 'logger'
-LOG_FILE = 'tmp/test.log'
+require "logger"
+LOG_FILE = "tmp/test.log"
 FileUtils.rm_rf(LOG_FILE)
 Dragonfly.logger = Logger.new(LOG_FILE)
 
@@ -36,7 +42,7 @@ RSpec.configure do |c|
   end
 end
 
-def test_app(name=nil)
+def test_app(name = nil)
   app = Dragonfly::App.instance(name)
   app.datastore = Dragonfly::MemoryDataStore.new
   app.secret = "test secret"
@@ -45,8 +51,6 @@ end
 
 def test_imagemagick_app
   test_app.configure do
-    generator :convert, Dragonfly::ImageMagick::Generators::Convert.new
-    processor :convert, Dragonfly::ImageMagick::Processors::Convert.new
     analyser :image_properties, Dragonfly::ImageMagick::Analysers::ImageProperties.new
   end
 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.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Mark Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-09 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
@@ -158,12 +172,11 @@ files:
 - lib/dragonfly/has_filename.rb
 - lib/dragonfly/hash_with_css_style_keys.rb
 - lib/dragonfly/image_magick/analysers/image_properties.rb
-- lib/dragonfly/image_magick/generators/convert.rb
+- lib/dragonfly/image_magick/commands.rb
 - lib/dragonfly/image_magick/generators/plain.rb
 - lib/dragonfly/image_magick/generators/plasma.rb
 - lib/dragonfly/image_magick/generators/text.rb
 - lib/dragonfly/image_magick/plugin.rb
-- lib/dragonfly/image_magick/processors/convert.rb
 - lib/dragonfly/image_magick/processors/encode.rb
 - lib/dragonfly/image_magick/processors/thumb.rb
 - lib/dragonfly/job.rb
@@ -182,6 +195,7 @@ files:
 - lib/dragonfly/model/class_methods.rb
 - lib/dragonfly/model/instance_methods.rb
 - lib/dragonfly/model/validations.rb
+- lib/dragonfly/param_validators.rb
 - lib/dragonfly/rails/images.rb
 - lib/dragonfly/railtie.rb
 - lib/dragonfly/register.rb
@@ -220,12 +234,12 @@ files:
 - spec/dragonfly/has_filename_spec.rb
 - spec/dragonfly/hash_with_css_style_keys_spec.rb
 - spec/dragonfly/image_magick/analysers/image_properties_spec.rb
-- spec/dragonfly/image_magick/generators/convert_spec.rb
+- spec/dragonfly/image_magick/commands_spec.rb
 - spec/dragonfly/image_magick/generators/plain_spec.rb
 - spec/dragonfly/image_magick/generators/plasma_spec.rb
 - spec/dragonfly/image_magick/generators/text_spec.rb
 - spec/dragonfly/image_magick/plugin_spec.rb
-- spec/dragonfly/image_magick/processors/convert_spec.rb
+- spec/dragonfly/image_magick/processors/encode_spec.rb
 - spec/dragonfly/image_magick/processors/thumb_spec.rb
 - spec/dragonfly/job/fetch_file_spec.rb
 - spec/dragonfly/job/fetch_spec.rb
@@ -239,6 +253,7 @@ files:
 - spec/dragonfly/model/active_record_spec.rb
 - spec/dragonfly/model/model_spec.rb
 - spec/dragonfly/model/validations_spec.rb
+- spec/dragonfly/param_validators_spec.rb
 - spec/dragonfly/register_spec.rb
 - spec/dragonfly/routed_endpoint_spec.rb
 - spec/dragonfly/serializer_spec.rb
@@ -285,8 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.
@@ -301,12 +315,12 @@ test_files:
 - spec/dragonfly/has_filename_spec.rb
 - spec/dragonfly/hash_with_css_style_keys_spec.rb
 - spec/dragonfly/image_magick/analysers/image_properties_spec.rb
-- spec/dragonfly/image_magick/generators/convert_spec.rb
+- spec/dragonfly/image_magick/commands_spec.rb
 - spec/dragonfly/image_magick/generators/plain_spec.rb
 - spec/dragonfly/image_magick/generators/plasma_spec.rb
 - spec/dragonfly/image_magick/generators/text_spec.rb
 - spec/dragonfly/image_magick/plugin_spec.rb
-- spec/dragonfly/image_magick/processors/convert_spec.rb
+- spec/dragonfly/image_magick/processors/encode_spec.rb
 - spec/dragonfly/image_magick/processors/thumb_spec.rb
 - spec/dragonfly/job/fetch_file_spec.rb
 - spec/dragonfly/job/fetch_spec.rb
@@ -320,6 +334,7 @@ test_files:
 - spec/dragonfly/model/active_record_spec.rb
 - spec/dragonfly/model/model_spec.rb
 - spec/dragonfly/model/validations_spec.rb
+- spec/dragonfly/param_validators_spec.rb
 - spec/dragonfly/register_spec.rb
 - spec/dragonfly/routed_endpoint_spec.rb
 - spec/dragonfly/serializer_spec.rb

data/lib/dragonfly/image_magick/generators/convert.rb

@@ -1,19 +0,0 @@
-module Dragonfly
-  module ImageMagick
-    module Generators
-      class Convert
-
-        def call(content, args, format)
-          format = format.to_s
-          convert_command = content.env[:convert_command] || 'convert'
-          content.shell_generate :ext => format do |path|
-            "#{convert_command} #{args} #{path}"
-          end
-          content.add_meta('format' => format)
-        end
-
-      end
-    end
-  end
-end
-

data/lib/dragonfly/image_magick/processors/convert.rb

@@ -1,33 +0,0 @@
-module Dragonfly
-  module ImageMagick
-    module Processors
-      class Convert
-
-        def call(content, args='', opts={})
-          convert_command = content.env[:convert_command] || 'convert'
-          format = opts['format']
-
-          input_args = opts['input_args'] if opts['input_args']
-          delegate_string = "#{opts['delegate']}:" if opts['delegate']
-          frame_string = "[#{opts['frame']}]" if opts['frame']
-
-          content.shell_update :ext => format do |old_path, new_path|
-            "#{convert_command} #{input_args} #{delegate_string}#{old_path}#{frame_string} #{args} #{new_path}"
-          end
-
-          if format
-            content.meta['format'] = format.to_s
-            content.ext = format
-            content.meta['mime_type'] = nil # don't need it as we have ext now
-          end
-        end
-
-        def update_url(attrs, args='', opts={})
-          format = opts['format']
-          attrs.ext = format if format
-        end
-
-      end
-    end
-  end
-end

data/spec/dragonfly/image_magick/generators/convert_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe Dragonfly::ImageMagick::Generators::Convert do
-  let (:generator) { Dragonfly::ImageMagick::Generators::Convert.new }
-  let (:app) { test_app }
-  let (:image) { Dragonfly::Content.new(app) }
-
-  describe "calling convert" do
-    before(:each) do
-      generator.call(image, "-size 1x1 xc:white", 'png')
-    end
-    it {image.should have_width(1)}
-    it {image.should have_height(1)}
-    it {image.should have_format('png')}
-    it {image.meta.should == {'format' => 'png'}}
-  end
-
-end
-