fog 0.3.34 → 0.4.0

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

@@ -14,12 +14,13 @@ module Fog
         attribute :cache_control,       :aliases => 'Cache-Control'
         attribute :content_disposition, :aliases => 'Content-Disposition'
         attribute :content_encoding,    :aliases => 'Content-Encoding'
-        attribute :content_length,      :aliases => ['Content-Length', 'Size'], :type => :integer
+        attribute :content_length,      :aliases => ['Content-Length', 'Size']
         attribute :content_md5,         :aliases => 'Content-MD5'
         attribute :content_type,        :aliases => 'Content-Type'
         attribute :etag,                :aliases => ['Etag', 'ETag']
         attribute :expires,             :aliases => 'Expires'
-        attribute :last_modified,       :aliases => ['Last-Modified', 'LastModified'], :type => :time
+        attribute :last_modified,       :aliases => ['Last-Modified', 'LastModified']
+        attribute :metadata
         attribute :owner,               :aliases => 'Owner'
         attribute :storage_class,       :aliases => ['x-goog-storage-class', 'StorageClass']
 
@@ -63,6 +64,16 @@ module Fog
           true
         end
 
+        remove_method :metadata
+        def metadata
+          attributes.reject {|key, value| !(key.to_s =~ /^x-goog-meta-/)}
+        end
+
+        remove_method :metadata=
+        def metadata=(new_metadata)
+          merge_attributes(new_metadata)
+        end
+
         remove_method :owner=
         def owner=(new_owner)
           if new_owner
@@ -107,6 +118,7 @@ module Fog
           options['Content-MD5'] = content_md5 if content_md5
           options['Content-Type'] = content_type if content_type
           options['Expires'] = expires if expires
+          options.merge(metadata)
 
           data = connection.put_object(directory.key, key, body, options)
           merge_attributes(data.headers)

data/lib/fog/linode/dns.rb

@@ -6,6 +6,10 @@ module Fog
       recognizes :port, :scheme, :persistent
 
       model_path 'fog/linode/models/dns'
+      model       :record
+      collection  :records
+      model       :zone
+      collection  :zones
 
       request_path 'fog/linode/requests/dns'
       request :domain_create

data/lib/fog/linode/models/dns/record.rb

@@ -0,0 +1,69 @@
+require 'fog/core/model'
+
+module Fog
+  module Linode
+    class DNS
+
+      class Record < Fog::Model
+
+        identity :id,         :aliases => ['ResourceID', 'RESOURCEID']
+
+        attribute :ip,        :aliases => 'TARGET'
+        attribute :name,      :aliases => 'NAME'
+        attribute :priority,  :aliases => 'PRIORITY'
+        attribute :ttl,       :aliases => 'TTL_SEC'
+        attribute :type,      :aliases => 'TYPE'
+        attribute :zone_id,   :aliases => 'DOMAINID'
+
+        # "PROTOCOL":"",
+        # "WEIGHT":0,
+        # "PORT":0,
+
+        def initialize(attributes={})
+          self.ttl    ||= 3600
+          super
+        end
+
+        def destroy
+          requires :identity, :zone
+          connection.domain_resource_delete(zone.id, identity)
+          true
+        end
+
+        def zone
+          @zone
+        end
+
+        def save
+          requires :type, :zone
+          options = {}
+          # * options<~Hash>
+          #   * weight<~Integer>: default: 5
+          #   * port<~Integer>: default: 80 
+          #   * protocol<~String>: The protocol to append to an SRV record. Ignored on other record 
+          #                        types. default: udp
+          options[:name]      = name if name
+          options[:priority]  = priority if priority
+          options[:target]    = ip if ip
+          options[:ttl_sec]   = ttl if ttl
+          response = unless identity
+            connection.domain_resource_create(zone.identity, type, options)
+          else
+            options[:type] = type if type
+            connection.domain_resource_update(zone.identity, identity, options)
+          end
+          merge_attributes(response.body['DATA'])
+          true
+        end
+
+        private
+        
+        def zone=(new_zone)
+          @zone = new_zone
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/linode/models/dns/records.rb

@@ -0,0 +1,37 @@
+require 'fog/core/collection'
+require 'fog/linode/models/dns/record'
+
+module Fog
+  module Linode
+    class DNS
+
+      class Records < Fog::Collection
+
+        attribute :zone
+
+        model Fog::Linode::DNS::Record
+
+        def all
+          requires :zone
+          data = connection.domain_resource_list(zone.id).body['DATA']
+          load(data)
+        end
+
+        def get(record_id)
+          if data = connection.domain_resource_list(zone.id, record_id).body['DATA'].first
+            new(data)
+          else
+            nil
+          end
+        end
+
+        def new(attributes = {})
+          requires :zone
+          super({ :zone => zone }.merge!(attributes))
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/linode/models/dns/zone.rb

