fog 0.3.24 → 0.3.25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.24)
+    fog (0.3.25)
       builder
       excon (>= 0.2.4)
       formatador (>= 0.0.16)

data/README.rdoc

@@ -129,8 +129,7 @@ Enjoy, and let me know what I can do to continue improving fog!
 * Follow {@fog}[http://twitter.com/fog] and/or {@geemus}[http://twitter.com/geemus] on Twitter
 * Discuss in irc on the {#ruby-fog}[irc://irc.freenode.net/ruby-fog] channel on Freenode
 * Discuss via email on the {mailing list}[http://groups.google.com/group/ruby-fog] (note: release notes appear on this list)
-* See upcoming work in the {tracker}[http://www.pivotaltracker.com/projects/54635]
-* Report bugs in {issues}[http://github.com/geemus/fog/issues]
+* Report bugs or find stuff to work on in {issues}[http://github.com/geemus/fog/issues]
 * Learn about {contributing}[http://github.com/geemus/fog/wiki/contributor-guide] or find more info about the {Providers}[http://github.com/geemus/fog/wiki/Providers] (including some todo items)
 * See what already uses fog and add your own stuff to {the list}[http://wiki.github.com/geemus/fog/in-the-wild]
 

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.24'
-  s.date              = '2010-11-22'
+  s.version           = '0.3.25'
+  s.date              = '2010-11-23'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -18,7 +18,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.24'
+    VERSION = '0.3.25'
   end
 
   module Mock

data/lib/fog/local/models/storage/file.rb

@@ -65,7 +65,7 @@ module Fog
         end
 
         def path
-          connection.path_to(::File.join(directory.key, key))
+          connection.path_to(::File.join(directory.key, CGI.escape(key)))
         end
 
       end

data/lib/fog/local/models/storage/files.rb

@@ -20,7 +20,7 @@ module Fog
               path = file_path(key)
               {
                 :content_length => ::File.size(path),
-                :key            => key,
+                :key            => CGI.unescape(key),
                 :last_modified  => ::File.mtime(path)
               }
             end
@@ -32,7 +32,7 @@ module Fog
 
         def get(key, &block)
           requires :directory
-          path = file_path(key)
+          path = file_path(CGI.escape(key))
           if ::File.exists?(path)
             data = {
               :content_length => ::File.size(path),
@@ -53,6 +53,20 @@ module Fog
           end
         end
 
+        def head(key)
+          requires :directory
+          path = file_path(CGI.escape(key))
+          if ::File.exists?(path)
+            new({
+              :content_length => ::File.size(path),
+              :key            => key,
+              :last_modified  => ::File.mtime(path)
+            })
+          else
+            nil
+          end
+        end
+
         def new(attributes = {})
           requires :directory
           super({ :directory => directory }.merge!(attributes))

data/lib/fog/rackspace/models/storage/directory.rb

@@ -40,7 +40,7 @@ module Fog
           requires :key
           @public_url ||= begin
             begin response = connection.cdn.head_container(key)
-              response.headers['X-CDN-URI']
+              response.headers['X-CDN-Enabled'] == 'True' && response.headers['X-CDN-URI']
             rescue Fog::Service::NotFound
               nil
             end
@@ -51,7 +51,10 @@ module Fog
           requires :key
           connection.put_container(key)
           if @public
-            @public_url = connection.cdn.put_container(key).headers['X-CDN-URI']
+            @public_url = connection.cdn.put_container(key, 'X-CDN-Enabled' => 'True').headers['X-CDN-URI']
+          else
+            connection.cdn.put_container(key, 'X-CDN-Enabled' => 'False')
+            @public_url = nil
           end
           true
         end

data/lib/fog/rackspace/models/storage/files.rb

@@ -49,12 +49,12 @@ module Fog
 
         def get_url(key, expires)
           requires :directory
-          connection.get_object_url(directory.name, key, expires)
+          connection.get_object_url(directory.key, key, expires)
         end
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_object(directory.name, key, options)
+          data = connection.head_object(directory.key, key)
           file_data = data.headers.merge({
             :key => key
           })

data/tests/helper.rb

@@ -28,6 +28,14 @@ if ENV["FOG_MOCK"] == "true"
   Fog.mock!
 end
 
+# check to see which credentials are available and add others to the skipped tags list
+all_providers = ['aws', 'bluebox', 'brightbox', 'gogrid', 'google', 'linode', 'local', 'newservers', 'rackspace', 'slicehost', 'terremark']
+available_providers = Fog.providers.map {|provider| provider.to_s.downcase}
+for provider in (all_providers - available_providers)
+  Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '~/.fog' to run them)[/]")
+  Thread.current[:tags] << ('-' << provider)
+end
+
 # Boolean hax
 module Fog
   module Boolean

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 24
-  version: 0.3.24
+  - 25
+  version: 0.3.25
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -08:00
+date: 2010-11-23 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency