s3batch 0.1.1 → 0.1.2

data/lib/s3batch/batch_upload.rb

@@ -39,7 +39,7 @@ module S3Batch
 
     def self.run s3id, s3key, bucket, dir, pattern
       EM.run {
-        items = Upload.new bucket, dir, pattern, :aws_access_key_id => s3id, :aws_secret_access_key => s3key, :protocol => 'http', :permissions => 'public-read'
+        items = S3Batch::Upload.new bucket, dir, pattern, :aws_access_key_id => s3id, :aws_secret_access_key => s3key, :protocol => 'http', :permissions => 'public-read'
         items.upload 
       }
     end
@@ -58,7 +58,7 @@ module S3Batch
       end
 
       def check_md5_and_upload keys
-        manager = TaskManager.new
+        manager = S3Batch::TaskManager.new
         on_error = Proc.new {|response| puts "An error occured: #{response.response_header.status}"; manager.remove; }
         on_success = Proc.new {|response| manager.remove; }
 
@@ -72,7 +72,10 @@ module S3Batch
           if keys[key] != md5
             puts "uploading #{key} to #{@bucket}"
             item = Happening::S3::Item.new(@bucket, key, @options)
-            item.put(content, :on_error => on_error, :on_success => on_success)
+            headers = {}
+            type = MIME::Types.type_for(key).first
+            headers['Content-Type'] = type if type
+            item.put(content, :on_error => on_error, :on_success => on_success, :headers => headers)
             manager.add
           else
             puts "ignore #{key}, no change"
@@ -81,6 +84,5 @@ module S3Batch
 
         manager.end_adding
       end
-    
   end
 end

data/lib/s3batch/happening_patch.rb

@@ -7,6 +7,7 @@ module Happening
     def canonical_request_description(method, path, headers = {}, expires = nil)
       description = old_canonical_request_description(method, path, headers, expires)
       description << '?delete'  if path[/[&?]delete($|&|=)/]
+      description << '?website'  if path[/[&?]website($|&|=)/]
       description
     end
   end

data/lib/s3batch/multi_delete.rb

@@ -26,12 +26,12 @@ module S3Batch
       end
     end
 
-    def run s3id, s3key, bucket, keys 
+    def self.run s3id, s3key, bucket, keys 
       EM.run {
         on_error = Proc.new {|response| puts "An error occured: #{response.response}"; EM.stop }
         on_success = Proc.new {|response| puts "Deleted!"; EM.stop }
-        items = Delete.new bucket, keys, :aws_access_key_id => s3id, :aws_secret_access_key => s3key, :protocol => 'http'
-        items.delete(:on_error => on_error, :on_success => on_success) 
+        items = S3Batch::Delete.new bucket, keys, :aws_access_key_id => s3id, :aws_secret_access_key => s3key, :protocol => 'http'
+        items.delete(:on_error => on_error, :on_success => on_success)
       }
     end
   end

data/lib/s3batch/website_enabler.rb

@@ -0,0 +1,35 @@
+module S3Batch
+  class WebsiteEnabler < Happening::S3::Item
+    def path(with_bucket=true)
+      with_bucket ? "/#{bucket}/?website" : "/?website"
+    end
+
+    def enable index_doc, error_doc, request_options = {}, &blk
+      data =<<EOF
+<WebsiteConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+    <IndexDocument>
+        <Suffix>#{index_doc}</Suffix>
+    </IndexDocument>
+    <ErrorDocument>
+        <Key>#{error_doc}</Key>
+    </ErrorDocument>
+</WebsiteConfiguration>
+EOF
+
+      md5 = Base64.encode64(Digest::MD5.digest(data)).strip
+      headers = aws.sign("PUT", path, {"Content-MD5" => md5})
+      request_options[:on_success] = blk if blk          
+      request_options.update(:headers => headers, :data => data)
+      Happening::S3::Request.new(:put, url, {:ssl => options[:ssl]}.update(request_options)).execute
+    end
+
+    def self.run s3id, s3key, bucket, index_doc = "index.html", error_doc = "404.html"
+      EM.run {
+        on_error = Proc.new {|response| puts "An error occured: #{response.response}"; EM.stop; }
+        on_success = Proc.new {|response| puts "Enabled #{response.response}"; EM.stop; }
+        item = S3Batch::WebsiteEnabler.new(bucket, "NO_USE", :aws_access_key_id => s3id, :aws_secret_access_key => s3key, :protocol => 'http')
+        item.enable(index_doc, error_doc, :on_error => on_error, :on_success => on_success)
+      }
+    end
+  end
+end

data/lib/s3batch.rb

@@ -1,9 +1,11 @@
 require 'happening'
 require 'nokogiri'
+require 'mime/types'
 
 require File.expand_path(File.dirname(__FILE__) + '/s3batch/happening_patch')
 require File.expand_path(File.dirname(__FILE__) + '/s3batch/multi_delete')
 require File.expand_path(File.dirname(__FILE__) + '/s3batch/batch_upload')
+require File.expand_path(File.dirname(__FILE__) + '/s3batch/website_enabler')
 
 #ruby s3batch.rb S3ID S3KEY BUCKET DIR
 if $0 == __FILE__
@@ -13,6 +15,8 @@ if $0 == __FILE__
   dir = ARGV[3]
   pattern = ARGV[4] || "**/*"
 
-  S3Batch::Upload.run s3id, s3key, bucket, dir, pattern
+  S3Batch::WebsiteEnabler.run s3id, s3key, bucket
+  #S3Batch::Upload.run s3id, s3key, bucket, dir, pattern
+  #S3Batch::Delete.run s3id, s3key, bucket, [dir]
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3batch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: happening
-  requirement: &68897600 !ruby/object:Gem::Requirement
+  requirement: &72777590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68897600
+  version_requirements: *72777590
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &68897130 !ruby/object:Gem::Requirement
+  requirement: &72777260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68897130
+  version_requirements: *72777260
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &72701030 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *72701030
 description: 
 email:
 - yong@intridea.com
@@ -42,6 +53,7 @@ extra_rdoc_files: []
 files:
 - lib/s3batch/multi_delete.rb
 - lib/s3batch/batch_upload.rb
+- lib/s3batch/website_enabler.rb
 - lib/s3batch/happening_patch.rb
 - lib/s3batch.rb
 homepage: http://github.com/yong/s3batch