dragonfly 0.8.6 → 0.9.0

data/spec/dragonfly/url_mapper_spec.rb

@@ -0,0 +1,130 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Dragonfly::UrlMapper do
+
+  describe "validating the url format" do
+    it "should be ok with a valid one" do
+      Dragonfly::UrlMapper.new('/media/:job/:name')
+    end
+    it "should throw an error if params aren't separated" do
+      lambda{
+        Dragonfly::UrlMapper.new('/media/:job:name')
+      }.should raise_error(Dragonfly::UrlMapper::BadUrlFormat)
+    end
+  end
+
+  describe "params_in_url" do
+    it "should return everything specified in the url" do
+      url_mapper = Dragonfly::UrlMapper.new('/media/:job/:basename.:ext')
+      url_mapper.params_in_url.should == ['job', 'basename', 'ext']
+    end
+  end
+  
+  describe "url_regexp" do
+    it "should return a regexp with non-greedy optional groups that include the preceding slash/dot/dash" do
+      url_mapper = Dragonfly::UrlMapper.new('/media/:job/:basename-:size.:format')
+      url_mapper.url_regexp.should == %r{^/media(/[^\/\-\.]+?)?(/[^\/\-\.]+?)?(\-[^\/\-\.]+?)?(\.[^\/\-\.]+?)?$}
+    end
+    
+    it "should allow setting custom patterns in the url" do
+      url_mapper = Dragonfly::UrlMapper.new('/media/:job-:size.:format',
+        :job => '\w',
+        :size => '\d',
+        :format => '[^\.]'
+      )
+      url_mapper.url_regexp.should == %r{^/media(/\w+?)?(\-\d+?)?(\.[^\.]+?)?$}
+    end
+    
+    it "should make optional match patterns (ending in ?) apply to the whole group including the preceding seperator" do
+      url_mapper = Dragonfly::UrlMapper.new('/media/:job', :job => '\w')
+      url_mapper.url_regexp.should == %r{^/media(/\w+?)?$}
+    end
+  end
+
+  describe "url_for" do
+    before(:each) do
+      @url_mapper = Dragonfly::UrlMapper.new('/media/:job-:size',
+        :job => '\w',
+        :size => '\w'
+      )
+    end
+    
+    it "should map correctly" do
+      @url_mapper.url_for('job' => 'asdf', 'size' => '30x30').should == '/media/asdf-30x30'
+    end
+    
+    it "should add extra params as query parameters" do
+      @url_mapper.url_for('job' => 'asdf', 'size' => '30x30', 'when' => 'now').should == '/media/asdf-30x30?when=now'
+    end
+    
+    it "should not worry if params aren't given" do
+      @url_mapper.url_for('job' => 'asdf', 'when' => 'now', 'then' => 'soon').should == '/media/asdf?when=now&then=soon'
+    end
+    
+    it "should call to_s on non-string values" do
+      @url_mapper.url_for('job' => 'asdf', 'size' => 500).should == '/media/asdf-500'
+    end
+  end
+
+  describe "params_for" do
+    before(:each) do
+      @url_mapper = Dragonfly::UrlMapper.new('/media/:job')
+    end
+    
+    it "should map correctly" do
+      @url_mapper.params_for('/media/asdf').should == {'job' => 'asdf'}
+    end
+    
+    it "should include query parameters" do
+      @url_mapper.params_for('/media/asdf', 'when=now').should == {'job' => 'asdf', 'when' => 'now'}
+    end
+    
+    it "should generally be ok with wierd characters" do
+      @url_mapper = Dragonfly::UrlMapper.new('/media/:doobie')
+      @url_mapper.params_for('/media/sd sdf jl£@$ sdf:_', 'job=goodun').should == {'job' => 'goodun', 'doobie' => 'sd sdf jl£@$ sdf:_'}
+    end
+  end
+
+  describe "matching urls with standard format /media/:job/:basename.:format" do
+    before(:each) do
+      @url_mapper = Dragonfly::UrlMapper.new('/media/:job/:basename.:format',
+        :job => '\w',
+        :basename => '[^\/]',
+        :format => '[^\.]'
+      )
+    end
+
+    {
+      '' => nil,
+      '/' => nil,
+      '/media' => {'job' => nil, 'basename' => nil, 'format' => nil},
+      '/media/' => nil,
+      '/moodia/asdf' => nil,
+      '/media/asdf/' => nil,
+      '/mount/media/asdf' => nil,
+      '/media/asdf/stuff.egg' => {'job' => 'asdf', 'basename' => 'stuff', 'format' => 'egg'},
+      '/media/asdf' =>           {'job' => 'asdf', 'basename' => nil,     'format' => nil},
+      '/media/asdf/stuff' =>     {'job' => 'asdf', 'basename' => 'stuff', 'format' => nil},
+      '/media/asdf.egg' =>       {'job' => 'asdf', 'basename' => nil,     'format' => 'egg'},
+      '/media/asdf/stuff/egg' => nil,
+      '/media/asdf/stuff.dog.egg' => {'job' => 'asdf', 'basename' => 'stuff.dog', 'format' => 'egg'},
+      '/media/asdf/s=2 -.d.e' => {'job' => 'asdf', 'basename' => 's=2 -.d', 'format' => 'e'},
+      '/media/asdf-40x40/stuff.egg' => nil
+    }.each do |path, params|
+      
+      it "should turn the url #{path} into params #{params.inspect}" do
+        @url_mapper.params_for(path).should == params
+      end    
+      
+      if params
+        it "should turn the params #{params.inspect} into url #{path}" do
+          @url_mapper.url_for(params).should == path
+        end
+      end
+      
+    end
+
+  end
+  
+end

