inline_image.rb in compass-0.10.3.pre.1

- old
+ new

@@ -1,6 +1,5 @@
-require 'base64'
 module Compass::SassExtensions::Functions::InlineImage
 
   def inline_image(path, mime_type = nil)
     path = path.value
     real_path = File.join(Compass.configuration.images_path, path)
@@ -8,23 +7,22 @@
     Sass::Script::String.new(url)
   end
 
   def inline_font_files(*args)
     raise Sass::SyntaxError, "An even number of arguments must be passed to font_files()" unless args.size % 2 == 0
-    path = path.value
     files = []
     while args.size > 0
       path = args.shift.value
       real_path = File.join(Compass.configuration.fonts_path, path)
-      url = "url('data:#{compute_mime_type(path,mime_type)};base64,#{data(real_path)}')"
+      url = "url('data:#{compute_mime_type(path)};base64,#{data(real_path)}')"
       files << "#{url} format('#{args.shift}')"
     end
     Sass::Script::String.new(files.join(", "))
   end
 
 private
-  def compute_mime_type(path, mime_type)
+  def compute_mime_type(path, mime_type = nil)
     return mime_type if mime_type
     case path
     when /\.png$/i
       'image/png'
     when /\.jpe?g$/i
@@ -46,10 +44,10 @@
     end
   end
 
   def data(real_path)
     if File.readable?(real_path)
-      Base64.encode64(File.read(real_path)).gsub("\n","")
+      [File.read(real_path)].pack('m').gsub("\n","")
     else
       raise Compass::Error, "File not found or cannot be read: #{real_path}"
     end
   end
 end