fog 0.3.29 → 0.3.30

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    fog (0.3.29)
+    fog (0.3.30)
       builder
       excon (>= 0.2.8)
       formatador (>= 0.0.16)
       json
       mime-types
-      named-parameters (= 0.0.14)
+      named-parameters (>= 0.0.17)
       net-ssh (>= 2.0.23)
       nokogiri (>= 1.4.4)
       ruby-hmac
@@ -22,7 +22,7 @@ GEM
       formatador (>= 0.0.12)
     json (1.4.6)
     mime-types (1.16)
-    named-parameters (0.0.14)
+    named-parameters (0.0.17)
     net-ssh (2.0.23)
     nokogiri (1.4.4)
     rake (0.8.7)
@@ -42,7 +42,7 @@ DEPENDENCIES
   formatador (>= 0.0.16)
   json
   mime-types
-  named-parameters (= 0.0.14)
+  named-parameters (>= 0.0.17)
   net-ssh (>= 2.0.23)
   nokogiri (>= 1.4.4)
   rake

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.3.29'
-  s.date              = '2010-12-06'
+  s.version           = '0.3.30'
+  s.date              = '2010-12-08'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.add_dependency('formatador', '>=0.0.16')
   s.add_dependency('json')
   s.add_dependency('mime-types')
-  s.add_dependency('named-parameters', '=0.0.14')
+  s.add_dependency('named-parameters', '>=0.0.17')
   s.add_dependency('net-ssh', '>=2.0.23')
   s.add_dependency('nokogiri', '>=1.4.4')
   s.add_dependency('ruby-hmac')

data/lib/fog.rb

@@ -3,8 +3,8 @@ require 'base64'
 require 'cgi'
 require 'excon'
 require 'formatador'
-require 'named-parameters'
 require 'time'
+require 'named-parameters'
 
 __DIR__ = File.dirname(__FILE__)
 
@@ -19,7 +19,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.29'
+    VERSION = '0.3.30'
   end
 
   module Mock

data/lib/fog/aws/bin.rb

@@ -1,35 +1,45 @@
 class AWS < Fog::Bin
   class << self
 
+    def class_for(key)
+      case key
+      when :cdn
+        Fog::AWS::CDN
+      when :compute, :ec2
+        Fog::AWS::Compute
+      when :elb
+        Fog::AWS::ELB
+      when :iam
+        Fog::AWS::IAM
+      when :sdb
+        Fog::AWS::SimpleDB
+      when :eu_storage, :s3, :storage
+        Fog::AWS::Storage
+      else 
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case key
-        when :cdn
-          Fog::AWS::CDN.new
-        when :compute
-          Fog::AWS::Compute.new
+        klazz = class_for(key)
+        hash[key] = case key 
         when :ec2
           location = caller.first
           warning = "[yellow][WARN] AWS[:ec2] is deprecated, use AWS[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          Fog::AWS::Compute.new
-        when :elb
-          Fog::AWS::ELB.new
+          klazz.new
         when :eu_storage
-          Fog::AWS::Storage.new(:region => 'eu-west-1')
-        when :iam
-          Fog::AWS::IAM.new
-        when :sdb
-          Fog::AWS::SimpleDB.new
+          klazz.new(:region => 'eu-west-1')
         when :s3
           location = caller.first
           warning = "[yellow][WARN] AWS[:s3] is deprecated, use AWS[:storage] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          Fog::AWS::Storage.new
-        when :storage
-          Fog::AWS::Storage.new
+          klazz.new
+        else
+          klazz.new
         end
       end
       @@connections[service]

data/lib/fog/aws/cdn.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class CDN < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :version, :persistent
+      requires :aws_access_key_id, :aws_secret_access_key, &inject_parameter_specs
+      recognizes :host, :path, :port, :scheme, :version, :persistent, &inject_parameter_specs
 
       model_path 'fog/aws/models/cdn'
 

data/lib/fog/aws/compute.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class Compute < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
+      requires :aws_access_key_id, :aws_secret_access_key, &inject_parameter_specs
+      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, &inject_parameter_specs
 
       model_path 'fog/aws/models/compute'
       model       :address

