RubyGems - fog - Versions diffs - 0.8.2 → 0.9.0 - Mend

fog 0.8.2 → 0.9.0

Files changed (913) hide show

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

@@ -2,8 +2,8 @@ require 'fog/core/model'
 require 'fog/storage/models/google/files'
 module Fog
-  module Google
-    class Storage
+  module Storage
+    class Google
       class Directory < Fog::Model
@@ -29,7 +29,7 @@ module Fog
         def files
           @files ||= begin
-            Fog::Google::Storage::Files.new(
+            Fog::Storage::Google::Files.new(
               :directory    => self,
               :connection   => connection
             )

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

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 module Fog
-  module Google
-    class Storage
+  module Storage
+    class Google
       class File < Fog::Model

data/lib/fog/storage/models/google/files.rb CHANGED

@@ -2,8 +2,8 @@ require 'fog/core/collection'
 require 'fog/storage/models/google/file'
 module Fog
-  module Google
-    class Storage
+  module Storage
+    class Google
       class Files < Fog::Collection
@@ -15,7 +15,7 @@ module Fog
         attribute :max_keys,        :aliases => ['MaxKeys', 'max-keys']
         attribute :prefix,          :aliases => 'Prefix'
-        model Fog::Google::Storage::File
+        model Fog::Storage::Google::File
         def all(options = {})
           requires :directory

data/lib/fog/storage/models/local/directories.rb CHANGED

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/storage/models/local/directory'
 module Fog
-  module Local
-    class Storage
+  module Storage
+    class Local
       class Directories < Fog::Collection
-        model Fog::Local::Storage::Directory
+        model Fog::Storage::Local::Directory
         def all
           data = Dir.entries(connection.local_root).select do |entry|

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

@@ -2,8 +2,8 @@ require 'fog/core/model'
 require 'fog/storage/models/local/files'
 module Fog
-  module Local
-    class Storage
+  module Storage
+    class Local
       class Directory < Fog::Model
@@ -22,7 +22,7 @@ module Fog
         def files
           @files ||= begin
-            Fog::Local::Storage::Files.new(
+            Fog::Storage::Local::Files.new(
               :directory    => self,
               :connection   => connection
             )

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

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 module Fog
-  module Local
-    class Storage
+  module Storage
+    class Local
       class File < Fog::Model

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

@@ -2,14 +2,14 @@ require 'fog/core/collection'
 require 'fog/storage/models/local/file'
 module Fog
-  module Local
-    class Storage
+  module Storage
+    class Local
       class Files < Fog::Collection
         attribute :directory
-        model Fog::Local::Storage::File
+        model Fog::Storage::Local::File
         def all
           requires :directory

data/lib/fog/storage/models/rackspace/directories.rb CHANGED

@@ -2,21 +2,25 @@ require 'fog/core/collection'
 require 'fog/storage/models/rackspace/directory'
 module Fog
-  module Rackspace
-    class Storage
+  module Storage
+    class Rackspace
       class Directories < Fog::Collection
-        model Fog::Rackspace::Storage::Directory
+        model Fog::Storage::Rackspace::Directory
         def all
           data = connection.get_containers.body
           load(data)
         end
+        # Supply the :cdn_cname option to use the Rackspace CDN CNAME functionality on the public_url.
+        #
+        # > fog.directories.get('video', :cdn_cname => 'http://cdn.lunenburg.org').files.first.public_url
+        # => 'http://cdn.lunenburg.org/hayley-dancing.mov'
         def get(key, options = {})
           data = connection.get_container(key, options)
-          directory = new(:key => key)
+          directory = new(:key => key, :cdn_cname => options[:cdn_cname])
           for key, value in data.headers
             if ['X-Container-Bytes-Used', 'X-Container-Object-Count'].include?(key)
               directory.merge_attributes(key => value)
@@ -28,7 +32,7 @@ module Fog
             directory.files << directory.files.new(file)
           end
           directory
-        rescue Fog::Rackspace::Storage::NotFound
+        rescue Fog::Storage::Rackspace::NotFound
           nil
         end

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

@@ -2,8 +2,8 @@ require 'fog/core/model'
 require 'fog/storage/models/rackspace/files'
 module Fog
-  module Rackspace
-    class Storage
+  module Storage
+    class Rackspace
       class Directory < Fog::Model
@@ -11,6 +11,7 @@ module Fog
         attribute :bytes, :aliases => 'X-Container-Bytes-Used'
         attribute :count, :aliases => 'X-Container-Object-Count'
+        attribute :cdn_cname
         def destroy
           requires :key
@@ -23,7 +24,7 @@ module Fog
         def files
           @files ||= begin
-            Fog::Rackspace::Storage::Files.new(
+            Fog::Storage::Rackspace::Files.new(
               :directory    => self,
               :connection   => connection
             )
@@ -42,7 +43,7 @@ module Fog
                 if connection.rackspace_cdn_ssl == true
                   response.headers['X-CDN-SSL-URI']
                 else
-                  response.headers['X-CDN-URI']
+                  cdn_cname || response.headers['X-CDN-URI']
                 end
               end
             rescue Fog::Service::NotFound

data/lib/fog/storage/models/rackspace/file.rb CHANGED

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 module Fog
-  module Rackspace
-    class Storage
+  module Storage
+    class Rackspace
       class File < Fog::Model
@@ -49,10 +49,8 @@ module Fog
         end
         def public_url
-          requires :directory, :key
-          if @directory.public_url
-            "#{@directory.public_url}/#{key}"
-          end
+          requires :key
+          self.collection.get_url(self.key)
         end
         def save(options = {})

data/lib/fog/storage/models/rackspace/files.rb CHANGED

@@ -2,8 +2,8 @@ require 'fog/core/collection'
 require 'fog/storage/models/rackspace/file'
 module Fog
-  module Rackspace
-    class Storage
+  module Storage
+    class Rackspace
       class Files < Fog::Collection
@@ -13,7 +13,7 @@ module Fog
         attribute :path
         attribute :prefix
-        model Fog::Rackspace::Storage::File
+        model Fog::Storage::Rackspace::File
         def all(options = {})
           requires :directory
@@ -60,13 +60,15 @@ module Fog
             :key  => key
           })
           new(file_data)
-        rescue Fog::Rackspace::Storage::NotFound
+        rescue Fog::Storage::Rackspace::NotFound
           nil
         end
-        def get_url(key, expires)
+        def get_url(key)
           requires :directory
-          connection.get_object_url(directory.key, key, expires)
+          if self.directory.public_url
+            "#{self.directory.public_url}/#{key}"
+          end
         end
         def head(key, options = {})
@@ -76,7 +78,7 @@ module Fog
             :key => key
           })
           new(file_data)
-        rescue Fog::Rackspace::Storage::NotFound
+        rescue Fog::Storage::Rackspace::NotFound
           nil
         end

data/lib/fog/storage/parsers/aws/access_control_list.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class AccessControlList < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/complete_multipart_upload.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class CompleteMultipartUpload < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/copy_object.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class CopyObject < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/get_bucket.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class GetBucket < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/get_bucket_location.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class GetBucketLocation < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/get_bucket_logging.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class GetBucketLogging < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/get_bucket_object_versions.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class GetBucketObjectVersions < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/get_bucket_versioning.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class GetBucketVersioning < Fog::Parsers::Base

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class GetBucketWebsite < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/get_request_payment.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class GetRequestPayment < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/get_service.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class GetService < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/initiate_multipart_upload.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class InitiateMultipartUpload < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/list_multipart_uploads.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class ListMultipartUploads < Fog::Parsers::Base

data/lib/fog/storage/parsers/aws/list_parts.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module Storage
+    module Storage
+      module AWS
         class ListParts < Fog::Parsers::Base

data/lib/fog/storage/parsers/google/access_control_list.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Google
-      module Storage
+    module Storage
+      module Google
         class AccessControlList < Fog::Parsers::Base

data/lib/fog/storage/parsers/google/copy_object.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Google
-      module Storage
+    module Storage
+      module Google
         class CopyObject < Fog::Parsers::Base

data/lib/fog/storage/parsers/google/get_bucket.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Google
-      module Storage
+    module Storage
+      module Google
         class GetBucket < Fog::Parsers::Base