data/spec/functional/deprecations_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe 'deprecations' do
+  
+  before(:each) do
+    @app = test_app
+  end
+  
+  describe "url_suffix" do
+    it "should give an appropriate error" do
+      @app.configure do |c|
+        expect{
+          c.url_suffix = 'darble'
+        }.to raise_error(NoMethodError, /deprecated.*please use url_format/)
+      end
+    end
+  end
+  
+  describe "url_path_prefix" do
+    it "should give an appropriate error" do
+      @app.configure do |c|
+        expect{
+          c.url_path_prefix = '/darble'
+        }.to raise_error(NoMethodError, /deprecated.*please use url_format/)
+      end
+    end
+  end
+  
+  describe "middleware" do
+    it "should give an appropriate error" do
+      app = Rack::Builder.new do
+        use Dragonfly::Middleware, :images, '/media'
+        run proc{[200, {}, []]}
+      end
+      expect{
+        app.call({})
+      }.to raise_error(ArgumentError, /deprecated/)
+    end
+  end
+  
+  describe "infer_mime_type_from_file_ext" do
+    it "should give an appropriate error" do
+      @app.configure do |c|
+        expect{
+          c.infer_mime_type_from_file_ext = false
+        }.to raise_error(NoMethodError, /deprecated.*please use trust_file_extensions = false/)
+      end
+    end
+  end
+  
+end

data/spec/functional/image_magick_app_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe "a configured imagemagick app" do
+  
+  before(:each) do
+    @app = Dragonfly[:images].configure_with(:imagemagick)
+  end
+  
+  describe "convert command path" do
+    before(:each) do
+      @processor = @app.processor.get_registered(Dragonfly::ImageMagick::Processor)
+    end
+    
+    it "should default to 'convert'" do
+      @processor.convert_command.should == 'convert'
+    end
+    
+    it "should change when configured through the app" do
+      @app.configure do |c|
+        c.convert_command = '/usr/eggs'
+      end
+      @processor.convert_command.should == '/usr/eggs'
+    end
+    
+  end
+  
+end

data/spec/functional/model_urls_spec.rb