data/lib/fog/aws/elb.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class ELB < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent
+      requires :aws_access_key_id, :aws_secret_access_key, &inject_parameter_specs
+      recognizes :region, :host, :path, :port, :scheme, :persistent, &inject_parameter_specs
 
       request_path 'fog/aws/requests/elb'
       request :create_load_balancer

data/lib/fog/aws/iam.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class IAM < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :persistent
+      requires :aws_access_key_id, :aws_secret_access_key, &inject_parameter_specs
+      recognizes :host, :path, :port, :scheme, :persistent, &inject_parameter_specs
 
       request_path 'fog/aws/requests/iam'
       request :add_user_to_group

data/lib/fog/aws/simpledb.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class SimpleDB < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :nil_string, :path, :port, :scheme, :persistent
+      requires :aws_access_key_id, :aws_secret_access_key, &inject_parameter_specs
+      recognizes :host, :nil_string, :path, :port, :scheme, :persistent, &inject_parameter_specs
       
       request_path 'fog/aws/requests/simpledb'
       request :batch_put_attributes

data/lib/fog/aws/storage.rb

@@ -2,8 +2,8 @@ module Fog
   module AWS
     class Storage < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
+      requires :aws_access_key_id, :aws_secret_access_key, &inject_parameter_specs
+      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, &inject_parameter_specs
       
       model_path 'fog/aws/models/storage'
       collection  :directories

data/lib/fog/bluebox/bin.rb

@@ -1,25 +1,31 @@
 class Bluebox < Fog::Bin
   class << self
 
-      def [](service)
-        @@connections ||= Hash.new do |hash, key|
-          hash[key] = case key
-          when :blocks
-            location = caller.first
-            warning = "[yellow][WARN] Bluebox[:blocks] is deprecated, use Bluebox[:compute] instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-            Fog::Bluebox::Compute.new
-          when :compute
-            Fog::Bluebox::Compute.new
-          end
-        end
-        @@connections[service]
+    def class_for(key)
+      case key
+      when :blocks, :compute
+        Fog::Bluebox::Compute
+      else 
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
+    end
 
-      def services
-        [:compute]
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        if key == :blocks
+          location = caller.first
+          warning = "[yellow][WARN] Bluebox[:blocks] is deprecated, use Bluebox[:compute] instead[/]"
+          warning << " [light_black](" << location << ")[/] "
+          Formatador.display_line(warning)
+        end
+        hash[key] = class_for(key).new
       end
+      @@connections[service]
+    end
+
+    def services
+      [:compute]
+    end
 
   end
 end

data/lib/fog/bluebox/compute.rb

@@ -2,8 +2,8 @@ module Fog
   module Bluebox
     class Compute < Fog::Service
 
-      requires :bluebox_api_key, :bluebox_customer_id
-      recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent
+      requires :bluebox_api_key, :bluebox_customer_id, &inject_parameter_specs
+      recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent, &inject_parameter_specs
 
       model_path 'fog/bluebox/models/compute'
       model       :flavor

data/lib/fog/brightbox/bin.rb

@@ -1,12 +1,18 @@
 class Brightbox < Fog::Bin
   class << self
 
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Brightbox::Compute
+      else 
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case key
-        when :compute
-          Fog::Brightbox::Compute.new
-        end
+        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

data/lib/fog/brightbox/compute.rb

@@ -4,8 +4,8 @@ module Fog
 
       API_URL = "https://api.gb1.brightbox.com/"
 
-      requires :brightbox_client_id, :brightbox_secret
-      recognizes :brightbox_auth_url, :brightbox_api_url
+      requires :brightbox_client_id, :brightbox_secret, &inject_parameter_specs
+      recognizes :brightbox_auth_url, :brightbox_api_url, &inject_parameter_specs
 
       model_path 'fog/brightbox/models/compute'
       model :account # Singular resource, no collection

data/lib/fog/core/bin.rb

@@ -34,16 +34,20 @@ module Fog
         availability = true
         for service in services
           begin
