aws-s3 0.6.0 → 0.6.1

data/COPYING

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006-2008 Marcel Molina Jr. <marcel@vernix.org>
+# Copyright (c) 2006-2009 Marcel Molina Jr. <marcel@vernix.org>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in the

data/Rakefile

@@ -208,7 +208,7 @@ namespace :test do
     
   desc 'Check test coverage'
   task :coverage do
-    system("rcov --sort coverage #{File.join(library_root, 'test/*_test.rb')}")
+    system("rcov -x Library -x support --sort coverage #{File.join(library_root, 'test/*_test.rb')}")
     show_test_coverage_results
   end
   
@@ -224,7 +224,7 @@ namespace :test do
 
   desc 'Check test coverage of full stack remote tests'
   task :full_coverage do
-    system("rcov --sort coverage #{File.join(library_root, 'test/remote/*_test.rb')} #{File.join(library_root, 'test/*_test.rb')}")
+    system("rcov -x Library -x support --sort coverage #{File.join(library_root, 'test/remote/*_test.rb')} #{File.join(library_root, 'test/*_test.rb')}")
     show_test_coverage_results
   end
   

data/lib/aws/s3/acl.rb

@@ -528,7 +528,7 @@ module AWS
         #   bucket.acl(bucket.acl)
         def acl(reload = false)
           policy = reload.is_a?(ACL::Policy) ? reload : nil
-          memoize(reload) do
+          expirable_memoize(reload) do
             self.class.acl(name, policy) if policy
             self.class.acl(name)
           end
@@ -579,7 +579,7 @@ module AWS
         #   object.acl(object.acl)
         def acl(reload = false)
           policy = reload.is_a?(ACL::Policy) ? reload : nil
-          memoize(reload) do
+          expirable_memoize(reload) do
             self.class.acl(key, bucket.name, policy) if policy
             self.class.acl(key, bucket.name)
           end

data/lib/aws/s3/connection.rb

@@ -249,73 +249,28 @@ module AWS
       end
         
       class Options < Hash #:nodoc:
-        class << self
-          def valid_options
-            [:access_key_id, :secret_access_key, :server, :port, :use_ssl, :persistent, :proxy]
-          end
-        end
+        VALID_OPTIONS = [:access_key_id, :secret_access_key, :server, :port, :use_ssl, :persistent, :proxy].freeze
         
-        attr_reader :options
         def initialize(options = {})
           super()
-          @options = options
-          validate!
-          extract_proxy_settings!
-          extract_persistent!
-          extract_server!
-          extract_port!
-          extract_remainder!
+          validate(options)
+          replace(:server => DEFAULT_HOST, :port => (options[:use_ssl] ? 443 : 80))
+          merge!(options)
         end
-        
+
         def connecting_through_proxy?
           !self[:proxy].nil?
         end
         
         def proxy_settings
-          proxy_setting_keys.map do |proxy_key| 
-            self[:proxy][proxy_key]
-          end
+          self[:proxy].values_at(:host, :port, :user, :password)
         end
         
         private
-          def proxy_setting_keys
-            [:host, :port, :user, :password]
-          end
-          
-          def missing_proxy_settings?
-            !self[:proxy].keys.include?(:host)
-          end
-          
-          def extract_persistent!
-            self[:persistent] = options.has_key?(:persitent) ? options[:persitent] : false
-          end
-          
-          def extract_proxy_settings!
-            self[:proxy] = options.delete(:proxy) if options.include?(:proxy)
-            validate_proxy_settings!
-          end
-          
-          def extract_server!
-            self[:server] = options.delete(:server) || DEFAULT_HOST
-          end
-
-          def extract_port!
-            self[:port] = options.delete(:port) || (options[:use_ssl] ? 443 : 80)
-          end
-          
-          def extract_remainder!
-            update(options)
-          end
-          
-          def validate!
-            invalid_options = options.keys.select {|key| !self.class.valid_options.include?(key)}
+          def validate(options)
+            invalid_options = options.keys - VALID_OPTIONS
             raise InvalidConnectionOption.new(invalid_options) unless invalid_options.empty?
