Merge pull request #22 from basicallydan/master

Added #toBase64 and #fromDroppedFile:

shims/init.coffee

@@ -28,3 +28,15 @@ module.exports =
 
         reader.onerror = reject
         reader.readAsArrayBuffer(file)
+
+    @fromDroppedFile = (file) ->
+      new RSVP.Promise (resolve, reject) ->
+        reader = new FileReader()
+        reader.onload = (e) ->
+          psd = new PSD(new Uint8Array(e.target.result))
+          psd.parse()
+
+          resolve(psd)
+
+        reader.onerror = reject
+        reader.readAsArrayBuffer(file)

shims/png.coffee

 RSVP = require 'rsvp'
 
 module.exports = 
-  toPng: ->
-    new RSVP.Promise (resolve, reject) =>
-      # Draw the pixels to the canvas
-      canvas = document.createElement('canvas')
-      canvas.width = @width()
-      canvas.height = @height()
-      context = canvas.getContext('2d')
+  toBase64: ->
+    # Draw the pixels to the canvas
+    canvas = document.createElement('canvas')
+    canvas.width = @width()
+    canvas.height = @height()
+    context = canvas.getContext('2d')
+
+    imageData = context.getImageData(0, 0, @width(), @height())
+    pixelData = imageData.data
 
-      imageData = context.getImageData(0, 0, @width(), @height())
-      pixelData = imageData.data
+    pixelData[i] = pixel for pixel, i in @pixelData
 
-      pixelData[i] = pixel for pixel, i in @pixelData
+    context.putImageData(imageData, 0, 0)
 
-      context.putImageData(imageData, 0, 0)
+    canvas.toDataURL 'image/png'
 
+  toPng: ->
+    new RSVP.Promise (resolve, reject) =>
+      dataUrl = @toBase64()
       # Create the image and set the source to the
       # canvas data URL.
       image = new Image()
       image.width = @width()
       image.height = @height()
-      image.src = canvas.toDataURL 'image/png'
+      image.src = dataUrl
 
       resolve(image)