citrusbyte-milton 0.3.3 → 0.3.4

data/lib/milton/derivatives/thumbnail.rb

@@ -5,11 +5,24 @@ module Milton
   class Thumbnail < Derivative
     def process
       raise "target size must be specified for resizing" unless options.has_key?(:size)
-
-      temp_dst = File.join(settings[:tempfile_path], Milton::Tempfile.from(source.filename))
-      temp_src = File.join(settings[:tempfile_path], Milton::Tempfile.from(source.filename))
       
-      source.copy(temp_src)
+      temp_dst = File.join(settings[:tempfile_path], Milton::Tempfile.from(@source.filename))
+      temp_src = File.join(settings[:tempfile_path], Milton::Tempfile.from(@source.filename))
+      
+      @source.copy(temp_src)
+      image = Image.from_path(temp_src)
+      
+      # TODO: this really only makes sense for processing recipes, reimplement
+      # once it's setup to build all derivatives then push to storage
+      # 
+      # For speed, any derivatives less than 640-wide are made from a 
+      # 640-wide version of the image (so you're not generating tiny
+      # thumbnails from an 8-megapixel upload)
+      # source = if image.width > 640 && Image.from_geometry(options[:size]).width < 640
+      #   Thumbnail.process(@source, { :size => '640x' }, settings).file
+      # else
+      #   @source
+      # end
       
       if options[:crop]
         crop = CropCalculator.new(image, Image.from_geometry(options[:size]))
@@ -22,24 +35,5 @@ module Milton
       # TODO: raise if the store fails
       file.store(temp_dst)
     end
-
-    protected
-  
-    # For speed, any derivatives less than 640-wide are made from a 
-    # 640-wide version of the image (so you're not generating tiny
-    # thumbnails from an 8-megapixel upload)
-    def source
-      @quick_source ||= if image.width > 640 && Image.from_geometry(options[:size]).width < 640
-        Thumbnail.process(@source, { :size => '640x' }, settings).file
-      else
-        @source
-      end
-    end
-    
-    # Returns and memoizes an Image initialized from the file we're making a
-    # thumbnail of
-    def image
-      @image ||= Image.from_path(@source.path)
-    end
   end
 end

data/lib/milton/storage/s3_file.rb

@@ -44,7 +44,7 @@ module Milton
 
         # stream the download as opposed to downloading the whole thing and reading
         # it all into memory at once since it might be gigantic...
-        s3.get(bucket_name, key) { |chunk| file.write(chunk) }
+        s3.get(options[:storage_options][:bucket], key) { |chunk| file.write(chunk) }
         file.close
       end
 

data/test/s3_helper.rb

@@ -0,0 +1,59 @@
+require 'right_aws'
+
+# this fakes S3 and makes it write to the file-system so we can check results
+module RightAws
+  raise "Must define S3_ROOT with fake S3 root before requiring s3_helper" unless defined?(S3_ROOT)
+  
+  class S3
+    def buckets
+      Dir.glob(S3_ROOT + '/*').collect do |bucket|
+        Bucket.new(self, File.basename(bucket), Time.now, Owner.new(1, 'owner'))
+      end
+    end
+    
+    class Key
+      def put(data=nil, perms=nil, headers={})
+        Rails.logger.info "Putting to fake S3 store: #{filename}"
+        FileUtils.mkdir_p(File.join(S3_ROOT, @bucket.name, File.dirname(@name)))
+        FileUtils.cp(data.path, filename)
+      end
+      
+      def delete
+        Rails.logger.info "Deleting from fake S3 store: #{filename}"        
+        FileUtils.rm(filename)
+      end
+      
+      def exists?
+        File.exists?(filename)
+      end
+      
+      private
+      
+      def filename
+        File.join(S3_ROOT, @bucket.name, @name)
+      end
+    end
+    
+    class Bucket
+      def key(key_name, head=false)
+        Key.new(self, key_name, nil, {}, {}, Time.now, Time.now.to_s, 100, '', Owner.new(1, 'owner'))
+      end
+    end
+    
+    class Grantee
+      def apply
+        true
+      end
+    end    
+  end
+
+  class S3Interface < RightAwsBase
+    def get(bucket, key, headers={}, &block)
+      File.open(File.join(S3_ROOT, bucket, key), 'rb').each{ |io| block.call(io) }
+    end
+
+    def create_bucket(bucket, headers={})
+      FileUtils.mkdir_p(File.join(S3_ROOT, bucket))
+    end
+  end
+end

data/test/test_helper.rb

@@ -23,7 +23,7 @@ class ActiveSupport::TestCase
   ActiveSupport::TestCase.fixture_path = File.join(File.dirname(__FILE__), 'fixtures/')
 
   @@output_path = File.expand_path(File.join(File.dirname(__FILE__), 'output'))
-  cattr_reader :output_path  
+  cattr_reader :output_path
   def output_path;ActiveSupport::TestCase.output_path;end;
   
   # remove files created from previous test run, happens before instead of
@@ -60,3 +60,19 @@ class Net::HTTP
     raise "Trying to hit the interwebz!!!"
   end
 end
+
+S3_ROOT = File.join(ActiveSupport::TestCase.output_path, 's3') 
+require File.join(File.dirname(__FILE__), 's3_helper')
+
+class S3File
+  class << self
+    def path(url)
+      url.scan /http:\/\/(.*)\.s3.amazonaws.com\/(.*)\/(.*)/
+      File.join(S3_ROOT, $1, $2, $3)
+    end
+    
+    def exists?(url)
+      File.exist?(path(url))
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: citrusbyte-milton
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Ben Alavi
@@ -45,6 +45,7 @@ files:
 - test/milton/attachment_test.rb
 - test/milton/milton_test.rb
 - test/milton/resizing_test.rb
+- test/s3_helper.rb
 - test/schema.rb
 - test/test_helper.rb
 has_rdoc: false