fog 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/bin/fog

@@ -3,7 +3,9 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require 'irb'
 require 'yaml'
 
-if File.exists?(File.expand_path('~/.fog'))
+if ARGV[0] && File.exists?(File.expand_path(ARGV[0]))
+  @credentials = YAML.load(File.open(File.expand_path(ARGV[0])).read)
+elsif File.exists?(File.expand_path('~/.fog'))
   @credentials = YAML.load(File.open(File.expand_path('~/.fog')).read)
 end
 

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wesley Beary"]
-  s.date = %q{2009-10-01}
+  s.date = %q{2009-10-05}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}

data/lib/fog/aws/models/s3/objects.rb

@@ -42,6 +42,10 @@ module Fog
           nil
         end
 
+        def get_url(key, expires)
+          connection.get_object_url(bucket.name, key, expires)
+        end
+
         def head(key, options = {})
           data = connection.head_object(bucket.name, key, options)
           object_data = {

data/lib/fog/aws/requests/s3/copy_object.rb

@@ -33,7 +33,7 @@ unless Fog.mocking?
             :host     => "#{target_bucket_name}.#{@host}",
             :method   => 'PUT',
             :parser   => Fog::Parsers::AWS::S3::CopyObject.new,
-            :path     => target_object_name
+            :path     => CGI.escape(target_object_name)
           })
         end
 

data/lib/fog/aws/requests/s3/delete_object.rb

@@ -19,7 +19,7 @@ unless Fog.mocking?
             :headers  => {},
             :host     => "#{bucket_name}.#{@host}",
             :method   => 'DELETE',
-            :path     => object_name
+            :path     => CGI.escape(object_name)
           })
         end
 

data/lib/fog/aws/requests/s3/get_object.rb

@@ -39,11 +39,26 @@ unless Fog.mocking?
             :headers  => headers,
             :host     => "#{bucket_name}.#{@host}",
             :method   => 'GET',
-            :path     => object_name,
+            :path     => CGI.escape(object_name),
             :block    => block
           })
         end
 
+        def get_object_url(bucket_name, object_name, expires)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+          url({
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'GET',
+            :path     => object_name
+          }, expires)
+        end
+
       end
     end
   end

data/lib/fog/aws/requests/s3/head_object.rb

@@ -34,7 +34,7 @@ unless Fog.mocking?
             :headers  => headers,
             :host     => "#{bucket_name}.#{@host}",
             :method   => 'HEAD',
-            :path     => object_name
+            :path     => CGI.escape(object_name)
           })
         end
 

data/lib/fog/aws/requests/s3/put_object.rb

@@ -33,7 +33,7 @@ unless Fog.mocking?
             :headers  => headers,
             :host     => "#{bucket_name}.#{@host}",
             :method   => 'PUT',
-            :path     => object_name
+            :path     => CGI.escape(object_name)
           })
         end
 

data/lib/fog/aws/s3.rb

@@ -55,7 +55,7 @@ module Fog
       # :aws_secret_access_key in order to create a connection
       #
       # ==== Examples
-      #   sdb = S3.new(
+      #   s3 = S3.new(
       #     :aws_access_key_id => your_aws_access_key_id,
       #     :aws_secret_access_key => your_aws_secret_access_key
       #   )
@@ -100,7 +100,33 @@ module Fog
 
       def request(params)
         params[:headers]['Date'] = Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000")
+        params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
 
+        response = @connection.request({
+          :block    => params[:block],
+          :body     => params[:body],
+          :expects  => params[:expects],
+          :headers  => params[:headers],
+          :host     => params[:host],
+          :method   => params[:method],
+          :parser   => params[:parser],
+          :path     => params[:path],
+          :query    => params[:query]
+        })
+
+        response
+      end
+
+      def url(params, expires)
+        params[:headers]['Date'] = expires.to_i
+        query = [params[:query]].compact
+        query << "AWSAccessKeyId=#{@aws_access_key_id}"
+        query << "Signature=#{CGI.escape(signature(params))}"
+        query << "Expires=#{params[:headers]['Date']}"
+        "http://#{params[:host]}/#{params[:path]}?#{query.join('&')}"
+      end
+
+      def signature(params)
         string_to_sign =
 <<-DATA
 #{params[:method]}
