fog 0.0.88 → 0.0.89

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.0.88'
-  s.date              = '2010-05-03'
+  s.version           = '0.0.89'
+  s.date              = '2010-05-04'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -34,7 +34,7 @@ require 'fog/terremark'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.0.88'
+    VERSION = '0.0.89'
   end
 
   module Mock

data/lib/fog/aws/models/s3/directory.rb

@@ -8,8 +8,9 @@ module Fog
       class Directory < Fog::Model
         extend Fog::Deprecation
         deprecate(:name, :key)
+        deprecate(:name=, :key=)
 
-        identity  :key,           ['Name', 'name', :name]
+        identity  :key,           ['Name', 'name']
 
         attribute :creation_date, 'CreationDate'
 

data/lib/fog/aws/requests/ec2/modify_image_attributes.rb

@@ -19,7 +19,7 @@ module Fog
             'Action'        => 'ModifyImageAttribute',
             'Attribute'     => attribute,
             'ImageId'       => image_id,
-            'OperationType' => operation,
+            'OperationType' => operation_type,
             :parser         => Fog::Parsers::AWS::EC2::Basic.new
           }.merge!(params))
         end
@@ -28,7 +28,7 @@ module Fog
 
       class Mock
 
-        def modify_image_attributes(image_id, user_id, options = {})
+        def modify_image_attributes(image_id, attribute, operation_type, options = {})
           raise MockNotImplemented.new("Contributions welcome!")
         end
 

data/lib/fog/deprecation.rb

@@ -8,7 +8,7 @@ module Fog
           warning = "[yellow][WARN] #{self} => ##{older} is deprecated, use ##{newer} instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          #{newer}(*args)
+          send(:#{newer}, *args)
         end
       EOS
     end

data/lib/fog/local/models/directories.rb

@@ -24,14 +24,14 @@ module Fog
         data = Dir.entries(connection.local_root).select do |entry|
           entry[0...1] != '.' && ::File.directory?(connection.path_to(entry))
         end.map do |entry| 
-          {:name => entry}
+          {:key => entry}
         end
         load(data)
       end
 
-      def get(name)
-        if ::File.directory?(connection.path_to(name))
-          new(:name => name)
+      def get(key)
+        if ::File.directory?(connection.path_to(key))
+          new(:key => key)
         else
           nil
         end

data/lib/fog/local/models/directory.rb

@@ -5,11 +5,14 @@ module Fog
   module Local
 
     class Directory < Fog::Model
+      extend Fog::Deprecation
+      deprecate(:name, :key)
+      deprecate(:name=, :key=)
 
-      identity  :name
+      identity  :key
 
       def destroy
-        requires :name
+        requires :key
 
         if ::File.directory?(path)
           Dir.rmdir(path)
@@ -29,7 +32,7 @@ module Fog
       end
 
       def save
-        requires :name
+        requires :key
 
         Dir.mkdir(path)
         true
@@ -38,7 +41,7 @@ module Fog
       private
 
       def path
-        connection.path_to(name)
+        connection.path_to(key)
       end
 
     end

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

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

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

@@ -9,8 +9,8 @@ module Fog
       model Fog::Local::File
 
       def all
-        if directory.collection.get(directory.name)
-          data = Dir.entries(connection.path_to(directory.name)).select do |key|
+        if directory.collection.get(directory.key)
+          data = Dir.entries(connection.path_to(directory.key)).select do |key|
             key[0...1] != '.' && !::File.directory?(connection.path_to(key))
           end.map do |key|
             path = file_path(key)
@@ -66,7 +66,7 @@ module Fog
       end
 
       def file_path(key)
-        connection.path_to(::File.join(directory.name, key))
+        connection.path_to(::File.join(directory.key, key))
       end
 
     end

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

@@ -8,8 +8,9 @@ module Fog
       class Directory < Fog::Model
         extend Fog::Deprecation
         deprecate(:name, :key)
+        deprecate(:name=, :key=)
 
-        identity  :key, ['name', :name]
+        identity  :key, ['name']
 
         attribute :bytes
         attribute :count

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 88
-  version: 0.0.88
+  - 89
+  version: 0.0.89
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -07:00
+date: 2010-05-04 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency