steamcannon-s3 0.3.2.1 → 0.3.5.1

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.2)
+    s3 (0.3.5)
+      http_connection
       proxies
-      trollop
 
 GEM
   remote: http://rubygems.org/
   specs:
+    http_connection (1.3.1)
     mocha (0.9.8)
       rake
-    proxies (0.1.1)
+    proxies (0.2.1)
     rake (0.8.7)
     test-unit (2.1.1)
-    trollop (1.16.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0.0)
+  http_connection
   mocha
   proxies
   s3!
   test-unit (>= 2.0)
-  trollop

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler"
 Bundler::GemHelper.install_tasks
+Bundler.setup
 
 require "rake/testtask"
 require "rake/rdoctask"

data/lib/s3.rb

@@ -15,6 +15,7 @@ require "s3/parser"
 require "s3/bucket"
 require "s3/connection"
 require "s3/exceptions"
+require "s3/request"
 require "s3/object"
 require "s3/service"
 require "s3/signature"

data/lib/s3/bucket.rb

@@ -93,7 +93,7 @@ module S3
     # Returns the objects in the bucket and caches the result (see
     # #reload method).
     def objects
-      MethodProxy.new(self, :list_bucket, :extend => ObjectsExtension)
+      Proxy.new(lambda { list_bucket }, :owner => self, :extend => ObjectsExtension)
     end
 
     def inspect #:nodoc:

data/lib/s3/connection.rb

@@ -19,7 +19,8 @@ module S3
     # * <tt>:timeout</tt> - Timeout to use by the Net::HTTP object
     #   (60 by default)
     # * <tt>:proxy</tt> - Hash for Net::HTTP Proxy settings
-    # { :host => "proxy.mydomain.com", :port => "80, :user => "user_a", :password => "secret" }
+    #   { :host => "proxy.mydomain.com", :port => "80, :user => "user_a", :password => "secret" }
+    # * <tt>:proxy</tt> - Hash for Net::HTTP Proxy settings
     def initialize(options = {})
       @access_key_id = options.fetch(:access_key_id)
       @secret_access_key = options.fetch(:secret_access_key)
@@ -53,7 +54,7 @@ module S3
     def request(method, options)
       host = options.fetch(:host, HOST)
       path = options.fetch(:path)
-      body = options.fetch(:body, "")
+      body = options.fetch(:body, nil)
       params = options.fetch(:params, {})
       headers = options.fetch(:headers, {})
 
@@ -63,14 +64,21 @@ module S3
       end
 
       path = URI.escape(path)
-      request = request_class(method).new(path)
+      request = Net::HTTPGenericRequest.new(method.to_s.upcase, !!body, true, path)
 
       headers = self.class.parse_headers(headers)
       headers.each do |key, value|
         request[key] = value
       end
 
-      request.body = body
+      if body
+        if body.respond_to?(:read)
+          request.body_stream = body
+        else
+          request.body = body
+        end
+        request.content_length = body.respond_to?(:lstat) ? body.stat.size : body.size
+      end
 
       send_request(host, request)
     end
@@ -143,19 +151,6 @@ module S3
 
     private
 
-    def request_class(method)
-      case method
-      when :get
-        request_class = Net::HTTP::Get
-      when :head
-        request_class = Net::HTTP::Head
-      when :put
-        request_class = Net::HTTP::Put
-      when :delete
-        request_class = Net::HTTP::Delete
-      end
-    end
-
     def port
       use_ssl ? 443 : 80
     end

data/lib/s3/object.rb

@@ -40,8 +40,8 @@ module S3
     def acl=(acl)
       @acl = acl.to_s.gsub("_", "-") if acl
     end
-    
-    # Assigns a new storage class (RRS) to the object. Please note 
+
+    # Assigns a new storage class (RRS) to the object. Please note
     # that the storage class is not retrieved from the server and set
     # to "STANDARD" by default.
     #
@@ -185,8 +185,7 @@ module S3
     end
 
     def put_object
-      body = content.is_a?(IO) ? content.read : content
-      response = object_request(:put, :body => body, :headers => dump_headers)
+      response = object_request(:put, :body => content, :headers => dump_headers)
       parse_headers(response)
     end
 

data/lib/s3/request.rb

@@ -0,0 +1,11 @@
+module S3
+  # Class responsible for sending chunked requests
+  # properly. Net::HTTPGenericRequest has hardcoded chunk_size, so we
+  # inherit the class and override chunk_size.
+  class Request < Net::HTTPGenericRequest
+    def initialize(chunk_size, m, reqbody, resbody, path, initheader = nil)
+      @chunk_size = chunk_size
+      super(m, reqbody, resbody, path, initheader)
+    end
+  end
+end

data/lib/s3/service.rb

@@ -28,7 +28,7 @@ module S3
       @use_ssl = options.fetch(:use_ssl, false)
       @timeout = options.fetch(:timeout, 60)
       @debug = options.fetch(:debug, false)
-      
+
       raise ArgumentError, "Missing proxy settings. Must specify at least :host." if options[:proxy] && !options[:proxy][:host]
       @proxy = options.fetch(:proxy, nil)
     end
@@ -36,7 +36,7 @@ module S3
     # Returns all buckets in the service and caches the result (see
     # +reload+)
     def buckets
-      MethodProxy.new(self, :list_all_my_buckets, :extend => BucketsExtension)
+      Proxy.new(lambda { list_all_my_buckets}, :owner => self, :extend => BucketsExtension)
     end
 
     # Returns "http://" or "https://", depends on <tt>:use_ssl</tt>

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.3.2.1"
+  VERSION = "0.3.5.1"
 end

data/s3.gemspec

@@ -9,14 +9,14 @@ Gem::Specification.new do |s|
   s.authors     = ["Jakub Kuźma"]
   s.email       = ["qoobaa@gmail.com"]
   s.homepage    = "http://jah.pl/projects/s3.html"
-  s.summary     = "Library for accessing S3 objects and buckets, with command line tool"
+  s.summary     = "Library for accessing S3 objects and buckets"
   s.description = "S3 library provides access to Amazon's Simple Storage Service. It supports both: European and US buckets through REST API."
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "s3"
 
-  s.add_dependency "trollop"
   s.add_dependency "proxies"
+  s.add_dependency "http_connection"
   s.add_development_dependency "test-unit", ">= 2.0"
   s.add_development_dependency "mocha"
   s.add_development_dependency "bundler", ">= 1.0.0"

data/test/test_helper.rb

@@ -1,6 +1,3 @@
-require "rubygems"
-require "bundler/setup"
-
-Bundler.require
 require "test/unit"
 require "mocha"
+require "s3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: steamcannon-s3
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 65
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
+  - 5
   - 1
-  version: 0.3.2.1
+  version: 0.3.5.1
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -16,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 -04:00
+date: 2010-09-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: trollop
+  name: proxies
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: proxies
+  name: http_connection
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -95,8 +95,8 @@ dependencies:
 description: "S3 library provides access to Amazon's Simple Storage Service. It supports both: European and US buckets through REST API."
 email: 
 - qoobaa@gmail.com
-executables: 
-- s3
+executables: []
+
 extensions: []
 
 extra_rdoc_files: []
@@ -108,7 +108,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- bin/s3
 - extra/s3_attachment_fu.rb
 - extra/s3_paperclip.rb
 - lib/s3.rb
@@ -119,6 +118,7 @@ files:
 - lib/s3/object.rb
 - lib/s3/objects_extension.rb
 - lib/s3/parser.rb
+- lib/s3/request.rb
 - lib/s3/service.rb
 - lib/s3/signature.rb
 - lib/s3/version.rb
@@ -164,6 +164,6 @@ rubyforge_project: s3
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Library for accessing S3 objects and buckets, with command line tool
+summary: Library for accessing S3 objects and buckets
 test_files: []
 

data/bin/s3

