fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/rackspace/models/databases/instances.rb

@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::Databases::Instance
 
         def all
-          data = connection.list_instances.body['instances']
+          data = service.list_instances.body['instances']
           load(data)
         end
 
         def get(instance_id)
-          data = connection.get_instance(instance_id).body['instance']
+          data = service.get_instance(instance_id).body['instance']
           new(data)
         rescue Fog::Rackspace::Databases::NotFound
           nil

data/lib/fog/rackspace/models/databases/user.rb

@@ -11,13 +11,13 @@ module Fog
 
         def save
           requires :identity, :instance, :password
-          connection.create_user(instance.identity, identity, password, :databases => databases)
+          service.create_user(instance.identity, identity, password, :databases => databases)
           true
         end
 
         def destroy
           requires :identity, :instance
-          connection.delete_user(instance.identity, identity)
+          service.delete_user(instance.identity, identity)
           true
         end
 

data/lib/fog/rackspace/models/databases/users.rb

@@ -23,7 +23,7 @@ module Fog
 
         def retrieve_users
           requires :instance
-          data = connection.list_users(instance.identity).body['users']
+          data = service.list_users(instance.identity).body['users']
         end
       end
     end

data/lib/fog/rackspace/models/dns/callback.rb

@@ -10,7 +10,7 @@ module Fog
           retries = 5
           response = nil
           Fog.wait_for(timeout, interval) do
-            response = connection.callback job_id
+            response = service.callback job_id
             if response.body['status'] == 'COMPLETED'
               true
             elsif response.body['status'] == 'ERROR'

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

@@ -1,5 +1,6 @@
 require 'fog/core/model'
 require 'fog/rackspace/models/dns/callback'
+require 'ipaddr'
 
 module Fog
   module DNS
@@ -23,7 +24,7 @@ module Fog
 
         def destroy
           requires :zone, :identity
-          wait_for_job connection.remove_record(@zone.identity, identity).body['jobId']
+          wait_for_job service.remove_record(@zone.identity, identity).body['jobId']
           true
         end
 
@@ -32,7 +33,7 @@ module Fog
         end
 
         def save
-          if identity
+          if persisted?
             update
           else
             create
@@ -50,12 +51,28 @@ module Fog
             :data => value
           }
 
+          if ttl
+            options[:ttl] = ttl
+          end
+
           if priority
             options[:priority] = priority
           end
 
-          response = wait_for_job connection.add_records(@zone.identity, [options]).body['jobId']
-          merge_attributes(response.body['response']['records'].select {|record| record['name'] == self.name && record['type'] == self.type && record['data'] == self.value}.first)
+          response = wait_for_job service.add_records(@zone.identity, [options]).body['jobId']
+
+          matching_record = response.body['response']['records'].find do |record|
+            if ['A', 'AAAA'].include?(self.type.upcase)
+              # If this is an A or AAAA record, match by normalized IP address value.
+              (record['name'] == self.name) && (record['type'] == self.type) && (IPAddr.new(record['data']) == IPAddr.new(self.value))
+            else
+              # Other record types are matched by the raw value.
+              (record['name'] == self.name) && (record['type'] == self.type) && (record['data'] == self.value)
+            end
+          end
+
+          merge_attributes(matching_record)
+
           true
         end
 
@@ -67,8 +84,9 @@ module Fog
           options[:type] = type if type
           options[:data] = value if value
           options[:priority] = priority if priority
+          options[:ttl] = ttl if ttl
 
-          wait_for_job connection.modify_record(@zone.identity, identity, options).body['jobId']
+          wait_for_job service.modify_record(@zone.identity, identity, options).body['jobId']
           true
         end
 

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

@@ -13,13 +13,13 @@ module Fog
 
         def all
           requires :zone
-          data = connection.list_records(zone.identity)
+          data = service.list_records(zone.identity)
           load(data.body['records'])
         end
 
         def get(record_id)
           requires :zone
-          data = connection.list_record_details(zone.identity, record_id).body
+          data = service.list_record_details(zone.identity, record_id).body
           new(data)
         #nil or empty string will trigger an argument error
         rescue ArgumentError

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