-            service = eval(self[service].class.to_s.split('::')[0...-1].join('::'))
-            availability &&= service.requirements.all? {|requirement| Fog.credentials.include?(requirement)}
-          rescue
+            service = self.class_for(service)
+            availability &&= service.requirements.all? { |requirement| Fog.credentials.include?(requirement) }
+          rescue ArgumentError => e
+            warning = "[yellow][WARN] #{e.message}[/]"
+            Formatador.display_line(warning)
+            availability = false
+          rescue => e
             availability = false
           end
         end
 
         if availability
           for service in services
-            for collection in self[service].collections
+            for collection in self.class_for(service).collections
               unless self.respond_to?(collection)
                 self.class_eval <<-EOS, __FILE__, __LINE__
                   def self.#{collection}

data/lib/fog/core/service.rb

@@ -18,6 +18,26 @@ module Fog
 
     class << self
 
+      # this is to accomodate Real implementations of Service subclasses
+      # NOTE: it might be good to enforce parameter specs to Mock classes as well.
+      def inject_parameter_specs
+        lambda do |spec|
+          implementation = "Real"
+          self.const_set(implementation, Class.new) unless self.const_defined? implementation
+          realclass = self.const_get implementation
+
+          if realclass.declared_parameters_for(:'self.new', :required).empty?
+            required = declared_parameters_for(:'self.new', :required)
+            realclass.send(:requires, *required)
+          end
+        
+          if realclass.declared_parameters_for(:'self.new', :optional).empty?
+            optional = declared_parameters_for(:'self.new', :optional)
+            realclass.send(:recognizes, *optional) 
+          end
+        end
+      end
+
       def inherited(child)
         child.class_eval <<-EOS, __FILE__, __LINE__
           module Collections
@@ -35,7 +55,7 @@ module Fog
       end
 
       def requirements
-        declared_parameters_for :new, :required
+        declared_parameters_for :'self.new', :required
       end
 
       def new(options={})

data/lib/fog/go_grid/bin.rb

@@ -1,18 +1,24 @@
 class GoGrid < Fog::Bin
   class << self
 
+    def class_for(key)
+      case key
+      when :compute, :servers
+        Fog::GoGrid::Compute
+      else 
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case key
-        when :compute
-          Fog::GoGrid::Compute.new
-        when :servers
+        if key == :servers
           location = caller.first
           warning = "[yellow][WARN] GoGrid[:servers] is deprecated, use GoGrid[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          Fog::GoGrid::Compute.new
         end
+        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

data/lib/fog/go_grid/compute.rb

@@ -2,8 +2,8 @@ module Fog
   module GoGrid
     class Compute < Fog::Service
 
-      requires :go_grid_api_key, :go_grid_shared_secret
-      recognizes :host, :path, :port, :scheme, :persistent
+      requires :go_grid_api_key, :go_grid_shared_secret, &inject_parameter_specs
+      recognizes :host, :path, :port, :scheme, :persistent, &inject_parameter_specs
 
       model_path 'fog/go_grid/models/compute'
       model         :image

data/lib/fog/google/bin.rb

@@ -1,12 +1,18 @@
 class Google < Fog::Bin
   class << self
 
+    def class_for(key)
+      case key
+      when :storage
+        Fog::Google::Storage
+      else 
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case key
-        when :storage
-          Fog::Google::Storage.new
-        end
+        hash[key] = class_for(key).new
       end
       @@connections[service]
     end
@@ -16,5 +22,4 @@ class Google < Fog::Bin
     end
 
   end
-
 end

data/lib/fog/google/parsers/storage/access_control_list.rb

@@ -17,7 +17,7 @@ module Fog
             when 'Entries'
               @in_entries = true
             when 'Scope'
-              key, value = attrs
+              key, value = attrs.first
               @entry['Scope'][key] = value
             end
           end

data/lib/fog/google/storage.rb

@@ -2,8 +2,8 @@ module Fog
   module Google
     class Storage < Fog::Service
 
-      requires :google_storage_access_key_id, :google_storage_secret_access_key
-      recognizes :host, :port, :scheme, :persistent
+      requires :google_storage_access_key_id, :google_storage_secret_access_key, &inject_parameter_specs
+      recognizes :host, :port, :scheme, :persistent, &inject_parameter_specs
 
       model_path 'fog/google/models/storage'
       collection  :directories

