dragonfly 0.9.15 → 1.0

data/spec/dragonfly_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'logger'
+require 'stringio'
+
+describe Dragonfly do
+  it "returns a default app" do
+    Dragonfly.app.should == Dragonfly::App.instance
+  end
+
+  it "returns a named app" do
+    Dragonfly.app(:mine).should == Dragonfly::App.instance(:mine)
+  end
+
+  describe "logging" 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 "warns" do
+      Dragonfly.logger.should_receive(:warn).with(/something/)
+      Dragonfly.warn("something")
+    end
+
+    it "shows info" do
+      Dragonfly.logger.should_receive(:info).with(/something/)
+      Dragonfly.info("something")
+    end
+  end
+
+  describe "deprecations" do
+    it "raises a message when using Dragonfly[:name]" do
+      expect {
+        Dragonfly[:images]
+      }.to raise_error(/deprecated/)
+    end
+  end
+end
+

data/spec/fixtures/deprecated_stored_content/eggs.bonus

@@ -0,0 +1 @@
+Barnicle

data/spec/fixtures/deprecated_stored_content/eggs.bonus.meta

@@ -0,0 +1 @@
+{:	nameI"eggs.bonus:ET:	someI"	meta;T:numberi

data/spec/functional/configuration_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "configuration" do
+  let (:app) { test_app }
+
+  it "adds to fetch_file_whitelist" do
+    app.configure do
+      fetch_file_whitelist ['something']
+    end
+    app.fetch_file_whitelist.should include 'something'
+  end
+
+  it "adds to fetch_url_whitelist" do
+    app.configure do
+      fetch_url_whitelist ['http://something']
+    end
+    app.fetch_url_whitelist.should include 'http://something'
+  end
+end

data/spec/functional/model_urls_spec.rb

@@ -1,44 +1,46 @@
-require 'dragonfly/active_model_extensions/spec_helper'
+require '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.stub(:original_filename).and_return(filename)
     tempfile
   end
-  
+
   before(:each) do
-    @app = test_app.configure do |c|
-      c.url_format = '/media/:job/:basename.:format'
-      c.analyser.add :some_analyser_method do |t|
+    @app = test_app.configure do
+      plugin :imagemagick
+      url_format '/media/:job/:name'
+      analyser :some_analyser_method do |t|
         53
       end
-      c.processor.add :upcase do |t|
-        t.data.upcase
-      end
     end
-    @app.define_macro(MyModel, :image_accessor)
-    Item.class_eval do
-      image_accessor :preview_image # has name, some_analyser_method, etc.
-      image_accessor :other_image # doesn't have magic stuff
+    @item_class = new_model_class('Item',
+      :preview_image_uid,
+      :preview_image_name,
+      :preview_image_some_analyser_method,
+      :other_image_uid
+      ) do
+      dragonfly_accessor :preview_image # has name, some_analyser_method, etc.
+      dragonfly_accessor :other_image # doesn't have magic stuff
     end
-    @item = Item.new
+    @item = @item_class.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.preview_image.url.should =~ %r{^/media/\w+/hello\.txt$}
   end
-  
+
   it "should still include the name in the url if it has the magic attribute on reload" do
     @item.preview_image = new_tempfile
     @item.save!
-    item = Item.find(@item.id)
+    item = @item_class.find(@item.id)
     item.preview_image.url.should =~ %r{^/media/\w+/hello\.txt$}
   end
 
@@ -47,74 +49,74 @@ describe "model urls" do
     @item.preview_image = new_tempfile
     @item.save!
     @item.preview_image.url.should =~ %r{^/\w+/53$}
-    Item.find(@item.id).preview_image.url.should =~ %r{^/\w+/53$}
+    @item_class.find(@item.id).preview_image.url.should =~ %r{^/\w+/53$}
   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 = @item_class.find(@item.id)
     item.other_image.url.should =~ %r{^/media/\w+$}
   end
-  
+
   it "should not add the name when there's no magic attr, even if the name is set (for consistency)" do
     @item.other_image = new_tempfile
     @item.save!
     @item.other_image.name = 'test.txt'
     @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 = @item_class.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 = @item_class.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 = @item_class.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$}
