rely on service to include collections

lib/fog/aws/compute.rb

@@ -64,7 +64,6 @@ module Fog
       request :stop_instances
 
       class Mock
-        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -127,7 +126,6 @@ module Fog
       end
 
       class Real
-        include Collections
 
         # Initialize connection to EC2
         #

lib/fog/aws/elb.rb

@@ -15,7 +15,6 @@ module Fog
       request :register_instances_with_load_balancer
 
       class Mock
-        include Collections
 
         def initialize(options={})
           Fog::Mock.not_implemented
@@ -24,7 +23,6 @@ module Fog
       end
 
       class Real
-        include Collections
 
         # Initialize connection to ELB
         #

lib/fog/aws/simpledb.rb

@@ -16,7 +16,6 @@ module Fog
       request :select
 
       class Mock
-        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -40,7 +39,6 @@ module Fog
       end
 
       class Real
-        include Collections
 
         # Initialize connection to SimpleDB
         #

lib/fog/aws/storage.rb

@@ -70,7 +70,6 @@ module Fog
       end
 
       class Mock
-        include Collections
         include Utils
 
         def self.data
@@ -98,7 +97,6 @@ module Fog
       end
 
       class Real
-        include Collections
         include Utils
         extend Fog::Deprecation
         deprecate(:reset, :reload)

lib/fog/bluebox/compute.rb

@@ -24,7 +24,6 @@ module Fog
       request :reboot_block
 
       class Mock
-        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -46,7 +45,6 @@ module Fog
       end
 
       class Real
-        include Collections
 
         def initialize(options={})
           @bluebox_api_key      = options[:bluebox_api_key]

lib/fog/go_grid/compute.rb

@@ -19,7 +19,6 @@ module Fog
       request :grid_server_power
 
       class Mock
-        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -42,7 +41,6 @@ module Fog
       end
 
       class Real
-        include Collections
 
         def initialize(options={})
           @go_grid_api_key = options[:go_grid_api_key]

lib/fog/linode/compute.rb

@@ -18,7 +18,6 @@ module Fog
       request :linode_reboot
 
       class Mock
-        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -40,7 +39,6 @@ module Fog
       end
 
       class Real
-        include Collections
 
         def initialize(options={})
           @linode_api_key = options[:linode_api_key]

lib/fog/local/storage.rb

@@ -11,7 +11,6 @@ module Fog
       collection  :files
 
       class Mock
-        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -40,7 +39,6 @@ module Fog
       end
 
       class Real
-        include Collections
 
         def initialize(options={})
           @local_root = ::File.expand_path(options[:local_root])

lib/fog/new_servers/compute.rb

@@ -19,7 +19,6 @@ module Fog
       request :reboot_server
 
       class Mock
-        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -41,7 +40,6 @@ module Fog
       end
 
       class Real
-        include Collections
 
         def initialize(options={})
           @new_servers_password = options[:new_servers_password]

lib/fog/rackspace/compute.rb

@@ -33,7 +33,6 @@ module Fog
       request :update_server
 
       class Mock
-        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -62,7 +61,6 @@ module Fog
       end
 
       class Real
-        include Collections
 
         def initialize(options={})
           credentials = Fog::Rackspace.authenticate(options)

lib/fog/rackspace/storage.rb

@@ -48,7 +48,6 @@ module Fog
       end
 
       class Mock
-        include Collections
         include Utils
 
         def self.data
@@ -71,7 +70,6 @@ module Fog
       end
 
       class Real
-        include Collections
         include Utils
 
         def initialize(options={})

lib/fog/slicehost/compute.rb

@@ -25,7 +25,6 @@ module Fog
       request :reboot_slice
 
       class Mock
-        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -47,7 +46,6 @@ module Fog
       end
 
       class Real
-        include Collections
 
         def initialize(options={})
           @slicehost_password = options[:slicehost_password]

lib/fog/vcloud/bin.rb

@@ -38,7 +38,7 @@ module Vcloud
       def [](service)
         @@connections ||= Hash.new do |hash, key|
           if credentials = Fog.credentials[:vcloud][key]
-            hash[key] = Fog::Vcloud.new(credentials)
+            hash[key] = eval(credentials[:module]).new(credentials)
           else
             raise ArgumentError.new("Unregistered service: :#{key}. Registered services are: #{Vcloud.registered_services}")
           end

lib/fog/vcloud/terremark/ecloud.rb

@@ -63,7 +63,6 @@ module Fog
         request :power_shutdown
 
         class Mock < Fog::Vcloud::Mock
-          include Collections
 
           def initialize(options={})
           end
@@ -192,7 +191,6 @@ module Fog
         end
 
         class Real < Fog::Vcloud::Real
-          include Collections
 
           def supporting_versions
             ["v0.8b-ext2.3", "0.8b-ext2.3"]

lib/fog/vcloud/terremark/vcloud.rb

@@ -6,7 +6,6 @@ module Fog
         request :get_vdc
 
         class Real < Fog::Vcloud::Real
-          include Collections
 
           def supporting_versions
             ["0.8", "0.8a-ext1.6"]
@@ -15,8 +14,6 @@ module Fog
         end
 
         class Mock < Fog::Vcloud::Mock
-          include Collections
-
         end
 
       end