thumbkit 0.0.4 → 0.0.5

data/lib/thumbkit/adapters/carrierwave.rb

@@ -3,7 +3,7 @@
 #   class MyUploader < CarrierWave::Uploader::Base
 #     include Thumbkit::Adapters::CarrierWave
 #
-#     version :thumbnail do
+#     version :thumbnail, :if => :valid_for_thumbkit? do
 #       # See [Configuration](#configuration) below for more about options.
 #       process thumbkit: [200, 200, { colors: { foreground: '#cccccc' } }]
 #
@@ -28,9 +28,19 @@ module Thumbkit::Adapters::CarrierWave
     @file = CarrierWave::SanitizedFile.new(result)
   end
 
+  def valid_for_thumbkit?(file)
+    p "valid_for_thumbkit?", file, current_path
+    !! Thumbkit.new(file.path)
+  rescue ArgumentError
+    false
+  end
+
   # Given a filename, return the filename that Thumbkit would generate.
   # This should not do any processing.
   def thumbkit_filename(for_file)
     File.basename(Thumbkit.new(for_file).processor_instance.outfile)
+  rescue ArgumentError
+    # TODO: Handle this case better
+    nil
   end
 end

data/lib/thumbkit/processor.rb

@@ -1,24 +1,26 @@
 class Thumbkit::Processor
-  autoload :Text, 'thumbkit/processor/text'
-  autoload :Audio, 'thumbkit/processor/audio'
-  autoload :Image, 'thumbkit/processor/image'
+  autoload :Text,       'thumbkit/processor/text'
+  autoload :Audio,      'thumbkit/processor/audio'
+  autoload :Image,      'thumbkit/processor/image'
   autoload :Collection, 'thumbkit/processor/collection'
 
   def self.processors
     @processors ||= {
-      'png' => 'Image',
-      'jpg' => 'Image',
-      'gif' => 'Image',
-      'txt' => 'Text',
-      'md'  => 'Text',
-      'mp3' => 'Audio',
-      'wav' => 'Audio',
-      'm4a' => 'Audio',
+      'png'   => 'Image',
+      'jpg'   => 'Image',
+      'jpeg'  => 'Image',
+      'gif'   => 'Image',
+      'txt'   => 'Text',
+      'md'    => 'Text',
+      'rb'    => 'Text',
+      'mp3'   => 'Audio',
+      'wav'   => 'Audio',
+      'm4a'   => 'Audio',
     }
   end
 
   def self.processor_for(extension)
-    if (class_name = self.processors[extension])
+    if (class_name = self.processors[extension.downcase])
       self.const_get(class_name)
     end
   end

data/lib/thumbkit/version.rb

@@ -1,3 +1,3 @@
 class Thumbkit
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/thumbkit.rb

@@ -39,6 +39,10 @@ class Thumbkit
       @path = File.expand_path(path)
       @filename = File.basename(@path)
       @type = File.extname(@filename)[1..-1]
+
+      if ! self.processor
+        raise ArgumentError, "Do processor defined for '#{ @type }'"
+      end
     end
   end
 

data/spec/thumbkit_spec.rb

@@ -25,6 +25,13 @@ describe Thumbkit do
 
     its(:processor) { should == Thumbkit::Processor::Collection }
   end
+
+  context 'with an unknown extension' do
+    subject { Thumbkit.new 'this_extension.no_exist_i_promise' }
+    it 'raises an ArgumentError' do
+      expect { subject }.to raise_error(ArgumentError)
+    end
+  end
 end
 
 describe Thumbkit, '.defaults' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thumbkit
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies: []
 description: Thumbkit makes thumbnails!
 email:
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Thumbkit makes thumbnails from a variety of media types.