fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/cloudstack/models/compute/servers.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Cloudstack::Server
 
         def all
-          data = connection.list_virtual_machines["listvirtualmachinesresponse"]["virtualmachine"] || []
+          data = service.list_virtual_machines["listvirtualmachinesresponse"]["virtualmachine"] || []
           load(data)
         end
 
@@ -21,7 +21,7 @@ module Fog
         end
 
         def get(server_id)
-          if server = connection.list_virtual_machines('id' => server_id)["listvirtualmachinesresponse"]["virtualmachine"].first
+          if server = service.list_virtual_machines('id' => server_id)["listvirtualmachinesresponse"]["virtualmachine"].first
             new(server)
           end
         rescue Fog::Compute::Cloudstack::BadRequest

data/lib/fog/cloudstack/models/compute/volume.rb

@@ -39,7 +39,7 @@ module Fog
             'snapshotid'     => snapshot_id,
             'projectid'      => project_id
           }
-          data = connection.create_volume(options)
+          data = service.create_volume(options)
           merge_attributes(data['createvolumeresponse'])
         end
 
@@ -48,13 +48,13 @@ module Fog
         end
 
         def flavor
-          connection.disk_offerings.get(self.disk_offering_id)
+          service.disk_offerings.get(self.disk_offering_id)
         end
         alias disk_offering flavor
 
         def server
           if server_id
-            connection.servers.get(server_id)
+            service.servers.get(server_id)
           end
         end
 
@@ -91,22 +91,22 @@ module Fog
           }
           options.merge!('deviceid' => mountpoint) if mountpoint
 
-          data = connection.attach_volume(options)
+          data = service.attach_volume(options)
 
-					connection.jobs.new(data["attachvolumeresponse"])
+					service.jobs.new(data["attachvolumeresponse"])
         end
 
         def detach
           requires :id
 
-          data = connection.detach_volume('id' => id)
+          data = service.detach_volume('id' => id)
 
-          connection.jobs.new(data["detachvolumeresponse"])
+          service.jobs.new(data["detachvolumeresponse"])
         end
 
         def destroy
           requires :id
-          connection.delete_volume('id' => id)
+          service.delete_volume('id' => id)
           true
         end
       end # Volume

data/lib/fog/cloudstack/models/compute/volumes.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Cloudstack::Volume
 
         def all
-          data = connection.list_volumes["listvolumesresponse"]["volume"] || []
+          data = service.list_volumes["listvolumesresponse"]["volume"] || []
           load(data)
         end
 
         def get(volume_id)
-          if volume = connection.list_volumes('id' => volume_id)["listvolumesresponse"]["volume"].first
+          if volume = service.list_volumes('id' => volume_id)["listvolumesresponse"]["volume"].first
             new(volume)
           end
         rescue Fog::Compute::Cloudstack::BadRequest

data/lib/fog/cloudstack/models/compute/zone.rb

@@ -28,7 +28,7 @@ module Fog
             'internaldns2'          => internaldns2,
             'securitygroupenabled'  => security_groups_enabled,
           }
-          data = connection.create_zone(options)
+          data = service.create_zone(options)
           merge_attributes(data['createzoneresponse'])
         end
       end # Zone

data/lib/fog/cloudstack/models/compute/zones.rb

@@ -14,12 +14,12 @@ module Fog
             'templatefilter' => 'self'
           }.merge(filters)
 
-          data = connection.list_zones(options)["listzonesresponse"]["zone"] || []
+          data = service.list_zones(options)["listzonesresponse"]["zone"] || []
           load(data)
         end
 
         def get(zone_id)
-          if zone = connection.list_zones('id' => zone_id)["listzonesresponse"]["zone"].first
+          if zone = service.list_zones('id' => zone_id)["listzonesresponse"]["zone"].first
             new(zone)
           end
         rescue Fog::Compute::Cloudstack::BadRequest

data/lib/fog/compute.rb

@@ -70,8 +70,9 @@ module Fog
         version = version.to_s.downcase.to_sym unless version.nil?
         if version == :v2
           require 'fog/rackspace/compute_v2'
-          Fog::Compute::RackspaceV2.new(attributes)
+           Fog::Compute::RackspaceV2.new(attributes)
         else
+          warn "[DEPRECATION] First Gen Cloud Servers are deprecated. Please use `:version => :v2` attribute to use Next Gen Cloud Servers."
           require 'fog/rackspace/compute'
           Fog::Compute::Rackspace.new(attributes)
         end

data/lib/fog/core.rb

@@ -15,6 +15,7 @@ require 'time'
 require 'timeout'
 
 # internal core dependencies
+require "fog/version"
 require 'fog/core/attributes'
 require 'fog/core/collection'
 require 'fog/core/connection'