+    item = @item_class.find(@item.id)
+    item.preview_image.encode(:bum).url.should =~ %r{^/media/\w+/file\.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 = @item_class.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'
+    @app.configure do
+      url_format '/img/:job'
     end
     @item.preview_image = new_tempfile
     @item.save!
-    item = Item.find(@item.id)
+    item = @item_class.find(@item.id)
     item.preview_image.url.should =~ %r{^/img/\w+$}
   end
 
   it "should still get params from magic attributes even when chained" do
     @item.preview_image = new_tempfile
     @item.save!
-    item = Item.find(@item.id)
-    item.preview_image.process(:upcase).url.should =~ %r{^/media/\w+/hello\.txt$}
+    item = @item_class.find(@item.id)
+    item.preview_image.thumb('30x30').url.should =~ %r{^/media/\w+/hello\.txt$}
   end
-  
-end
+
+end

data/spec/functional/remote_on_the_fly_spec.rb

@@ -1,42 +1,40 @@
 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"
+    @thumbs = thumbs = {}
+    @app = test_app.configure do
+      generator :test do |content|
+        content.update("TEST")
       end
-      c.server.before_serve do |job, env|
+      before_serve do |job, env|
         uid = job.store(:path => 'yay.txt')
-        THUMBS[job.serialize] = uid
+        thumbs[job.serialize] = uid
       end
-      c.define_url do |app, job, opts|
-        uid = THUMBS[job.serialize]
+      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 = 'tmp/dragonfly_test_urls'
-      c.datastore.server_root = 'tmp'
+      datastore :file,
+        :root_path => 'tmp/dragonfly_test_urls',
+        :server_root => 'tmp'
     end
     @job = @app.generate(:test)
   end
 
   after(:each) do
-    THUMBS.delete_if{true}
     FileUtils.rm_f('tmp/dragonfly_test_urls/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?('tmp/dragonfly_test_urls/yay.txt').should be_false
     @app.server.call('PATH_INFO' => @job.url, 'REQUEST_METHOD' => 'GET')

data/spec/functional/shell_commands_spec.rb

@@ -1,23 +1,33 @@
 require 'spec_helper'
 
-describe "a configured imagemagick app" do
-  
-  before(:each) do
-    @app = test_app.configure_with(:imagemagick)
-  end
-  
+describe "using the shell" do
+
+  let (:app) { test_app }
+
   describe "shell injection" do
-    
     it "should not allow it!" do
+      app.configure_with(:imagemagick)
       begin
-        suppressing_stderr do
-          @app.generate(:plain, 10, 10, 'white').convert("-resize 5x5 ; touch tmp/stuff").apply
-        end
-      rescue Dragonfly::FunctionManager::UnableToHandle
+        app.generate(:plain, 10, 10, 'white').convert("-resize 5x5 ; touch tmp/stuff").apply
+      rescue Dragonfly::Shell::CommandFailed
       end
       File.exist?('tmp/stuff').should be_false
     end
-    
   end
-  
-end
+
+  describe "env variables with imagemagick" do
+    it "allows configuring the convert path" do
+      app.configure_with(:imagemagick, :convert_command => '/bin/convert')
+      app.shell.should_receive(:run).with(%r[/bin/convert], hash_including)
+      app.create("").thumb('30x30').apply
+    end
+
+    it "allows configuring the identify path" do
+      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/functional/to_response_spec.rb

@@ -1,31 +1,31 @@
 require 'spec_helper'
 
 describe "getting rack response directly" do
-  
+
   before(:each) do
-    @app = test_app.configure do |c|
-      c.generator.add :test do
-        "bunheads"
+    @app = test_app.configure do
+      generator :test do |content|
+        content.update("bunheads")
       end
     end
   end
-  
+
   it "should give a rack response" do
-    response = @app.generate(:test, 1, 1).to_response
+    response = @app.generate(:test).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 = @app.generate(:test).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"]
+    response[2].should == ["method not allowed"]
   end
-  
+
 end

data/spec/functional/urls_spec.rb

@@ -9,18 +9,20 @@ describe "urls" do
   def job_should_match(array)
     Dragonfly::Response.should_receive(:new).with do |job, env|
       job.to_a.should == array
-    end.and_return(mock('response', :to_response => [200, {'Content-Type' => 'text/plain'}, ["OK"]]))
+    end.and_return(double('response', :to_response => [200, {'Content-Type' => 'text/plain'}, ["OK"]]))
   end
 
-  let (:app) { test_app }
+  let (:app) { test_app.configure{ processor(:thumb){} } }
 
   it "works with old marshalled urls (including with tildes in them)" do
+    app.allow_legacy_urls = true
     url = "/BAhbBlsHOgZmSSIIPD4~BjoGRVQ"
     job_should_match [["f", "<>?"]]
     response = request(app, url)
   end
 
   it "blows up if it detects bad objects" do
+    app.allow_legacy_urls = true
     url = "/BAhvOhpEcmFnb25mbHk6OlRlbXBPYmplY3QIOgpAZGF0YUkiCWJsYWgGOgZFVDoXQG9yaWdpbmFsX2ZpbGVuYW1lMDoKQG1ldGF7AA"
     Dragonfly::Job.should_not_receive(:from_a)
     response = request(app, url)
@@ -40,7 +42,7 @@ describe "urls" do
   end
 
   it "works with potentially tricky url characters for the url" do
-    url = app.fetch('uid []=~/+').url(:basename => 'name []=~/+')
+    url = app.fetch('uid []=~/+').url(:name => 'name []=~/+')
     url.should =~ %r(^/[\w%]+/name%20%5B%5D%3D%7E%2F%2B$)
     job_should_match [["f", "uid []=~/+"]]
     response = request(app, url)

data/spec/spec_helper.rb

@@ -7,49 +7,44 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 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}
 
-SAMPLES_DIR = Pathname.new(File.expand_path(File.dirname(__FILE__) + '/../samples')) unless defined?(SAMPLES_DIR)
+SAMPLES_DIR = Pathname.new(File.expand_path('../../samples', __FILE__))
+
+RSpec.configure do |c|
+  c.include ModelHelpers
+end
 
 def todo
   raise "TODO"
 end
 
 require 'logger'
-LOG_FILE = 'tmp/test.log' unless defined?(LOG_FILE)
+LOG_FILE = 'tmp/test.log'
 FileUtils.rm_rf(LOG_FILE)
-def mock_app(extra_stubs={})
-  mock('app', {
-    :datastore => mock('datastore', :store => 'some_uid', :retrieve => ["SOME_DATA", {}], :destroy => nil),
-    :processor => mock('processor', :process => "SOME_PROCESSED_DATA"),
-    :encoder => mock('encoder', :encode => "SOME_ENCODED_DATA"),
-    :analyser => mock('analyser', :analyse => "some_result", :analysis_methods => Module.new),
-    :generator => mock('generator', :generate => "SOME_GENERATED_DATA"),
-    :log => Logger.new(LOG_FILE),
-    :cache_duration => 10000,
-    :job_definitions => Module.new
-  }.merge(extra_stubs)
-  )
+Dragonfly.logger = Logger.new(LOG_FILE)
+
+RSpec.configure do |c|
+  c.after(:each) do
+    Dragonfly::App.destroy_apps
+  end
 end
 
-def test_app
-  time = Time.now
-  app = Dragonfly::App.send(:new, "test_#{time.sec}_#{time.usec}".to_sym)
-  app.log = Logger.new(LOG_FILE)
-  app.datastore.root_path = 'tmp/file_data_store_test'
+def test_app(name=nil)
+  app = Dragonfly::App.instance(name)
+  app.datastore = Dragonfly::MemoryDataStore.new
   app
 end
 
-def suppressing_stderr
-  original_stderr = $stderr.dup
-  tempfile = Tempfile.new('stderr')
-  $stderr.reopen(tempfile) rescue
-  yield
-ensure
-  tempfile.close!
-  $stderr.reopen(original_stderr)
+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