@@ -20,7 +20,7 @@ module Fog
         attribute :comment
 
         def destroy
-          response = connection.remove_domain(identity)
+          response = service.remove_domain(identity)
           wait_for_job response.body['jobId'], Fog.timeout
           true
         end
@@ -29,13 +29,13 @@ module Fog
           @records ||= begin
             Fog::DNS::Rackspace::Records.new(
               :zone       => self,
-              :connection => connection
+              :service => service
             )
           end
         end
 
         def save
-          if identity
+          if persisted?
             update
           else
             create
@@ -49,7 +49,7 @@ module Fog
           requires :domain, :email
 
           data = { :name => domain, :email => email }
-          response = connection.create_domains([data])
+          response = service.create_domains([data])
 
           response = wait_for_job response.body['jobId']
           merge_attributes(response.body['response']['domains'].select {|domain| domain['name'] == self.domain}.first)
@@ -58,7 +58,7 @@ module Fog
         def update
           requires :ttl, :email
 
-          response = connection.modify_domain(identity, { :ttl => ttl, :comment => comment, :email => email})
+          response = service.modify_domain(identity, { :ttl => ttl, :comment => comment, :email => email})
           wait_for_job response.body['jobId']
         end
       end

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

@@ -10,7 +10,7 @@ module Fog
 
         def all
           clear
-          data = connection.list_domains.body['domains']
+          data = service.list_domains.body['domains']
           load(data)
         end
 
@@ -19,7 +19,7 @@ module Fog
             return nil
           end
 
-          data = connection.list_domain_details(zone_id).body
+          data = service.list_domain_details(zone_id).body
           new(data)
         rescue Fog::Rackspace::Errors::NotFound
           nil

data/lib/fog/rackspace/models/identity/credentials.rb

@@ -24,7 +24,7 @@ module Fog
         private
 
         def retrieve_credentials
-          data = connection.list_credentials(user.identity).body['credentials']
+          data = service.list_credentials(user.identity).body['credentials']
         end
       end
     end

data/lib/fog/rackspace/models/identity/roles.rb

@@ -24,7 +24,7 @@ module Fog
         private
 
         def retrieve_roles
-          data = connection.list_user_roles(user.identity).body['roles']
+          data = service.list_user_roles(user.identity).body['roles']
         end
       end
     end

data/lib/fog/rackspace/models/identity/tenants.rb

@@ -20,7 +20,7 @@ module Fog
         private
 
         def retrieve_tenants
-          data = connection.list_tenants.body['tenants']
+          data = service.list_tenants.body['tenants']
         end
       end
     end

data/lib/fog/rackspace/models/identity/user.rb

@@ -15,10 +15,10 @@ module Fog
 
         def save
           requires :username, :email, :enabled
-          if identity.nil?
-            data = connection.create_user(username, email, enabled, :password => password)
+          unless persisted?
+            data = service.create_user(username, email, enabled, :password => password)
           else
-            data = connection.update_user(identity, username, email, enabled, :password => password)
+            data = service.update_user(identity, username, email, enabled, :password => password)
           end
           merge_attributes(data.body['user'])
           true
@@ -26,14 +26,14 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_user(identity)
+          service.delete_user(identity)
           true
         end
 
         def roles
           @roles ||= begin
             Fog::Rackspace::Identity::Roles.new({
-              :connection => connection,
+              :service => service,
               :user => self
             })
           end
@@ -42,7 +42,7 @@ module Fog
         def credentials
           @credentials ||= begin
             Fog::Rackspace::Identity::Credentials.new({
-              :connection => connection,
+              :service => service,
               :user => self
             })
           end

data/lib/fog/rackspace/models/identity/users.rb

@@ -9,12 +9,12 @@ module Fog
         model Fog::Rackspace::Identity::User
 
         def all
-          data = connection.list_users.body['users']
+          data = service.list_users.body['users']
           load(data)
         end
 
         def get(user_id)
