illusionist 0.0.1 → 0.0.2

data/bin/illusionist

@@ -8,8 +8,8 @@ options = {
   :Port => '8080'
 }
 
-foo = Illusionist.new
+merlin = Illusionist.new
  
-Rack::Handler::Thin.run(foo, options) do |server|
+Rack::Handler::Thin.run(merlin, options) do |server|
   [:INT, :TERM].each { |sig| trap(sig) { server.stop } }
 end

data/lib/illusionist.rb

@@ -30,27 +30,21 @@ class Illusionist
                 file_name = env["REQUEST_PATH"].split('.').first
                 extension = env["REQUEST_PATH"].split('.').last
 	            illusion = "#{Dir.pwd}/illusions/#{file_name}_r#{width}x#{height}_#{mode}.#{extension}"
-	            
-	            
                 
 	            #create the illusion if nessicary
 	            unless File.exists?(illusion)
 	                #choose a resize function 
-	                resize_function =  case mode
-                        when 'max'      then :resize_to_fit
-                        when 'pad'      then :pad
-                        when 'crop' then :resize_to_fill
-                        when 'stretch'  then :scale
-                        else :resize_to_fill
-                    end
+	                resize_function =  self.resize_function(mode)
                     
                     #call the appropriate function
                     if resize_function == :pad #one of these things is not like the others
                         source = Image.read(full_path).first().resize_to_fit!(width, height)
+                        #select the appropriate background color
+                        background_color = source.opaque? ? 'white': 'Transparent' 
                         target = Image.new(width, height) do
-                          self.background_color = 'white'
+                                self.background_color = background_color
                         end
-                        target.composite(source, CenterGravity, AtopCompositeOp).write(illusion)
+                        target.composite(source, CenterGravity, OverCompositeOp).write(illusion)
                     else
                         Image.read(full_path).first().send(resize_function, width, height).write(illusion)
                     end	                
@@ -69,4 +63,14 @@ class Illusionist
 	    [self.response_code, self.headers, self.body]
   end
   
+  def resize_function(mode)
+      case mode
+          when 'max'      then :resize_to_fit
+          when 'pad'      then :pad
+          when 'crop' then :resize_to_fill
+          when 'stretch'  then :scale
+          else :resize_to_fill
+      end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: illusionist
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack