fog 0.5.3 → 0.6.0

data/lib/fog/storage/google.rb

@@ -167,8 +167,6 @@ module Fog
     
       class Real
         include Utils
-        extend Fog::Deprecation
-        deprecate(:reset, :reload)
 
         # Initialize connection to Google Storage
         #
@@ -195,7 +193,9 @@ module Fog
             Formatador.display_line(warning)
           end
 
+          require 'fog/core/parser'
           require 'mime/types'
+
           @google_storage_access_key_id = options[:google_storage_access_key_id]
           @google_storage_secret_access_key = options[:google_storage_secret_access_key]
           @hmac = Fog::HMAC.new('sha1', @google_storage_secret_access_key)

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

@@ -6,9 +6,6 @@ module Fog
     class Storage
 
       class Directory < Fog::Model
-        extend Fog::Deprecation
-        deprecate(:name, :key)
-        deprecate(:name=, :key=)
 
         identity  :key,           :aliases => ['Name', 'name']
 

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

@@ -5,9 +5,6 @@ module Fog
     class Storage
 
       class File < Fog::Model
-        extend Fog::Deprecation
-        deprecate(:size, :content_length)
-        deprecate(:size=, :content_length=)
 
         identity  :key,             :aliases => 'Key'
 

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

@@ -6,9 +6,6 @@ module Fog
     class Storage
 
       class Directory < Fog::Model
-        extend Fog::Deprecation
-        deprecate(:name, :key)
-        deprecate(:name=, :key=)
 
         identity  :key,           :aliases => ['Name', 'name']
 

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

@@ -5,9 +5,6 @@ module Fog
     class Storage
 
       class File < Fog::Model
-        extend Fog::Deprecation
-        deprecate(:size, :content_length)
-        deprecate(:size=, :content_length=)
 
         identity  :key,             :aliases => 'Key'
 

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

@@ -6,9 +6,6 @@ module Fog
     class Storage
 
       class Directory < Fog::Model
-        extend Fog::Deprecation
-        deprecate(:name, :key)
-        deprecate(:name=, :key=)
 
         identity  :key
 

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

@@ -39,6 +39,23 @@ module Fog
         def destroy
           requires :directory, :key
           ::File.delete(path)
+          dirs = path.split(::File::SEPARATOR)[0...-1]
+          dirs.length.times do |index|
+            dir_path = dirs[0..-index].join(::File::SEPARATOR)
+            if dir_path.empty? # path starts with ::File::SEPARATOR
+              next
+            end
+            # don't delete the containing directory or higher
+            if dir_path == connection.path_to(directory.key)
+              break
+            end
+            pwd = Dir.pwd
+            Dir.chdir(dir_path)
+            if Dir.glob('*').empty?
+              Dir.rmdir(dir_path)
+            end
+            Dir.chdir(pwd)
+          end
           true
         end
 
@@ -52,6 +69,17 @@ module Fog
 
         def save(options = {})
           requires :body, :directory, :key
+          dirs = path.split(::File::SEPARATOR)[0...-1]
+          dirs.length.times do |index|
+            dir_path = dirs[0..index].join(::File::SEPARATOR)
+            if dir_path.empty? # path starts with ::File::SEPARATOR
+              next
+            end
+            # create directory if it doesn't already exist
+            unless ::File.directory?(dir_path)
+              Dir.mkdir(dir_path)
+            end
+          end
           file = ::File.new(path, 'w')
           if body.is_a?(String)
             file.write(body)
@@ -73,7 +101,7 @@ module Fog
         end
 
         def path
-          connection.path_to(::File.join(directory.key, CGI.escape(key)))
+          connection.path_to(::File.join(directory.key, key))
         end
 
       end

data/lib/fog/storage/models/local/files.rb

@@ -14,16 +14,19 @@ module Fog
         def all
           requires :directory
           if directory.collection.get(directory.key)