data/lib/fog/linode/bin.rb

@@ -1,18 +1,24 @@
 class Linode < Fog::Bin
   class << self
 
+    def class_for(key)
+      case key
+      when :compute, :linode
+        Fog::Linode::Compute
+      else 
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case key
-        when :compute
-          Fog::Linode::Compute.new
-        when :linode
+        if key == :linode
           location = caller.first
           warning = "[yellow][WARN] Linode[:linode] is deprecated, use Linode[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          Fog::Linode::Compute.new
         end
+        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

data/lib/fog/linode/compute.rb

@@ -2,8 +2,8 @@ module Fog
   module Linode
     class Compute < Fog::Service
 
-      requires :linode_api_key
-      recognizes :port, :scheme, :persistent
+      requires :linode_api_key, &inject_parameter_specs
+      recognizes :port, :scheme, :persistent, &inject_parameter_specs
 
       model_path 'fog/linode/models/compute'
 

data/lib/fog/local/bin.rb

@@ -1,18 +1,24 @@
 class Local < Fog::Bin
   class << self
 
+    def class_for(key)
+      case key
+      when :files, :storage
+        Fog::Local::Storage
+      else 
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case key
-        when :files
+        if key == :files
           location = caller.first
           warning = "[yellow][WARN] Local[:files] is deprecated, use Local[:storage] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          Fog::Local::Storage.new
-        when :storage
-          Fog::Local::Storage.new
         end
+        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

data/lib/fog/local/storage.rb

@@ -2,7 +2,7 @@ module Fog
   module Local
     class Storage < Fog::Service
 
-      requires :local_root
+      requires :local_root, &inject_parameter_specs
 
       model_path 'fog/local/models/storage'
       collection  :directories

data/lib/fog/new_servers/bin.rb

@@ -1,18 +1,24 @@
 class NewServers < Fog::Bin
   class << self
 
+    def class_for(key)
+      case key
+      when :compute, :new_servers
+        Fog::NewServers::Compute
+      else 
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case key
-        when :compute
-          Fog::NewServers::Compute.new
-        when :new_servers
+        if key == :new_servers
           location = caller.first
           warning = "[yellow][WARN] NewServers[:servers] is deprecated, use NewServers[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          Fog::NewServers::Compute.new
         end
+        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

data/lib/fog/new_servers/compute.rb

@@ -4,8 +4,8 @@ module Fog
   module NewServers
     class Compute < Fog::Service
 
-      requires :new_servers_password, :new_servers_username
-      recognizes :host, :port, :scheme, :persistent
+      requires :new_servers_password, :new_servers_username, &inject_parameter_specs
+      recognizes :host, :port, :scheme, :persistent, &inject_parameter_specs
 
       model_path 'fog/new_servers/models/compute'
 

data/lib/fog/rackspace.rb

@@ -1,7 +1,6 @@
 module Fog
   module Rackspace
     
-    include NamedParameters
     extend Fog::Provider
 
     service_path 'fog/rackspace'
@@ -11,11 +10,6 @@ module Fog
     service 'servers'
     service 'storage'
 
-    # NOTE: might be better to rely on the caller alone to enforce parameter 
-    # requirements...
-    has_named_parameters :'self.authenticate', 
-      :required => [ :rackspace_api_key, :rackspace_username ],
-      :optional => [ :rackspace_auth_url ]
     def self.authenticate(options)
       rackspace_auth_url = options[:rackspace_auth_url] || "auth.api.rackspacecloud.com"
       connection = Fog::Connection.new("https://" + rackspace_auth_url)

data/lib/fog/rackspace/bin.rb

@@ -1,27 +1,37 @@
 class Rackspace < Fog::Bin
   class << self
 
+    def class_for(key)
+      case key
+      when :cdn
+        Fog::Rackspace::CDN
+      when :compute, :servers
+        Fog::Rackspace::Compute
+      when :files, :storage
+        Fog::Rackspace::Storage
+      else 
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
     def [](service)
       @@connections ||= Hash.new do |hash, key|
