RubyGems - fog - Versions diffs - 0.2.30 → 0.3.0 - Mend

fog 0.2.30 → 0.3.0

Files changed (531) hide show

data/lib/fog/rackspace/models/{files → storage}/directories.rb RENAMED

@@ -1,19 +1,13 @@
 require 'fog/collection'
-require 'fog/rackspace/models/files/directory'
+require 'fog/rackspace/models/storage/directory'
 module Fog
   module Rackspace
-    module Files
-      module Collections
-        def directories
-          Fog::Rackspace::Files::Directories.new(:connection => self)
-        end
-      end
+    class Storage
       class Directories < Fog::Collection
-        model Fog::Rackspace::Files::Directory
+        model Fog::Rackspace::Storage::Directory
         def all
           data = connection.get_containers.body
@@ -29,7 +23,7 @@ module Fog
             directory.files << directory.files.new(file)
           end
           directory
-        rescue Excon::Errors::NotFound
+        rescue Fog::Rackspace::Storage::NotFound
           nil
         end

data/lib/fog/rackspace/models/{files → storage}/directory.rb RENAMED

@@ -1,16 +1,16 @@
 require 'fog/model'
-require 'fog/rackspace/models/files/files'
+require 'fog/rackspace/models/storage/files'
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class Directory < Fog::Model
         extend Fog::Deprecation
         deprecate(:name, :key)
         deprecate(:name=, :key=)
-        identity  :key, ['name']
+        identity  :key, :aliases => 'name'
         attribute :bytes
         attribute :count
@@ -25,7 +25,7 @@ module Fog
         def files
           @files ||= begin