@@ -0,0 +1,84 @@
+require 'fog/core/model'
+require 'fog/linode/models/dns/records'
+
+module Fog
+  module Linode
+    class DNS
+
+      class Zone < Fog::Model
+
+        identity :id,           :aliases => ['DomainID', 'DOMAINID', 'ResourceID']
+
+        attribute :description, :aliases => 'DESCRIPTION'
+        attribute :domain,      :aliases => 'DOMAIN'
+        attribute :email,       :aliases => 'SOA_EMAIL'
+        attribute :ttl,         :aliases => 'TTL_SEC'
+        attribute :type,        :aliases => 'TYPE'
+
+        # "STATUS":1,
+        # "RETRY_SEC":0,
+        # "MASTER_IPS":"",
+        # "EXPIRE_SEC":0,
+        # "REFRESH_SEC":0,
+        # "TTL_SEC":0
+
+        def initialize(attributes={})
+          self.type ||= 'master'
+          self.ttl  ||= 3600
+          super
+        end
+
+        def destroy
+          requires :identity
+          connection.domain_delete(identity)
+          true
+        end
+
+        def records
+          @records ||= begin
+            Fog::Linode::DNS::Records.new(
+              :zone       => self,
+              :connection => connection
+            )
+          end
+        end
+
+        def nameservers
+          [
+            'ns1.linode.com',
+            'ns2.linode.com',
+            'ns3.linode.com',
+            'ns4.linode.com',
+            'ns5.linode.com'
+          ]
+        end
+
+        def save
+          requires :domain, :type
+          requires :email if type == 'master'
+          options = {}
+          # * options<~Hash>
+          #   * refresh_sec<~Integer> numeric, default: '0'
+          #   * retry_sec<~Integer> numeric, default: '0'
+          #   * expire_sec<~Integer> numeric, default: '0'
+          #   * status<~Integer> 0, 1, or 2 (disabled, active, edit mode), default: 1 
+          #   * master_ips<~String> When type=slave, the zone's master DNS servers list, semicolon separated
+          options[:description] = description if description
+          options[:soa_email]   = email if email
+          options[:ttl_sec]     = ttl if ttl
+          response = unless identity
+            connection.domain_create(domain, type, options)
+          else
+            options[:domain]  = domain if domain
+            options[:type]    = type if type
+            connection.domain_update(identity, options)
+          end
+          merge_attributes(response.body['DATA'])
+          true
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/linode/models/dns/zones.rb

@@ -0,0 +1,29 @@
+require 'fog/core/collection'
+require 'fog/linode/models/dns/zone'
+
+module Fog
+  module Linode
+    class DNS
+
+      class Zones < Fog::Collection
+
+        model Fog::Linode::DNS::Zone
+
+        def all
+          data = connection.domain_list.body['DATA']
+          load(data)
+        end
+
+        def get(zone_id)
+          if data = connection.domain_list(zone_id).body['DATA'].first
+            new(data)
+          else
+            nil
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/linode/requests/dns/domain_create.rb

@@ -24,8 +24,7 @@ module Fog
         #   * body<~Hash>:
         #     * DATA<~Hash>:
         #       * 'DomainID'<~Integer>: domain ID