data/lib/fog/core/attributes.rb

@@ -152,8 +152,25 @@ module Fog
         self
       end
 
+      # Returns true if a remote resource has been assigned an
+      # identity and we can assume it has been persisted.
+      #
+      # @return [Boolean]
+      def persisted?
+        !!identity
+      end
+
+      # Returns true if a remote resource has not been assigned an
+      # identity.
+      #
+      # This was added for a ActiveRecord like feel but has been
+      # outdated by ActiveModel API using {#persisted?}
+      #
+      # @deprecated Use inverted form of {#persisted?}
+      # @return [Boolean]
       def new_record?
-        !identity
+        Fog::Logger.deprecation("#new_record? is deprecated, use !persisted? instead [light_black](#{caller.first})[/]")
+        !persisted?
       end
 
       # check that the attributes specified in args exist and is not nil
@@ -177,7 +194,7 @@ module Fog
 
       def missing_attributes(args)
         missing = []
-        for arg in [:connection] | args
+        for arg in [:service] | args
           unless send("#{arg}") || attributes.has_key?(arg)
             missing << arg
           end

data/lib/fog/core/collection.rb

@@ -1,8 +1,12 @@
+require "fog/core/deprecated_connection_accessors"
+
 module Fog
   class Collection < Array
-
     extend Fog::Attributes::ClassMethods
     include Fog::Attributes::InstanceMethods
+    include Fog::Core::DeprecatedConnectionAccessors
+
+    attr_reader :service
 
     Array.public_instance_methods(false).each do |method|
       unless [:reject, :select, :slice].include?(method.to_sym)
@@ -37,8 +41,6 @@ module Fog
       end
     end
 
-    attr_accessor :connection
-
     remove_method :clear
     def clear
       @loaded = true
@@ -56,11 +58,20 @@ module Fog
       object.destroy
     end
 
+    # Creates a new Fog::Collection based around the passed service
+    #
+    # @param [Hash] attributes
+    # @option attributes [Fog::Service] service Instance of a service
+    #
+    # @return [Fog::Collection]
+    #
     def initialize(attributes = {})
+      @service = attributes.delete(:service)
       @loaded = false
       merge_attributes(attributes)
     end
 
+
     remove_method :inspect
     def inspect
       Thread.current[:formatador] ||= Formatador.new
@@ -103,10 +114,10 @@ module Fog
         raise(ArgumentError.new("Initialization parameters must be an attributes hash, got #{attributes.class} #{attributes.inspect}"))
       end
       model.new(
-        attributes.merge(
+        {
           :collection => self,
-          :connection => connection
-        )
+          :service => service
+        }.merge(attributes)
       )
     end
 

data/lib/fog/core/connection.rb

@@ -2,6 +2,7 @@ module Fog
   class Connection
 
     def initialize(url, persistent=false, params={})
+      Excon.defaults[:headers]['User-Agent'] ||= "fog/#{Fog::VERSION}"
       @excon = Excon.new(url, params)
       @persistent = persistent
     end

data/lib/fog/core/deprecated_connection_accessors.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Core
+    # This module covers the shared code used by models and collections
+    # that deprecates the confusing usage of 'connection' which was
+    # actually intended to be an instance of Fog::Service
+    module DeprecatedConnectionAccessors
+      # Sets the Service but using the wrong name!
+      #
+      # @deprecated The connection name was wrong and confusing since it refered to the service
+      # @param [Fog::Service] service An instance of a Fog service this collection is for
+      #
+      def connection=(service)
+        Fog::Logger.deprecation("#connection= is deprecated, pass :service in at creation [light_black](#{caller.first})[/]")
+        @service = service
+      end
+
+      # Returns the Service the collection is part of
+      #
+      # @deprecated #connection is deprecated due to confusing name, use #service instead
+      # @return [Fog::Service]
+      #
+      def connection
+        Fog::Logger.deprecation("#connection is deprecated, use #service instead [light_black](#{caller.first})[/]")
+        @service
+      end
+
+      # Prepares the value of the service based on the passed attributes
+      #
+      # @note Intended for use where the service is required before the normal
+      #   initializer runs. The logic is run there with deprecation warnings.
+      #
+      # @param [Hash] attributes
+      # @return [Fog::Service]
+      #
+      def prepare_service_value(attributes)
+        @service = attributes[:service] || attributes[:connection]
+      end
+
+    end
+  end
+end

data/lib/fog/core/errors.rb

@@ -17,6 +17,8 @@ module Fog
     class NotFound < Fog::Errors::Error; end
 
     class LoadError < LoadError; end
+    
+    class TimeoutError< Fog::Errors::Error; end
 
     # @return [String] The error message that will be raised, if credentials cannot be found
     def self.missing_credentials

