dragonfly 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2009-12-16}
+  s.date = %q{2009-12-17}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -61,6 +61,7 @@ Gem::Specification.new do |s|
      "lib/dragonfly/data_storage/base.rb",
      "lib/dragonfly/data_storage/base64_data_store.rb",
      "lib/dragonfly/data_storage/file_data_store.rb",
+     "lib/dragonfly/data_storage/s3data_store.rb",
      "lib/dragonfly/data_storage/transparent_data_store.rb",
      "lib/dragonfly/delegatable.rb",
      "lib/dragonfly/delegator.rb",
@@ -94,6 +95,7 @@ Gem::Specification.new do |s|
      "spec/dragonfly/configurable_spec.rb",
      "spec/dragonfly/data_storage/data_store_spec.rb",
      "spec/dragonfly/data_storage/file_data_store_spec.rb",
+     "spec/dragonfly/data_storage/s3_data_store_spec.rb",
      "spec/dragonfly/delegatable_spec.rb",
      "spec/dragonfly/delegator_spec.rb",
      "spec/dragonfly/encoding/r_magick_encoder_spec.rb",
@@ -133,6 +135,7 @@ Gem::Specification.new do |s|
      "spec/dragonfly/configurable_spec.rb",
      "spec/dragonfly/data_storage/data_store_spec.rb",
      "spec/dragonfly/data_storage/file_data_store_spec.rb",
+     "spec/dragonfly/data_storage/s3_data_store_spec.rb",
      "spec/dragonfly/delegatable_spec.rb",
      "spec/dragonfly/delegator_spec.rb",
      "spec/dragonfly/encoding/r_magick_encoder_spec.rb",

data/lib/dragonfly/data_storage/file_data_store.rb

@@ -11,12 +11,7 @@ module Dragonfly
 
       def store(temp_object)
 
-        suffix = if temp_object.name.blank?
-          'file'
-        else
-          temp_object.name.sub(/\.[^.]*?$/, '')
-        end
-        relative_path = relative_storage_path(suffix)
+        relative_path = relative_storage_path(temp_object.basename || 'file')
 
         begin
           while File.exist?(storage_path = absolute_storage_path(relative_path))

data/lib/dragonfly/data_storage/s3data_store.rb

@@ -0,0 +1,64 @@
+require 'aws/s3'
+
+module Dragonfly
+  module DataStorage
+
+    class S3DataStore < Base
+  
+      include Configurable
+  
+      configurable_attr :bucket_name
+      configurable_attr :access_key_id
+      configurable_attr :secret_access_key
+
+      def connect!
+        AWS::S3::Base.establish_connection!(
+          :access_key_id => access_key_id,
+          :secret_access_key => secret_access_key
+        )
+      end
+
+      def create_bucket!
+        AWS::S3::Bucket.create(bucket_name)
+      end
+
+      def store(temp_object)
+        uid = generate_uid(temp_object.basename || 'file')
+        ensure_initialized
+        AWS::S3::S3Object.store(uid, temp_object.file, bucket_name)
+        uid
+      end
+
+      def retrieve(uid)
+        ensure_initialized
+        AWS::S3::S3Object.value(uid, bucket_name)
+      rescue AWS::S3::NoSuchKey => e
+        raise DataNotFound, "#{e} - #{uid}"
+      end
+  
+      def destroy(uid)
+        ensure_initialized
+        AWS::S3::S3Object.delete(uid, bucket_name)
+      rescue AWS::S3::NoSuchKey => e
+        raise DataNotFound, "#{e} - #{uid}"
+      end
+
+      private
+
+      def ensure_initialized
+        unless @initialized
+          connect!
+          create_bucket!
+          @initialized = true
+        end
+      end
+
+      def generate_uid(suffix)
+        time = Time.now
+        "#{time.strftime '%Y/%m/%d/%H/%M/%S'}/#{rand(1000)}/#{suffix}"
+      end
+
+    end
+    
+  end
+end

data/lib/dragonfly/temp_object.rb

@@ -17,8 +17,6 @@ module Dragonfly
       initialize_from_object!(obj)
     end
     
-    attr_accessor :name
-    
     def modify_self!(obj)
       unless obj == self
         reset!
@@ -35,11 +33,12 @@ module Dragonfly
       if @tempfile
         @tempfile
       elsif initialized_tempfile
+        initialized_tempfile.open
         @tempfile = initialized_tempfile
       elsif initialized_data
         tempfile = Tempfile.new('dragonfly')
         tempfile.write(initialized_data)
-        tempfile.close
+        tempfile.open
         @tempfile = tempfile
       elsif initialized_file
         @tempfile = copy_to_tempfile(initialized_file)
@@ -60,6 +59,17 @@ module Dragonfly
       end
     end
     
+    attr_writer :name
+    
+    def name
+      @name unless @name.blank?
+    end
+    
+    def basename
+      return unless name
+      name.sub(/\.[^.]+$/,'')
+    end
+    
     def ext
       return unless name
       bits = name.split('.')
@@ -123,7 +133,6 @@ module Dragonfly
     
     def copy_to_tempfile(file)
       tempfile = Tempfile.new('dragonfly')
-      tempfile.close
       FileUtils.cp File.expand_path(file.path), tempfile.path
       tempfile
     end

data/spec/dragonfly/data_storage/data_store_spec.rb

@@ -10,7 +10,8 @@ describe "data_store", :shared => true do
 
   describe "store" do
     it "should return a unique identifier for each storage" do
-      @data_store.store(@temp_object).should_not == @data_store.store(@temp_object)
+      temp_object2 = Dragonfly::TempObject.new('gollum')
+      @data_store.store(@temp_object).should_not == @data_store.store(temp_object2)
     end
   end
   
@@ -37,11 +38,6 @@ describe "data_store", :shared => true do
       }.should raise_error(Dragonfly::DataStorage::DataNotFound)
     end
     
-    it "should raise an error if the data doesn't exist" do
-      lambda{
-        @data_store.destroy('gooble/gubbub')
-      }.should raise_error(Dragonfly::DataStorage::DataNotFound)
-    end
   end
 
 end

data/spec/dragonfly/data_storage/file_data_store_spec.rb

@@ -110,7 +110,13 @@ describe Dragonfly::DataStorage::FileDataStore do
   end
   
   describe "destroying" do
-  
+
+    it "should raise an error if the data doesn't exist" do
+      lambda{
+        @data_store.destroy('gooble/gubbub')
+      }.should raise_error(Dragonfly::DataStorage::DataNotFound)
+    end
+
     it "should prune empty directories when destroying" do
       uid = @data_store.store(@temp_object)
       @data_store.destroy(uid)

data/spec/dragonfly/data_storage/s3_data_store_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/data_store_spec'
+
+describe Dragonfly::DataStorage::S3DataStore do
+
+  # Uncomment this to test it with an actual internet connection
+  # describe "common data_store behaviour" do
+  #   
+  #   before(:each) do
+  #     @data_store = Dragonfly::DataStorage::S3DataStore.new
+  #     @data_store.configure do |d|
+  #       d.bucket_name = 'dragonfly_test'
+  #       d.access_key_id = 'xxxxxxxxxx'
+  #       d.secret_access_key = 'xxxxxxxxxx'
+  #     end
+  #   end
+  #   
+  #   it_should_behave_like 'data_store'
+  #   
+  # end
+
+  describe "specific s3_data_store behaviour" do
+    before(:each) do
+      @data_store = Dragonfly::DataStorage::S3DataStore.new
+      @data_store.configure do |d|
+        d.bucket_name = 'dragonfly_test'
+        d.access_key_id = 'my_key_id'
+        d.secret_access_key = 'my_secret_access_key'
+      end
+      @temp_object = Dragonfly::TempObject.new('gollum')
+      AWS::S3::Base.stub!(:establish_connection!).with(
+        :access_key_id => @data_store.access_key_id,
+        :secret_access_key => @data_store.secret_access_key
+      )
+      AWS::S3::Bucket.stub!(:create).with(@data_store.bucket_name)
+      AWS::S3::S3Object.stub!(:store).with(anything, anything, @data_store.bucket_name)
+      AWS::S3::S3Object.stub!(:value).with(anything, @data_store.bucket_name)
+      AWS::S3::S3Object.stub!(:delete).with(anything, @data_store.bucket_name)
+    end
+    
+
+    describe "store" do
+      it "should return a unique identifier for each storage" do
+        temp_object2 = Dragonfly::TempObject.new('gollum')
+        @data_store.store(@temp_object).should_not == @data_store.store(temp_object2)
+      end
+    end
+  end
+
+end

data/spec/dragonfly/temp_object_spec.rb

@@ -7,7 +7,7 @@ describe Dragonfly::TempObject do
   def new_tempfile(data = File.read(SAMPLES_DIR + '/round.gif'))
     tempfile = Tempfile.new('test')
     tempfile.write(data)
-    tempfile.close
+    tempfile.rewind
     tempfile
   end
   
@@ -73,12 +73,12 @@ describe Dragonfly::TempObject do
       end
     end
     describe "file" do
-      it "should lazily create a closed tempfile" do
+      it "should lazily create an unclosed tempfile" do
         @temp_object.file.should be_a(Tempfile)
-        @temp_object.file.should be_closed
+        @temp_object.file.should_not be_closed
       end
       it "should contain the correct data" do
-        @temp_object.file.open.read.should == @gif_string
+        @temp_object.file.read.should == @gif_string
       end
     end
     describe "each" do
@@ -102,9 +102,9 @@ describe Dragonfly::TempObject do
       end
     end
     describe "file" do
-      it "should return the closed tempfile" do
+      it "should return the unclosed tempfile" do
         @temp_object.file.should be_a(Tempfile)
-        @temp_object.file.should be_closed
+        @temp_object.file.should_not be_closed
         @temp_object.file.path.should == @tempfile.path
       end
     end
@@ -131,12 +131,12 @@ describe Dragonfly::TempObject do
       end
     end
     describe "file" do
-      it "should lazily return a closed tempfile" do
+      it "should lazily return an unclosed tempfile" do
         @temp_object.file.should be_a(Tempfile)
-        @temp_object.file.should be_closed
+        @temp_object.file.should_not be_closed
       end
       it "should contain the correct data" do
-        @temp_object.file.open.read.should == @file.read
+        @temp_object.file.read.should == @file.read
       end
     end
     describe "each" do
@@ -191,7 +191,7 @@ describe Dragonfly::TempObject do
     end
     it "should modify itself when the new object is a tempfile" do
       tempfile = new_tempfile
-      data = tempfile.open.read
+      data = tempfile.read
       @temp_object.modify_self!(tempfile)
       @temp_object.data.should == data
     end
@@ -237,6 +237,11 @@ describe Dragonfly::TempObject do
       temp_object = Dragonfly::TempObject.new(file)
       temp_object.name.should == 'round.gif'
     end
+    it "should still be nil if set to empty string" do
+      temp_object = Dragonfly::TempObject.new('sdf')
+      temp_object.name = ''
+      temp_object.name.should be_nil
+    end
   end
   
   describe "ext" do
@@ -257,6 +262,24 @@ describe Dragonfly::TempObject do
     end
   end
   
+  describe "basename" do
+    before(:each) do
+      @temp_object = Dragonfly::TempObject.new('asfsadf')
+    end
+    it "should use the correct basename from name" do
+      @temp_object.name = 'hello.there.mate'
+      @temp_object.basename.should == 'hello.there'
+    end
+    it "should be the name if it has no ext" do
+      @temp_object.name = 'hello'
+      @temp_object.basename.should == 'hello'
+    end
+    it "should be nil if name is nil" do
+      @temp_object.name = nil
+      @temp_object.basename.should be_nil
+    end
+  end
+  
   describe "to_file" do
     
     describe "common behaviour for to_file", :shared => true do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragonfly
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Mark Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 +00:00
+date: 2009-12-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ files:
 - lib/dragonfly/data_storage/base.rb
 - lib/dragonfly/data_storage/base64_data_store.rb
 - lib/dragonfly/data_storage/file_data_store.rb
+- lib/dragonfly/data_storage/s3data_store.rb
 - lib/dragonfly/data_storage/transparent_data_store.rb
 - lib/dragonfly/delegatable.rb
 - lib/dragonfly/delegator.rb
@@ -110,6 +111,7 @@ files:
 - spec/dragonfly/configurable_spec.rb
 - spec/dragonfly/data_storage/data_store_spec.rb
 - spec/dragonfly/data_storage/file_data_store_spec.rb
+- spec/dragonfly/data_storage/s3_data_store_spec.rb
 - spec/dragonfly/delegatable_spec.rb
 - spec/dragonfly/delegator_spec.rb
 - spec/dragonfly/encoding/r_magick_encoder_spec.rb
@@ -171,6 +173,7 @@ test_files:
 - spec/dragonfly/configurable_spec.rb
 - spec/dragonfly/data_storage/data_store_spec.rb
 - spec/dragonfly/data_storage/file_data_store_spec.rb
+- spec/dragonfly/data_storage/s3_data_store_spec.rb
 - spec/dragonfly/delegatable_spec.rb
 - spec/dragonfly/delegator_spec.rb
 - spec/dragonfly/encoding/r_magick_encoder_spec.rb