@@ -121,9 +147,20 @@ DATA
         end
         string_to_sign << "#{canonical_amz_headers}"
 
-        canonical_resource  = "/"
         subdomain = params[:host].split(".#{@host}").first
-        unless subdomain == @host
+        unless subdomain =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+          puts("[WARN] fog: the specified s3 bucket name(#{subdomain}) is not a valid dns name.  See: http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?Introduction.html")
+          params[:host] = params[:host].split("#{subdomain}.")[-1]
+          if params[:path]
+            params[:path] = "#{subdomain}/#{params[:path]}"
+          else
+            params[:path] = "#{subdomain}"
+          end
+          subdomain = nil
+        end
+
+        canonical_resource  = "/"
+        unless subdomain.nil? || subdomain == @host
           canonical_resource << "#{CGI.escape(subdomain).downcase}/"
         end
         canonical_resource << "#{params[:path]}"
@@ -134,21 +171,6 @@ DATA
 
         hmac = @hmac.update(string_to_sign)
         signature = Base64.encode64(hmac.digest).chomp!
-        params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature}"
-
-        response = @connection.request({
-          :block    => params[:block],
-          :body     => params[:body],
-          :expects  => params[:expects],
-          :headers  => params[:headers],
-          :host     => params[:host],
-          :method   => params[:method],
-          :parser   => params[:parser],
-          :path     => params[:path],
-          :query    => params[:query]
-        })
-
-        response
       end
 
     end

data/lib/fog/connection.rb

@@ -17,13 +17,20 @@ unless Fog.mocking?
 
       def initialize(url)
         @uri = URI.parse(url)
-        @connection = TCPSocket.open(@uri.host, @uri.port)
-        if @uri.scheme == 'https'
-          @ssl_context = OpenSSL::SSL::SSLContext.new
-          @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          @connection = OpenSSL::SSL::SSLSocket.new(@connection, @ssl_context)
-          @connection.sync_close = true
-          @connection.connect
+      end
+
+      def connection
+        if @connection && !@connection.closed?
+          @connection
+        else
+          @connection = TCPSocket.open(@uri.host, @uri.port)
+          if @uri.scheme == 'https'
+            @ssl_context = OpenSSL::SSL::SSLContext.new
+            @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            @connection = OpenSSL::SSL::SSLSocket.new(@connection, @ssl_context)
+            @connection.sync_close = true
+            @connection.connect
+          end
         end
       end
 
@@ -45,7 +52,7 @@ unless Fog.mocking?
           request << "#{key}: #{value}\r\n"
         end
         request << "\r\n"
-        @connection.write(request)
+        connection.write(request)
 
         if params[:body]
           if params[:body].is_a?(String)
@@ -54,18 +61,18 @@ unless Fog.mocking?
             body = params[:body]
           end
           while chunk = body.read(CHUNK_SIZE)
-            @connection.write(chunk)
+            connection.write(chunk)
           end
         end
 
         response = Fog::Response.new
         response.request = params
-        response.status = @connection.readline[9..11].to_i
+        response.status = connection.readline[9..11].to_i
         if params[:expects] && params[:expects] != response.status
           error = true
         end
         while true
-          data = @connection.readline.chomp!
+          data = connection.readline.chomp!
           if data == ""
             break
           end
@@ -73,35 +80,35 @@ unless Fog.mocking?
           response.headers[capitalize(header[0])] = header[1]
         end
 