data/lib/fog/core/json.rb

@@ -21,24 +21,12 @@ module Fog
     # Do the MultiJson introspection at this level so we can define our encode/decode methods and perform
     # the introspection only once rather than once per call.
 
-    if MultiJson.respond_to?(:dump)
-      def self.encode(obj)
-        MultiJson.dump(obj)
-      end
-    else
-      def self.encode(obj)
-        MultiJson.encode(obj)
-      end
+    def self.encode(obj)
+      MultiJson.encode(obj)
     end
 
-    if MultiJson.respond_to?(:load)
-      def self.decode(obj)
-        MultiJson.load(obj)
-      end
-    else
-      def self.decode(obj)
-        MultiJson.decode(obj)
-      end
+    def self.decode(obj)
+      MultiJson.decode(obj)
     end
 
 

data/lib/fog/core/model.rb

@@ -1,12 +1,22 @@
+require "fog/core/deprecated_connection_accessors"
+
 module Fog
   class Model
 
     extend Fog::Attributes::ClassMethods
     include Fog::Attributes::InstanceMethods
+    include Fog::Core::DeprecatedConnectionAccessors
 
-    attr_accessor :collection, :connection
+    attr_accessor :collection
+    attr_reader :service
 
     def initialize(new_attributes = {})
+      # TODO Remove compatibility with old connection option
+      @service = @service || new_attributes.delete(:service)
+      if @service.nil? && new_attributes[:connection]
+        Fog::Logger.deprecation("Passing :connection option is deprecated, use :service instead [light_black](#{caller.first})[/]")
+        @service = new_attributes[:connection]
+      end
       merge_attributes(new_attributes)
     end
 

data/lib/fog/core/service.rb

@@ -91,7 +91,7 @@ module Fog
             constant = collection.to_s.split('_').map {|characters| characters[0...1].upcase << characters[1..-1]}.join('')
             service::Collections.module_eval <<-EOS, __FILE__, __LINE__
               def #{collection}(attributes = {})
-                #{service}::#{constant}.new({:connection => self}.merge(attributes))
+                #{service}::#{constant}.new({:service => self}.merge(attributes))
               end
             EOS
           end

data/lib/fog/core/wait_for.rb

@@ -7,7 +7,7 @@ module Fog
       duration = Time.now - start
     end
     if duration > timeout
-      false
+      raise Errors::TimeoutError.new("The specified wait_for timeout (#{timeout} seconds) was exceeded")
     else
       { :duration => duration }
     end

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

@@ -26,7 +26,7 @@ module Fog
         end
 
         def destroy
-          connection.delete_record(zone.domain, identity)
+          service.delete_record(zone.domain, identity)
           true
         end
 
@@ -42,14 +42,14 @@ module Fog
 
           # decide whether its a new record or update of an existing
           if id.nil?
-            data = connection.create_record(zone.domain, name, type, value, options)
+            data = service.create_record(zone.domain, name, type, value, options)
           else
             options[:name] = name if name
             options[:content] = value if value
             options[:type] = type if type
-            data = connection.update_record(zone.domain, id, options)
+            data = service.update_record(zone.domain, id, options)
           end
-          
+
           merge_attributes(data.body["record"])
           true
         end

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

@@ -14,13 +14,13 @@ module Fog
         def all
           requires :zone
           clear
-          data = connection.list_records(zone.id).body.map {|record| record['record']}
+          data = service.list_records(zone.id).body.map {|record| record['record']}
           load(data)
         end
 
         def get(record_id)
           requires :zone
-          data = connection.get_record(zone.id, record_id).body["record"]
+          data = service.get_record(zone.id, record_id).body["record"]
           new(data)
         rescue Excon::Errors::NotFound
           nil

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

@@ -14,7 +14,7 @@ module Fog
         attribute :updated_at
 
         def destroy
-          connection.delete_domain(identity)
+          service.delete_domain(identity)
           true
         end
 
@@ -22,7 +22,7 @@ module Fog
           @records ||= begin
             Fog::DNS::DNSimple::Records.new(
               :zone       => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -38,7 +38,7 @@ module Fog
 
         def save
           requires :domain
-          data = connection.create_domain(domain).body["domain"]
+          data = service.create_domain(domain).body["domain"]
           merge_attributes(data)
           true
         end

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

@@ -11,12 +11,12 @@ module Fog
 
         def all
           clear
-          data = connection.list_domains.body.map {|zone| zone['domain']}
+          data = service.list_domains.body.map {|zone| zone['domain']}
           load(data)
         end
 
         def get(zone_id)
-          data = connection.get_domain(zone_id).body['domain']
+          data = service.get_domain(zone_id).body['domain']
           new(data)
         rescue Excon::Errors::NotFound
           nil