fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/tests/rackspace/models/identity/service_catalog_tests.rb

@@ -2,30 +2,6 @@ require 'fog/rackspace/models/identity/service_catalog'
 
 Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
 
-  tests('#from_response') do
-    tests('missing serviceCatalog node') do
-      before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"}}}
-      after_hash = {}
-      service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
-      returns(after_hash) { service_catalog.catalog }
-    end
-
-    tests('missing serviceCatalog node') do
-      before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"}, "serviceCatalog"=>[{"type"=>"volume",  "name"=>"cloudBlockStorage", "endpoints" =>[{"region"=>"DFW", "tenantId"=>"777" }]}, {"type"=>"rax:load-balancer","name"=>"cloudLoadBalancers",  "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}] }] }}
-
-      after_hash = {:cloudBlockStorage=>nil, :cloudLoadBalancers=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}
-      service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
-      returns(after_hash) { service_catalog.catalog }
-    end
-
-    tests('missing region') do
-      before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"}, "serviceCatalog"=> [{"type"=>"rax:load-balancer","name"=>"cloudLoadBalancers",  "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}, {"tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}] }] }}
-
-      after_hash = {:cloudLoadBalancers=>{:ord=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777", :global=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}}
-      service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
-      returns(after_hash) { service_catalog.catalog }
-    end
-
     tests('successful') do
       before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"},
       "serviceCatalog"=>[{"type"=>"volume", "endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777"},
@@ -46,47 +22,90 @@ Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
       "tenantId"=>"777", "versionList"=>"https://dfw.servers.api.rackspacecloud.com/", "versionInfo"=>"https://dfw.servers.api.rackspacecloud.com/v2",
       "publicURL"=>"https://dfw.servers.api.rackspacecloud.com/v2/777"}, {"region"=>"ORD", "versionId"=>"2", "tenantId"=>"777",
       "versionList"=>"https://ord.servers.api.rackspacecloud.com/", "versionInfo"=>"https://ord.servers.api.rackspacecloud.com/v2",
-      "publicURL"=>"https://ord.servers.api.rackspacecloud.com/v2/777"}], "name"=>"cloudServersOpenStack"}, {"type"=>"rax:monitor", "endpoints"=>[{"tenantId"=>"777",
+      "publicURL"=>"https://ord.servers.api.rackspacecloud.com/v2/777"}, {"versionId"=>"2", "tenantId"=>"777", "versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v2", "publicURL"=>"https://servers.api.rackspacecloud.com/v2/777"}], "name"=>"cloudServersOpenStack"}, {"type"=>"rax:monitor", "endpoints"=>[{"tenantId"=>"777",
       "publicURL"=>"https://monitoring.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudMonitoring"}, {"type"=>"rax:object-cdn", "endpoints"=>[{"region"=>"DFW",
       "tenantId"=>"Mosso777", "publicURL"=>"https://cdn1.clouddrive.com/v1/Mosso777"},
       {"region"=>"ORD", "tenantId"=>"Mosso777",
-      "publicURL"=>"https://cdn2.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFilesCDN"}], "user"=>{"roles"=>[{"description"=>"User Admin
+      "publicURL"=>"https://cdn2.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFilesCDN"},
+
+      {"type"=>"not_here", "name" => "not_here", "endpoints"=>[{"tenantId"=>"777", "region" => "LON",
+      "publicURL"=>"https://monitoring.api.rackspacecloud.com/v1.0/777"}]}
+      ],
+
+      "user"=>{"roles"=>[{"description"=>"User Admin
       Role.", "name"=>"identity:user-admin", "id"=>"3"}], "name"=>"joe-racker", "RAX-AUTH:defaultRegion"=>"", "id"=>"TK421"}}}
 
-      after_hash = {:cloudServers=>"https://servers.api.rackspacecloud.com/v1.0/777", :cloudServersOpenStack=>{:dfw=>"https://dfw.servers.api.rackspacecloud.com/v2/777", :ord=>"https://ord.servers.api.rackspacecloud.com/v2/777"}, :cloudFiles=>{:dfw=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777", :ord=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}, :cloudBlockStorage=>{:dfw=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777", :ord=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}, :cloudMonitoring=>"https://monitoring.api.rackspacecloud.com/v1.0/777", :cloudLoadBalancers=>{:dfw=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}, :cloudFilesCDN=>{:dfw=>"https://cdn1.clouddrive.com/v1/Mosso777", :ord=>"https://cdn2.clouddrive.com/v1/Mosso777"}, :cloudDatabases=>{:dfw=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}, :cloudDNS=>"https://dns.api.rackspacecloud.com/v1.0/777"}
       @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
-      returns(after_hash) { @service_catalog.catalog }
     end
-  end
   
-  tests('services') do
-    services = ["cloudBlockStorage", "cloudDNS", "cloudDatabases", "cloudFiles", "cloudFilesCDN", "cloudLoadBalancers", "cloudMonitoring", "cloudServers", "cloudServersOpenStack"]
-    returns(services) { @service_catalog.services.collect {|s| s.to_s }.sort }
-  end
+    tests('services') do
+      services = ["cloudBlockStorage", "cloudDNS", "cloudDatabases", "cloudFiles", "cloudFilesCDN", "cloudLoadBalancers", "cloudMonitoring", "cloudServers", "cloudServersOpenStack", "not_here"]
+
+      returns(services) { @service_catalog.services.collect {|s| s.to_s }.sort }
+    end
   
   tests('get_endpoints') do
-    endpoints = {:dfw=>"https://dfw.servers.api.rackspacecloud.com/v2/777", :ord=>"https://ord.servers.api.rackspacecloud.com/v2/777"}
+    endpoints = [{"region"=>"DFW", "versionId"=>"2", "tenantId"=>"777", "versionList"=>"https://dfw.servers.api.rackspacecloud.com/", "versionInfo"=>"https://dfw.servers.api.rackspacecloud.com/v2", "publicURL"=>"https://dfw.servers.api.rackspacecloud.com/v2/777"}, {"region"=>"ORD", "versionId"=>"2", "tenantId"=>"777", "versionList"=>"https://ord.servers.api.rackspacecloud.com/", "versionInfo"=>"https://ord.servers.api.rackspacecloud.com/v2", "publicURL"=>"https://ord.servers.api.rackspacecloud.com/v2/777"}, {"versionId"=>"2", "tenantId"=>"777", "versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v2", "publicURL"=>"https://servers.api.rackspacecloud.com/v2/777"}]
     returns(endpoints) { @service_catalog.get_endpoints(:cloudServersOpenStack) }
     returns(endpoints) { @service_catalog.get_endpoints('cloudServersOpenStack') }
-    returns(nil) { @service_catalog.get_endpoints('non-existent') }
+    returns({}) { @service_catalog.get_endpoints('non-existent') }
   end
   
   tests('get_endpoint') do
     tests('service with mulitple endpoints') do
       returns("https://dfw.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, :dfw) }
-      returns("https://ord.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, :ord) }      
+      returns("https://ord.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, :ord) }
       returns("https://dfw.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, 'dfw') }
       returns("https://dfw.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint('cloudServersOpenStack', 'dfw') }
+      returns("https://servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint('cloudServersOpenStack', :global) }
     end
     
     tests('with one endpoint') do
-      returns("https://monitoring.api.rackspacecloud.com/v1.0/777") { @service_catalog.get_endpoint(:cloudMonitoring, 'dfw') }
+      tests('catalog contains global endpoint') do
+        catalog_hash =  [{"type"=>"volume", "endpoints"=>[{"tenantId"=>"777", "publicURL"=>"https://blockstorage.api.rackspacecloud.com/v1/777"}], "name"=>"cloudBlockStorage"}]
+        @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.new(:service => nil, :catalog => catalog_hash)
+
+        tests('no region specifed').returns("https://blockstorage.api.rackspacecloud.com/v1/777") do
+          @service_catalog.get_endpoint(:cloudBlockStorage)
+        end
+        tests('region specifed').returns("https://blockstorage.api.rackspacecloud.com/v1/777") do
+          @service_catalog.get_endpoint(:cloudBlockStorage, :ord)
+        end
+      end
+      tests('catalog does not contain global endpoint') do
+        catalog_hash =   [{"type"=>"volume", "endpoints"=>[{"region" => "ORD", "tenantId"=>"777", "publicURL"=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}], "name"=>"cloudBlockStorage"}]
+        @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.new(:service => nil, :catalog => catalog_hash)
+
+        tests('non-existing region') do
+          raises(RuntimeError) { @service_catalog.get_endpoint(:cloudBlockStorage, :dfw) }
+        end
+        tests('existing region').returns("https://ord.blockstorage.api.rackspacecloud.com/v1/777") do
+          @service_catalog.get_endpoint(:cloudBlockStorage, :ord)
+        end
+      end
+    end
+
+    tests('endpoint type') do
+      catalog_hash =  [{"type"=>"object-store", "endpoints"=>[{"internalURL"=>"https://snet-storage101.dfw1.clouddrive.com/v1/Mosso777", "region"=>"DFW",
+      "tenantId"=>"Mosso777",
+      "publicURL"=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777"},
+      {"internalURL"=>"https://snet-storage101.ord1.clouddrive.com/v1/Mosso777", "region"=>"ORD",
+      "tenantId"=>"Mosso777",
+      "publicURL"=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFiles"}]
+      @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.new(:service => nil, :catalog => catalog_hash)
+
+      returns("https://storage101.ord1.clouddrive.com/v1/Mosso777") { @service_catalog.get_endpoint(:cloudFiles, :ord) }
+      returns("https://snet-storage101.ord1.clouddrive.com/v1/Mosso777") { @service_catalog.get_endpoint(:cloudFiles, :ord, true) }
+      returns("https://storage101.ord1.clouddrive.com/v1/Mosso777") { @service_catalog.get_endpoint(:cloudFiles, :ord, false) }
     end
     
     tests('error conditions') do
       raises(RuntimeError) { @service_catalog.get_endpoint(:cloudServersOpenStack) }
       raises(RuntimeError) { @service_catalog.get_endpoint(:cloudServersOpenStack, :sat) }
+      raises(RuntimeError) { @service_catalog.get_endpoint(:cloudServersOpenStack, :sat, true) }
+      raises(RuntimeError) { @service_catalog.get_endpoint(:not_here, :dfw) }
       raises(RuntimeError) { @service_catalog.get_endpoint('non-existent') }
+      raises(RuntimeError)  { @service_catalog.get_endpoint(:cloudServersOpenStack, :ord, true) }
     end    
   end
   
@@ -95,12 +114,41 @@ Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
 
     service = Fog::Identity[:rackspace]
     service_catalog = service.service_catalog
-    service_catalog.catalog[:fakeService] = "http:///fake-endpoint.com"
+    service_catalog.catalog << {"name"=>"fakeService", "endpoints"=>[{ "publicURL"=>"http:///fake-endpoint.com"}]}
     returns("http:///fake-endpoint.com") { service_catalog.get_endpoint :fakeService }
     returns("http:///fake-endpoint.com") { service.service_catalog.get_endpoint :fakeService }
     service_catalog.reload
     raises(RuntimeError) { service_catalog.get_endpoint :fakeService }
     raises(RuntimeError) { service.service_catalog.get_endpoint :fakeService }
-    
-  end  
+  end
+
+  tests('display_service_regions') do
+
+    tests('with global endpoint').returns(":dfw, :ord, :global") do
+      catalog_hash =  [{"type"=>"compute", "endpoints"=>[{"region"=>"DFW", "versionId"=>"2",
+      "tenantId"=>"777", "versionList"=>"https://dfw.servers.api.rackspacecloud.com/", "versionInfo"=>"https://dfw.servers.api.rackspacecloud.com/v2",
+      "publicURL"=>"https://dfw.servers.api.rackspacecloud.com/v2/777"}, {"region"=>"ORD", "versionId"=>"2", "tenantId"=>"777",
+      "versionList"=>"https://ord.servers.api.rackspacecloud.com/", "versionInfo"=>"https://ord.servers.api.rackspacecloud.com/v2",
+      "publicURL"=>"https://ord.servers.api.rackspacecloud.com/v2/777"}, {"versionId"=>"2", "tenantId"=>"777", "versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v2", "publicURL"=>"https://servers.api.rackspacecloud.com/v2/777"}], "name"=>"cloudServersOpenStack"}]
+      @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.new(:service => nil, :catalog => catalog_hash)
+
+     @service_catalog.display_service_regions(:cloudServersOpenStack)
+    end
+
+    tests('endpoint types') do
+      catalog_hash =  [{"type"=>"object-store", "endpoints"=>[{"internalURL"=>"https://snet-storage101.dfw1.clouddrive.com/v1/Mosso777", "region"=>"DFW",
+      "tenantId"=>"Mosso777",
+      "publicURL"=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777"},
+      { "region"=>"ORD",
+      "tenantId"=>"Mosso777",
+      "publicURL"=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFiles"},]
+      @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.new(:service => nil, :catalog => catalog_hash)
+      tests('public').returns(":dfw, :ord") do
+        @service_catalog.display_service_regions(:cloudFiles)
+      end
+      tests('private').returns(":dfw") do
+        @service_catalog.display_service_regions(:cloudFiles, true)
+      end
+    end
+  end
 end

data/tests/rackspace/models/queues/claim_tests.rb

@@ -0,0 +1,43 @@
+Shindo.tests('Fog::Rackspace::Queues | claim', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::Queues.new
+  queue = service.queues.create({
+    :name => "fog_queue_#{Time.now.to_i.to_s}",
+  })
+  queue.messages.create({
+    :ttl => VALID_TTL,
+    :body => { :random => :body }
+  })
+
+  params = {
+    :ttl => VALID_TTL,
+    :grace => VALID_GRACE
+  }
+
+  begin
+    model_tests(queue.claims, params, false) do
+      tests('#messages') do
+        returns(1) { @instance.messages.length }
+        returns('body') { @instance.messages.first.body['random'] }
+      end
+
+      tests('#update').succeeds do
+        @instance.ttl = VALID_TTL + 5
+        @instance.save
+      end
+    end
+
+    queue.messages.create({
+      :ttl => VALID_TTL,
+      :body => { :random => :body }
+    })
+    tests('destroying claimed messages').succeeds do
+      claim = queue.claims.create(params)
+      claim.messages.first.destroy
+    end
+  ensure
+    queue.destroy
+  end
+end

data/tests/rackspace/models/queues/claims_tests.rb

@@ -0,0 +1,55 @@
+Shindo.tests('Fog::Rackspace::Queues | claims', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::Queues.new
+  queue = service.queues.create({
+    :name => "fog_queue_#{Time.now.to_i.to_s}",
+  })
+  queue.messages.create({
+    :ttl => VALID_TTL,
+    :body => { :random => :body }
+  })
+  params = {
+    :ttl => VALID_TTL,
+    :grace => VALID_GRACE
+  }
+
+  begin
+    collection_tests(queue.claims, params, false)
+
+    tests('creating claims when there are no messages') do
+
+      before do
+        #clear all message from queue
+        queue.messages.all.each do |message|
+          message.destroy
+        end
+      end
+
+      tests("#create(#{params.inspect}) => with no messages does not show up in claim list") do
+        returns(false) { queue.claims.create(params) }
+        returns(true) { queue.claims.empty? }
+      end
+    end
+
+    tests('create claims when there are messages') do
+
+      before do
+        queue.messages.create({
+          :ttl => VALID_TTL,
+          :body => { :random => :body }
+        })
+      end
+
+      tests("#create(#{params.inspect}) => with messages does show up in claim list") do
+        returns(true) do
+          queue.claims.create(params).instance_of? Fog::Rackspace::Queues::Claim
+        end
+        returns(false) { queue.claims.empty? }
+      end
+    end
+  ensure
+    queue.destroy
+  end
+end

data/tests/rackspace/models/queues/message_tests.rb

@@ -0,0 +1,35 @@
+Shindo.tests('Fog::Rackspace::Queues | message', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::Queues.new
+  queue = service.queues.create({
+    :name => "fog_instance_#{Time.now.to_i.to_s}",
+  })
+  options = {
+    :ttl => VALID_TTL,
+    :body => { :key => 'value' }
+  }
+  begin
+    model_tests(queue.messages, options, false) do
+      tests('#href').returns(true) do
+        !@instance.href.nil?
+      end
+      tests('#identity').returns(true) do
+        !@instance.identity.nil?
+      end
+      tests('#save => Fails to update').raises(StandardError) do
+        @instance.save
+      end
+    end
+
+    message = queue.messages.create(options.merge({:claim_id => '10'}))
+    tests('#destroy => fails if claim is not valid').raises(Fog::Rackspace::Queues::ServiceError) do
+      #API team should be fixing this so that it errors in this scenario
+      pending
+      message.destroy
+    end
+  ensure
+    queue.destroy
+  end
+end

data/tests/rackspace/models/queues/messages_tests.rb

@@ -0,0 +1,18 @@
+Shindo.tests('Fog::Rackspace::Queues | messages', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::Queues.new
+  queue = service.queues.create({
+    :name => "fog_queue_#{Time.now.to_i.to_s}",
+  })
+
+  options = {
+    :ttl => 300,
+    :body => "blah"
+  }
+
+  collection_tests(queue.messages, options, false)
+
+  queue.destroy
+end

data/tests/rackspace/models/queues/queue_tests.rb

@@ -0,0 +1,30 @@
+Shindo.tests('Fog::Rackspace::Queues | queue', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::Queues.new
+  options = {
+    :name => "fog_instance_#{Time.now.to_i.to_s}",
+  }
+  model_tests(service.queues, options, false) do
+
+    tests('#stats').formats(QUEUE_STATS_FORMAT['messages']) do
+      @instance.stats
+    end
+
+    tests('#enqueue("msg", 60)') do
+      @instance.enqueue("msg", 60)
+    end
+
+    tests('#dequeue(60, 60)').returns(true) do
+      @instance.dequeue(60, 60) do |message|
+        returns("msg") { message.body }
+      end
+    end
+
+    tests('#dequeue(60, 60) => with not messages').returns(false) do
+      @instance.dequeue(60, 60) do |message|
+      end
+    end
+  end
+end

data/tests/rackspace/models/queues/queues_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests('Fog::Rackspace::Queues | queues', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  service = Fog::Rackspace::Queues.new
+  options = {
+    :name => "fog_instance_#{Time.now.to_i.to_s}",
+  }
+  collection_tests(service.queues, options, false)
+end

data/tests/rackspace/models/storage/file_tests.rb

@@ -56,10 +56,8 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
     :key => "fogfilestests-#{rand(65536)}"
   }
 
-  @directory = Fog::Storage[:rackspace].
-    directories.
-    create(directory_attributes)
-
+  @service = Fog::Storage.new :provider => 'rackspace', :rackspace_temp_url_key => "my_secret"
+  @directory = @service.directories.create(directory_attributes)
 
   model_tests(@directory.files, file_attributes, Fog.mocking?) do
 
@@ -126,13 +124,28 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
       tests('urls') do
         tests('no CDN') do
           
+          tests('url') do
+            tests('http').succeeds do
+              expire_time = Time.now + 3600
+              url = @instance.url(expire_time)
+              url =~ /^http:/
+            end
+            tests('https').succeeds do
+              @directory.service.instance_variable_set "@rackspace_cdn_ssl", true
+              expire_time = Time.now + 3600
+              url = @instance.url(expire_time)
+              url =~ /^https:/
+            end
+            @directory.service.instance_variable_set "@rackspace_cdn_ssl", false
+          end
+
           tests('#public_url') do
 
              tests('http').returns(nil) do
                @instance.public_url
               end
 
-              @directory.cdn_cname = "my_cname.com"        
+              @directory.cdn_cname = "my_cname.com"
               tests('cdn_cname').returns(nil) do
                 @instance.public_url
               end
@@ -142,7 +155,7 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
               tests('ssl').returns(nil) do
                 @instance.public_url
               end   
-              @directory.service.instance_variable_set "@rackspace_cdn_ssl", nil             
+              @directory.service.instance_variable_set "@rackspace_cdn_ssl", nil
            end
 
            tests('#ios_url').returns(nil) do
@@ -301,6 +314,35 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
 
     end
 
+    tests("#content_encoding") do
+
+      tests("#content_encoding should default to nil").returns(nil) do
+        @instance.save
+        @instance.content_encoding
+      end
+
+      @instance.content_encoding = 'gzip'
+      @instance.save
+      tests("#content_encoding should return the content encoding").returns('gzip') do
+        @instance.content_encoding
+      end
+      @instance.attributes.delete('content_encoding')
+
+      @instance.content_encoding = 'foo'
+      @instance.save
+      tests("#content_encoding= should update content_encoding").returns('bar') do
+        @instance.content_encoding = 'bar'
+        @instance.save
+        @instance.content_encoding
+      end
+
+      tests("#content_encoding= should not blow up on nil") do
+        @instance.content_encoding = nil
+        @instance.save
+      end
+
+    end
+
   end
 
   @directory.destroy

data/tests/rackspace/models/storage/files_tests.rb

@@ -0,0 +1,44 @@
+Shindo.tests("Fog::Rackspace::Storage | files", ['rackspace', 'storage']) do
+
+  file_attributes = {
+    :key => 'fog_files_tests',
+    :body => lorem_file
+  }
+
+  directory_attributes = {
+    :key => 'fogfilestests',
+    :public => true
+  }
+
+
+  tests('success') do
+    pending if Fog.mocking?
+    collection_tests(Fog::Storage[:rackspace].directories.create(directory_attributes).files, file_attributes, false)
+
+    @service = Fog::Storage.new :provider => 'rackspace', :rackspace_temp_url_key => "my_secret"
+
+    @directory = @service.directories.create(directory_attributes)
+    @file = @directory.files.create(file_attributes)
+
+    tests("#get_url('#{@directory.key}')").succeeds do
+      @directory.files.get_url(@directory.key)
+    end
+
+    tests("#get_http_url('#{@directory.key}')").succeeds do
+      pending if Fog.mocking?
+      expire_time = Time.now + 3600
+      @directory.files.get_http_url(@file.key, expire_time)
+    end
+
+    tests("#get_https_url('#{@directory.key}', '#{@file.key}')").succeeds do
+      pending if Fog.mocking?
+      expire_time = Time.now + 3600
+      @directory.files.get_https_url(@file.key, expire_time)
+    end
+
+    @file.destroy
+    @directory.destroy
+  end
+
+
+end

data/tests/rackspace/queues_tests.rb

@@ -0,0 +1,118 @@
+Shindo.tests('Fog::Rackspace::Queues', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+
+  def assert_method(url, method)
+    @service.instance_variable_set "@rackspace_auth_url", url
+    returns(method) { @service.send :authentication_method }
+  end
+
+  tests('#authentication_method') do
+    @service = Fog::Rackspace::Queues.new
+
+    assert_method nil, :authenticate_v2
+
+    assert_method 'https://identity.api.rackspacecloud.com', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+
+    assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1.1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+  end
+
+  tests('authentication v1') do
+    pending if Fog.mocking?
+
+    raises(Fog::Errors::NotImplemented) do
+      @service = Fog::Rackspace::Queues.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0'
+    end
+  end
+
+  tests('authentication v2') do
+    pending if Fog.mocking?
+
+    tests('variables populated').succeeds do
+      @service = Fog::Rackspace::Queues.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => { :ssl_verify_peer => true }
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").nil? }
+
+      identity_service = @service.instance_variable_get("@identity_service")
+      returns(false, "identity service was used") { identity_service.nil? }
+      returns(true, "connection_options are passed") { identity_service.instance_variable_get("@connection_options").has_key?(:ssl_verify_peer) }
+      @service.queues
+    end
+    tests('dfw region').succeeds do
+      #We consistently use DFW as our default but queues doesn't have a DFW default region yet.
+      # We can enable this test once they have a DFW region (which they will)
+      pending
+      @service = Fog::Rackspace::Queues.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :dfw
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
+      @service.queues
+    end
+    tests('ord region').succeeds do
+      @service = Fog::Rackspace::Queues.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/) != nil }
+      @service.queues
+    end
+  end
+
+  tests('default auth') do
+    pending if Fog.mocking?
+
+    tests('no params').succeeds do
+      #We consistently use DFW as our default but queues doesn't have a DFW default region yet.
+      # We can enable this test once they have a DFW region (which they will)
+      pending
+      @service = Fog::Rackspace::Queues.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
+      @service.queues
+    end
+    tests('specify region').succeeds do
+      @service = Fog::Rackspace::Queues.new :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/ ) != nil }
+      @service.queues
+    end
+  end
+
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Rackspace::Queues.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad_token")
+    returns(true, 'list queues call succeeds') { [200, 204].include?(@service.list_queues.status) }
+  end
+
+  @service = Fog::Rackspace::Queues.new
+
+  tests('#queues').succeeds do
+    data = @service.queues
+    returns(true) { data.is_a? Array }
+  end
+
+  tests('client_id') do
+    pending if Fog.mocking?
+
+    tests('should generate uuid if a client id is not provided').succeeds do
+      pending unless Fog::UUID.supported?
+      service = Fog::Rackspace::Queues.new
+      service.client_id =~ /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+    end
+    tests('should use specified uuid').succeeds do
+      pending unless Fog::UUID.supported?
+      my_uuid = Fog::UUID.uuid
+      service = Fog::Rackspace::Queues.new :rackspace_queues_client_id => my_uuid
+      service.client_id == my_uuid
+    end
+
+  end
+
+end