diff --git a/lib/fog/cdn.rb b/lib/fog/cdn.rb index d87f3372d..8f86a16cb 100644 --- a/lib/fog/cdn.rb +++ b/lib/fog/cdn.rb @@ -7,7 +7,7 @@ module Fog def self.new(attributes) attributes = attributes.dup # prevent delete from having side effects - case provider = attributes[:provider].to_s.downcase.to_sym + case provider = attributes.delete(:provider).to_s.downcase.to_sym when :aws require 'fog/cdn/aws' Fog::CDN::AWS.new(attributes) diff --git a/lib/fog/cdn/aws.rb b/lib/fog/cdn/aws.rb index d63746ef9..340c04f4d 100644 --- a/lib/fog/cdn/aws.rb +++ b/lib/fog/cdn/aws.rb @@ -4,7 +4,6 @@ module Fog requires :aws_access_key_id, :aws_secret_access_key recognizes :host, :path, :port, :scheme, :version, :persistent - recognizes :provider # remove post deprecation model_path 'fog/cdn/models/aws' diff --git a/lib/fog/cdn/rackspace.rb b/lib/fog/cdn/rackspace.rb index c1fe2e02e..c07271c0e 100644 --- a/lib/fog/cdn/rackspace.rb +++ b/lib/fog/cdn/rackspace.rb @@ -4,7 +4,6 @@ module Fog requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url, :persistent - recognizes :provider # remove post deprecation model_path 'fog/cdn/models/rackspace' diff --git a/lib/fog/compute.rb b/lib/fog/compute.rb index 6be5e2ae4..72a6a0ac2 100644 --- a/lib/fog/compute.rb +++ b/lib/fog/compute.rb @@ -7,7 +7,7 @@ module Fog def self.new(attributes) attributes = attributes.dup # prevent delete from having side effects - case provider = attributes[:provider].to_s.downcase.to_sym + case provider = attributes.delete(:provider).to_s.downcase.to_sym when :aws require 'fog/compute/aws' Fog::Compute::AWS.new(attributes) diff --git a/lib/fog/compute/aws.rb b/lib/fog/compute/aws.rb index a47937e84..d095c8dd5 100644 --- a/lib/fog/compute/aws.rb +++ b/lib/fog/compute/aws.rb @@ -4,7 +4,6 @@ module Fog requires :aws_access_key_id, :aws_secret_access_key recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/compute/models/aws' model :address diff --git a/lib/fog/compute/bluebox.rb b/lib/fog/compute/bluebox.rb index 459439000..42e423d94 100644 --- a/lib/fog/compute/bluebox.rb +++ b/lib/fog/compute/bluebox.rb @@ -4,7 +4,6 @@ module Fog requires :bluebox_api_key, :bluebox_customer_id recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/compute/models/bluebox' model :flavor diff --git a/lib/fog/compute/brightbox.rb b/lib/fog/compute/brightbox.rb index 7351893d1..d3f6084e9 100644 --- a/lib/fog/compute/brightbox.rb +++ b/lib/fog/compute/brightbox.rb @@ -6,7 +6,6 @@ module Fog requires :brightbox_client_id, :brightbox_secret recognizes :brightbox_auth_url, :brightbox_api_url - recognizes :provider # remove post deprecation model_path 'fog/compute/models/brightbox' model :account # Singular resource, no collection diff --git a/lib/fog/compute/ecloud.rb b/lib/fog/compute/ecloud.rb index 55b57adac..04011e29e 100644 --- a/lib/fog/compute/ecloud.rb +++ b/lib/fog/compute/ecloud.rb @@ -830,7 +830,6 @@ module Fog requires :ecloud_username, :ecloud_password, :ecloud_versions_uri recognizes :ecloud_version - recognizes :provider # remove post deprecation model_path 'fog/compute/models/ecloud' model :catalog_item diff --git a/lib/fog/compute/go_grid.rb b/lib/fog/compute/go_grid.rb index 6856827c5..e3eb0a6fa 100644 --- a/lib/fog/compute/go_grid.rb +++ b/lib/fog/compute/go_grid.rb @@ -4,7 +4,6 @@ module Fog requires :go_grid_api_key, :go_grid_shared_secret recognizes :host, :path, :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/compute/models/go_grid' model :image diff --git a/lib/fog/compute/linode.rb b/lib/fog/compute/linode.rb index 78a3c9baa..ef9ffc84f 100644 --- a/lib/fog/compute/linode.rb +++ b/lib/fog/compute/linode.rb @@ -4,7 +4,6 @@ module Fog requires :linode_api_key recognizes :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/compute/models/linode' model :flavor diff --git a/lib/fog/compute/new_servers.rb b/lib/fog/compute/new_servers.rb index ac99c8f5f..e4aaa68c4 100644 --- a/lib/fog/compute/new_servers.rb +++ b/lib/fog/compute/new_servers.rb @@ -4,7 +4,6 @@ module Fog requires :new_servers_password, :new_servers_username recognizes :host, :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/compute/models/new_servers' diff --git a/lib/fog/compute/ninefold.rb b/lib/fog/compute/ninefold.rb index d869f20cd..3e321c43d 100644 --- a/lib/fog/compute/ninefold.rb +++ b/lib/fog/compute/ninefold.rb @@ -5,7 +5,6 @@ module Fog API_URL = "http://api.ninefold.com/compute/v1.0/" requires :ninefold_compute_key, :ninefold_compute_secret - recognizes :provider # remove post deprecation model_path 'fog/compute/models/ninefold' model :server diff --git a/lib/fog/compute/rackspace.rb b/lib/fog/compute/rackspace.rb index 7e0b23982..379383816 100644 --- a/lib/fog/compute/rackspace.rb +++ b/lib/fog/compute/rackspace.rb @@ -4,7 +4,6 @@ module Fog requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent - recognizes :provider # remove post deprecation model_path 'fog/compute/models/rackspace' model :flavor diff --git a/lib/fog/compute/slicehost.rb b/lib/fog/compute/slicehost.rb index bc54479d7..77c16cb66 100644 --- a/lib/fog/compute/slicehost.rb +++ b/lib/fog/compute/slicehost.rb @@ -4,7 +4,6 @@ module Fog requires :slicehost_password recognizes :host, :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/compute/models/slicehost' model :flavor diff --git a/lib/fog/compute/storm_on_demand.rb b/lib/fog/compute/storm_on_demand.rb index 2f6c1b4d2..3e14ced4a 100644 --- a/lib/fog/compute/storm_on_demand.rb +++ b/lib/fog/compute/storm_on_demand.rb @@ -6,7 +6,6 @@ module Fog requires :storm_on_demand_username, :storm_on_demand_password recognizes :storm_on_demand_auth_url - recognizes :provider # remove post deprecation model_path 'fog/compute/models/storm_on_demand' model :config diff --git a/lib/fog/compute/virtual_box.rb b/lib/fog/compute/virtual_box.rb index d77f7e050..526a46cfd 100644 --- a/lib/fog/compute/virtual_box.rb +++ b/lib/fog/compute/virtual_box.rb @@ -2,8 +2,6 @@ module Fog module Compute class VirtualBox < Fog::Service - recognizes :provider # remove post deprecation - model_path 'fog/compute/models/virtual_box' model :medium collection :mediums diff --git a/lib/fog/compute/voxel.rb b/lib/fog/compute/voxel.rb index ac5b4d701..5b9957677 100644 --- a/lib/fog/compute/voxel.rb +++ b/lib/fog/compute/voxel.rb @@ -3,7 +3,7 @@ module Fog class Voxel < Fog::Service requires :voxel_api_key, :voxel_api_secret - recognizes :provider, :host, :port, :scheme, :persistent + recognizes :host, :port, :scheme, :persistent model_path 'fog/compute/models/voxel' model :image diff --git a/lib/fog/dns.rb b/lib/fog/dns.rb index 9ed19f358..ef9ac9fe4 100644 --- a/lib/fog/dns.rb +++ b/lib/fog/dns.rb @@ -7,7 +7,7 @@ module Fog def self.new(attributes) attributes = attributes.dup # prevent delete from having side effects - case provider = attributes[:provider].to_s.downcase.to_sym + case provider = attributes.delete(:provider).to_s.downcase.to_sym when :aws require 'fog/dns/aws' Fog::DNS::AWS.new(attributes) diff --git a/lib/fog/dns/aws.rb b/lib/fog/dns/aws.rb index 9ec4daa2d..c68a90068 100644 --- a/lib/fog/dns/aws.rb +++ b/lib/fog/dns/aws.rb @@ -4,7 +4,6 @@ module Fog requires :aws_access_key_id, :aws_secret_access_key recognizes :host, :path, :port, :scheme, :version, :persistent - recognizes :provider # remove post deprecation model_path 'fog/dns/models/aws' model :record diff --git a/lib/fog/dns/bluebox.rb b/lib/fog/dns/bluebox.rb index 846eb9389..dedb9426e 100644 --- a/lib/fog/dns/bluebox.rb +++ b/lib/fog/dns/bluebox.rb @@ -1,9 +1,9 @@ module Fog module DNS class Bluebox < Fog::Service + requires :bluebox_api_key, :bluebox_customer_id recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/dns/models/bluebox' model :record diff --git a/lib/fog/dns/dnsimple.rb b/lib/fog/dns/dnsimple.rb index 1045b1d99..3c536facf 100644 --- a/lib/fog/dns/dnsimple.rb +++ b/lib/fog/dns/dnsimple.rb @@ -4,7 +4,6 @@ module Fog requires :dnsimple_email, :dnsimple_password recognizes :dnsimple_url, :host, :path, :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/dns/models/dnsimple' model :record diff --git a/lib/fog/dns/dnsmadeeasy.rb b/lib/fog/dns/dnsmadeeasy.rb index b25369edc..e31e7752f 100644 --- a/lib/fog/dns/dnsmadeeasy.rb +++ b/lib/fog/dns/dnsmadeeasy.rb @@ -4,7 +4,6 @@ module Fog requires :dnsmadeeasy_api_key, :dnsmadeeasy_secret_key recognizes :host, :path, :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/dns/models/dnsmadeeasy' model :record diff --git a/lib/fog/dns/linode.rb b/lib/fog/dns/linode.rb index d264771a4..48f5c1ade 100644 --- a/lib/fog/dns/linode.rb +++ b/lib/fog/dns/linode.rb @@ -4,7 +4,6 @@ module Fog requires :linode_api_key recognizes :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/dns/models/linode' model :record diff --git a/lib/fog/dns/slicehost.rb b/lib/fog/dns/slicehost.rb index eea480ec7..7daad5526 100644 --- a/lib/fog/dns/slicehost.rb +++ b/lib/fog/dns/slicehost.rb @@ -4,7 +4,6 @@ module Fog requires :slicehost_password recognizes :host, :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/dns/models/slicehost' model :record diff --git a/lib/fog/dns/zerigo.rb b/lib/fog/dns/zerigo.rb index 8e86d7c05..72762fdd9 100644 --- a/lib/fog/dns/zerigo.rb +++ b/lib/fog/dns/zerigo.rb @@ -4,7 +4,6 @@ module Fog requires :zerigo_email, :zerigo_token recognizes :timeout, :persistent - recognizes :provider # remove post deprecation model_path 'fog/dns/models/zerigo' model :record diff --git a/lib/fog/storage.rb b/lib/fog/storage.rb index 3e5b0bdcd..3ffafa09c 100644 --- a/lib/fog/storage.rb +++ b/lib/fog/storage.rb @@ -7,7 +7,7 @@ module Fog def self.new(attributes) attributes = attributes.dup # prevent delete from having side effects - case provider = attributes[:provider].to_s.downcase.to_sym + case provider = attributes.delete(:provider).to_s.downcase.to_sym when :aws require 'fog/storage/aws' Fog::Storage::AWS.new(attributes) diff --git a/lib/fog/storage/aws.rb b/lib/fog/storage/aws.rb index 98dd8c1e8..5eb3dfff1 100644 --- a/lib/fog/storage/aws.rb +++ b/lib/fog/storage/aws.rb @@ -4,7 +4,6 @@ module Fog requires :aws_access_key_id, :aws_secret_access_key recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/storage/models/aws' collection :directories diff --git a/lib/fog/storage/google.rb b/lib/fog/storage/google.rb index 40fb0a810..7eaceba49 100644 --- a/lib/fog/storage/google.rb +++ b/lib/fog/storage/google.rb @@ -4,7 +4,6 @@ module Fog requires :google_storage_access_key_id, :google_storage_secret_access_key recognizes :host, :port, :scheme, :persistent - recognizes :provider # remove post deprecation model_path 'fog/storage/models/google' collection :directories diff --git a/lib/fog/storage/local.rb b/lib/fog/storage/local.rb index 9625d5879..446b03bc2 100644 --- a/lib/fog/storage/local.rb +++ b/lib/fog/storage/local.rb @@ -3,7 +3,6 @@ module Fog class Local < Fog::Service requires :local_root - recognizes :provider # remove post deprecation model_path 'fog/storage/models/local' collection :directories diff --git a/lib/fog/storage/rackspace.rb b/lib/fog/storage/rackspace.rb index 9d8f8d12a..8815a7097 100644 --- a/lib/fog/storage/rackspace.rb +++ b/lib/fog/storage/rackspace.rb @@ -4,7 +4,6 @@ module Fog requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url, :rackspace_servicenet, :rackspace_cdn_ssl, :persistent - recognizes :provider # remove post deprecation model_path 'fog/storage/models/rackspace' model :directory