dragonfly 0.4.2 → 0.4.3

data/Rakefile

@@ -31,7 +31,7 @@ YARD::Rake::YardocTask.new do |t|
   t.options = %w(-e yard/setup.rb)
 end
 YARD::Rake::YardocTask.new 'yard:changed' do |t|
-  t.files   = `git stat | grep '.rb' | grep modified | grep -v yard | cut -d' ' -f4`.split
+  t.files   = `git status | grep '.rb' | grep modified | grep -v yard | cut -d' ' -f4`.split
   t.options = %w(-e yard/setup.rb)
 end
 

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-01-10}
+  s.date = %q{2010-01-24}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
      "lib/dragonfly/active_record_extensions/class_methods.rb",
      "lib/dragonfly/active_record_extensions/instance_methods.rb",
      "lib/dragonfly/active_record_extensions/validations.rb",
+     "lib/dragonfly/analyser_list.rb",
      "lib/dragonfly/analysis/base.rb",
      "lib/dragonfly/analysis/file_command_analyser.rb",
      "lib/dragonfly/analysis/r_magick_analyser.rb",
@@ -65,6 +66,7 @@ Gem::Specification.new do |s|
      "lib/dragonfly/data_storage/transparent_data_store.rb",
      "lib/dragonfly/delegatable.rb",
      "lib/dragonfly/delegator.rb",
+     "lib/dragonfly/encoder_list.rb",
      "lib/dragonfly/encoding/base.rb",
      "lib/dragonfly/encoding/r_magick_encoder.rb",
      "lib/dragonfly/encoding/transparent_encoder.rb",
@@ -73,6 +75,7 @@ Gem::Specification.new do |s|
      "lib/dragonfly/parameters.rb",
      "lib/dragonfly/processing/base.rb",
      "lib/dragonfly/processing/r_magick_processor.rb",
+     "lib/dragonfly/processor_list.rb",
      "lib/dragonfly/r_magick_configuration.rb",
      "lib/dragonfly/rails/images.rb",
      "lib/dragonfly/temp_object.rb",
@@ -89,6 +92,8 @@ 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",
      "spec/dragonfly/configurable_spec.rb",
@@ -128,6 +133,8 @@ 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",
      "spec/dragonfly/configurable_spec.rb",

data/lib/dragonfly/analyser_list.rb

@@ -0,0 +1,15 @@
+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/file_command_analyser.rb

@@ -5,11 +5,19 @@ module Dragonfly
       
       include Configurable
       
-      configurable_attr :file_command do `which file`.chomp end
+      configurable_attr :file_command, "file"
+      configurable_attr :use_filesystem, false
       
       def mime_type(temp_object)
-        output = `#{file_command} -b --mime #{temp_object.path}`
-        output.split(';').first
+        if use_filesystem
+          `#{file_command} -b --mime '#{temp_object.path}'`
+        else
+          IO.popen("#{file_command} -b --mime -", 'r+') do |io|
+            io.write temp_object.data
+            io.close_write
+            io.read
+          end
+        end.split(';').first
       end
       
     end

data/lib/dragonfly/app.rb

@@ -70,7 +70,7 @@ module Dragonfly
     end
     
     def initialize
-      @analysers, @processors, @encoders = Delegator.new, Delegator.new, Delegator.new
+      @analysers, @processors, @encoders = AnalyserList.new, ProcessorList.new, EncoderList.new
       @parameters_class = Class.new(Parameters)
       @url_handler = UrlHandler.new(@parameters_class)
       initialize_temp_object_class

data/lib/dragonfly/delegator.rb

@@ -1,5 +1,5 @@
 module Dragonfly
-  class Delegator
+  module Delegator
     
     # This gets raised if no delegated objects are able to handle
     # the method call, even though they respond to that method.

data/lib/dragonfly/encoder_list.rb

@@ -0,0 +1,5 @@
+module Dragonfly
+  class EncoderList
+    include Delegator
+  end
+end

data/lib/dragonfly/processor_list.rb

@@ -0,0 +1,5 @@
+module Dragonfly
+  class ProcessorList
+    include Delegator
+  end
+end

data/spec/dragonfly/analyser_list_spec.rb

@@ -0,0 +1,40 @@
+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

data/spec/dragonfly/analysis/file_command_analyser_spec.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+png_path = File.dirname(__FILE__) + '/../../../samples/egg.png'
+
+describe Dragonfly::Analysis::FileCommandAnalyser do
+  
+  before(:each) do
+    @analyser = Dragonfly::Analysis::FileCommandAnalyser.new
+  end
+  
+  describe "mime_type" do
+    
+    describe "when using the filesystem" do
+      before(:each) do
+        @analyser.use_filesystem = true
+        @temp_object = Dragonfly::TempObject.new(File.new(png_path))
+      end
+      it "should give the mime-type" do
+        @analyser.mime_type(@temp_object).should == 'image/png'
+      end
+      it "should not have initialized the data string" do
+        @analyser.mime_type(@temp_object)
+        @temp_object.instance_eval{@data}.should be_nil
+      end
+    end
+    
+    describe "when not using the filesystem" do
+      before(:each) do
+        @analyser.use_filesystem = false
+        @temp_object = Dragonfly::TempObject.new(File.read(png_path))
+      end
+      it "should give the mime-type" do
+        @analyser.mime_type(@temp_object).should == 'image/png'
+      end
+      it "should not have initialized the file" do
+        @analyser.mime_type(@temp_object)
+        @temp_object.instance_eval{@tempfile}.should be_nil
+      end
+    end
+  
+  end
+  
+end

data/spec/dragonfly/delegator_spec.rb

@@ -44,7 +44,8 @@ end
 describe Dragonfly::Delegator do
   
   before(:each) do
-    @delegator = Dragonfly::Delegator.new
+    @delegator = Object.new
+    @delegator.extend Dragonfly::Delegator
   end
   
   describe "when no items have been registered" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragonfly
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Mark Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 +00:00
+date: 2010-01-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - lib/dragonfly/active_record_extensions/class_methods.rb
 - lib/dragonfly/active_record_extensions/instance_methods.rb
 - lib/dragonfly/active_record_extensions/validations.rb
+- lib/dragonfly/analyser_list.rb
 - lib/dragonfly/analysis/base.rb
 - lib/dragonfly/analysis/file_command_analyser.rb
 - lib/dragonfly/analysis/r_magick_analyser.rb
@@ -81,6 +82,7 @@ files:
 - lib/dragonfly/data_storage/transparent_data_store.rb
 - lib/dragonfly/delegatable.rb
 - lib/dragonfly/delegator.rb
+- lib/dragonfly/encoder_list.rb
 - lib/dragonfly/encoding/base.rb
 - lib/dragonfly/encoding/r_magick_encoder.rb
 - lib/dragonfly/encoding/transparent_encoder.rb
@@ -89,6 +91,7 @@ files:
 - lib/dragonfly/parameters.rb
 - lib/dragonfly/processing/base.rb
 - lib/dragonfly/processing/r_magick_processor.rb
+- lib/dragonfly/processor_list.rb
 - lib/dragonfly/r_magick_configuration.rb
 - lib/dragonfly/rails/images.rb
 - lib/dragonfly/temp_object.rb
@@ -105,6 +108,8 @@ 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
 - spec/dragonfly/configurable_spec.rb
@@ -166,6 +171,8 @@ 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
 - spec/dragonfly/configurable_spec.rb