-        if error || params[:parser]
-          if error
-            parser = Fog::Errors::Parser.new
-          elsif params[:parser]
-            parser = params[:parser]
+        unless params[:method] == 'HEAD'
+          if error || params[:parser]
+            if error
+              parser = Fog::Errors::Parser.new
+            elsif params[:parser]
+              parser = params[:parser]
+            end
+            body = Nokogiri::XML::SAX::PushParser.new(parser)
+          elsif params[:block]
+            body = nil
+          else
+            body = ''
           end
-          body = Nokogiri::XML::SAX::PushParser.new(parser)
-        elsif params[:block]
-          body = nil
-        else
-          body = ''
-        end
 
-        unless params[:method] == 'HEAD'
           if response.headers['Content-Length']
             if error || !params[:block]
-              body << @connection.read(response.headers['Content-Length'].to_i)
+              body << connection.read(response.headers['Content-Length'].to_i)
             else
               remaining = response.headers['Content-Length'].to_i
               while remaining > 0
-                params[:block].call(@connection.read([CHUNK_SIZE, remaining].min))
+                params[:block].call(connection.read([CHUNK_SIZE, remaining].min))
                 remaining -= CHUNK_SIZE;
               end
             end
           elsif response.headers['Transfer-Encoding'] == 'chunked'
             while true
               # 2 == "/r/n".length
-              chunk_size = @connection.readline.chomp!.to_i(16) + 2
-              chunk = @connection.read(chunk_size)[0...-2]
+              chunk_size = connection.readline.chomp!.to_i(16) + 2
+              chunk = connection.read(chunk_size)[0...-2]
               if error || !params[:block]
                 body << chunk
               else
@@ -112,13 +119,13 @@ unless Fog.mocking?
               end
             end
           end
-        end
 
-        if parser
-          body.finish
-          response.body = parser.response
-        else
-          response.body = body
+          if parser
+            body.finish
+            response.body = parser.response
+          else
+            response.body = body
+          end
         end
 
         if error

data/spec/aws/models/s3/objects_spec.rb

@@ -90,6 +90,18 @@ describe 'Fog::AWS::S3::Objects' do
 
   end
 
+  describe "#get_url" do
+
+    it "should return a signed expiring url" do
+      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
+      object = @bucket.objects.create(:key => 'fogobjectname', :body => file)
+      url = @bucket.objects.get_url('fogobjectname', Time.now + 60 * 10)
+      open(url).read.should == File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r').read
+      object.destroy
+    end
+
+  end
+
   describe "#head" do
 
     it "should return a Fog::AWS::S3::Object with metadata" do

data/spec/aws/requests/s3/get_bucket_spec.rb

@@ -106,5 +106,11 @@ describe 'S3.get_bucket' do
       }.should raise_error(Fog::Errors::NotFound)
     end
 
+    it 'should request non-subdomain buckets and raise a NotFound error' do
+      lambda {
+        s3.get_bucket('A-invalid--name')
+      }.should raise_error(Fog::Errors::NotFound)
+    end
+
   end
 end

data/spec/aws/requests/s3/get_object_spec.rb

@@ -35,6 +35,12 @@ describe 'S3.get_object' do
       data.should == file.read
     end
 
+    it 'should return a signed expiring url' do
+      url = s3.get_object_url('foggetobject', 'fog_get_object', Time.now + 60 * 10)
+      file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
+      open(url).read.should == file.read
+    end
+
   end
   describe 'failure' do
 

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'spec'
+require 'open-uri'
 
 current_directory = File.dirname(__FILE__)
 require "#{current_directory}/../lib/fog"
@@ -6,7 +7,7 @@ require "#{current_directory}/../lib/fog"
 
 def credentials
   @credentials ||= begin
-    credentials_path = "#{File.dirname(__FILE__)}/credentials.yml"
+    credentials_path = File.expand_path('~/.fog')
     credentials_data = File.open(credentials_path).read
     YAML.load(credentials_data)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Wesley Beary
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -07:00
+date: 2009-10-05 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency