dragonfly 1.1.3 → 1.3.0

data/README.md

@@ -1,5 +1,8 @@
 Dragonfly
 ===========
+
+[![Build Status](https://travis-ci.org/markevans/dragonfly.svg?branch=master)](https://travis-ci.org/markevans/dragonfly)
+
 Hello!!
 Dragonfly is a highly customizable ruby gem for handling images and other attachments and is already in use on thousands of websites.
 
@@ -10,7 +13,7 @@ class User < ActiveRecord::Base  # model
 end
 ```
 ```erb
-<%= image_tag @user.photo.thumb('300x200#').url  # view  %>
+<%= image_tag @user.photo.thumb('300x200#').url if @user.photo_stored? # view %>
 ```
 
 ... or generate text images on-demand in Sinatra ...
@@ -44,7 +47,7 @@ Installation
 
 or in your Gemfile
 ```ruby
-gem 'dragonfly', '~> 1.1.3'
+gem 'dragonfly', '~> 1.2.2'
 ```
 
 Require with

data/dev/rails_template.rb

@@ -1,40 +1,42 @@
-gem 'dragonfly', :path => File.expand_path('../..', __FILE__)
-generate "dragonfly"
-generate "scaffold", "photo image_uid:string image_name:string"
-rake "db:migrate"
-route %(
-  get "text/:text" => Dragonfly.app.endpoint { |params, app|
-    app.generate(:text, params[:text])
-  }
-)
-route "root :to => 'photos#index'"
-run "rm -rf public/index.html"
+after_bundle do
+  gem 'dragonfly', :path => File.expand_path('../..', __FILE__)
+  generate "dragonfly"
+  generate "scaffold", "photo image_uid:string image_name:string"
+  rake "db:migrate"
+  route %(
+    get "text/:text" => Dragonfly.app.endpoint { |params, app|
+      app.generate(:text, params[:text])
+    }
+  )
+  route "root :to => 'photos#index'"
+  run "rm -rf public/index.html"
 
-possible_base_classes = ['ActiveRecord::Base', 'ApplicationRecord']
-possible_base_classes.each do |base_class|
-  inject_into_file 'app/models/photo.rb', :after => "class Photo < #{base_class}\n" do
-    %(
-      attr_accessible :image rescue nil
-      dragonfly_accessor :image
-    )
+  possible_base_classes = ['ActiveRecord::Base', 'ApplicationRecord']
+  possible_base_classes.each do |base_class|
+    inject_into_file 'app/models/photo.rb', :after => "class Photo < #{base_class}\n" do
+      %(
+        attr_accessible :image rescue nil
+        dragonfly_accessor :image
+      )
+    end
   end
-end
 
-gsub_file 'app/views/photos/_form.html.erb', /^.*:image_.*$/, ''
+  gsub_file 'app/views/photos/_form.html.erb', /^.*:image_.*$/, ''
 
-inject_into_file 'app/views/photos/_form.html.erb', :before => %(<div class="actions">\n) do
-  %(
-    <div class="field">
-      <%= f.label :image %><br>
-      <%= f.file_field :image %>
-    </div>
+  inject_into_file 'app/views/photos/_form.html.erb', :before => %(<div class="actions">\n) do
+    %(
+      <div class="field">
+        <%= form.label :image %><br>
+        <%= form.file_field :image %>
+      </div>
 
-    <%= image_tag @photo.image.thumb('100x100').url if @photo.image_uid %>
-  )
-end
+      <%= image_tag @photo.image.thumb('100x100').url if @photo.image_stored? %>
+    )
+  end
 
-gsub_file "app/controllers/photos_controller.rb", "permit(", "permit(:image, "
+  gsub_file "app/controllers/photos_controller.rb", "permit(", "permit(:image, "
 
-append_file 'app/views/photos/show.html.erb', %(
- <%= image_tag @photo.image.thumb('300x300').url if @photo.image_uid? %>
-)
+  append_file 'app/views/photos/show.html.erb', %(
+  <%= image_tag @photo.image.thumb('300x300').url if @photo.image_stored? %>
+  )
+end

data/dragonfly.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dragonfly/version'
+require "dragonfly/version"
 
 Gem::Specification.new do |spec|
   spec.name = "dragonfly"
@@ -13,33 +13,27 @@ Gem::Specification.new do |spec|
   spec.homepage = "http://github.com/markevans/dragonfly"
   spec.license = "MIT"
   spec.files = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.extra_rdoc_files = [
     "LICENSE",
-    "README.md"
+    "README.md",
   ]
 
-  # Rack 2.0 only works with ruby >= 2.2.2
-  if RUBY_VERSION < "2.2.2"
-    rack_version = "~> 1.3"
-    activemodel_version = "~> 4.2"
-  else
-    rack_version = ">= 1.3"
-    activemodel_version = nil
-  end
-
   # Runtime dependencies
-  spec.add_runtime_dependency("rack", rack_version)
+  spec.add_runtime_dependency("rack", ">= 1.3")
   spec.add_runtime_dependency("multi_json", "~> 1.0")
   spec.add_runtime_dependency("addressable", "~> 2.3")
 
   # Development dependencies
   spec.add_development_dependency("rspec", "~> 2.5")
   spec.add_development_dependency("webmock")
-  spec.add_development_dependency("activemodel", activemodel_version)
+  spec.add_development_dependency("activemodel")
   if RUBY_PLATFORM == "java"
     spec.add_development_dependency("jruby-openssl")
+  else
+    spec.add_development_dependency("activerecord")
+    spec.add_development_dependency("sqlite3")
   end
 end

data/lib/dragonfly.rb

@@ -33,12 +33,14 @@ module Dragonfly
 
     # Logging
     def logger
-      @logger ||= Logger.new('dragonfly.log')
+      @logger = Logger.new('dragonfly.log') unless instance_variable_defined?(:@logger)
+      @logger
     end
     attr_writer :logger
 
     [:debug, :warn, :info].each do |method|
       define_method method do |message|
+        return unless logger
         logger.send(method, "DRAGONFLY: #{message}")
       end
     end

data/lib/dragonfly/content.rb

@@ -137,7 +137,7 @@ module Dragonfly
     #   # ===> "beach.jpg: image/jpeg"
     def shell_eval(opts={})
       should_escape = opts[:escape] != false
-      command = yield(should_escape ? shell.quote(path) : path)
+      command = yield(should_escape ? shell.escape(path) : path)
       run command, :escape => should_escape
     end
 
@@ -152,7 +152,7 @@ module Dragonfly
       ext = opts[:ext] || self.ext
       should_escape = opts[:escape] != false
       tempfile = Utils.new_tempfile(ext)
-      new_path = should_escape ? shell.quote(tempfile.path) : tempfile.path
+      new_path = should_escape ? shell.escape(tempfile.path) : tempfile.path
       command = yield(new_path)
       run(command, :escape => should_escape)
       update(tempfile)
@@ -169,8 +169,8 @@ module Dragonfly
       ext = opts[:ext] || self.ext
       should_escape = opts[:escape] != false
       tempfile = Utils.new_tempfile(ext)
-      old_path = should_escape ? shell.quote(path) : path
-      new_path = should_escape ? shell.quote(tempfile.path) : tempfile.path
+      old_path = should_escape ? shell.escape(path) : path
+      new_path = should_escape ? shell.escape(tempfile.path) : tempfile.path
       command = yield(old_path, new_path)
       run(command, :escape => should_escape)
       update(tempfile)

data/lib/dragonfly/job/fetch_url.rb

@@ -80,7 +80,7 @@ module Dragonfly
       end
 
       def update_from_data_uri
-        mime_type, b64_data = uri.scan(/\Adata:([^;]+);base64,(.*)$/)[0]
+        mime_type, b64_data = uri.scan(/\Adata:([^;]+);base64,(.*)\Z/m)[0]
         if mime_type && b64_data
           data = Base64.decode64(b64_data)
           ext = app.ext_for(mime_type)
@@ -91,7 +91,7 @@ module Dragonfly
       end
 
       def parse_url(url)
-        URI.parse(url)
+        URI.parse(url.to_s)
       rescue URI::InvalidURIError
         begin
           encoded_uri = Addressable::URI.parse(url).normalize.to_s

data/lib/dragonfly/model/class_methods.rb

@@ -30,7 +30,12 @@ module Dragonfly
 
         # Add callbacks
         before_save :save_dragonfly_attachments if respond_to?(:before_save)
-        before_destroy :destroy_dragonfly_attachments if respond_to?(:before_destroy)
+        case
+        when respond_to?(:after_commit)
+          after_commit :destroy_dragonfly_attachments, on: :destroy
+        when respond_to?(:after_destroy)
+          after_destroy :destroy_dragonfly_attachments
+        end
 
         # Register the new attribute
         dragonfly_attachment_classes << new_dragonfly_attachment_class(attribute, app, config_block)
@@ -86,7 +91,7 @@ module Dragonfly
             unless Utils.blank?(string)
               begin
                 dragonfly_attachments[attribute].retained_attrs = Serializer.json_b64_decode(string)
-              rescue Serializer::BadString => e
+              rescue Serializer::BadString
                 Dragonfly.warn("couldn't update attachment with serialized retained_#{attribute} string #{string.inspect}")
               end
             end

data/lib/dragonfly/routed_endpoint.rb

@@ -24,9 +24,9 @@ module Dragonfly
         Dragonfly.warn("can't handle return value from routed endpoint: #{value.inspect}")
         plain_response(500, "Server Error")
       end
-    rescue Job::NoSHAGiven => e
+    rescue Job::NoSHAGiven
       plain_response(400, "You need to give a SHA parameter")
-    rescue Job::IncorrectSHA => e
+    rescue Job::IncorrectSHA
       plain_response(400, "The SHA parameter you gave is incorrect")
     end
 

data/lib/dragonfly/server.rb

@@ -28,11 +28,11 @@ module Dragonfly
     attr_reader :url_format, :fetch_file_whitelist, :fetch_url_whitelist
 
     def add_to_fetch_file_whitelist(patterns)
-      fetch_file_whitelist.push *patterns
+      fetch_file_whitelist.push(*patterns)
     end
 
     def add_to_fetch_url_whitelist(patterns)
-      fetch_url_whitelist.push *patterns
+      fetch_url_whitelist.push(*patterns)
     end
 
     def url_format=(url_format)

data/lib/dragonfly/shell.rb

@@ -15,14 +15,11 @@ module Dragonfly
     end
 
     def escape_args(args)
-      args.shellsplit.map do |arg|
-        quote arg.gsub(/\\?'/, %q('\\\\''))
-      end.join(' ')
+      args.shellsplit.map{|arg| escape(arg) }.join(' ')
     end
 
-    def quote(string)
-      q = Dragonfly.running_on_windows? ? '"' : "'"
-      q + string + q
+    def escape(string)
+      Shellwords.escape(string)
     end
 
     private
@@ -36,22 +33,31 @@ module Dragonfly
       def run_command(command)
         result = `#{command}`
         status = $?
-        raise CommandFailed, "Command failed (#{command}) with exit status #{status.exitstatus}" unless status.success?
+        raise_command_failed!(command, status.exitstatus) unless status.success?
         result
+      rescue Errno::ENOENT => e
+        raise_command_failed!(command, nil, e.message)
       end
 
     else
 
       def run_command(command)
-        Open3.popen3 command do |stdin, stdout, stderr, wait_thread|
-          stdin.close_write # make sure it doesn't hang
-          status = wait_thread.value
-          raise CommandFailed, "Command failed (#{command}) with exit status #{status.exitstatus} and stderr #{stderr.read}" unless status.success?
-          stdout.read
-        end
+        stdout_str, stderr_str, status = Open3.capture3(command)
+        raise_command_failed!(command, status.exitstatus, stderr_str) unless status.success?
+        stdout_str
+      rescue Errno::ENOENT => e
+        raise_command_failed!(command, nil, e.message)
       end
 
     end
 
+    def raise_command_failed!(command, status=nil, error=nil)
+      raise CommandFailed, [
+        "Command failed: #{command}",
+        ("exit status: #{status}" if status),
+        ("error: #{error}" if error),
+      ].join(', ')
+    end
+
   end
 end

data/lib/dragonfly/url_mapper.rb

@@ -24,7 +24,7 @@ module Dragonfly
 
     def initialize(url_format)
       @url_format = url_format
-      raise BadUrlFormat, "bad url format #{url_format}" if url_format[/[\w_]:[\w_]/]
+      raise BadUrlFormat, "bad url format #{url_format}" if url_format[/\w:\w/]
       init_segments
       init_url_regexp
     end
@@ -43,7 +43,7 @@ module Dragonfly
     end
 
     def params_in_url
-      @params_in_url ||= url_format.scan(/\:[\w_]+/).map{|f| f.tr(':','') }
+      @params_in_url ||= url_format.scan(/\:\w+/).map{|f| f.tr(':','') }
     end
 
     def url_for(params)
@@ -51,7 +51,7 @@ module Dragonfly
       url = url_format.dup
       segments.each do |seg|
         value = params[seg.param]
-        value ? url.sub!(/:[\w_]+/, Utils.uri_escape_segment(value.to_s)) : url.sub!(/.:[\w_]+/, '')
+        value ? url.sub!(/:\w+/, Utils.uri_escape_segment(value.to_s)) : url.sub!(/.:\w+/, '')
         params.delete(seg.param)
       end
       url << "?#{Rack::Utils.build_query(params)}" if params.any?
@@ -62,7 +62,7 @@ module Dragonfly
 
     def init_segments
       @segments = []
-      url_format.scan(/([^\w_]):([\w_]+)/).each do |seperator, param|
+      url_format.scan(/([^\w]):(\w+)/).each do |seperator, param|
         segments << Segment.new(
           param,
           seperator,
@@ -73,7 +73,7 @@ module Dragonfly
 
     def init_url_regexp
       i = -1
-      regexp_string = url_format.gsub(/[^\w_]:[\w_]+/) do
+      regexp_string = url_format.gsub(/[^\w]:\w+/) do
         i += 1
         segments[i].regexp_string
       end

data/lib/dragonfly/utils.rb

@@ -38,7 +38,7 @@ module Dragonfly
     end
 
     def uri_unescape(string)
-      URI.unescape(string)
+      URI::DEFAULT_PARSER.unescape(string)
     end
 
   end

data/lib/dragonfly/version.rb

@@ -1,3 +1,3 @@
 module Dragonfly
-  VERSION = '1.1.3'
+  VERSION = "1.3.0"
 end

data/lib/rails/generators/dragonfly/templates/initializer.rb.erb

@@ -20,7 +20,7 @@ Dragonfly.logger = Rails.logger
 Rails.application.middleware.use Dragonfly::Middleware
 
 # Add model functionality
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.extend Dragonfly::Model
-  ActiveRecord::Base.extend Dragonfly::Model::Validations
+ActiveSupport.on_load(:active_record) do
+  extend Dragonfly::Model
+  extend Dragonfly::Model::Validations
 end

data/spec/dragonfly/content_spec.rb

@@ -232,7 +232,7 @@ describe Dragonfly::Content do
         path = p
         "cat #{path}"
       end.should == "big\nstuff"
-      path.should == app.shell.quote(content.path)
+      path.should == app.shell.escape(content.path)
     end
 
     it "allows evaluating without escaping" do
@@ -253,8 +253,8 @@ describe Dragonfly::Content do
         new_path = n
         "cp #{o} #{n}"
       end.should == content
-      old_path.should == app.shell.quote(original_path)
-      new_path.should == app.shell.quote(content.path)
+      old_path.should == app.shell.escape(original_path)
+      new_path.should == app.shell.escape(content.path)
       content.data.should == "big\nstuff"
     end
 

data/spec/dragonfly/cookie_monster_spec.rb

@@ -7,7 +7,7 @@ describe Dragonfly::CookieMonster do
   def app(extra_env={})
     Rack::Builder.new do
       use Dragonfly::CookieMonster
-      run proc{|env| env.merge!(extra_env); [200, {"Set-Cookie" => "blah", "Something" => "else"}, ["body here"]] }
+      run proc{|env| env.merge!(extra_env); [200, {"Set-Cookie" => "blah=thing", "Something" => "else"}, ["body here"]] }
     end
   end
 
@@ -15,7 +15,7 @@ describe Dragonfly::CookieMonster do
     response = Rack::MockRequest.new(app).get('')
     response.status.should == 200
     response.body.should == "body here"
-    response.headers["Set-Cookie"].should == "blah"
+    response.headers["Set-Cookie"].should == "blah=thing"
     response.headers["Something"].should == "else"
   end
 

data/spec/dragonfly/image_magick/plugin_spec.rb

@@ -61,7 +61,7 @@ describe "a configured imagemagick app" do
 
     it "should return false for pdfs" do
       image.encode('pdf').image?.should be_falsey
-    end
+    end unless ENV['SKIP_FLAKY_TESTS']
   end
 
   describe "processors that change the url" do