dragonfly 1.1.4 → 1.4.0

data/spec/dragonfly/model/active_record_spec.rb

@@ -0,0 +1,62 @@
+# jruby has problems with installing sqlite3 - don't bother with these tests for jruby
+unless RUBY_PLATFORM == "java"
+  require "spec_helper"
+  require "active_record"
+  require "sqlite3"
+
+  # ActiveRecord specific stuff goes here (there should be very little!)
+  describe "ActiveRecord models" do
+    let! :dragonfly_app do test_app(:test_ar) end
+
+    before :all do
+      @connection = ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+
+      ActiveRecord::Migration.verbose = false
+
+      ActiveRecord::Schema.define(:version => 1) do
+        create_table :photos do |t|
+          t.string :image_uid
+        end
+      end
+
+      class Photo < ActiveRecord::Base
+        extend Dragonfly::Model
+        dragonfly_accessor :image, app: :test_ar
+      end
+    end
+
+    after :all do
+      Photo.destroy_all
+      ActiveRecord::Base.remove_connection(@connection)
+    end
+
+    describe "destroying" do
+      before do
+        Photo.destroy_all
+        @photo = Photo.create(image: "some data")
+      end
+
+      def data_exists(uid)
+        !!dragonfly_app.datastore.read(uid)
+      end
+
+      it "should not remove the attachment if a transaction is cancelled" do
+        Photo.transaction do
+          @photo.destroy
+          raise ActiveRecord::Rollback
+        end
+        photo = Photo.last
+        expect(photo.image_uid).not_to be_nil
+        expect(data_exists(photo.image_uid)).to eq(true)
+      end
+
+      it "should remove the attachment as per usual otherwise" do
+        uid = @photo.image_uid
+        @photo.destroy
+        photo = Photo.last
+        expect(photo).to be_nil
+        expect(data_exists(uid)).to eq(false)
+      end
+    end
+  end
+end

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

@@ -22,19 +22,21 @@ describe Dragonfly::Shell do
 
   unless Dragonfly.running_on_windows?
 
+    # NOTE: every \\ translates to a single \ on the command line
     describe "escaping args" do
       {
-        %q(hello) => %q('hello'),
-        %q("hello") => %q('hello'),
-        %q('hello') => %q('hello'),
-        %q(he\'llo) => %q('he'\''llo'),
-        %q('he'\''llo') => %q('he'\''llo'),
-        %q("he'llo") => %q('he'\''llo'),
-        %q(hel$(lo)) => %q('hel$(lo)'),
-        %q(hel\$(lo)) => %q('hel$(lo)'),
-        %q('hel\$(lo)') => %q('hel\$(lo)')
+        %q(hello there) => %q(hello there),
+        %q('hello' 'there') => %q(hello there),
+        %q(he\\'llo there) => %q(he\\'llo there),
+        %q(he\\ llo there) => %q(he\\ llo there),
+        %q("he'llo" there) => %q(he\\'llo there),
+        %q('he'\\''llo' there) => %q(he\\'llo there),
+        %q(hel$(lo) there) => %q(hel\\$\\(lo\\) there),
+        %q(hel\\$(lo) > there) => %q(hel\\$\\(lo\\) \\> there),
+        %q('hel$(lo) > there') => %q(hel\\$\\(lo\\)\\ \\>\\ there),
+        %q(hello -there) => %q(hello -there),
       }.each do |args, escaped_args|
-        it "should escape #{args.inspect} -> #{escaped_args.inspect}" do
+        it "should escape #{args} -> #{escaped_args}" do
           shell.escape_args(args).should == escaped_args
         end
       end

data/spec/dragonfly_spec.rb

@@ -12,23 +12,47 @@ describe Dragonfly do
   end
 
   describe "logging" do
-    before do
-      Dragonfly.logger = Logger.new(StringIO.new)
-    end
+    context "logger exists" do
+      before do
+        Dragonfly.logger = Logger.new(StringIO.new)
+      end
 
-    it "debugs" do
-      Dragonfly.logger.should_receive(:debug).with(/something/)
-      Dragonfly.debug("something")
-    end
+      it "debugs" do
+        Dragonfly.logger.should_receive(:debug).with(/something/)
+        Dragonfly.debug("something")
+      end
+
+      it "warns" do
+        Dragonfly.logger.should_receive(:warn).with(/something/)
+        Dragonfly.warn("something")
+      end
 
-    it "warns" do
-      Dragonfly.logger.should_receive(:warn).with(/something/)
-      Dragonfly.warn("something")
+      it "shows info" do
+        Dragonfly.logger.should_receive(:info).with(/something/)
+        Dragonfly.info("something")
+      end
     end
 
-    it "shows info" do
-      Dragonfly.logger.should_receive(:info).with(/something/)
-      Dragonfly.info("something")
+    context "logger is nil" do
+      before do
+        allow_message_expectations_on_nil
+        Dragonfly.logger = nil
+      end
+
+      it "does not call debug" do
+        Dragonfly.logger.should_not_receive(:debug)
+        Dragonfly.debug("something")
+      end
+
+      it "does not warn" do
+        Dragonfly.logger.should_not_receive(:warn)
+        Dragonfly.warn("something")
+      end
+
+      it "does not show info" do
+        Dragonfly.logger.should_not_receive(:info)
+        Dragonfly.info("something")
+      end
     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/spec_helper.rb

@@ -2,19 +2,19 @@ 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.include ModelHelpers
@@ -25,8 +25,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 +36,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 +45,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Mark Evans
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-31 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  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: sqlite3
+  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'
 description: |-
   Dragonfly is a framework that enables on-the-fly processing for any content type.
     It is especially suited to image handling. Its uses range from image thumbnails to standard attachments to on-demand text generation.
@@ -130,12 +158,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
@@ -154,6 +181,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
@@ -178,10 +206,10 @@ files:
 - samples/beach.png
 - samples/egg.png
 - samples/gif.gif
+- samples/mevs' white pixel.png
 - samples/round.gif
 - samples/sample.docx
 - samples/taj.jpg
-- samples/white pixel.png
 - spec/dragonfly/app_spec.rb
 - spec/dragonfly/configurable_spec.rb
 - spec/dragonfly/content_spec.rb
@@ -192,12 +220,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
@@ -208,8 +236,10 @@ files:
 - spec/dragonfly/job_spec.rb
 - spec/dragonfly/memory_data_store_spec.rb
 - spec/dragonfly/middleware_spec.rb
+- 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
@@ -241,7 +271,7 @@ homepage: http://github.com/markevans/dragonfly
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -256,9 +286,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.
 test_files:
@@ -272,12 +301,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
@@ -288,8 +317,10 @@ test_files:
 - spec/dragonfly/job_spec.rb
 - spec/dragonfly/memory_data_store_spec.rb
 - spec/dragonfly/middleware_spec.rb
+- 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