fog 1.10.0 → 1.10.1

data/lib/fog/internet_archive/models/storage/directory.rb

@@ -1,36 +1,39 @@
 require 'fog/core/model'
 require 'fog/internet_archive/models/storage/files'
-require 'fog/internet_archive/models/storage/versions'
+require 'fog/internet_archive/models/storage/ia_attributes.rb'
 
 module Fog
   module Storage
     class InternetArchive
 
       class Directory < Fog::Model
-        VALID_ACLS = ['private', 'public-read', 'public-read-write', 'authenticated-read']
 
-        # See http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html
-        INVALID_LOCATIONS = ['us-east-1']
-
-        attr_reader :acl
+        extend Fog::Storage::IAAttributes::ClassMethods
+        include Fog::Storage::IAAttributes::InstanceMethods
 
         identity  :key,           :aliases => ['Name', 'name']
 
         attribute :creation_date, :aliases => 'CreationDate'
 
+        # treat these differently
+        attribute :collections
+        attribute :subjects
+
+        ia_metadata_attribute :ignore_preexisting_bucket
+        ia_metadata_attribute :interactive_priority
+
+        # acl for internet archive is always public-read
+        def acl
+          'public-read'
+        end
+
         def acl=(new_acl)
-          unless VALID_ACLS.include?(new_acl)
-            raise ArgumentError.new("acl must be one of [#{VALID_ACLS.join(', ')}]")
-          else
-            @acl = new_acl
-          end
+          'public-read'
         end
 
+        # See http://archive.org/help/abouts3.txt
         def destroy
-          requires :key
-          service.delete_bucket(key)
-          true
-        rescue Excon::Errors::NotFound
+          Fog::Logger.warning("fog: Internet Archive does not support deleting a Bucket (i.e. Item).  For details see: See http://archive.org/help/abouts3.txt")
           false
         end
 
@@ -63,37 +66,13 @@ module Fog
           @payer = new_payer
         end
 
-        def versioning?
-          requires :key
-          data = service.get_bucket_versioning(key)
-          data.body['VersioningConfiguration']['Status'] == 'Enabled'
-        end
-
-        def versioning=(new_versioning)
-          requires :key
-          service.put_bucket_versioning(key, new_versioning ? 'Enabled' : 'Suspended')
-        end
-
-        def versions
-          @versions ||= Fog::Storage::InternetArchive::Versions.new(:directory => self, :service => service)
-        end
-
         def public=(new_public)
-          self.acl = new_public ? 'public-read' : 'private'
-          new_public
+          'public-read'
         end
 
         def public_url
           requires :key
-          if service.get_bucket_acl(key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
-            if key.to_s =~ Fog::InternetArchive::COMPLIANT_BUCKET_NAMES
-              "https://#{key}.s3.#{Fog::InternetArchive::DOMAIN_NAME}"
-            else
-              "https://s3.#{Fog::InternetArchive::DOMAIN_NAME}/#{key}"
-            end
-          else
-            nil
-          end
+          "http://#{Fog::InternetArchive::DOMAIN_NAME}/details/#{key}"
         end
 
         def save
@@ -101,7 +80,11 @@ module Fog
 
           options = {}
 
-          options['x-amz-acl'] = acl if acl
+          options['x-archive-ignore-preexisting-bucket'] = ignore_preexisting_bucket if ignore_preexisting_bucket
+          options['x-archive-interactive-priority'] = interactive_priority if interactive_priority
+
+          set_metadata_array_headers(:collections, options)
+          set_metadata_array_headers(:subjects, options)
 
           if location = attributes[:location] || (self.service.region != 'us-east-1' && self.service.region)
             options['LocationConstraint'] = location

data/lib/fog/internet_archive/models/storage/file.rb

@@ -1,16 +1,26 @@
 require 'fog/core/model'
-require 'fog/internet_archive/models/storage/versions'
+require 'fog/internet_archive/models/storage/ia_attributes.rb'
 
 module Fog
   module Storage
     class InternetArchive
 
       class File < Fog::Model
+
+        extend Fog::Storage::IAAttributes::ClassMethods
+        include Fog::Storage::IAAttributes::InstanceMethods
+
         # @see AWS Object docs http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectOps.html 
 
-        identity  :key,             :aliases => 'Key'
+        # @note Chunk size to use for multipart uploads.
+        #     Use small chunk sizes to minimize memory. E.g. 5242880 = 5mb
+        attr_accessor :multipart_chunk_size
 
         attr_writer :body
+
+
+        identity  :key,                 :aliases => 'Key'
+
         attribute :cache_control,       :aliases => 'Cache-Control'
         attribute :content_disposition, :aliases => 'Content-Disposition'
         attribute :content_encoding,    :aliases => 'Content-Encoding'
@@ -22,31 +32,28 @@ module Fog
         attribute :last_modified,       :aliases => ['Last-Modified', 'LastModified']
         attribute :metadata
         attribute :owner,               :aliases => 'Owner'
-        attribute :storage_class,       :aliases => ['x-amz-storage-class', 'StorageClass']
-        attribute :encryption,          :aliases => 'x-amz-server-side-encryption'
-        attribute :version,             :aliases => 'x-amz-version-id'
-
-        # @note Chunk size to use for multipart uploads.
-        #     Use small chunk sizes to minimize memory. E.g. 5242880 = 5mb
-        attr_accessor :multipart_chunk_size
 
+        # treat these differently
+        attribute :collections
+        attribute :subjects
+
+        ia_metadata_attribute :auto_make_bucket
+        ia_metadata_attribute :cascade_delete
+        ia_metadata_attribute :ignore_preexisting_bucket
+        ia_metadata_attribute :interactive_priority
+        ia_metadata_attribute :keep_old_version
+        ia_metadata_attribute :queue_derive
+        ia_metadata_attribute :size_hint
+
+        # acl for internet archive is always public-read
+        def acl
+          'public-read'
+        end
 
-        # Set file's access control list (ACL).
-        # 
-        #     valid acls: private, public-read, public-read-write, authenticated-read
-        # 
-        # @param [String] new_acl one of valid options
-        # @return [String] @acl
-        # 
         def acl=(new_acl)
-          valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
-          unless valid_acls.include?(new_acl)
-            raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
-          end
-          @acl = new_acl
+          'public-read'
         end
 
-
         # Get file's body if exists, else ' '.
         # 
         # @return [File]
@@ -101,23 +108,20 @@ module Fog
         #     required attributes: directory, key
         # 
         # @param options [Hash]
-        # @option options versionId []
         # @return [Boolean] true if successful
         # 
         def destroy(options = {})
           requires :directory, :key
-          attributes[:body] = nil if options['versionId'] == version
+          options['x-archive-cascade-delete'] = cascade_delete if cascade_delete
           service.delete_object(directory.key, key, options)
           true
         end
 
-
         remove_method :metadata
         def metadata
-          attributes.reject {|key, value| !(key.to_s =~ /^x-amz-/)}
+          attributes.reject {|key, value| !(key.to_s =~ /^x-(amz||archive)-meta/)}
         end
 
-
         remove_method :metadata=
         def metadata=(new_metadata)
           merge_attributes(new_metadata)
@@ -143,18 +147,11 @@ module Fog
         # @return [String] new_puplic 
         # 
         def public=(new_public)
-          if new_public
-            @acl = 'public-read'
-          else
-            @acl = 'private'
-          end
-          new_public
+          'public-read'
         end
 
 
-        # Get pubically acessible url via http GET.
-        # Checks persmissions before creating. 
-        # Defaults to s3 subdomain or compliant bucket name
+        # Get publicly acessible url via http GET.
         # 
         #     required attributes: directory, key
         # 
@@ -162,15 +159,7 @@ module Fog
         # 
         def public_url
           requires :directory, :key
-          if service.get_object_acl(directory.key, key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
-            if directory.key.to_s =~ Fog::InternetArchive::COMPLIANT_BUCKET_NAMES
-              "https://#{directory.key}.s3.#{Fog::InternetArchive::DOMAIN_NAME}/#{Fog::InternetArchive.escape(key)}".gsub('%2F','/')
-            else
-              "https://s3.#{Fog::InternetArchive::DOMAIN_NAME}/#{directory.key}/#{Fog::InternetArchive.escape(key)}".gsub('%2F','/')
-            end
-          else
-            nil
-          end
+          "http://#{Fog::InternetArchive::DOMAIN_NAME}/download/#{directory.key}/#{Fog::InternetArchive.escape(key)}".gsub('%2F','/')
         end
 
         # Save file with body as contents to directory.key with name key via http PUT
@@ -178,7 +167,6 @@ module Fog
         #   required attributes: body, directory, key
         # 
         # @param [Hash] options  
-        # @option options [String] acl sets x-amz-acl HTTP header. Valid values include, private | public-read | public-read-write | authenticated-read | bucket-owner-read | bucket-owner-full-control
         # @option options [String] cache_controle sets Cache-Control header. For example, 'No-cache'
         # @option options [String] content_disposition sets Content-Disposition HTTP header. For exampple, 'attachment; filename=testing.txt'
         # @option options [String] content_encoding sets Content-Encoding HTTP header. For example, 'x-gzip'
@@ -192,9 +180,8 @@ module Fog
         def save(options = {})
           requires :body, :directory, :key
           if options != {}
-            Fog::Logger.deprecation("options param is deprecated, use acl= instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("options param is deprecated [light_black](#{caller.first})[/]")
           end
-          options['x-amz-acl'] ||= @acl if @acl
           options['Cache-Control'] = cache_control if cache_control
           options['Content-Disposition'] = content_disposition if content_disposition
           options['Content-Encoding'] = content_encoding if content_encoding
@@ -202,8 +189,15 @@ module Fog
           options['Content-Type'] = content_type if content_type
           options['Expires'] = expires if expires
           options.merge!(metadata)
-          options['x-amz-storage-class'] = storage_class if storage_class
-          options['x-amz-server-side-encryption'] = encryption if encryption
+
+          options['x-archive-auto-make-bucket'] = auto_make_bucket if auto_make_bucket
+          options['x-archive-interactive-priority'] = interactive_priority if interactive_priority
+          options['x-archive-keep-old-version'] = keep_old_version if keep_old_version
+          options['x-archive-queue-derive'] = queue_derive if queue_derive
+          options['x-archive-size-hint'] = size_hint.to_i.to_s if size_hint
+
+          set_metadata_array_headers(:collections, options)
+          set_metadata_array_headers(:subjects, options)
 
           if multipart_chunk_size && body.respond_to?(:read)
             data = multipart_save(options)
@@ -212,7 +206,7 @@ module Fog
             data = service.put_object(directory.key, key, body, options)
             merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
           end
-          self.etag.gsub!('"','')
+          self.etag.gsub!('"','') if self.etag
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)
           true
@@ -232,19 +226,6 @@ module Fog
           collection.get_url(key, expires, options)
         end
 
-
-        # File version if exists or creates new version.
-        # @return [Fog::Storage::InternetArchive::Version] 
-        # 
-        def versions
-          @versions ||= begin
-            Fog::Storage::InternetArchive::Versions.new(
-              :file         => self,
-              :service   => service
-            )
-          end
-        end
-
         private
 
         def directory=(new_directory)

data/lib/fog/internet_archive/models/storage/ia_attributes.rb

@@ -0,0 +1,39 @@
+module Fog
+  module Storage
+    module IAAttributes
+
+		  # you can add other x-archive-metadata-* values, but these are standard
+		  IA_STANDARD_METADATA_FIELDS = %q[hidden, title, collection, creator, mediatype, description, date, subject, licenseurl , pick, noindex, notes, rights, contributor, language, coverage, credits]
+
+		  # for x-archive-metadata-mediatype, these are the valid values
+		  IA_VALID_MEDIA_TYPES = %q[audio, data, etree, image, movies, software, texts, web]
+
+			module ClassMethods
+			  def ia_metadata_attribute(name)
+			    attribute(name, :aliases=>['amz','archive'].collect{|p|"x-#{p}-#{name.to_s.tr('_','-')}"})
+			  end
+			end
+
+			module InstanceMethods
+				# set_metadata_array_headers(:collections, options)
+				def set_metadata_array_headers(array_attribute, options={})
+				  attr_values = Array(self.send(array_attribute))
+				  opt_values = options.collect do |key,value| 
+				    options.delete(key) if (key.to_s =~ /^x-(amz||archive)-meta(\d*)-#{array_attribute.to_s[0..-2]}/)
+				  end
+				  values = (attr_values + opt_values).compact.sort.uniq
+				  # got the values, now add them back to the options
+				  if values.size == 1
+				    options["x-archive-meta-#{array_attribute.to_s[0..-2]}"] = values.first
+				  elsif values.size > 1
+				    values[0,99].each_with_index do |value, i|
+				      options["x-archive-meta#{format("%02d", i+1)}-#{array_attribute.to_s[0..-2]}"] = value
+				    end
+				  end
+
+				end
+			end
+
+		end
+	end
+end

data/lib/fog/internet_archive/requests/storage/delete_multiple_objects.rb

@@ -34,14 +34,9 @@ module Fog
         def delete_multiple_objects(bucket_name, object_names, options = {})
           data = "<Delete>"
           data << "<Quiet>true</Quiet>" if options.delete(:quiet)
-          version_ids = options.delete('versionId')
           object_names.each do |object_name|
             data << "<Object>"
             data << "<Key>#{CGI.escapeHTML(object_name)}</Key>"
-            object_version = version_ids.nil? ? nil : version_ids[object_name]
-            if object_version
-              data << "<VersionId>#{CGI.escapeHTML(object_version)}</VersionId>"
-            end
             data << "</Object>"
           end
           data << "</Delete>"
@@ -71,12 +66,9 @@ module Fog
           if bucket = self.data[:buckets][bucket_name]
             response.status = 200
             response.body = { 'DeleteResult' => [] }
-            version_ids = options.delete('versionId')
             object_names.each do |object_name|
-              object_version = version_ids.nil? ? nil : version_ids[object_name]
               response.body['DeleteResult'] << delete_object_helper(bucket,
-                                                                object_name,
-                                                                object_version)
+                                                                object_name)
             end
           else
             response.status = 404
@@ -87,79 +79,13 @@ module Fog
 
         private
 
-        def delete_object_helper(bucket, object_name, version_id)
+        def delete_object_helper(bucket, object_name)
           response = { 'Deleted' => {} }
-          if bucket[:versioning]
-            bucket[:objects][object_name] ||= []
-
-            if version_id
-              version = bucket[:objects][object_name].find { |object| object['VersionId'] == version_id}
-
-              # S3 special cases the 'null' value to not error out if no such version exists.
-              if version || (version_id == 'null')
-                bucket[:objects][object_name].delete(version)
-                bucket[:objects].delete(object_name) if bucket[:objects][object_name].empty?
-
-                response['Deleted'] = { 'Key' => object_name,
-                                        'VersionId' => version_id,
-                                        'DeleteMarker' => 'true',
-                                        'DeleteMarkerVersionId' => version_id
-                                      }
-              else
-                response = delete_error_body(object_name,
-                                             version_id,
-                                             'InvalidVersion',
-                                             'Invalid version ID specified')
-              end
-            else
-              delete_marker = {
-                :delete_marker    => true,
-                'Key'             => object_name,
-                'VersionId'       => bucket[:versioning] == 'Enabled' ? Fog::Mock.random_base64(32) : 'null',
-                'Last-Modified'   => Fog::Time.now.to_date_header
-              }
-
-              # When versioning is suspended, a delete marker is placed if the last object ID is not the value 'null',
-              # otherwise the last object is replaced.
-              if bucket[:versioning] == 'Suspended' && bucket[:objects][object_name].first['VersionId'] == 'null'
-                bucket[:objects][object_name].shift
-              end
-
-              bucket[:objects][object_name].unshift(delete_marker)
-
-              response['Deleted'] = { 'Key' => object_name,
-                                      'VersionId' => delete_marker['VersionId'],
-                                      'DeleteMarkerVersionId' =>
-                                          delete_marker['VersionId'],
-                                      'DeleteMarker' => 'true',
-                                    }
-            end
-          else
-            if version_id && version_id != 'null'
-              response = delete_error_body(object_name,
-                                           version_id,
-                                           'InvalidVersion',
-                                           'Invalid version ID specified')
-              response = invalid_version_id_payload(version_id)
-            else
-              bucket[:objects].delete(object_name)
-              response['Deleted'] = { 'Key' => object_name }
-            end
-          end
+          bucket[:objects].delete(object_name)
+          response['Deleted'] = { 'Key' => object_name }
           response
         end
 
-        def delete_error_body(key, version_id, message, code)
-          {
-            'Error' => {
-              'Code'      => code,
-              'Message'   => message,
-              'VersionId' => version_id,
-              'Key'       => key,
-            }
-          }
-        end
-
       end
     end
   end