dragonfly 1.1.3 → 1.3.0

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

@@ -29,8 +29,8 @@ describe Dragonfly::ImageMagick::Processors::Convert do
     image.should have_width(280)
   end
 
-  it "should work for files with spaces in the name" do
-    image = Dragonfly::Content.new(app, SAMPLES_DIR.join('white pixel.png'))
+  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
@@ -65,7 +65,7 @@ describe Dragonfly::ImageMagick::Processors::Convert do
   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'})
+    }.to call_command(app.shell, %r{convert png:/[^']+?/beach\.png /[^']+?\.jpg})
   end
 
   it "maintains the mime_type meta if it exists already" do

data/spec/dragonfly/job/fetch_url_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'base64'
 
 describe Dragonfly::Job::FetchUrl do
 
@@ -162,6 +163,18 @@ describe Dragonfly::Job::FetchUrl do
       job.ext.should == 'txt'
     end
 
+    it "accepts long base64 encoded data uris with newline" do
+      str = 'hello' * 10
+      job.fetch_url!("data:text/plain;base64,#{Base64.encode64(str)}")
+      job.data.should == str
+    end
+
+    it "accepts long base64 encoded data uris without newline" do
+      str = 'hello' * 10
+      job.fetch_url!("data:text/plain;base64,#{Base64.strict_encode64(str)}")
+      job.data.should == str
+    end
+
     it "doesn't accept other data uris" do
       expect {
         job.fetch_url!("data:text/html;charset=utf-8,<stuff />").apply

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/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Mark Evans
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2021-01-09 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.
@@ -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
@@ -208,6 +236,7 @@ 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/register_spec.rb
@@ -241,7 +270,7 @@ homepage: http://github.com/markevans/dragonfly
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -256,9 +285,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: Ideal gem for handling attachments in Rails, Sinatra and Rack applications.
 test_files:
@@ -288,6 +317,7 @@ 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/register_spec.rb