-            data = Dir.entries(connection.path_to(directory.key)).select do |key|
-              key[0...1] != '.' && !::File.directory?(connection.path_to(key))
+            pwd = Dir.pwd
+            Dir.chdir(connection.path_to(directory.key))
+            data = Dir.glob('**/*').reject do |file|
+              ::File.directory?(file)
             end.map do |key|
               path = file_path(key)
               {
                 :content_length => ::File.size(path),
-                :key            => CGI.unescape(key),
+                :key            => key,
                 :last_modified  => ::File.mtime(path)
               }
             end
+            Dir.chdir(pwd)
             load(data)
           else
             nil
@@ -32,7 +35,7 @@ module Fog
 
         def get(key, &block)
           requires :directory
-          path = file_path(CGI.escape(key))
+          path = file_path(key)
           if ::File.exists?(path)
             data = {
               :content_length => ::File.size(path),
@@ -55,7 +58,7 @@ module Fog
 
         def head(key)
           requires :directory
-          path = file_path(CGI.escape(key))
+          path = file_path(key)
           if ::File.exists?(path)
             new({
               :content_length => ::File.size(path),

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

@@ -6,9 +6,6 @@ module Fog
     class Storage
 
       class Directory < Fog::Model
-        extend Fog::Deprecation
-        deprecate(:name, :key)
-        deprecate(:name=, :key=)
 
         identity  :key, :aliases => 'name'
 
@@ -18,6 +15,7 @@ module Fog
         def destroy
           requires :key
           connection.delete_container(key)
+          connection.cdn.put_container(key, 'X-CDN-Enabled' => 'False')
           true
         rescue Excon::Errors::NotFound
           false

data/lib/fog/storage/parsers/aws/get_bucket_website.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+
+        class GetBucketWebsite < Fog::Parsers::Base
+
+          def reset
+            @response = { 'ErrorDocument' => {}, 'IndexDocument' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'Key'
+              @response['ErrorDocument'][name] = @value
+            when 'Suffix'
+              @response['IndexDocument'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/storage/rackspace.rb

@@ -1,19 +1,3 @@
-module Fog
-  module Rackspace
-    class Files
-
-      def self.new(attributes = {})
-        location = caller.first
-        warning = "[yellow][WARN] Fog::Rackspace::Files#new is deprecated, use Fog::Rackspace::Storage#new instead[/]"
-        warning << " [light_black](" << location << ")[/] "
-        Formatador.display_line(warning)
-        Fog::Rackspace::Storage.new(attributes)
-      end
-
-    end
-  end
-end
-
 module Fog
   module Rackspace
     class Storage < Fog::Service

data/lib/fog/storage/requests/aws/delete_bucket_website.rb

@@ -0,0 +1,32 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+
+        # Delete website configuration for a bucket
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - name of bucket to delete website configuration from
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * status<~Integer> - 204
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEwebsite.html
+
+        def delete_bucket_website(bucket_name)
+          request({
+            :expects  => 204,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'DELETE',
+            :query    => {'website' => nil}
+          })
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/storage/requests/aws/get_bucket_website.rb

@@ -0,0 +1,42 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+
+        require 'fog/storage/parsers/aws/get_bucket_website'
+
+        # Get website configuration for an S3 bucket
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - name of bucket to get website configuration for
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * IndexDocument<~Hash>
+        #       * Suffix<~String> - Suffix appended when directory is requested
+        #     * ErrorDocument<~Hash>
+        #       * Key<~String> - Object key to return for 4XX class errors
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETwebsite.html
+
+        def get_bucket_website(bucket_name)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          request({
+            :expects    => 200,
+            :headers    => {},
+            :host       => "#{bucket_name}.#{@host}",
+            :idempotent => true,
+            :method     => 'GET',
+            :parser     => Fog::Parsers::AWS::Storage::GetBucketWebsite.new,
+            :query      => {'website' => nil}
+          })
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/storage/requests/aws/put_bucket_website.rb

@@ -0,0 +1,49 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+
+        # Change website configuration for an S3 bucket
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - name of bucket to modify
+        # * suffix<~String> - suffix to append to requests for the bucket
+        # * options<~Hash>
+        #   * key<~String> - key to use for 4XX class errors
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTwebsite.html
+
+        def put_bucket_website(bucket_name, suffix, options = {})
+          data =
+<<-DATA
+<WebsiteConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+    <IndexDocument>
+        <Suffix>#{suffix}</Suffix>
+    </IndexDocument>
+DATA
+
+          if options[:key]
+            data <<
+<<-DATA
+<ErrorDocument>
+    <Key>#{options[:key]}</Key>
+</ErrorDocument>
+DATA
+          end
+
+          data << '</WebsiteConfiguration>'
+          request({
+            :body     => data,
+            :expects  => 200,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'PUT',
+            :query    => {'website' => nil}
+          })
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/terremark.rb

@@ -1,16 +1,11 @@
-require 'nokogiri'
-
 require 'fog/core'
-require 'fog/core/parser'
 
 require 'fog/terremark/shared'
 require 'fog/terremark/parser'
-require 'fog/terremark/ecloud'
 require 'fog/terremark/vcloud'
 
 module Fog
   module Terremark
-    ECLOUD_OPTIONS = [:terremark_ecloud_username, :terremark_ecloud_password]
     VCLOUD_OPTIONS = [:terremark_vcloud_username, :terremark_vcloud_password]
   end
 end

data/spec/ecloud/bin_spec.rb

@@ -0,0 +1,22 @@
+require 'ecloud/spec_helper'
+
+describe 'Ecloud' do
+  it { Ecloud.should be_available }
+
+  it { Ecloud.should have_at_least(1).services }
+
+  describe "when indexing it like an array" do
+    describe "with a service that exists" do
+      it "should return something when indexed with a configured service" do
+        Ecloud[:compute].should_not be_nil
+      end
+    end
+
+    describe "with a service that does not exist" do
+      it "should raise an ArgumentError" do
+        lambda {Ecloud[:foozle]}.should raise_error(ArgumentError)
+      end
+    end
+
+  end
+end

data/spec/{vcloud/terremark/ecloud → ecloud}/models/backup_internet_service_spec.rb

@@ -1,11 +1,11 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::BackupInternetService", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::BackupInternetService", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud.vdcs[0].backup_internet_services[0] }
 
     describe :class do
-      subject { Fog::Vcloud::Terremark::Ecloud::BackupInternetService }
+      subject { Fog::Ecloud::Compute::BackupInternetService }
 
       it { should have_identity(:href) }
       it { should have_only_these_attributes([:href, :name, :id, :protocol, :enabled, :description, :timeout, :redirect_url, :monitor]) }
@@ -13,7 +13,7 @@ if Fog.mocking?
 
     context "with no uri" do
 
-      subject { Fog::Vcloud::Terremark::Ecloud::BackupInternetService.new() }
+      subject { Fog::Ecloud::Compute::BackupInternetService.new() }
       it { should have_all_attributes_be_nil }
 
     end
@@ -23,7 +23,7 @@ if Fog.mocking?
 
       let(:composed_service_data) { @vcloud.vdcs[0].backup_internet_services[0].send(:_compose_service_data) }
 
-      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::BackupInternetService) }
+      it { should be_an_instance_of(Fog::Ecloud::Compute::BackupInternetService) }
 
       its(:href)                  { should == @mock_backup_service.href }
       its(:identity)              { should == @mock_backup_service.href }

data/spec/{vcloud/terremark/ecloud → ecloud}/models/backup_internet_services_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::InternetServices", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::InternetServices", :type => :mock_tmrk_ecloud_model do
     context "as an attribute of a VDC" do
       subject { @vcloud.vdcs[0] }
 
@@ -9,7 +9,7 @@ if Fog.mocking?
 
       describe :class do
         subject { @vcloud.vdcs[0].backup_internet_services.class }
-        its(:model)       { should == Fog::Vcloud::Terremark::Ecloud::BackupInternetService }
+        its(:model)       { should == Fog::Ecloud::Compute::BackupInternetService }
       end
 
       describe :backup_internet_services do
@@ -17,7 +17,7 @@ if Fog.mocking?
 
         it { should respond_to(:create) }
 
-        it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::BackupInternetServices) }
+        it { should be_an_instance_of(Fog::Ecloud::Compute::BackupInternetServices) }
 
         its(:length) { should == 1 }