attached 0.2.1 → 0.2.2

data/lib/attached/attachment.rb

@@ -33,11 +33,11 @@ module Attached
     #
     # Usage:
     #
-    #   Attached::Attachment.options = { :storage => :fs, :path => "/:name/:style/:identifier:extension" }
+    #   Attached::Attachment.options = { :storage => :fs, :path => ":name/:style/:identifier:extension" }
     
     def self.options
       @options ||= {
-        :path        => "/:name/:style/:identifier:extension",
+        :path        => ":name/:style/:identifier:extension",
         :default     => :original,
         :medium      => :aws,
         :credentials => {},

data/lib/attached/storage.rb

@@ -1,5 +1,6 @@
-require 'attached/storage/base'
 require 'attached/storage/aws'
+require 'attached/storage/google'
+require 'attached/storage/rackspace'
 
 module Attached
   module Storage
@@ -9,14 +10,16 @@ module Attached
     #
     # Usage:
     #
-    #   Attached::Storage.storage()
     #   Attached::Storage.storage(:aws)
-    #   Attached::Storage.storage(:aws, credentials)
+    #   Attached::Storage.storage(:google)
+    #   Attached::Storage.storage(:rackspace)
     
     def self.storage(medium = :aws, credentials = nil)
       
       case medium
-        when :aws then return Attached::Storage::AWS.new credentials
+        when :aws       then return Attached::Storage::AWS.new       credentials
+        when :google    then return Attached::Storage::Google.new    credentials
+        when :rackspace then return Attached::Storage::Rackspace.new credentials
         else raise "undefined storage medium '#{medium}'"
       end
       

data/lib/attached/storage/aws.rb

@@ -1,9 +1,9 @@
 require 'attached/storage/base'
 
 begin
-  require 'aws/s3'
+  require 'fog'
 rescue LoadError
-  raise "installation of 'aws/s3' is required before using 'aws' for storage"
+  raise "installation of 'fog' is required before using 'aws' for storage"
 end
 
 
@@ -12,7 +12,8 @@ module Attached
 		class AWS < Base
 			
 			
-			attr_reader :access
+			attr_reader :permissions
+			
 			attr_reader :bucket
 			attr_reader :access_key_id
 			attr_reader :secret_access_key
@@ -22,13 +23,14 @@ module Attached
 			#
 			# Usage:
 			#
-			#		Attached::Storage::S3.new()
-			#		Attached::Storage::S3.new("s3.yml")
+			#		Attached::Storage::AWS.new()
+			#		Attached::Storage::AWS.new("aws.yml")
 			
 			def initialize(credentials)
 				credentials = parse(credentials)
 				
-				@access            = :public_read
+				@permissions       = { :public => true }
+				
 				@bucket						 = credentials[:bucket]            || credentials['bucket']
 				@access_key_id		 = credentials[:access_key_id]     || credentials['access_key_id']
 				@secret_access_key = credentials[:secret_access_key] || credentials['secret_access_key']
@@ -42,7 +44,7 @@ module Attached
 			#		storage.host
 			
 			def host()
-				"https://#{self.bucket}.s3.amazonaws.com"
+				"https://#{self.bucket}.s3.amazonaws.com/"
 			end
 			
 			
@@ -54,13 +56,12 @@ module Attached
       # * path - The path to save.
       
       def save(file, path)
-        connect()
-        begin
-          ::AWS::S3::S3Object.store(path, file, bucket, :access => access)
-        rescue ::AWS::S3::NoSuchBucket => e
-          ::AWS::S3::Bucket.create(bucket)
-          retry
-        end
+        file = File.open(file.path)
+        
+        directory = connection.directories.get(self.bucket)
+        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
+        
+        directory.files.create(self.permissions.merge(:body => file, :key => path))
       end
       
       
@@ -71,22 +72,22 @@ module Attached
       # * path - The path to destroy.
       
       def destroy(path)
-        connect()
-        begin
-          ::AWS::S3::S3Object.delete(path, bucket)
-        rescue ::AWS::S3::NoSuchBucket => e
-        end
+        directory = connection.directories.get(self.bucket)
+        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
+        
+        file = directory.files.get(path)
+        file.destroy if file
       end
 			
 			
 		private
+
 			
-			
-			# Connect to an AWS S3 server.
-			
-			def connect()
-        @connection ||= ::AWS::S3::Base.establish_connection!(
-          :access_key_id => access_key_id, :secret_access_key => secret_access_key
+			def connection
+			  @connection ||= Fog::Storage.new(
+          :aws_secret_access_key => self.secret_access_key,
+          :aws_access_key_id     => self.access_key_id,
+          :provider => 'AWS'
         )
 			end
 			

data/lib/attached/storage/google.rb

@@ -0,0 +1,97 @@
+require 'attached/storage/base'
+
+begin
+  require 'fog'
+rescue LoadError
+  raise "installation of 'fog' is required before using 'google' for storage"
+end
+
+
+module Attached
+	module Storage
+		class Google < Base
+			
+			
+			attr_reader :permissions
+			
+			attr_reader :bucket
+			attr_reader :access_key_id
+			attr_reader :secret_access_key
+			
+			
+			# Create a new AWS interface supporting save and destroy operations.
+			#
+			# Usage:
+			#
+			#		Attached::Storage::Google.new()
+			#		Attached::Storage::Google.new("google.yml")
+			
+			def initialize(credentials)
+				credentials = parse(credentials)
+				
+				@permissions       = { :public => true }
+				
+				@bucket            = credentials[:bucket]            || credentials['bucket']
+				@access_key_id		 = credentials[:access_key_id]     || credentials['access_key_id']
+				@secret_access_key = credentials[:secret_access_key] || credentials['secret_access_key']
+			end
+			
+			
+			# Access the host (e.g. bucket.s3.amazonaws.com) for a storage service.
+			#
+			# Usage:
+			#
+			#		storage.host
+			
+			def host()
+			  "https://#{self.bucket}.commondatastorage.googleapis.com/"
+			end
+			
+			
+      # Save a file to a given path on AWS S3.
+      #
+      # Parameters:
+      #
+      # * file - The file to save.
+      # * path - The path to save.
+      
+      def save(file, path)
+        file = File.open(file.path)
+        
+        directory = connection.directories.get(self.bucket)
+        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
+        
+        directory.files.create(self.permissions.merge(:body => file, :key => path))
+      end
+      
+      
+      # Destroy a file at a given path on AWS S3.
+      #
+      # Parameters:
+      #
+      # * path - The path to destroy.
+      
+      def destroy(path)
+        directory = connection.directories.get(self.bucket)
+        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
+        
+        file = directory.files.get(path)
+        file.destroy if file
+      end
+			
+			
+		private
+
+			
+			def connection
+			  @connection ||= Fog::Storage.new(
+  			  :google_storage_secret_access_key => self.secret_access_key,
+          :google_storage_access_key_id     => self.access_key_id,
+          :provider => 'Google'
+        )
+			end
+			
+			
+		end
+	end
+end

data/lib/attached/storage/rackspace.rb

@@ -0,0 +1,96 @@
+require 'attached/storage/base'
+
+begin
+  require 'fog'
+rescue LoadError
+  raise "installation of 'fog' is required before using 'rackspace' for storage"
+end
+
+
+module Attached
+	module Storage
+		class Rackspace < Base
+			
+			
+			attr_reader :permissions
+			attr_reader :container
+			attr_reader :username
+			attr_reader :api_key
+			
+			
+			# Create a new AWS interface supporting save and destroy operations.
+			#
+			# Usage:
+			#
+			#		Attached::Storage::Rackspace.new()
+			#		Attached::Storage::Rackspace.new("rackspace.yml")
+			
+			def initialize(credentials)
+				credentials = parse(credentials)
+				
+				@permissions  = { :public => true }
+				
+				@container		= credentials[:container] || credentials['container']
+				@username     = credentials[:username]  || credentials['username']
+				@api_key      = credentials[:api_key]   || credentials['api_key']
+			end
+			
+			
+			# Access the host (e.g. bucket.s3.amazonaws.com) for a storage service.
+			#
+			# Usage:
+			#
+			#		storage.host
+			
+			def host()
+				"https://#{self.bucket}.s3.amazonaws.com/"
+			end
+			
+			
+      # Save a file to a given path on AWS S3.
+      #
+      # Parameters:
+      #
+      # * file - The file to save.
+      # * path - The path to save.
+      
+      def save(file, path)
+        file = File.open(file.path)
+        
+        directory = connection.directories.get(self.bucket)
+        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
+        
+        directory.files.create(self.permissions.merge(:body => file, :key => path))
+      end
+      
+      
+      # Destroy a file at a given path on AWS S3.
+      #
+      # Parameters:
+      #
+      # * path - The path to destroy.
+      
+      def destroy(path)
+        directory = connection.directories.get(self.bucket)
+        directory ||= connection.directories.create(self.permissions.merge(:key => self.bucket))
+        
+        file = directory.files.get(path)
+        file.destroy if file
+      end
+			
+			
+		private
+
+			
+			def connection
+			  @connection ||= Fog::Storage.new(
+          :rackspace_username => self.username,
+          :rackspace_api_key  => self.api_key,
+          :provider => 'Rackspace'
+        )
+			end
+			
+			
+		end
+	end
+end

data/lib/attached/version.rb

@@ -1,3 +1,3 @@
 module Attached
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
+  name: fog
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -63,6 +63,8 @@ files:
 - lib/attached/storage/aws.rb
 - lib/attached/storage/base.rb
 - lib/attached/storage/error.rb
+- lib/attached/storage/google.rb
+- lib/attached/storage/rackspace.rb
 - lib/attached/storage.rb
 - lib/attached/version.rb
 - lib/attached.rb