-            Fog::Rackspace::Files::Files.new(
+            Fog::Rackspace::Storage::Files.new(
               :directory    => self,
               :connection   => connection
             )

data/lib/fog/rackspace/models/{files → storage}/file.rb RENAMED

@@ -2,17 +2,17 @@ require 'fog/model'
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class File < Fog::Model
-        identity  :key,             'Key'
+        identity  :key,             :aliases => 'Key'
         attr_accessor :body
-        attribute :content_length,  'Content-Length'
-        attribute :content_type,    'Content-Type'
-        attribute :etag,            'Etag'
-        attribute :last_modified,   'Last-Modified'
+        attribute :content_length,  :aliases => 'Content-Length'
+        attribute :content_type,    :aliases => 'Content-Type'
+        attribute :etag,            :aliases => 'Etag'
+        attribute :last_modified,   :aliases => 'Last-Modified'
         def body
           @body ||= if last_modified

data/lib/fog/rackspace/models/{files → storage}/files.rb RENAMED

@@ -1,20 +1,22 @@
 require 'fog/collection'
-require 'fog/rackspace/models/files/file'
+require 'fog/rackspace/models/storage/file'
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class Files < Fog::Collection
+        attribute :directory
         attribute :limit
         attribute :marker
         attribute :path
         attribute :prefix
-        model Fog::Rackspace::Files::File
+        model Fog::Rackspace::Storage::File
         def all(options = {})
+          requires :directory
           merge_attributes(options)
           parent = directory.collection.get(
             directory.key,
@@ -27,11 +29,8 @@ module Fog
           end
         end
-        def directory
-          @directory
-        end
         def get(key, options = {}, &block)
+          requires :directory
           options = {
             'limit'   => @limit,
             'marker'  => @marker,
@@ -49,15 +48,17 @@ module Fog
             end
           end
           new(file_data)
-        rescue Excon::Errors::NotFound
+        rescue Fog::Rackspace::Storage::NotFound
           nil
         end
         def get_url(key, expires)
+          requires :directory
           connection.get_object_url(directory.name, key, expires)
         end
         def head(key, options = {})
+          requires :directory
           data = connection.head_object(directory.name, key, options)
           file_data = { :key => key }
           for key, value in data.headers
@@ -66,20 +67,15 @@ module Fog
             end
           end
           new(file_data)
-        rescue Excon::Errors::NotFound
+        rescue Fog::Rackspace::Storage::NotFound
           nil
         end
         def new(attributes = {})
+          requires :directory
           super({ :directory => directory }.merge!(attributes))
         end
-        private
-        def directory=(new_directory)
-          @directory = new_directory
-        end
       end
     end

data/lib/fog/rackspace/requests/{servers → compute}/create_image.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # Create an image from a running server

data/lib/fog/rackspace/requests/{servers → compute}/create_server.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # Create a new server

data/lib/fog/rackspace/requests/{servers → compute}/delete_image.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # Delete an image

data/lib/fog/rackspace/requests/{servers → compute}/delete_server.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # Delete an existing server
@@ -33,7 +33,7 @@ module Fog
             end
             response
           else
-            raise Fog::Rackspace::Servers::NotFound
+            raise Fog::Rackspace::Compute::NotFound
           end
         end

data/lib/fog/rackspace/requests/{servers → compute}/get_flavor_details.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # Get details for flavor by id

data/lib/fog/rackspace/requests/{servers → compute}/get_image_details.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # Get details for image by id

data/lib/fog/rackspace/requests/{servers → compute}/get_server_details.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # Get details about a server
@@ -42,7 +42,7 @@ module Fog
             response.body = { 'server' => server }
             response
           else
-            raise Fog::Rackspace::Servers::NotFound
+            raise Fog::Rackspace::Compute::NotFound
           end
         end

data/lib/fog/rackspace/requests/{servers → compute}/list_addresses.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # List all server addresses
@@ -33,7 +33,7 @@ module Fog
             response.body = { 'addresses' => server['addresses'] }
             response
           else
-            raise Fog::Rackspace::Servers::NotFound
+            raise Fog::Rackspace::Compute::NotFound
           end
         end

data/lib/fog/rackspace/requests/{servers → compute}/list_flavors.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # List all flavors (IDs and names only)

data/lib/fog/rackspace/requests/{servers → compute}/list_flavors_detail.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # List all flavors

data/lib/fog/rackspace/requests/{servers → compute}/list_images.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # List all images (IDs and names only)

data/lib/fog/rackspace/requests/{servers → compute}/list_images_detail.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # List all images

data/lib/fog/rackspace/requests/{servers → compute}/list_private_addresses.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # List private server addresses
@@ -31,7 +31,7 @@ module Fog
             response.body = { 'private' => server['addresses']['private'] }
             response
           else
-            raise Fog::Rackspace::Servers::NotFound
+            raise Fog::Rackspace::Compute::NotFound
           end
         end

data/lib/fog/rackspace/requests/{servers → compute}/list_public_addresses.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # List public server addresses
@@ -31,7 +31,7 @@ module Fog
             response.body = { 'public' => server['addresses']['public'] }
             response
           else
-            raise Fog::Rackspace::Servers::NotFound
+            raise Fog::Rackspace::Compute::NotFound
           end
         end

data/lib/fog/rackspace/requests/{servers → compute}/list_servers.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # List all servers (IDs and names only)

data/lib/fog/rackspace/requests/{servers → compute}/list_servers_detail.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # List all servers details

data/lib/fog/rackspace/requests/{servers → compute}/reboot_server.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # Reboot an existing server

data/lib/fog/rackspace/requests/{servers → compute}/update_server.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Servers
+    class Compute
       class Real
         # Update an existing server
@@ -35,7 +35,7 @@ module Fog
             response.status = 204
             response
           else
-            raise Fog::Rackspace::Servers::NotFound
+            raise Fog::Rackspace::Compute::NotFound
           end
         end

data/lib/fog/rackspace/requests/{files → storage}/delete_container.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class Real
         # Delete an existing container

data/lib/fog/rackspace/requests/{files → storage}/delete_object.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class Real
         # Delete an existing container

data/lib/fog/rackspace/requests/{files → storage}/get_container.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class Real
         # Get details for container and total bytes stored

data/lib/fog/rackspace/requests/{files → storage}/get_containers.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class Real
         # List existing storage containers

data/lib/fog/rackspace/requests/{files → storage}/get_object.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class Real
         # Get details for object

data/lib/fog/rackspace/requests/{files → storage}/head_container.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class Real
         # List number of objects and total bytes stored

data/lib/fog/rackspace/requests/{files → storage}/head_containers.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class Real
         # List number of containers and total bytes stored

data/lib/fog/rackspace/requests/{files → storage}/head_object.rb RENAMED

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    module Files
+    class Storage
       class Real
         # Get headers for object