@@ -1,187 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
-
-require "trollop"
-require "s3"
-
-# HELPER METHODS
-
-include S3
-
-def list_buckets(service)
-  service.buckets.each do |bucket|
-    puts bucket.name
-  end
-end
-
-def create_bucket(service, name, location)
-  service.buckets.build(name).save(location)
-end
-
-def destroy_bucket(service, name)
-  service.buckets.find(name).destroy
-end
-
-def show_bucket(service, name, options = {})
-  service.buckets.find(name).objects.find_all.each do |object|
-    puts "#{name}/#{object.key}"
-  end
-end
-
-def list_objects(service)
-  service.buckets.each do |bucket|
-    bucket.objects.each do |object|
-      puts "#{bucket.name}/#{object.key}"
-    end
-  end
-end
-
-def create_object(service, name, file_name, options = {})
-  bucket_name, object_name = name.split("/", 2)
-  object = service.buckets.find(bucket_name).objects.build(object_name)
-  object.content_type = options[:type]
-  object.content_encoding = options[:encoding]
-  object.content_disposition = options[:disposition]
-  object.acl = options[:acl]
-  object.content = File.new(file_name)
-  object.save
-end
-
-def destroy_object(service, name)
-  bucket_name, object_name = name.split("/", 2)
-  object = service.buckets.find(bucket_name).objects.find(object_name)
-  object.destroy
-end
-
-def show_object(service, name, file_name = nil)
-  bucket_name, object_name = name.split("/", 2)
-  object = service.buckets.find(bucket_name).objects.find_first(object_name)
-  puts "         object:   #{object.name}/#{object.key}"
-  puts "   content type:   #{object.content_type}"
-  puts "           size:   #{object.size}"
-  puts "           etag:   #{object.etag}"
-  puts "  last modified:   #{object.last_modified}"
-  if file_name
-    if file_name == "-"
-      puts object.content
-    else
-      File.open(file_name, "wb") do |file|
-        file.write(object.content)
-      end
-    end
-  end
-end
-
-# COMMAND LINE PARSER
-
-ACCESS_KEY_ID = ENV["ACCESS_KEY_ID"]
-SECRET_ACCESS_KEY = ENV["SECRET_ACCESS_KEY"]
-COMMANDS = %w(bucket object)
-BUCKET_SUBCOMMANDS = %w(add remove show)
-OBJECT_SUBCOMMANDS = %w(add remove show)
-
-global_options = Trollop::options do
-  banner "s3 command line tool"
-  opt :access_key_id, "Your access key id to AWS", :type => :string, :default => ACCESS_KEY_ID
-  opt :secret_access_key, "Your secret access key to AWS", :type => :string, :default => SECRET_ACCESS_KEY
-  opt :debug, "Debug mode", :type => :flag, :default => false
-  stop_on COMMANDS
-end
-
-Trollop::die "No access key id given" unless global_options[:access_key_id]
-Trollop::die "No secret access key given" unless global_options[:secret_access_key]
-
-service = Service.new(:access_key_id => global_options[:access_key_id],
-                      :secret_access_key => global_options[:secret_access_key],
-                      :debug => global_options[:debug])
-
-command = ARGV.shift
-
-begin
-  case command
-  when "bucket"
-    command_options = Trollop::options do
-      banner "manage buckets"
-      stop_on BUCKET_SUBCOMMANDS
-    end
-    subcommand = ARGV.shift
-    case subcommand
-    when "add"
-      subcommand_options = Trollop::options do
-        banner "add bucket"
-        opt :location, "Location of the bucket - EU or US", :default => "US", :type => :string
-      end
-      name = ARGV.shift
-      Trollop::die "Bucket has not been added because of unknown error" unless create_bucket(service, name, subcommand_options[:location])
-    when "remove"
-      subcommand_options = Trollop::options do
-        banner "remove bucket"
-      end
-      name = ARGV.shift
-      Trollop::die "Bucket name must be given" if name.nil? or name.empty?
-      Trollop::die "Bucket has not been removed because of unknown error" unless destroy_bucket(service, name)
-    when "show"
-      subcommand_options = Trollop::options do
-        banner "show bucket"
-        opt :prefix, "Limits the response to keys which begin with the indicated prefix", :type => :string
-        opt :marker, "Indicates where in the bucket to begin listing", :type => :string
-        opt :max_keys, "The maximum number of keys you'd like to see", :type => :integer
-        opt :delimiter, "Causes keys that contain the same string between the prefix and the first occurrence of the delimiter to be rolled up into a single result element", :type => :string
-      end
-      name = ARGV.shift
-      Trollop::die "Bucket name must be given" if name.nil? or name.empty?
-      show_bucket(service, name, subcommand_options)
-    when nil
-      list_buckets(service)
-    else
-      Trollop::die "Unknown subcommand: #{subcommand.inspect}"
-    end
-  when "object"
-    command_options = Trollop::options do
-      banner "manage objects"
-      stop_on OBJECT_SUBCOMMANDS
-    end
-    subcommand = ARGV.shift
-    case subcommand
-    when "add"
-      subcommand_options = Trollop::options do
-        banner "object add s3_object_name local_file_name"
-        opt :type, "A standard MIME type describing the format of the contents", :default => "binary/octet-stream"
-        opt :disposition, "Specifies presentational information for the object", :type => :string
-        opt :encoding, "Specifies what content encodings have been applied to the object and thus what decoding mechanisms must be applied in order to obtain the media-type referenced by the Content-Type header field", :type => :string
-        opt :acl, "The canned ACL to apply to the object. Options include private, public-read, public-read-write, and authenticated-read", :type => :string
-      end
-      name = ARGV.shift
-      Trollop::die "No object name given" if name.nil? or name.empty?
-      file_name = ARGV.shift
-      Trollop::die "No file name given" if file_name.nil? or file_name.empty?
-      Trollop::die "Object has not been added because of unknown error" unless create_object(service, name, file_name, subcommand_options)
-    when "remove"
-      subcommand_options = Trollop::options do
-        banner "object remove s3_object_name"
-      end
-      name = ARGV.shift
-      Trollop::die "No object name given" if name.nil? or name.empty?
-      Trollop::die "Object has not been removed because of unknown error" unless destroy_object(service, name)
-    when "show"
-      subcommand_options = Trollop::options do
-        banner "object show s3_object_name optional_file_name"
-      end
-      name = ARGV.shift
-      Trollop::die "No object name given" if name.nil? or name.empty?
-      file_name = ARGV.shift
-      show_object(service, name, file_name)
-    when nil
-      list_objects(service)
-    else
-      Trollop::die "Unknown subcommand: #{subcommand.inspect}"
-    end
-  when nil
-    Trollop::die "No command given"
-  else
-    Trollop::die "Unknown command #{command.inspect}"
-  end
-rescue Error::ResponseError => e
-  Trollop::die e.message.sub(/\.+\Z/, "")
-end