-          data = connection.get_user_by_id(user_id).body['user']
+          data = service.get_user_by_id(user_id).body['user']
           new(data)
         rescue Excon::Errors::NotFound
           nil
@@ -23,7 +23,7 @@ module Fog
         end
 
         def get_by_name(user_name)
-          data = connection.get_user_by_name(user_name).body['user']
+          data = service.get_user_by_name(user_name).body['user']
           new(data)
         rescue Excon::Errors::NotFound
           nil

data/lib/fog/rackspace/models/load_balancers/access_rule.rb

@@ -12,17 +12,17 @@ module Fog
 
         def destroy
           requires :identity, :load_balancer
-          connection.delete_access_rule(load_balancer.identity, identity)
+          service.delete_access_rule(load_balancer.identity, identity)
           true
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :load_balancer, :address, :type
-          connection.create_access_rule(load_balancer.id, address, type)
+          service.create_access_rule(load_balancer.id, address, type)
 
           #Unfortunately, access rules creation doesn't return an ID, we require a subsequent list call and comparison
-          data = connection.list_access_rules(load_balancer.id).body['accessList'].select do |ar|
+          data = service.list_access_rules(load_balancer.id).body['accessList'].select do |ar|
             ar['address'] == address && ar['type'] == type
           end.first
           merge_attributes(data)

data/lib/fog/rackspace/models/load_balancers/access_rules.rb

@@ -21,7 +21,7 @@ module Fog
         private
         def all_raw
           requires :load_balancer
-          data = connection.list_access_rules(load_balancer.id).body['accessList']
+          data = service.list_access_rules(load_balancer.id).body['accessList']
         end
       end
     end

data/lib/fog/rackspace/models/load_balancers/load_balancer.rb

@@ -29,15 +29,16 @@ module Fog
         attribute :nodes
 
         def initialize(attributes)
-          #HACK - Since we are hacking how sub-collections work, we have to make sure the connection is valid first.
-          @connection = attributes[:connection]
+          #HACK - Since we are hacking how sub-collections work, we have to make sure the service is valid first.
+          # Old 'connection' is renamed as service and should be used instead
+          @service = attributes[:service] || attributes[:connection]
           super
         end
 
         def access_rules
           @access_rules ||= begin
             Fog::Rackspace::LoadBalancers::AccessRules.new({
-              :connection => connection,
+              :service => service,
               :load_balancer => self})
           end
         end
@@ -49,7 +50,7 @@ module Fog
         def nodes
           @nodes ||= begin
             Fog::Rackspace::LoadBalancers::Nodes.new({
-              :connection => connection,
+              :service => service,
               :load_balancer => self})
           end
         end
@@ -60,25 +61,25 @@ module Fog
 
         def ssl_termination
           requires :identity
-          ssl_termination = connection.get_ssl_termination(identity).body['sslTermination']
+          ssl_termination = service.get_ssl_termination(identity).body['sslTermination']
         rescue Fog::Rackspace::LoadBalancers::NotFound
           nil
         end
 
         def enable_ssl_termination(securePort, privatekey, certificate, options = {})
           requires :identity
-          connection.set_ssl_termination(identity, securePort, privatekey, certificate, options)
+          service.set_ssl_termination(identity, securePort, privatekey, certificate, options)
         end
 
         def disable_ssl_termination
           requires :identity
-          connection.remove_ssl_termination(identity)
+          service.remove_ssl_termination(identity)
         end
 
         def virtual_ips
           @virtual_ips ||= begin
             Fog::Rackspace::LoadBalancers::VirtualIps.new({
-              :connection => connection,
+              :service => service,
               :load_balancer => self})
           end
         end
@@ -87,75 +88,92 @@ module Fog
           virtual_ips.load(new_virtual_ips)
         end
 
+        def enable_content_caching
+          requires :identity
+          connection.set_content_caching identity, true
+          true
+        end
+
+        def disable_content_caching
+          requires :identity
+          connection.set_content_caching identity, false
+          true
+        end
+
+        def content_caching
+          requires :identity
+          connection.get_content_caching(identity).body['contentCaching']['enabled']
+        end
+
         def enable_connection_logging
           requires :identity
-          connection.set_connection_logging identity, true
+          service.set_connection_logging identity, true
           attributes[:connection_logging] = true
         end
 
         def disable_connection_logging
           requires :identity
-          connection.set_connection_logging identity, false
+          service.set_connection_logging identity, false
           attributes[:connection_logging] = false
         end
 
         def health_monitor
           requires :identity
-          monitor = connection.get_monitor(identity).body['healthMonitor']
+          monitor = service.get_monitor(identity).body['healthMonitor']
           monitor.count == 0 ? nil : monitor
         end
 
         def enable_health_monitor(type, delay, timeout, attempsBeforeDeactivation, options = {})
           requires :identity
-          connection.set_monitor(identity, type, delay, timeout, attempsBeforeDeactivation, options)
+          service.set_monitor(identity, type, delay, timeout, attempsBeforeDeactivation, options)
           true
         end
 
         def disable_health_monitor
           requires :identity
-          connection.remove_monitor(identity)
+          service.remove_monitor(identity)
           true
         end
 
         def connection_throttling
           requires :identity
-          throttle = connection.get_connection_throttling(identity).body['connectionThrottle']
+          throttle = service.get_connection_throttling(identity).body['connectionThrottle']
           throttle.count == 0 ? nil : throttle
         end
 
         def enable_connection_throttling(max_connections, min_connections, max_connection_rate, rate_interval)
           requires :identity
-          connection.set_connection_throttling(identity, max_connections, min_connections, max_connection_rate, rate_interval)
+          service.set_connection_throttling(identity, max_connections, min_connections, max_connection_rate, rate_interval)
           true
         end
 
         def disable_connection_throttling
           requires :identity
-          connection.remove_connection_throttling(identity)
+          service.remove_connection_throttling(identity)
           true
         end
 
         def session_persistence
           requires :identity
-          persistence = connection.get_session_persistence(identity).body['sessionPersistence']
+          persistence = service.get_session_persistence(identity).body['sessionPersistence']
           persistence.count == 0 ? nil : persistence
         end
 
         def enable_session_persistence(type)
           requires :identity
-          connection.set_session_persistence(identity, type)
+          service.set_session_persistence(identity, type)
           true
         end
 
         def disable_session_persistence
           requires :identity
-          connection.remove_session_persistence(identity)
+          service.remove_session_persistence(identity)
           true
         end
 
         def destroy
           requires :identity
-          connection.delete_load_balancer(identity)
+          service.delete_load_balancer(identity)
           true
         end
 
@@ -164,7 +182,7 @@ module Fog
         end
 
         def save
-          if identity
+          if persisted?
             update
           else
             create
@@ -174,22 +192,22 @@ module Fog
 
         def usage(options = {})
           requires :identity
-          connection.get_load_balancer_usage(identity, options).body
+          service.get_load_balancer_usage(identity, options).body
         end
 
         def error_page
           requires :identity
-          connection.get_error_page(identity).body['errorpage']['content']
+          service.get_error_page(identity).body['errorpage']['content']
         end
 
         def error_page=(content)
           requires :identity
-          connection.set_error_page identity, content
+          service.set_error_page identity, content
         end
 
         def reset_error_page
           requires :identity
-          connection.remove_error_page identity
+          service.remove_error_page identity
         end
 
         private
@@ -202,7 +220,7 @@ module Fog
             options = {}
           end
 
-          data = connection.create_load_balancer(name, protocol, port, virtual_ips_hash, nodes_hash, options)
+          data = service.create_load_balancer(name, protocol, port, virtual_ips_hash, nodes_hash, options)
           merge_attributes(data.body['loadBalancer'])
         end
 
@@ -213,7 +231,7 @@ module Fog
             :algorithm => algorithm,
             :protocol => protocol,
             :port => port}
-          connection.update_load_balancer(identity, options)
+          service.update_load_balancer(identity, options)
 
           #TODO - Should this bubble down to nodes? Without tracking changes this would be very inefficient.
           # For now, individual nodes will have to be saved individually after saving an LB