dragonfly 0.5.1 → 0.5.2

data/.yardopts

@@ -1,4 +1,5 @@
 --main extra_docs/Index.md
+-e yard/setup.rb
 -
 README.md
 extra_docs/GettingStarted.md
@@ -9,5 +10,6 @@ extra_docs/Shortcuts.md
 extra_docs/Analysers.md
 extra_docs/Processing.md
 extra_docs/Encoding.md
+extra_docs/MimeTypes.md
 extra_docs/ExampleUseCases.md
 LICENSE

data/History.txt

@@ -1,3 +1,23 @@
+0.5.2 (2010-03-04)
+==================
+
+Features
+--------
+- Added 'registered mime-types'
+- Enhanced docs
+
+Fixes
+-----
+- RMagickEncoder only encodes if not already in that format
+
+
+0.5.1 (2010-02-20)
+==================
+
+Fixes
+-----
+- Fixed 'broken pipe' errors in FileCommandAnalyser due to outputting loads of stuff to the command line stdin
+
 0.5.0 (2010-02-20)
 ==================
 

data/Rakefile

@@ -39,11 +39,11 @@ begin
   require 'yard'
   YARD::Rake::YardocTask.new do |t|
     t.files   = ['lib/**/*.rb']
-    t.options = %w(-e yard/setup.rb)
+    t.options = []
   end
   YARD::Rake::YardocTask.new 'yard:changed' do |t|
     t.files   = `git status | grep '.rb' | grep modified | grep -v yard | cut -d' ' -f4`.split
-    t.options = %w(-e yard/setup.rb)
+    t.options = []
   end
 rescue LoadError
   puts "YARD is not available. To run the documentation tasks, install it with: (sudo) gem install yard"

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-02-20}
+  s.date = %q{2010-03-04}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "extra_docs/ExampleUseCases.md",
      "extra_docs/GettingStarted.md",
      "extra_docs/Index.md",
+     "extra_docs/MimeTypes.md",
      "extra_docs/Processing.md",
      "extra_docs/Shortcuts.md",
      "extra_docs/UsingWithRails.md",
@@ -109,7 +110,6 @@ Gem::Specification.new do |s|
      "spec/dragonfly/active_record_extensions/model_spec.rb",
      "spec/dragonfly/active_record_extensions/models.rb",
      "spec/dragonfly/active_record_extensions/spec_helper.rb",
-     "spec/dragonfly/analyser_list_spec.rb",
      "spec/dragonfly/analysis/file_command_analyser_spec.rb",
      "spec/dragonfly/analysis/r_magick_analyser_spec.rb",
      "spec/dragonfly/app_spec.rb",
@@ -136,6 +136,7 @@ Gem::Specification.new do |s|
      "yard/handlers/configurable_attr_handler.rb",
      "yard/setup.rb",
      "yard/templates/default/fulldoc/html/css/common.css",
+     "yard/templates/default/layout/html/layout.erb",
      "yard/templates/default/module/html/configuration_summary.erb",
      "yard/templates/default/module/setup.rb"
   ]
@@ -152,7 +153,6 @@ Gem::Specification.new do |s|
      "spec/dragonfly/active_record_extensions/model_spec.rb",
      "spec/dragonfly/active_record_extensions/models.rb",
      "spec/dragonfly/active_record_extensions/spec_helper.rb",
-     "spec/dragonfly/analyser_list_spec.rb",
      "spec/dragonfly/analysis/file_command_analyser_spec.rb",
      "spec/dragonfly/analysis/r_magick_analyser_spec.rb",
      "spec/dragonfly/app_spec.rb",

data/extra_docs/Index.md