+        klazz = class_for(key)
         hash[key] = case key
-        when :cdn
-          Fog::Rackspace::CDN.new
-        when :compute
-          Fog::Rackspace::Compute.new
         when :files
           location = caller.first
           warning = "[yellow][WARN] Rackspace[:files] is deprecated, use Rackspace[:storage] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          Fog::Rackspace::Storage.new
+          klazz.new
         when :servers
           location = caller.first
           warning = "[yellow][WARN] Rackspace[:servers] is deprecated, use Rackspace[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          Fog::Rackspace::Compute.new
-        when :storage
-          Fog::Rackspace::Storage.new
+          klazz.new
+        else
+          klazz.new
         end
       end
       @@connections[service]

data/lib/fog/rackspace/cdn.rb

@@ -2,10 +2,8 @@ module Fog
   module Rackspace
     class CDN < Fog::Service
 
-      requires :rackspace_api_key, :rackspace_username
-      # NOTE: recognizes clause delegates to Fog::Rackspace.authenticate's so 
-      #       we also declare those parameters that the authenticate expects...
-      recognizes :rackspace_auth_url, :persistent
+      requires :rackspace_api_key, :rackspace_username, &inject_parameter_specs
+      recognizes :rackspace_auth_url, :persistent, &inject_parameter_specs
 
       model_path 'fog/rackspace/models/cdn'
 

data/lib/fog/rackspace/compute.rb

@@ -2,10 +2,8 @@ module Fog
   module Rackspace
     class Compute < Fog::Service
 
-      requires :rackspace_api_key, :rackspace_username
-      # NOTE: recognizes clause delegates to Fog::Rackspace.authenticate's so 
-      #       we also declare those parameters that the authenticate expects...
-      recognizes :rackspace_auth_url, :persistent
+      requires :rackspace_api_key, :rackspace_username, &inject_parameter_specs
+      recognizes :rackspace_auth_url, :persistent, &inject_parameter_specs
 
       model_path 'fog/rackspace/models/compute'
       model       :flavor

data/lib/fog/rackspace/storage.rb

@@ -2,10 +2,8 @@ module Fog
   module Rackspace
     class Storage < Fog::Service
 
-      requires :rackspace_api_key, :rackspace_username
-      # NOTE: recognizes clause delegates to Fog::Rackspace.authenticate's so 
-      #       we also declare those parameters that the authenticate expects...
-      recognizes :rackspace_auth_url, :persistent
+      requires :rackspace_api_key, :rackspace_username, &inject_parameter_specs
+      recognizes :rackspace_auth_url, :persistent, &inject_parameter_specs
 
       model_path 'fog/rackspace/models/storage'
       model       :directory

data/lib/fog/slicehost/bin.rb

@@ -1,18 +1,24 @@
 class Slicehost < Fog::Bin
   class << self
 
+    def class_for(key)
+      case key
+      when :compute, :slices
+        Fog::Slicehost::Compute
+      else 
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = case key
-        when :compute
-          Fog::Slicehost::Compute.new
-        when :slices
+        if key == :slices
           location = caller.first
           warning = "[yellow][WARN] Slicehost[:blocks] is deprecated, use Bluebox[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          Fog::Slicehost::Compute.new
         end
+        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

data/lib/fog/slicehost/compute.rb

@@ -2,8 +2,8 @@ module Fog
   module Slicehost
     class Compute < Fog::Service
 
-      requires :slicehost_password
-      recognizes :host, :port, :scheme, :persistent
+      requires :slicehost_password, &inject_parameter_specs
+      recognizes :host, :port, :scheme, :persistent, &inject_parameter_specs
 
       model_path 'fog/slicehost/models/compute'
       model       :flavor

data/lib/fog/terremark/ecloud.rb

@@ -32,6 +32,8 @@ module Fog
       end
 
       class Real
+        # NOTE: When this vbecomes a service, take care to pass the &inject_parameter_specs 
+        # block on call to requires and recognizes        
         requires :terremark_ecloud_password, :terremark_ecloud_username
         recognizes :host, :path, :port, :scheme, :persistent
         