@@ -0,0 +1,85 @@
+require 'dragonfly/active_model_extensions/spec_helper'
+require 'tempfile'
+
+describe "model urls" do
+  
+  def new_tempfile(data='HELLO', filename='hello.txt')
+    tempfile = Tempfile.new('test')
+    tempfile.write(data)
+    tempfile.rewind
+    tempfile.stub!(:original_filename).and_return(filename)
+    tempfile
+  end
+  
+  before(:each) do
+    @app = test_app.configure do |c|
+      c.url_format = '/media/:job/:basename.:format'
+    end
+    @app.define_macro(MyModel, :image_accessor)
+    Item.class_eval do
+      image_accessor :preview_image # has name etc.
+      image_accessor :other_image # doesn't have magic stuff
+    end
+    @item = Item.new
+  end
+  
+  it "should include the name in the url if it has the magic attribute" do
+    @item.preview_image = new_tempfile
+    @item.save!
+    item = Item.find(@item.id)
+    item.preview_image.url.should =~ %r{^/media/\w+/hello\.txt$}
+  end
+  
+  it "should work without the name if the name magic attr doesn't exist" do
+    @item.other_image = new_tempfile
+    @item.save!
+    item = Item.find(@item.id)
+    item.other_image.url.should =~ %r{^/media/\w+$}
+  end
+  
+  it "should include the name in the url even if it has no ext" do
+    @item.preview_image = new_tempfile("hello", 'hello')
+    @item.save!
+    item = Item.find(@item.id)
+    item.preview_image.url.should =~ %r{^/media/\w+/hello$}
+  end
+  
+  it "should change the ext when there's an encoding step" do
+    @item.preview_image = new_tempfile
+    @item.save!
+    item = Item.find(@item.id)
+    item.preview_image.encode(:bum).url.should =~ %r{^/media/\w+/hello\.bum$}
+  end
+  
+  it "should not include the name if it has none" do
+    @item.preview_image = "HELLO"
+    @item.save!
+    item = Item.find(@item.id)
+    item.preview_image.url.should =~ %r{^/media/\w+$}
+  end
+  
+  it "should have an ext when there's an encoding step but no name" do
+    @item.preview_image = "HELLO"
+    @item.save!
+    item = Item.find(@item.id)
+    item.preview_image.encode(:bum).url.should =~ %r{^/media/\w+\.bum$}
+  end
+  
+  it "should work as normal with dos protection" do
+    @app.server.protect_from_dos_attacks = true
+    @item.preview_image = new_tempfile
+    @item.save!
+    item = Item.find(@item.id)
+    item.preview_image.url.should =~ %r{^/media/\w+/hello\.txt\?sha=\w+$}
+  end
+  
+  it "should allow configuring the url" do
+    @app.configure do |c|
+      c.url_format = '/img/:job'
+    end
+    @item.preview_image = new_tempfile
+    @item.save!
+    item = Item.find(@item.id)
+    item.preview_image.url.should =~ %r{^/img/\w+$}
+  end
+end

data/spec/functional/remote_on_the_fly_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe "remote on-the-fly urls" do
+  
+  THUMBS = {}
+  
+  before(:each) do
+    @app = test_app.configure do |c|
+      c.generator.add :test do
+        "TEST"
+      end
+      c.server.before_serve do |job, env|
+        uid = job.store(:path => 'yay.txt')
+        THUMBS[job.serialize] = uid
+      end
+      c.define_url do |app, job, opts|
+        uid = THUMBS[job.serialize]
+        if uid
+          app.datastore.url_for(uid)
+        else
+          app.server.url_for(job)
+        end
+      end
+      c.datastore = Dragonfly::DataStorage::FileDataStore.new
+      c.datastore.root_path = '/var/tmp/dragonfly'
+      c.datastore.server_root = '/var/tmp'
+    end
+    @job = @app.generate(:test)
+  end
+
+  after(:each) do
+    THUMBS.delete_if{true}
+    FileUtils.rm_f('/var/tmp/dragonfly/yay.txt')
+  end
+  
+  it "should give the url for the server" do
+    @job.url.should == "/#{@job.serialize}"
+  end
+  
+  it "should store the content when first called" do
+    File.exist?('/var/tmp/dragonfly/yay.txt').should be_false
+    @app.server.call('PATH_INFO' => @job.url, 'REQUEST_METHOD' => 'GET')
+    File.read('/var/tmp/dragonfly/yay.txt').should == 'TEST'
+  end
+
+  it "should point to the external url the second time" do
+    @app.server.call('PATH_INFO' => @job.url, 'REQUEST_METHOD' => 'GET')
+    @job.url.should == '/dragonfly/yay.txt'
+  end
+
+end

