fog 0.0.46 → 0.0.47

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 46
+:patch: 47
 :build: 

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.46"
+  s.version = "0.0.47"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-02-22}
+  s.date = %q{2010-03-03}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -143,6 +143,10 @@ Gem::Specification.new do |s|
      "lib/fog/rackspace.rb",
      "lib/fog/rackspace/bin.rb",
      "lib/fog/rackspace/files.rb",
+     "lib/fog/rackspace/models/files/directories.rb",
+     "lib/fog/rackspace/models/files/directory.rb",
+     "lib/fog/rackspace/models/files/file.rb",
+     "lib/fog/rackspace/models/files/files.rb",
      "lib/fog/rackspace/models/servers/flavor.rb",
      "lib/fog/rackspace/models/servers/flavors.rb",
      "lib/fog/rackspace/models/servers/image.rb",
@@ -153,8 +157,10 @@ Gem::Specification.new do |s|
      "lib/fog/rackspace/requests/files/delete_object.rb",
      "lib/fog/rackspace/requests/files/get_container.rb",
      "lib/fog/rackspace/requests/files/get_containers.rb",
+     "lib/fog/rackspace/requests/files/get_object.rb",
      "lib/fog/rackspace/requests/files/head_container.rb",
      "lib/fog/rackspace/requests/files/head_containers.rb",
+     "lib/fog/rackspace/requests/files/head_object.rb",
      "lib/fog/rackspace/requests/files/put_container.rb",
      "lib/fog/rackspace/requests/files/put_object.rb",
      "lib/fog/rackspace/requests/servers/create_image.rb",
@@ -291,8 +297,10 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/files/delete_object_spec.rb",
      "spec/rackspace/requests/files/get_container_spec.rb",
      "spec/rackspace/requests/files/get_containers_spec.rb",
+     "spec/rackspace/requests/files/get_object_spec.rb",
      "spec/rackspace/requests/files/head_container_spec.rb",
      "spec/rackspace/requests/files/head_containers_spec.rb",
+     "spec/rackspace/requests/files/head_object_spec.rb",
      "spec/rackspace/requests/files/put_container_spec.rb",
      "spec/rackspace/requests/files/put_object_spec.rb",
      "spec/rackspace/requests/servers/create_image_spec.rb",
@@ -367,7 +375,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fog}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{fog = clouds + you}
   s.test_files = [
     "spec/aws/models/ec2/address_spec.rb",
@@ -445,8 +453,10 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/files/delete_object_spec.rb",
      "spec/rackspace/requests/files/get_container_spec.rb",
      "spec/rackspace/requests/files/get_containers_spec.rb",
+     "spec/rackspace/requests/files/get_object_spec.rb",
      "spec/rackspace/requests/files/head_container_spec.rb",
      "spec/rackspace/requests/files/head_containers_spec.rb",
+     "spec/rackspace/requests/files/head_object_spec.rb",
      "spec/rackspace/requests/files/put_container_spec.rb",
      "spec/rackspace/requests/files/put_object_spec.rb",
      "spec/rackspace/requests/servers/create_image_spec.rb",

data/lib/fog/aws/models/ec2/server.rb

@@ -31,6 +31,7 @@ module Fog
 
         def initialize(attributes)
           @groups ||= ["default"]
+          @flavor_id ||= 'm1.small'
           super
         end
 
@@ -56,7 +57,7 @@ module Fog
         # end
 
         def flavor_id
-          @flavor_id || @flavor && @flavor.id || 'm1.small'
+          @flavor && @flavor.id || @flavor_id
         end
 
         def flavor=(new_flavor)
@@ -64,7 +65,7 @@ module Fog
         end
 
         def flavor
-          @flavor || connection.flavors.all.detect {|flavor| flavor.id == @flavor_id}
+          @flavor ||= connection.flavors.all.detect {|flavor| flavor.id == @flavor_id}
         end
 
         def key_pair
@@ -106,7 +107,7 @@ module Fog
         def save
           requires :image_id
 
-          options = {'InstanceType' => flavor}
+          options = {'InstanceType' => flavor.id}
           if @availability_zone
             options['Placement.AvailabilityZone'] = @availability_zone
           end

data/lib/fog/aws/models/ec2/volume.rb

@@ -30,6 +30,8 @@ module Fog
         end
 
         def server=(new_server)
+          requires :device
+
           if new_server
             attach(new_server)
           else

data/lib/fog/aws/models/ec2/volumes.rb

@@ -32,7 +32,7 @@ module Fog
             volumes << new(volume)
           end
           if server
-            volumes = volumes.select {|volume| volume.instance_id == server.id}
+            volumes = volumes.select {|volume| volume.server_id == server.id}
           end
           self.replace(volumes)
         end

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

@@ -35,13 +35,13 @@ unless Fog.mocking?
           headers['If-Unmodified-Since'] = options['If-Unmodified-Since'].utc.strftime("%a, %d %b %Y %H:%M:%S +0000") if options['If-Modified-Since']
           headers.merge!(options)
           request({
+            :block    => block,
             :expects  => 200,
             :headers  => headers,
             :host     => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method   => 'GET',
-            :path     => CGI.escape(object_name),
-            :block    => block
+            :path     => CGI.escape(object_name)
           })
         end
 

data/lib/fog/collection.rb

@@ -10,7 +10,16 @@ module Fog
       RUBY
     end
 
-    def self._load(marhsalled)
+    %w[reject select].each do |method|
+      class_eval <<-RUBY
+        def #{method}(*args)
+          lazy_load
+          self.class.new(:connection => self.connection).load(super)
+        end
+      RUBY
+    end
+
+    def self._load(marshalled)
       new(Marshal.load(marshalled))
     end
 
@@ -92,6 +101,11 @@ module Fog
       data
     end
 
+    def load(array)
+      @loaded = true
+      self.clear.concat(array)
+    end
+
     def model
       self.class.instance_variable_get('@model')
     end

data/lib/fog/rackspace/bin.rb

@@ -21,6 +21,10 @@ module Rackspace
         @@connections[service]
       end
 
+      def directories
+        self[:files].directories
+      end
+
       def flavors
         self[:servers].flavors
       end

data/lib/fog/rackspace/files.rb

@@ -4,12 +4,18 @@ module Fog
 
       def self.dependencies
         [
+          "fog/rackspace/models/files/directory.rb",
+          "fog/rackspace/models/files/directories.rb",
+          "fog/rackspace/models/files/file.rb",
+          "fog/rackspace/models/files/files.rb",
           "fog/rackspace/requests/files/delete_container.rb",
           "fog/rackspace/requests/files/delete_object.rb",
           "fog/rackspace/requests/files/get_container.rb",
           "fog/rackspace/requests/files/get_containers.rb",
+          "fog/rackspace/requests/files/get_object.rb",
           "fog/rackspace/requests/files/head_container.rb",
           "fog/rackspace/requests/files/head_containers.rb",
+          "fog/rackspace/requests/files/head_object.rb",
           "fog/rackspace/requests/files/put_container.rb",
           "fog/rackspace/requests/files/put_object.rb"
         ]
@@ -44,12 +50,12 @@ module Fog
           metadata[:body] = data
           metadata[:headers]['Content-Length'] = metadata[:body].size.to_s
         else
-          filename = File.basename(data.path)
+          filename = ::File.basename(data.path)
           unless (mime_types = MIME::Types.of(filename)).empty?
             metadata[:headers]['Content-Type'] = mime_types.first.content_type
           end
           metadata[:body] = data.read
-          metadata[:headers]['Content-Length'] = File.size(data.path).to_s
+          metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
         end
         # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
         metadata
@@ -75,7 +81,7 @@ module Fog
         response
       end
 
-      def storage_request(params)
+      def storage_request(params, parse_json = true)
         @storage_connection = Fog::Connection.new("#{@storage_scheme}://#{@storage_host}:#{@storage_port}")
         response = @storage_connection.request({
           :body     => params[:body],
@@ -89,7 +95,7 @@ module Fog
           :path     => "#{@storage_path}/#{params[:path]}",
           :query    => params[:query]
         })
-        unless response.body.empty?
+        if !response.body.empty? && parse_json
           response.body = JSON.parse(response.body)
         end
         response

data/lib/fog/rackspace/models/files/directories.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Rackspace
+    class Files
+
+      def directories
+        Fog::Rackspace::Files::Directories.new(:connection => self)
+      end
+
+      class Directories < Fog::Collection
+
+        model Fog::Rackspace::Files::Directory
+
+        def all
+          if @loaded
+            clear
+          end
+          @loaded = true
+          data = connection.get_containers.body
+          data.each do |directory|
+            self << new(directory)
+          end
+          self
+        end
+
+        def get(name, options = {})
+          data = connection.get_container(name, options).body
+          directory = new(:name => name)
+          directory.files.merge_attributes(options)
+          directory.files.instance_variable_set(:@loaded, true)
+          data.each do |file|
+            directory.files << directory.files.new(file)
+          end
+          directory
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+module Fog
+  module Rackspace
+    class Files
+
+      class Directory < Fog::Model
+
+        identity  :name
+
+        attribute :bytes
+        attribute :count
+
+        def destroy
+          requires :name
+          connection.delete_container(@name)
+          true
+        rescue Excon::Errors::NotFound
+          false
+        end
+
+        def files
+          @files ||= begin
+            Fog::Rackspace::Files::Files.new(
+              :directory    => self,
+              :connection   => connection
+            )
+          end
+        end
+
+        def save
+          requires :name
+          connection.put_container(@name)
+          true
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/rackspace/models/files/file.rb

@@ -0,0 +1,59 @@
+module Fog
+  module Rackspace
+    class Files
+
+      class File < Fog::Model
+
+        identity  :key,             'Key'
+
+        attribute :body
+        attribute :content_length,  'Content-Length'
+        attribute :content_type,    'Content-Type'
+        attribute :etag,            'Etag'
+        attribute :last_modified,   'Last-Modified'
+
+        def body
+          @body ||= if last_modified
+            collection.get(identity).body
+          else
+            ''
+          end
+        end
+
+        def directory
+          @directory
+        end
+
+        def destroy
+          requires :directory, :key
+          connection.delete_object(directory.name, @key)
+          true
+        end
+
+        def owner=(new_owner)
+          if new_owner
+            @owner = {
+              :display_name => new_owner['DisplayName'],
+              :id           => new_owner['ID']
+            }
+          end
+        end
+
+        def save(options = {})
+          requires :body, :directory, :key
+          data = connection.put_object(directory.name, @key, @body, options)
+          @etag = data.headers['ETag']
+          true
+        end
+
+        private
+
+        def directory=(new_directory)
+          @directory = new_directory
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+module Fog
+  module Rackspace
+    class Files
+
+      class Files < Fog::Collection
+
+        attribute :limit
+        attribute :marker
+        attribute :path
+        attribute :prefix
+
+        model Fog::Rackspace::Files::File
+
+        def all(options = {})
+          merge_attributes(options)
+          if @loaded
+            clear
+          end
+          @loaded = true
+          collection = directory.collection.get(
+            directory.name,
+            options
+          )
+          if collection
+            self.replace(collection.files)
+          else
+            nil
+          end
+        end
+
+        def directory
+          @directory
+        end
+
+        def get(key, options = {}, &block)
+          options = {
+            'limit'   => @limit,
+            'marker'  => @marker,
+            'path'    => @path,
+            'prefix'  => @prefix
+          }.merge!(options)
+          data = connection.get_object(directory.name, key, options, &block)
+          file_data = {
+            :body => data.body,
+            :key  => key
+          }
+          for key, value in data.headers
+            if ['Content-Length', 'Content-Type', 'ETag', 'Last-Modified'].include?(key)
+              file_data[key] = value
+            end
+          end
+          new(file_data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+        def get_url(key, expires)
+          connection.get_object_url(directory.name, key, expires)
+        end
+
+        def head(key, options = {})
+          data = connection.head_object(directory.name, key, options)
+          file_data = { :key => key }
+          for key, value in data.headers
+            if ['Content-Length', 'Content-Type', 'ETag', 'Last-Modified'].include?(key)
+              file_data[key] = value
+            end
+          end
+          new(file_data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+        def new(attributes = {})
+          super({ :directory => directory }.merge!(attributes))
+        end
+
+        private
+
+        def directory=(new_directory)
+          @directory = new_directory
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/rackspace/requests/files/get_container.rb

@@ -4,7 +4,7 @@ unless Fog.mocking?
     module Rackspace
       class Files
 
-        # List number of containers and total bytes stored
+        # Get details for container and total bytes stored
         #
         # ==== Parameters
         # * container<~String> - Name of container to retrieve info for
@@ -20,6 +20,9 @@ unless Fog.mocking?
         #     * 'X-Account-Container-Count'<~String> - Count of containers
         #     * 'X-Account-Bytes-Used'<~String> - Bytes used
         #   * body<~Array>:
+        #     * 'bytes'<~Integer> - Number of bytes used by container
+        #     * 'count'<~Integer> - Number of items in container
+        #     * 'name'<~String> - Name of container
         #     * item<~Hash>:
         #       * 'bytes'<~String> - Size of object
         #       * 'content_type'<~String> Content-Type of object

data/lib/fog/rackspace/requests/files/get_object.rb

@@ -0,0 +1,41 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Files
+
+        # Get details for object
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container to look in
+        # * object<~String> - Name of object to look for
+        #
+        def get_object(container, object, &block)
+          response = storage_request({
+            :block    => block,
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "#{CGI.escape(container)}/#{CGI.escape(object)}"
+          }, false)
+          response
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def get_object(container, object)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
+    end
+  end
+
+end

data/lib/fog/rackspace/requests/files/head_object.rb

@@ -0,0 +1,40 @@
+unless Fog.mocking?
+
+  module Fog
+    module Rackspace
+      class Files
+
+        # Get headers for object
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container to look in
+        # * object<~String> - Name of object to look for
+        #
+        def head_object(container, object)
+          response = storage_request({
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "#{CGI.escape(container)}/#{CGI.escape(object)}"
+          }, false)
+          response
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module Rackspace
+      class Servers
+
+        def head_object(container, object)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
+    end
+  end
+
+end

data/spec/rackspace/requests/files/get_object_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Files.get_object' do
+  describe 'success' do
+
+    before(:each) do
+      Rackspace[:files].put_container('container_name')
+      Rackspace[:files].put_object('container_name', 'object_name', lorem_file)
+    end
+    
+    after(:each) do
+      Rackspace[:files].delete_object('container_name', 'object_name')
+      Rackspace[:files].delete_container('container_name')
+    end
+
+    it "should return proper attributes" do
+      Rackspace[:files].get_object('container_name', 'object_name')
+    end
+
+  end
+end

data/spec/rackspace/requests/files/head_object_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Rackspace::Files.head_object' do
+  describe 'success' do
+
+    before(:each) do
+      Rackspace[:files].put_container('container_name')
+      Rackspace[:files].put_object('container_name', 'object_name', lorem_file)
+    end
+    
+    after(:each) do
+      Rackspace[:files].delete_object('container_name', 'object_name')
+      Rackspace[:files].delete_container('container_name')
+    end
+
+    it "should return proper attributes" do
+      Rackspace[:files].head_object('container_name', 'object_name')
+    end
+
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.46
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 47
+  version: 0.0.47
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,69 +14,85 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -08:00
+date: 2010-03-03 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: excon
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 18
         version: 0.0.18
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: formatador
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 8
         version: 0.0.8
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: ruby-hmac
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id006
 description: brings clouds to you
 email: me@geemus.com
 executables: 
@@ -206,6 +227,10 @@ files:
 - lib/fog/rackspace.rb
 - lib/fog/rackspace/bin.rb
 - lib/fog/rackspace/files.rb
+- lib/fog/rackspace/models/files/directories.rb
+- lib/fog/rackspace/models/files/directory.rb
+- lib/fog/rackspace/models/files/file.rb
+- lib/fog/rackspace/models/files/files.rb
 - lib/fog/rackspace/models/servers/flavor.rb
 - lib/fog/rackspace/models/servers/flavors.rb
 - lib/fog/rackspace/models/servers/image.rb
@@ -216,8 +241,10 @@ files:
 - lib/fog/rackspace/requests/files/delete_object.rb
 - lib/fog/rackspace/requests/files/get_container.rb
 - lib/fog/rackspace/requests/files/get_containers.rb
+- lib/fog/rackspace/requests/files/get_object.rb
 - lib/fog/rackspace/requests/files/head_container.rb
 - lib/fog/rackspace/requests/files/head_containers.rb
+- lib/fog/rackspace/requests/files/head_object.rb
 - lib/fog/rackspace/requests/files/put_container.rb
 - lib/fog/rackspace/requests/files/put_object.rb
 - lib/fog/rackspace/requests/servers/create_image.rb
@@ -354,8 +381,10 @@ files:
 - spec/rackspace/requests/files/delete_object_spec.rb
 - spec/rackspace/requests/files/get_container_spec.rb
 - spec/rackspace/requests/files/get_containers_spec.rb
+- spec/rackspace/requests/files/get_object_spec.rb
 - spec/rackspace/requests/files/head_container_spec.rb
 - spec/rackspace/requests/files/head_containers_spec.rb
+- spec/rackspace/requests/files/head_object_spec.rb
 - spec/rackspace/requests/files/put_container_spec.rb
 - spec/rackspace/requests/files/put_object_spec.rb
 - spec/rackspace/requests/servers/create_image_spec.rb
@@ -438,18 +467,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: fog
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: fog = clouds + you
@@ -529,8 +560,10 @@ test_files:
 - spec/rackspace/requests/files/delete_object_spec.rb
 - spec/rackspace/requests/files/get_container_spec.rb
 - spec/rackspace/requests/files/get_containers_spec.rb
+- spec/rackspace/requests/files/get_object_spec.rb
 - spec/rackspace/requests/files/head_container_spec.rb
 - spec/rackspace/requests/files/head_containers_spec.rb
+- spec/rackspace/requests/files/head_object_spec.rb
 - spec/rackspace/requests/files/put_container_spec.rb
 - spec/rackspace/requests/files/put_object_spec.rb
 - spec/rackspace/requests/servers/create_image_spec.rb