data/lib/fog/terremark/parsers/shared/get_organization.rb

@@ -15,8 +15,13 @@ module Fog
             when 'Link'
               link = {}
               until attributes.empty?
-                link[attributes.shift] = attributes.shift
-              end            
+                if attributes.first.is_a?(Array)
+                  attribute = attributes.shift
+                  link[attribute.first] = attribute.last
+                else
+                  link[attributes.shift] = attributes.shift
+                end
+              end
               @response['Links'] << link
             when 'Org'
               org = {}

data/lib/fog/terremark/parsers/shared/get_organizations.rb

@@ -14,7 +14,12 @@ module Fog
             if name == 'Org'
               organization = {}
               until attributes.empty?
-                organization[attributes.shift] = attributes.shift
+                if attributes.first.is_a?(Array)
+                  attribute = attributes.shift
+                  organization[attribute.first] = attribute.last
+                else
+                  organization[attributes.shift] = attributes.shift
+                end
               end
               @response['OrgList'] << organization
             end

data/lib/fog/terremark/parsers/shared/get_vdc.rb

@@ -37,7 +37,12 @@ module Fog
             when 'Link'
               link = {}
               until attributes.empty?
-                link[attributes.shift] = attributes.shift
+                if attributes.first.is_a?(Array)
+                  attribute = attributes.shift
+                  link[attribute.first] = attribute.last
+                else
+                  link[attributes.shift] = attributes.shift
+                end
               end
               @response['links'] << link
             when 'Memory'
@@ -45,13 +50,23 @@ module Fog
             when 'Network'
               network = {}
               until attributes.empty?
-                network[attributes.shift] = attributes.shift
+                if attributes.first.is_a?(Array)
+                  attribute = attributes.shift
+                  network[attribute.first] = attribute.last
+                else
+                  network[attributes.shift] = attributes.shift
+                end
               end
               @response['AvailableNetworks'] << network
             when 'ResourceEntity'
               resource_entity = {}
               until attributes.empty?
-                resource_entity[attributes.shift] = attributes.shift
+                if attributes.first.is_a?(Array)
+                  attribute = attributes.shift
+                  resource_entity[attribute.first] = attribute.last
+                else
+                  resource_entity[attributes.shift] = attributes.shift
+                end
               end
               @response['ResourceEntities'] << resource_entity
             when 'StorageCapacity'

data/lib/fog/vcloud.rb

@@ -19,8 +19,8 @@ end
 module Fog
   class Vcloud < Fog::Service
 
-    requires :username, :password, :module, :versions_uri
-    recognizes :version, :persistent
+    requires :username, :password, :module, :versions_uri, &inject_parameter_specs
+    recognizes :version, :persistent, &inject_parameter_specs
 
     model_path 'fog/vcloud/models'
     model :vdc

data/tests/google/requests/storage/bucket_tests.rb

@@ -3,11 +3,12 @@ Shindo.tests('Google::Storage | bucket requests', ['google']) do
   tests('success') do
 
     @bucket_format = {
-      'IsTruncated' => Fog::Boolean,
-      'Marker'      => NilClass,
-      'Name'        => String,
-      'Prefix'      => NilClass,
-      'Contents'    => [{
+      'CommonPrefixes' => [],
+      'IsTruncated'     => Fog::Boolean,
+      'Marker'          => NilClass,
+      'Name'            => String,
+      'Prefix'          => NilClass,
+      'Contents'        => [{
         'ETag'          => String,
         'Key'           => String,
         'LastModified'  => Time,
@@ -16,7 +17,7 @@ Shindo.tests('Google::Storage | bucket requests', ['google']) do
           'ID'          => String
         },
         'Size' => Integer,
-        'StorageClass' => String
+        'StorageClass'  => String
       }]
     }
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 29
-  version: 0.3.29
+  - 30
+  version: 0.3.30
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -08:00
+date: 2010-12-08 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,13 +86,13 @@ dependencies:
   type: :runtime
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 0
-        - 14
-        version: 0.0.14
+        - 17
+        version: 0.0.17
   requirement: *id006
   name: named-parameters
 - !ruby/object:Gem::Dependency