citrusbyte-milton 0.3.1 → 0.3.2

data/README.markdown

@@ -220,13 +220,13 @@ Installation
 
 ### Gem
 
-    $ gem install citrusbyte-milton --source http://gems.github.com
+    $ gem install citrusbyte-milton --source=http://gems.github.com
 
 ###  Ruby on Rails gem plugin:
 
 Add to your environment.rb:
 
-    config.gem "citrusbyte-milton", :source => "http://gems.github.com", :lib => "milton"
+    config.gem "citrusbyte-milton", :lib => 'milton', :source => 'http://gems.github.com'
 
 Then run:
     
@@ -318,14 +318,10 @@ User's profile snippet (in Haml)
 Contributors
 ------------
 
-<<<<<<< HEAD:README.markdown
-Milton is based on AttachmentPow by Ari Lerner (auser)
-=======
 * Upload and file handling based on AttachmentPow by Ari Lerner (auser)
 * Cropping and thumbnailing calculations based on code by Nicolás Sanguinetti (foca)
 * Damian Janowski (djanowski)
 * Michel Martens (soveran)
->>>>>>> s3:README.markdown
 
 License
 -------

data/lib/milton/derivatives/derivative.rb

@@ -41,7 +41,18 @@ module Milton
       end
       
       def factory(type, source, options={}, settings={})
-        "Milton::#{type.to_s.classify}".constantize.new(source, options, settings)
+        begin
+          klass = "Milton::#{type.to_s.classify}".constantize
+        rescue NameError
+          begin
+            require "milton/derivatives/#{type.to_s}"
+          rescue MissingSourceFile => e
+            raise MissingSourceFile.new("#{e.message} (milton: couldn't find the processor '#{type}' you were trying to load)", e.path)
+          end
+          klass = "Milton::#{type.to_s.classify}".constantize
+        end
+        
+        klass.new(source, options, settings)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: citrusbyte-milton
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ben Alavi