data/spec/functional/to_response_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe "getting rack response directly" do
+  
+  before(:each) do
+    @app = Dragonfly[:to_response].configure do |c|
+      c.generator.add :test do
+        "bunheads"
+      end
+    end
+  end
+  
+  it "should give a rack response" do
+    response = @app.generate(:test, 1, 1).to_response
+    response.should be_a(Array)
+    response.length.should == 3
+    response[0].should == 200
+    response[1]['Content-Type'].should == 'application/octet-stream'
+    response[2].data.should == 'bunheads'
+  end
+  
+  it "should allow passing in the env" do
+    response = @app.generate(:test, 1, 1).to_response('REQUEST_METHOD' => 'POST')
+    response.should be_a(Array)
+    response.length.should == 3
+    response[0].should == 405
+    response[1]['Content-Type'].should == 'text/plain'
+    response[2].should == ["POST method not allowed"]
+  end
+  
+end

data/spec/spec_helper.rb

@@ -1,30 +1,20 @@
-require 'rubygems'
-require 'spec'
-require 'rack'
+require "rubygems"
+require "bundler"
+Bundler.setup(:default, :test)
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'dragonfly'
 require 'fileutils'
 
-require File.dirname(__FILE__) + '/../lib/dragonfly'
-$:.unshift(File.dirname(__FILE__))
-require 'argument_matchers'
-require 'simple_matchers'
-require 'image_matchers'
+require 'webmock/rspec'
 
-ROOT_PATH = File.expand_path(File.dirname(__FILE__) + "/..") unless defined?(ROOT_PATH)
-
-# A hack as system calls weren't using my path
-extra_paths = %w(/opt/local/bin)
-ENV['PATH'] ||= ''
-ENV['PATH'] += ':' + extra_paths.join(':')
-
-# If this is jRuby, ignore the rmagick tests
-ENV['IGNORE_RMAGICK'] = 'true' if RUBY_PLATFORM == 'java' || defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+# Requires supporting files with custom matchers and macros, etc,
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 SAMPLES_DIR = File.expand_path(File.dirname(__FILE__) + '/../samples') unless defined?(SAMPLES_DIR)
 
-Spec::Runner.configure do |c|
-  c.after(:all){ Dir["#{ROOT_PATH}/Gemfile*.lock"].each{|f| FileUtils.rm_f(f) } }
-end
-
 def todo
   raise "TODO"
 end
@@ -56,6 +46,6 @@ def suppressing_stderr
   $stderr.reopen(tempfile)
   yield
 ensure
-  tempfile.close
+  tempfile.close!
   $stderr.reopen(original_stderr)
 end

data/spec/{image_matchers.rb → support/image_matchers.rb}

@@ -22,25 +22,25 @@ def image_properties(image)
   }
 end
 
-Spec::Matchers.define :have_width do |width|
+RSpec::Matchers.define :have_width do |width|
   match do |given|
     width.should === image_properties(given)[:width].to_i
   end
 end
 
-Spec::Matchers.define :have_height do |height|
+RSpec::Matchers.define :have_height do |height|
   match do |given|
     height.should === image_properties(given)[:height].to_i
   end
 end
 
-Spec::Matchers.define :have_format do |format|
+RSpec::Matchers.define :have_format do |format|
   match do |given|
     image_properties(given)[:format].should == format
   end
 end
 
-Spec::Matchers.define :have_size do |size|
+RSpec::Matchers.define :have_size do |size|
   match do |given|
     image_properties(given)[:size].should == size
   end