-        def domain_create( domain, type, options = {})
-
+        def domain_create(domain, type, options = {})
           query= {}
           request(
             :expects  => 200,
@@ -42,7 +41,7 @@ module Fog
 
       class Mock
 
-        def domain_create( domain, type, options ={})
+        def domain_create(domain, type, options ={})
           Fog::Mock.not_implemented
         end
 

data/lib/fog/linode/requests/dns/domain_resource_create.rb

@@ -11,7 +11,7 @@ module Fog
         # * options<~Hash>
         #   * name<~String>: The hostname or FQDN. When Type=MX the subdomain to delegate to the 
         #                    Target MX server
-        #   * targe<~String> When Type=MX the hostname. When Type=CNAME the target of the alias. 
+        #   * target<~String> When Type=MX the hostname. When Type=CNAME the target of the alias.
         #                    When Type=TXT the value of the record. When Type=A or AAAA the token 
         #                    of '[remote_addr]' will be substituted with the IP address of the request. 
         #   * priority<~Integer>: priority for MX and SRV records, 0-255 - default: 10 
@@ -25,8 +25,7 @@ module Fog
         #   * body<~Hash>:
         #     * DATA<~Hash>:
         #       * 'ResourceID'<~Integer>: ID of the resource record created
-        def domain_resource_create( domain_id, type, options = {})
-
+        def domain_resource_create(domain_id, type, options = {})
           query= {}
           request(
             :expects  => 200,
@@ -43,7 +42,7 @@ module Fog
 
       class Mock
 
-        def domain_resource_create( domain_id, type, options = {})
+        def domain_resource_create(domain_id, type, options = {})
           Fog::Mock.not_implemented
         end
 

data/lib/fog/linode/requests/dns/domain_resource_list.rb

@@ -26,11 +26,14 @@ module Fog
         #       * 'DOMAINID'<~Interger>: ID of the domain that this record belongs to
         #       * 'NAME'<~Interger>: The hostname or FQDN. When Type=MX, the subdomain to delegate to        
         def domain_resource_list(domain_id, resource_id = nil)
-          
+          query = { :api_action => 'domain.resource.list', :domainID => domain_id }
+          if resource_id
+            query[:resourceID] = resource_id
+          end
           request(
             :expects  => 200,
             :method   => 'GET',
-            :query    => { :api_action => 'domain.resource.list', :domainID => domain_id, :resourceID => resource_id }
+            :query    => query
           )
         end
 

data/lib/fog/linode/requests/dns/domain_resource_update.rb

@@ -26,7 +26,7 @@ module Fog
         #   * body<~Hash>:
         #     * DATA<~Hash>:
         #       * 'ResourceID'<~Integer>: ID of the resource record updated
-        def domain_resource_update( domain_id, resource_id, options = {})
+        def domain_resource_update(domain_id, resource_id, options = {})
 
           query= {}
           request(
@@ -44,7 +44,7 @@ module Fog
 
       class Mock
 
-        def domain_resource_update( domain_id, resource_id, options = {})
+        def domain_resource_update(domain_id, resource_id, options = {})
           Fog::Mock.not_implemented
         end
 

data/lib/fog/linode/requests/dns/domain_update.rb

@@ -24,7 +24,7 @@ module Fog
         #   * body<~Hash>:
         #     * DATA<~Hash>:
         #       * 'DomainID'<~Integer>: domain ID
-        def domain_update( domain_id, options = {})
+        def domain_update(domain_id, options = {})
           
           request(
             :expects  => 200,
@@ -38,7 +38,7 @@ module Fog
 
       class Mock
 
-        def domain_update(datacenter_id, payment_term, plan_id)
+        def domain_update(domain_id, options = {})
           Fog::Mock.not_implemented
         end
 

data/lib/fog/rackspace/requests/compute/create_image.rb

@@ -43,7 +43,7 @@ module Fog
           now = Time.now
           data = {
             'created'   => now,
-            'id'        => 123456,
+            'id'        => Fog::Mock.random_numbers(6).to_i,
             'name'      => options['name'] || '',
             'serverId'  => server_id,
             'status'    => 'SAVING',

data/lib/fog/rackspace/requests/compute/create_server.rb

@@ -74,7 +74,7 @@ module Fog
           data = {
             'addresses' => { 'private' => ['0.0.0.0'], 'public' => ['0.0.0.0'] },
             'flavorId'  => flavor_id,
-            'id'        => 123456,
+            'id'        => Fog::Mock.random_numbers(6).to_i,
             'imageId'   => image_id,
             'hostId'    => "123456789ABCDEF01234567890ABCDEF",
             'metadata'  => options['metadata'] || {},

data/lib/fog/rackspace/requests/compute/get_flavor_details.rb

@@ -25,7 +25,25 @@ module Fog
       class Mock
 
         def get_flavor_details(flavor_id)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          flavor = {
+            1 => { 'name' => '256 server',    'ram' => 256,    'disk' => 10   },
+            2 => { 'name' => '512 server',    'ram' => 512,    'disk' => 20   },
+            3 => { 'name' => '1GB server',    'ram' => 1024,   'disk' => 40   },
+            4 => { 'name' => '2GB server',    'ram' => 2048,   'disk' => 80   },
+            5 => { 'name' => '4GB server',    'ram' => 4096,   'disk' => 160  },
+            6 => { 'name' => '8GB server',    'ram' => 8192,   'disk' => 320  },
+            7 => { 'name' => '15.5GB server', 'ram' => 15872,  'disk' => 620  }
+          }[flavor_id]
+          if flavor
+            response.status = 200
+            response.body = {
+              'flavor' => flavor
+            }
+            response
+          else
+            raise Fog::Rackspace::Compute::NotFound
+          end
         end
 
       end

data/lib/fog/rackspace/requests/compute/list_flavors.rb

@@ -23,7 +23,20 @@ module Fog
       class Mock
 
         def list_flavors
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'flavors' => [
+              { 'name' => '256 server',    'id' => 1 },
+              { 'name' => '512 server',    'id' => 2 },
+              { 'name' => '1GB server',    'id' => 3 },
+              { 'name' => '2GB server',    'id' => 4 },
+              { 'name' => '4GB server',    'id' => 5 },
+              { 'name' => '8GB server',    'id' => 6 },
+              { 'name' => '15.5GB server', 'id' => 7 }
+            ]
+          }
+          response
         end
 
       end