@@ -8,18 +8,7 @@ Dragonfly is a {http://rack.rubyforge.org Rack} framework for on-the-fly process
 It includes an extension for Ruby on Rails to enable easy image handling.
 It is intended to be highly customizable, and is not limited to images, but any data type that could suit on-the-fly processing/encoding.
 
-Use the links at the top-right to navigate around the code, or jump straight to one of the guides below.
-
-- {file:README.md Quick start for using in Rails for image handling (README)}
-- {file:GettingStarted.md Getting started}
-- {file:UsingWithRails.md Using with Rails}
-- {file:ActiveRecord.md Using with ActiveRecord}
-- {file:DataStorage.md Data Storage}
-- {file:Analysers.md Analysers}
-- {file:Processing.md Processing}
-- {file:Encoding.md Encoding}
-- {file:Shortcuts.md Shortcuts for processing and encoding}
-- {file:ExampleUseCases.md Example use cases}
+Use the dropdowns at the top-right to navigate around the code, or jump straight to one of the guides on the right.
 
 Installation
 ------------

data/extra_docs/MimeTypes.md

@@ -0,0 +1,39 @@
+Mime Types
+==========
+
+Responses from the Dragonfly app have the HTTP 'Content-Type' header set.
+
+Suppose we request the url '/media/some_uid.jpg'.
+The mime-type is looked for in the following order (and the first found is used):
+
+1. The app's registered mime-types
+2. Analyse the content using the analyser's 'mime_type' method (if exists)
+3. Use the fallback mime-type (default 'application/octet-stream')
+
+Registered mime-types
+---------------------
+Registered mime-types default to the list given by Rack (see {http://rack.rubyforge.org/doc/Rack/Mime.html#MIME_TYPES Rack mime-types}).
+
+To register a mime-type for the format 'egg', you can do the following:
+
+    Dragonfly::App[:my_app].register_mime_type(:egg, 'fried/egg')
+
+You can also do this inside a configuration block.
+
+Mime-type analysis
+------------------
+The {Dragonfly::Analysis::FileCommandAnalyser FileCommandAnalyser} has a `mime_type` method which will return the
+mime-type of any given content.
+
+If this, or any other analyser that has the `mime_type` method, is registered, then this is used when no mime-type
+is found in the registered list.
+
+The FileCommandAnalyser is registered by default when you use the preconfigured 'dragonfly/rails/images' file.
+
+Fallback mime-type
+------------------
+By default this is 'application/octet-stream', but it can be changed using the configuration method on the app
+
+    Dragonfly::App[:my_app].fallback_mime_type = 'meaty/beef'
+
+This can also be done inside a configuration block.

data/lib/dragonfly/analyser_list.rb

@@ -1,15 +1,5 @@
 module Dragonfly
   class AnalyserList
     include Delegator
-    
-    def mime_type(temp_object)
-      registered_objects.reverse.each do |analyser|
-        catch :unable_to_handle do
-          return analyser.mime_type(temp_object) if analyser.respond_to?(:mime_type)
-        end
-      end
-      nil
-    end
-    
   end
 end

data/lib/dragonfly/analysis/base.rb

@@ -4,10 +4,6 @@ module Dragonfly
 
       include Delegatable
 
-      def mime_type(*args)
-        throw :unable_to_handle
-      end
-
     end
   end
 end

data/lib/dragonfly/app.rb

@@ -118,7 +118,7 @@ module Dragonfly
       parameters = url_handler.url_to_parameters(env['PATH_INFO'], env['QUERY_STRING'])
       temp_object = fetch(parameters.uid, parameters)
       [200, {
-        "Content-Type" => temp_object.mime_type || fallback_mime_type,
+        "Content-Type" => mime_type_for(parameters.format, temp_object),
         "Content-Length" => temp_object.size.to_s,
         "ETag" => parameters.unique_signature,
         "Cache-Control" => "public, max-age=#{cache_duration}"
@@ -158,6 +158,18 @@ module Dragonfly
       create_object(processors.generate(*args))
     end
 
+    # Return the mime type for a given extension, from the registered list
+    # By default uses the list provided by Rack (see Rack::Mime::MIME_TYPES)
+    # If not found there, it falls back to the registered analysers (if temp_object provided).
+    # If not found there, it falls back to the configured 'fallback_mime_type'
+    # @param [Symbol, String] format the format (file-extension)
+    # @param [TempObject] temp_object (optional)
+    # @return [String] the mime-type
+    # @see register_mime_type
+    def mime_type_for(format, temp_object=nil)
+      registered_mime_types[file_ext_string(format)] || (temp_object.mime_type if temp_object.respond_to?(:mime_type)) || fallback_mime_type
+    end
+
     # Store an object, using the configured datastore
     # @param [String, File, Tempfile, TempObject] object the object holding the data
     # @return [String] the uid assigned to it
@@ -180,6 +192,15 @@ module Dragonfly
     end
     configuration_method :register_encoder
 
+    def register_mime_type(format, mime_type)
+      registered_mime_types[file_ext_string(format)] = mime_type
+    end
+    configuration_method :register_mime_type
+
+    def registered_mime_types
+      @registered_mime_types ||= Rack::Mime::MIME_TYPES.dup
+    end
+
     private
     
     def initialize_temp_object_class
@@ -190,6 +211,10 @@ module Dragonfly
     def warn_with_info(message, env)
       log.warn "Got error: #{message}\nPath was #{env['PATH_INFO'].inspect} and query was #{env['QUERY_STRING'].inspect}"
     end
+    
+    def file_ext_string(format)
+      '.' + format.to_s.downcase.sub(/^.*\./,'')
+    end
 
   end
 end

data/lib/dragonfly/encoding/r_magick_encoder.rb

@@ -8,10 +8,15 @@ module Dragonfly
       SUPPORTED_FORMATS = Magick.formats.select{|k,v| v =~ /.*rw./ }.map{|f| f.first.downcase }
       
       def encode(image, format, encoding={})
-        throw :unable_to_handle unless SUPPORTED_FORMATS.include?(format.to_s)
+        format = format.to_s.downcase
+        throw :unable_to_handle unless SUPPORTED_FORMATS.include?(format)
         encoded_image = Magick::Image.from_blob(image.data).first
-        encoded_image.format = format.to_s
-        encoded_image.to_blob
+        if encoded_image.format.downcase == format
+          image # do nothing
+        else
+          encoded_image.format = format
+          encoded_image.to_blob
+        end
       end
       
     end

data/spec/dragonfly/active_record_extensions/model_spec.rb

@@ -304,27 +304,27 @@ describe Item do
       it "should be invalid if the property is nil" do
         @item.preview_image = "OTHER TYPE"
         @item.should_not be_valid
-        @item.errors.on(:preview_image).should == "mime type is incorrect. It needs to be one of 'how/special', 'how/crazy', but was ''"
+        @item.errors[:preview_image].should match_ar_error("mime type is incorrect. It needs to be one of 'how/special', 'how/crazy', but was ''")
       end
 
       it "should be invalid if the property is wrong" do
         @item.preview_image = "WRONG TYPE"
         @item.should_not be_valid
-        @item.errors.on(:preview_image).should == "mime type is incorrect. It needs to be one of 'how/special', 'how/crazy', but was 'wrong/type'"
+        @item.errors[:preview_image].should match_ar_error("mime type is incorrect. It needs to be one of 'how/special', 'how/crazy', but was 'wrong/type'")
       end
       
       it "should work for a range" do
         @item.preview_image = "GOOGLE GUM"
         @item.should_not be_valid
-        @item.errors.on(:preview_image).should == "number of gs is incorrect. It needs to be between 0 and 2, but was '3'"
+        @item.errors[:preview_image].should match_ar_error("number of gs is incorrect. It needs to be between 0 and 2, but was '3'")
       end
 
       it "should validate individually" do
         @item.other_image = "1234567"
         @item.yet_another_image = "WRONG TYPE"
         @item.should_not be_valid
-        @item.errors.on(:other_image).should be_nil
-        @item.errors.on(:yet_another_image).should == "mime type is incorrect. It needs to be 'how/special', but was 'wrong/type'"
+        @item.errors[:other_image].should match_ar_error(nil)
+        @item.errors[:yet_another_image].should match_ar_error("mime type is incorrect. It needs to be 'how/special', but was 'wrong/type'")
       end
 
       it "should include standard extra options like 'if' on mime type validation" do

data/spec/dragonfly/app_spec.rb

@@ -67,22 +67,72 @@ describe Dragonfly::App do
   end
 
   describe "mime types" do
-    before(:each) do
-      @app = Dragonfly::App[:images]
-      @app.url_handler.protect_from_dos_attacks = false
-      @app.fallback_mime_type = 'egg/heads'
-      @temp_object = Dragonfly::TempObject.new('GOOG')
-      @app.stub!(:fetch).and_return(@temp_object)
+    describe "#mime_type_for" do
+      before(:each) do
+        Dragonfly::App.send(:apps)[:images] = nil # A Hack to get rspec to reset stuff in between tests
+        @app = Dragonfly::App[:images]
+      end
+      it "should return the correct mime type for a symbol" do
+        @app.mime_type_for(:png).should == 'image/png'
+      end
+      it "should work for strings" do
+        @app.mime_type_for('png').should == 'image/png'
+      end
+      it "should work with uppercase strings" do
+        @app.mime_type_for('PNG').should == 'image/png'
+      end
+      it "should work with a dot" do
+        @app.mime_type_for('.png').should == 'image/png'
+      end
+      it "should return the fallback mime_type if not known" do
+        @app.mime_type_for(:mark).should == 'application/octet-stream'
+      end
+      it "should return the fallback mime_type if not known" do
+        @app.configure{|c| c.fallback_mime_type = 'egg/nog'}
+        @app.mime_type_for(:mark).should == 'egg/nog'
+      end
+      it "should allow for configuring extra mime types" do
+        @app.configure{|c| c.register_mime_type 'mark', 'application/mark'}
+        @app.mime_type_for(:mark).should == 'application/mark'
+      end
+      it "should override existing mime types when registered" do
+        @app.configure{|c| c.register_mime_type :png, 'ping/pong'}
+        @app.mime_type_for(:png).should == 'ping/pong'
+      end
+      it "should have a per-app mime-type configuration" do
+        other_app = Dragonfly::App[:other_app]
+        @app.register_mime_type(:mark, 'first/one')
+        other_app.register_mime_type(:mark, 'second/one')
+        @app.mime_type_for(:mark).should == 'first/one'
+        other_app.mime_type_for(:mark).should == 'second/one'
+      end
     end
-    it "should use the temp object mime-type" do
-      @temp_object.should_receive(:mime_type).and_return 'my/type'
-      response = make_request(@app, '/hello.png')
-      response.headers['Content-Type'].should == 'my/type'
-    end
-    it "should use the app's fallback mime-type if the temp_object one isn't known" do
-      @temp_object.should_receive(:mime_type).and_return nil
-      response = make_request(@app, '/hello.png')
-      response.headers['Content-Type'].should == 'egg/heads'
+    
+    describe "Content-Type header" do
+      before(:each) do
+        Dragonfly::App.send(:apps)[:test] = nil # A Hack to get rspec to reset stuff in between tests
+        @app = Dragonfly::App[:test]
+        @app.url_handler.protect_from_dos_attacks = false
+        @app.datastore = Dragonfly::DataStorage::TransparentDataStore.new
+        @app.register_encoder(Dragonfly::Encoding::TransparentEncoder)
+        @analyser = Class.new(Dragonfly::Analysis::Base){ def mime_type(*args); 'analyser/mime-type'; end }
+      end
+      it "should return the fallback mime_type if none registered and no mime_type analyser" do
+        make_request(@app, '/some_uid.gog').headers['Content-Type'].should == 'application/octet-stream'
+      end
+      it "should return the analysed mime-type if an analyser is registered" do
+        @app.register_analyser(@analyser)
+        make_request(@app, '/some_uid.gog').headers['Content-Type'].should == 'analyser/mime-type'
+      end
+      it "should return the registered mime_type over the analysed one" do
+        @app.register_analyser(@analyser)
+        @app.register_mime_type(:gog, 'numb/nut')
+        make_request(@app, '/some_uid.gog').headers['Content-Type'].should == 'numb/nut'
+      end
+      it "should use the fallback mime-type if the registered analyser doesn't respond to 'mime-type'" do
+        @app.register_analyser(Class.new(Dragonfly::Analysis::Base))
+        make_request(@app, '/some_uid.gog').headers['Content-Type'].should == 'application/octet-stream'
+      end
     end
   end
 

data/spec/dragonfly/encoding/r_magick_encoder_spec.rb

@@ -23,6 +23,11 @@ describe Dragonfly::Encoding::RMagickEncoder do
       end
       test_string.should == "I'm a string"
     end
+    
+    it "should do nothing if the image is already in the correct format" do
+      image = @encoder.encode(@image, :png)
+      image.should == @image
+    end
   end
   
 end

data/spec/dragonfly/extended_temp_object_spec.rb

@@ -16,13 +16,16 @@ describe Dragonfly::ExtendedTempObject do
       @analyser.stub!(:has_callable_method?).with(:width).and_return(true)
       @processor = mock('processor')
       @encoder = mock('encoder')
-      @app = mock('app', :analysers => @analyser, :processor => @processor, :encoder => @encoder)
+      @app = mock('app', :analysers => @analyser, :processors => @processor, :encoders => @encoder)
       @klass = Class.new(Dragonfly::ExtendedTempObject)
       @klass.app = @app
-      @object = @klass.new('asdf')
     end
     
     describe "analysis" do
+
+      before(:each) do
+        @object = @klass.new('asdf')
+      end
       
       it "should respond to something that the analyser responds to" do
         @analyser.should_receive(:has_callable_method?).with(:some_method).and_return(true)
@@ -62,6 +65,23 @@ describe Dragonfly::ExtendedTempObject do
       
     end
     
+    describe "encoding" do
+      before(:each) do
+        @temp_object = @klass.new('abcde')
+      end
+      
+      it "should encode the data and return the new temp object" do
+        @encoder.should_receive(:encode).with(@temp_object, :some_format, :some => 'option').and_return('ABCDE')
+        new_temp_object = @temp_object.encode(:some_format, :some => 'option')
+        new_temp_object.data.should == 'ABCDE'
+      end
+      it "should encode its own data" do
+        @encoder.should_receive(:encode).with(@temp_object, :some_format, :some => 'option').and_return('ABCDE')
+        @temp_object.encode!(:some_format, :some => 'option')
+        @temp_object.data.should == 'ABCDE'
+      end
+    end
+    
   end
   
 end

data/spec/simple_matchers.rb

@@ -11,4 +11,12 @@ def be_an_empty_directory
   simple_matcher("be empty") do |given|
     Dir.entries(given) == ['.','..']
   end
-end
+end
+
+# The reason we need this is that ActiveRecord 2.x returns just a string/nil, whereas AR 3 always returns an array
+def match_ar_error(string)
+  simple_matcher("match activerecord error") do |given|
+    error = given.is_a?(Array) ? given.first : given
+    error == string
+  end
+end

data/yard/templates/default/fulldoc/html/css/common.css

@@ -1,5 +1,28 @@
 /* Overrides for yard documentation */
 
+/* Clearfix */
+.clearfix:after {
+	content: ".";
+	display: block;
+	clear: both;
+	visibility: hidden;
+	line-height: 0;
+	height: 0;
+}
+ 
+.clearfix {
+	display: inline-block;
+}
+ 
+html[xmlns] .clearfix {
+	display: block;
+}
+ 
+* html .clearfix {
+	height: 1%;
+}
+ /************/
+
 pre, code, .code,
 #filecontents pre.code,
 .docstring pre.code,
@@ -9,11 +32,15 @@ pre, code, .code,
 
 pre.code, code {
   background:#F5F5FF;
-  border:1px solid #EEEEFF;
+  overflow-x: auto;
 }
-pre.code {
-  margin-top:4px;
+#filecontents pre.code {
+  margin:10px 0;
   padding:5px 12px;
+  border-radius:5px;
+  -webkit-border-radius:5px;
+  -moz-border-radius:5px;
+  border: 1px dotted #CCC;
 }
 
 code .val {
@@ -25,3 +52,50 @@ code .kw {
 code .symbol {
   color:#C5060B;
 }
+
+ul.main_files {
+  list-style-type:none;
+  margin:0;
+  padding:0;
+  font-size:14px;
+}
+ul.main_files li {
+  margin:0;
+  padding:0;
+}
+ul.main_files li a {
+  margin: 5px;
+  padding:10px;
+  display:block;
+}
+
+/* Layout */
+#header,
+#content,
+#footer {
+  margin:0 auto;
+  width:1000px;
+}
+#header #logo {
+  float:left;
+  width:50%;
+  font-size: 24px;
+  letter-spacing: -1px;
+  margin-top: 20px;
+  text-transform: uppercase;
+}
+#header #search {
+  position:static;
+  float:right;
+}
+#content .col1 {
+  float:left;
+  width: 750px;
+}
+#content .col2 {
+  float:left;
+  margin: 20px 0 0 20px;
+  padding: 0 0 0 20px;
+  width: 200px;
+  border-left: 1px dotted #D5D5D5;
+}

data/yard/templates/default/layout/html/layout.erb

@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <%= erb(:headers) %>
+  </head>
+  <body>
+    <script type="text/javascript" charset="utf-8">
+      if (window.top.frames.main) document.body.className = 'frames';
+    </script>
+    
+    <div id="header" class="clearfix">
+      <%#= erb(:breadcrumb) %>
+      <div id="logo">Dragonfly Documentation</div>
+      <%= erb(:search) %>
+    </div>
+    
+    <div>
+      <iframe id="search_frame"></iframe>
+    </div>
+    
+    <div id="content" class="clearfix">
+      <div class="col1">
+        <%= yieldall %>
+      </div>
+      <div class="col2">
+        <ul class="main_files clearfix">
+          <%= [
+            ['README', 'Quick start for Rails (README)'],
+            ['GettingStarted', 'Getting started'],
+            ['UsingWithRails', 'Using with Rails'],
+            ['ActiveRecord', 'Using with ActiveRecord'],
+            ['DataStorage', 'Data Storage'],
+            ['Analysers', 'Analysers'],
+            ['Processing', 'Processing'],
+            ['Encoding', 'Encoding'],
+            ['Shortcuts', 'Shortcuts for processing and encoding'],
+            ['MimeTypes', 'Mime Types'],
+            ['ExampleUseCases', 'Example use cases']
+          ].map{|(file, text)|
+            "<li>#{link_file(file, text)}</li>"
+          }.join
+          %>
+        </ul>
+      </div>
+    </div>
+    
+    <%= erb(:footer) %>
+  </body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragonfly
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Mark Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 +00:00
+date: 2010-03-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,6 +150,7 @@ files:
 - extra_docs/ExampleUseCases.md
 - extra_docs/GettingStarted.md
 - extra_docs/Index.md
+- extra_docs/MimeTypes.md
 - extra_docs/Processing.md
 - extra_docs/Shortcuts.md
 - extra_docs/UsingWithRails.md
@@ -225,7 +226,6 @@ files:
 - spec/dragonfly/active_record_extensions/model_spec.rb
 - spec/dragonfly/active_record_extensions/models.rb
 - spec/dragonfly/active_record_extensions/spec_helper.rb
-- spec/dragonfly/analyser_list_spec.rb
 - spec/dragonfly/analysis/file_command_analyser_spec.rb
 - spec/dragonfly/analysis/r_magick_analyser_spec.rb
 - spec/dragonfly/app_spec.rb
@@ -252,6 +252,7 @@ files:
 - yard/handlers/configurable_attr_handler.rb
 - yard/setup.rb
 - yard/templates/default/fulldoc/html/css/common.css
+- yard/templates/default/layout/html/layout.erb
 - yard/templates/default/module/html/configuration_summary.erb
 - yard/templates/default/module/setup.rb
 has_rdoc: true
@@ -290,7 +291,6 @@ test_files:
 - spec/dragonfly/active_record_extensions/model_spec.rb
 - spec/dragonfly/active_record_extensions/models.rb
 - spec/dragonfly/active_record_extensions/spec_helper.rb
-- spec/dragonfly/analyser_list_spec.rb
 - spec/dragonfly/analysis/file_command_analyser_spec.rb
 - spec/dragonfly/analysis/r_magick_analyser_spec.rb
 - spec/dragonfly/app_spec.rb

data/spec/dragonfly/analyser_list_spec.rb

@@ -1,40 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Dragonfly::AnalyserList do
-
-  class EggHeads
-    include Dragonfly::Delegatable
-    def mime_type(temp_object)
-      "text/eggnog"
-    end
-  end
-  
-  class Dingbats
-    include Dragonfly::Delegatable
-    def mime_type(temp_object)
-      throw :unable_to_handle
-    end
-  end
-  
-  before(:each) do
-    @analysers = Dragonfly::AnalyserList.new
-  end
-  
-  describe "mime_type" do
-    before(:each) do
-      @temp_object = Dragonfly::TempObject.new 'asdfa'
-    end
-    it "should return the mime type as per usual if the registered analysers implement it" do
-      @analysers.register(EggHeads)
-      @analysers.mime_type(@temp_object).should == 'text/eggnog'
-    end
-    it "should return the mime_type as nil if the registered analysers don't implement it" do
-      @analysers.mime_type(@temp_object).should be_nil
-    end
-    it "should return the mime_type as nil if the registered analysers throw :unable_to_handle" do
-      @analysers.register(Dingbats)
-      @analysers.mime_type(@temp_object).should be_nil
-    end
-  end
-  
-end