dragonfly 1.3.0 → 1.4.0

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/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.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Mark Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-09 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -158,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
@@ -182,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
@@ -220,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
@@ -239,6 +239,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 +286,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.2.15
 signing_key:
 specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.
@@ -301,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
@@ -320,6 +320,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
-

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

@@ -1,88 +0,0 @@
-require 'spec_helper'
-
-describe Dragonfly::ImageMagick::Processors::Convert do
-
-  def sample_content(name)
-    Dragonfly::Content.new(app, SAMPLES_DIR.join(name))
-  end
-
-  let(:app){ test_app }
-  let(:image){ sample_content('beach.png') } # 280x355
-  let(:processor){ Dragonfly::ImageMagick::Processors::Convert.new }
-
-  it "should allow for general convert commands" do
-    processor.call(image, '-scale 56x71')
-    image.should have_width(56)
-    image.should have_height(71)
-  end
-
-  it "should allow for general convert commands with added format" do
-    processor.call(image, '-scale 56x71', 'format' => 'gif')
-    image.should have_width(56)
-    image.should have_height(71)
-    image.should have_format('gif')
-    image.meta['format'].should == 'gif'
-  end
-
-  it "should work for commands with parenthesis" do
-    processor.call(image, "\\( +clone -sparse-color Barycentric '0,0 black 0,%[fx:h-1] white' -function polynomial 2,-2,0.5 \\) -compose Blur -set option:compose:args 15 -composite")
-    image.should have_width(280)
-  end
-
-  it "should work for files with spaces/apostrophes in the name" do
-    image = Dragonfly::Content.new(app, SAMPLES_DIR.join("mevs' white pixel.png"))
-    processor.call(image, "-resize 2x2!")
-    image.should have_width(2)
-  end
-
-  it "updates the url with format if given" do
-    url_attributes = Dragonfly::UrlAttributes.new
-    processor.update_url(url_attributes, '-scale 56x71', 'format' => 'gif')
-    url_attributes.ext.should == 'gif'
-  end
-
-  it "allows converting specific frames" do
-    gif = sample_content('gif.gif')
-    processor.call(gif, '-resize 50x50')
-    all_frames_size = gif.size
-
-    gif = sample_content('gif.gif')
-    processor.call(gif, '-resize 50x50', 'frame' => 0)
-    one_frame_size = gif.size
-
-    one_frame_size.should < all_frames_size
-  end
-
-  it "accepts input arguments for convert commands" do
-    image2 = image.clone
-    processor.call(image, '')
-    processor.call(image2, '', 'input_args' => '-extract 50x50+10+10')
-
-    image.should_not equal_image(image2)
-    image2.should have_width(50)
-  end
-
-  it "allows converting using specific delegates" do
-    expect {
-      processor.call(image, '', 'format' => 'jpg', 'delegate' => 'png')
-    }.to call_command(app.shell, %r{convert png:/[^']+?/beach\.png /[^']+?\.jpg})
-  end
-
-  it "maintains the mime_type meta if it exists already" do
-    processor.call(image, '-resize 10x')
-    image.meta['mime_type'].should be_nil
-
-    image.add_meta('mime_type' => 'image/png')
-    processor.call(image, '-resize 5x')
-    image.meta['mime_type'].should == 'image/png'
-    image.mime_type.should == 'image/png' # sanity check
-  end
-
-  it "doesn't maintain the mime_type meta on format change" do
-    image.add_meta('mime_type' => 'image/png')
-    processor.call(image, '', 'format' => 'gif')
-    image.meta['mime_type'].should be_nil
-    image.mime_type.should == 'image/gif' # sanity check
-  end
-
-end