-          end
-          
-          def validate_proxy_settings!
-            if connecting_through_proxy? && missing_proxy_settings?
-              raise ArgumentError, "Missing proxy settings. Must specify at least :host."
-            end
+            raise ArgumentError, "Missing proxy settings. Must specify at least :host." if options[:proxy] && !options[:proxy][:host]
           end
       end
     end

data/lib/aws/s3/exceptions.rb

@@ -58,7 +58,7 @@ module AWS
     class InvalidConnectionOption < InvalidOption
       def initialize(invalid_options)
         message = "The following connection options are invalid: #{invalid_options.join(', ')}. "    +
-                  "The valid connection options are: #{Connection::Options.valid_options.join(', ')}."
+                  "The valid connection options are: #{Connection::Options::VALID_OPTIONS.join(', ')}."
         super(message)
       end
     end

data/lib/aws/s3/extensions.rb

@@ -133,8 +133,8 @@ module Kernel
     caller[1][/`([^']+)'/, 1]
   end if RUBY_VERSION > '1.8.7'
   
-  def memoize(reload = false, storage = nil)
-    current_method = RUBY_VERSION >= '1.8.7' ? __called_from__ : __method__(1)
+  def expirable_memoize(reload = false, storage = nil)
+    current_method = RUBY_VERSION > '1.8.7' ? __called_from__ : __method__(1)
     storage = "@#{storage || current_method}"
     if reload 
       instance_variable_set(storage, nil)
@@ -174,7 +174,7 @@ class Module
     alias_method original_method, method_name
     module_eval(<<-EVAL, __FILE__, __LINE__)
       def #{method_name}(reload = false, *args, &block)
-        memoize(reload) do
+        expirable_memoize(reload) do
           send(:#{original_method}, *args, &block)
         end
       end

data/lib/aws/s3/object.rb

@@ -485,7 +485,7 @@ module AWS
           reload  = options
           options = {}
         end
-        memoize(reload) do
+        expirable_memoize(reload) do
           self.class.stream(key, bucket.name, options, &block)
         end
       end
@@ -561,7 +561,7 @@ module AWS
       
       def etag(reload = false)
         return nil unless stored?
-        memoize(reload) do
+        expirable_memoize(reload) do
           reload ? about(reload)['etag'][1...-1] : attributes['e_tag'][1...-1]
         end
       end

data/lib/aws/s3/version.rb

@@ -3,8 +3,8 @@ module AWS
     module VERSION #:nodoc:
       MAJOR    = '0'
       MINOR    = '6'
-      TINY     = '0' 
-      BETA     = nil # Time.now.to_i.to_s
+      TINY     = '1' 
+      BETA     = nil #Time.now.to_i.to_s
     end
     
     Version = [VERSION::MAJOR, VERSION::MINOR, VERSION::TINY, VERSION::BETA].compact * '.'

data/test/connection_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/test_helper'
 class ConnectionTest < Test::Unit::TestCase
   attr_reader :keys
   def setup
-    @keys = {:access_key_id => '123', :secret_access_key => 'abc'}
+    @keys = {:access_key_id => '123', :secret_access_key => 'abc'}.freeze
   end
   
   def test_creating_a_connection
@@ -207,7 +207,6 @@ class ConnectionOptionsTest < Test::Unit::TestCase
   private
     def assert_key_transfered(key, value, options)
       assert_equal value, options[key]
-      assert !options.instance_variable_get('@options').has_key?(key)
     end
       
     def generate_options(options = {})

data/test/extensions_test.rb

@@ -144,13 +144,13 @@ end if RUBY_VERSION < '1.8.7'
 class ModuleExtensionsTest < Test::Unit::TestCase
   class Foo
     def foo(reload = false)
-      memoize(reload) do
+      expirable_memoize(reload) do
         Time.now
       end
     end
     
     def bar(reload = false)
-      memoize(reload, :baz) do
+      expirable_memoize(reload, :baz) do
         Time.now
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aws-s3
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Marcel Molina Jr.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 00:00:00 -07:00
+date: 2009-04-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency