fog 0.3.15 → 0.3.16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.15)
+    fog (0.3.16)
       builder
       excon (>= 0.2.4)
       formatador (>= 0.0.15)

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.15'
-  s.date              = '2010-11-03'
+  s.version           = '0.3.16'
+  s.date              = '2010-11-04'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -579,10 +579,6 @@ Gem::Specification.new do |s|
     spec/aws/models/compute/snapshots_spec.rb
     spec/aws/models/compute/volume_spec.rb
     spec/aws/models/compute/volumes_spec.rb
-    spec/aws/models/storage/directories_spec.rb
-    spec/aws/models/storage/directory_spec.rb
-    spec/aws/models/storage/file_spec.rb
-    spec/aws/models/storage/files_spec.rb
     spec/aws/requests/simpledb/batch_put_attributes_spec.rb
     spec/aws/requests/simpledb/create_domain_spec.rb
     spec/aws/requests/simpledb/delete_attributes_spec.rb
@@ -596,10 +592,6 @@ Gem::Specification.new do |s|
     spec/bluebox/models/compute/server_spec.rb
     spec/bluebox/models/compute/servers_spec.rb
     spec/compact_progress_bar_formatter.rb
-    spec/google/models/storage/directories_spec.rb
-    spec/google/models/storage/directory_spec.rb
-    spec/google/models/storage/file_spec.rb
-    spec/google/models/storage/files_spec.rb
     spec/google/requests/storage/copy_object_spec.rb
     spec/google/requests/storage/delete_bucket_spec.rb
     spec/google/requests/storage/delete_object_spec.rb
@@ -665,7 +657,10 @@ Gem::Specification.new do |s|
     spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
     spec/vcloud/vcloud_spec.rb
     tests/aws/helper.rb
+    tests/aws/models/storage/directories_tests.rb
     tests/aws/models/storage/directory_tests.rb
+    tests/aws/models/storage/file_tests.rb
+    tests/aws/models/storage/files_tests.rb
     tests/aws/requests/compute/address_tests.rb
     tests/aws/requests/compute/availability_zone_tests.rb
     tests/aws/requests/compute/image_tests.rb
@@ -684,16 +679,31 @@ Gem::Specification.new do |s|
     tests/bluebox/requests/compute/template_tests.rb
     tests/go_grid/helper.rb
     tests/go_grid/requests/compute/image_tests.rb
+    tests/google/models/storage/directories_tests.rb
+    tests/google/models/storage/directory_tests.rb
+    tests/google/models/storage/file_tests.rb
+    tests/google/models/storage/files_tests.rb
     tests/helper.rb
     tests/helper_tests.rb
-    tests/helpers/model_helper.rb
+    tests/helpers/storage/directories_tests.rb
+    tests/helpers/storage/directory_tests.rb
+    tests/helpers/storage/file_tests.rb
+    tests/helpers/storage/files_tests.rb
     tests/linode/helper.rb
     tests/linode/requests/compute/datacenter_tests.rb
     tests/linode/requests/compute/distribution_tests.rb
     tests/linode/requests/compute/linode_tests.rb
     tests/linode/requests/compute/linodeplans_tests.rb
+    tests/local/models/storage/directories_tests.rb
+    tests/local/models/storage/directory_tests.rb
+    tests/local/models/storage/file_tests.rb
+    tests/local/models/storage/files_tests.rb
     tests/lorem.txt
     tests/rackspace/helper.rb
+    tests/rackspace/models/storage/directories_tests.rb
+    tests/rackspace/models/storage/directory_tests.rb
+    tests/rackspace/models/storage/file_tests.rb
+    tests/rackspace/models/storage/files_tests.rb
     tests/rackspace/requests/compute/address_tests.rb
     tests/rackspace/requests/compute/flavor_tests.rb
     tests/rackspace/requests/compute/image_tests.rb

data/lib/fog.rb

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

data/lib/fog/core/collection.rb

@@ -17,7 +17,7 @@ module Fog
 
     %w[reject select].each do |method|
       class_eval <<-RUBY
-        remove_method :#{method}
+        # remove_method :#{method}
         def #{method}(*args)
           unless @loaded
             lazy_load

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

@@ -17,6 +17,12 @@ module Fog
 
         def all(options = {})
           requires :directory
+          options = {
+            'limit'   => @limit,
+            'marker'  => @marker,
+            'path'    => @path,
+            'prefix'  => @prefix
+          }.merge!(options)
           merge_attributes(options)
           parent = directory.collection.get(
             directory.key,
@@ -29,15 +35,9 @@ module Fog
           end
         end
 
-        def get(key, options = {}, &block)
+        def get(key, &block)
           requires :directory
-          options = {
-            'limit'   => @limit,
-            'marker'  => @marker,
-            'path'    => @path,
-            'prefix'  => @prefix
-          }.merge!(options)
-          data = connection.get_object(directory.name, key, options, &block)
+          data = connection.get_object(directory.key, key, &block)
           file_data = {
             :body => data.body,
             :key  => key

data/lib/fog/rackspace/requests/storage/get_object.rb

@@ -23,7 +23,7 @@ module Fog
 
       class Mock
 
-        def get_object(container, object)
+        def get_object(container, object, &block)
           Fog::Mock.not_implemented
         end
 

data/tests/aws/models/storage/directories_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests('AWS::Storage | directories collection', ['aws']) do
+
+  directories_tests(AWS[:storage])
+
+end

data/tests/aws/models/storage/directory_tests.rb

@@ -1,9 +1,5 @@
-Shindo.tests('AWS::Storage | directory models', ['aws']) do
+Shindo.tests('AWS::Storage | directory model', ['aws']) do
 
-  @collection = AWS[:storage].directories
-  @model = @collection.new(:key => Time.now.to_f.to_s)
-  @non_id = 'not_a_directory'
-
-  tests_model
+  directory_tests(AWS[:storage])
 
 end

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

@@ -0,0 +1,5 @@
+Shindo.tests('AWS::Storage | file model', ['aws']) do
+
+  file_tests(AWS[:storage])
+
+end

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

@@ -0,0 +1,5 @@
+Shindo.tests('AWS::Storage | files collection', ['aws']) do
+
+  files_tests(AWS[:storage])
+
+end

data/tests/google/models/storage/directories_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests('Google::Storage | directories collection', ['google']) do
+
+  directories_tests(Google[:storage])
+
+end

data/tests/google/models/storage/directory_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests('Google::Storage | directory model', ['google']) do
+
+  directory_tests(Google[:storage])
+
+end

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

@@ -0,0 +1,5 @@
+Shindo.tests('Google::Storage | file model', ['google']) do
+
+  file_tests(Google[:storage])
+
+end

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

@@ -0,0 +1,5 @@
+Shindo.tests('Google::Storage | files collection', ['google']) do
+
+  files_tests(Google[:storage])
+
+end

data/tests/helper.rb

@@ -2,7 +2,16 @@ require 'fog'
 require 'fog/core/bin'
 Fog.bin = true
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'model_helper'))
+__DIR__ = File.dirname(__FILE__)
+
+$LOAD_PATH.unshift __DIR__ unless
+  $LOAD_PATH.include?(__DIR__) ||
+  $LOAD_PATH.include?(File.expand_path(__DIR__))
+
+require 'tests/helpers/storage/directory_tests'
+require 'tests/helpers/storage/directories_tests'
+require 'tests/helpers/storage/file_tests'
+require 'tests/helpers/storage/files_tests'
 
 if ENV["FOG_MOCK"] == "true"
   Fog.mock!

data/tests/helpers/storage/directories_tests.rb

@@ -0,0 +1,39 @@
+def directories_tests(connection, mocks_implemented = true)
+
+  tests('success') do
+
+    tests("#new(:key => 'fogdirectoriestests')").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @directory = connection.directories.new(:key => 'fogdirectoriestests')
+    end
+
+    tests("#create(:key => 'fogdirectoriestests')").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @directory = connection.directories.create(:key => 'fogdirectoriestests')
+    end
+
+    tests("#all").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      connection.directories.all
+    end
+
+    tests("#get('fogdirectoriestests')").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      connection.directories.get('fogdirectoriestests')
+    end
+
+    if !Fog.mocking? || mocks_implemented
+      @directory.destroy
+    end
+  end
+
+  tests('failure') do
+
+    tests("#get('fognondirectory')").returns(nil) do
+      pending if Fog.mocking? && !mocks_implemented
+      connection.directories.get('fognondirectory')
+    end
+
+  end
+
+end

data/tests/helpers/storage/directory_tests.rb

@@ -0,0 +1,24 @@
+def directory_tests(connection, mocks_implemented = true)
+
+  tests('success') do
+
+    if !Fog.mocking? || mocks_implemented
+      @directory = connection.directories.new(:key => 'fogdirectorytests')
+    end
+
+    tests("#save").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @directory.save
+    end
+
+    tests("#destroy").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @directory.destroy
+    end
+
+  end
+
+  tests('failure') do
+  end
+
+end

data/tests/helpers/storage/file_tests.rb

@@ -0,0 +1,32 @@
+def file_tests(connection, mocks_implemented = true)
+
+  if !Fog.mocking? || mocks_implemented
+    @directory = connection.directories.create(:key => 'fogfilestests')
+  end
+
+  tests('success') do
+
+    if !Fog.mocking? || mocks_implemented
+      @file = @directory.files.new(:key => 'fog_file_tests', :body => lorem_file)
+    end
+
+    tests("#save").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @file.save
+    end
+
+    tests("#destroy").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @file.destroy
+    end
+
+  end
+
+  tests('failure') do
+  end
+
+  if !Fog.mocking? || mocks_implemented
+    @directory.destroy
+  end
+
+end

data/tests/helpers/storage/files_tests.rb

@@ -0,0 +1,47 @@
+def files_tests(connection, mocks_implemented = true)
+
+  if !Fog.mocking? || mocks_implemented
+    @directory = connection.directories.create(:key => 'fogfilestests')
+  end
+
+  tests('success') do
+
+    tests("#new(:key => 'fog_files_tests', :body => lorem_file)").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @directory.files.new(:key => 'fog_files_tests', :body => lorem_file)
+    end
+
+    tests("#create(:key => 'fog_files_tests', :body => lorem_file)").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @file = @directory.files.create(:key => 'fog_files_tests', :body => lorem_file)
+    end
+
+    tests("#all").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @directory.files.all
+    end
+
+    tests("#get('fog_files_tests')").succeeds do
+      pending if Fog.mocking? && !mocks_implemented
+      @directory.files.get('fog_files_tests')
+    end
+
+    if !Fog.mocking? || mocks_implemented
+      @file.destroy
+    end
+  end
+
+  tests('failure') do
+
+    tests("#get('fog_non_file')").returns(nil) do
+      pending if Fog.mocking? && !mocks_implemented
+      @directory.files.get('fog_non_file')
+    end
+
+  end
+
+  if !Fog.mocking? || mocks_implemented
+    @directory.destroy
+  end
+
+end

data/tests/local/models/storage/directories_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests('Local::Storage | directories collection', ['local']) do
+
+  directories_tests(Local[:storage], false)
+
+end

data/tests/local/models/storage/directory_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests('Local::Storage | directory model', ['local']) do
+
+  directory_tests(Local[:storage], false)
+
+end

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

@@ -0,0 +1,5 @@
+Shindo.tests('Local::Storage | file model', ['local']) do
+
+  file_tests(Local[:storage], false)
+
+end

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

@@ -0,0 +1,5 @@
+Shindo.tests('Local::Storage | files collection', ['local']) do
+
+  files_tests(Local[:storage], false)
+
+end

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

@@ -0,0 +1,5 @@
+Shindo.tests('Rackspace::Storage | directories collection', ['rackspace']) do
+
+  directories_tests(Rackspace[:storage], false)
+
+end

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

@@ -0,0 +1,5 @@
+Shindo.tests('Rackspace::Storage | directory model', ['rackspace']) do
+
+  directory_tests(Rackspace[:storage], false)
+
+end

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

@@ -0,0 +1,5 @@
+Shindo.tests('Rackspace::Storage | file model', ['rackspace']) do
+
+  file_tests(Rackspace[:storage], false)
+
+end

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

@@ -0,0 +1,5 @@
+Shindo.tests('Rackspace::Storage | files collection', ['rackspace']) do
+
+  files_tests(Rackspace[:storage], false)
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 15
-  version: 0.3.15
+  - 16
+  version: 0.3.16
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -07:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -686,10 +686,6 @@ files:
 - spec/aws/models/compute/snapshots_spec.rb
 - spec/aws/models/compute/volume_spec.rb
 - spec/aws/models/compute/volumes_spec.rb
-- spec/aws/models/storage/directories_spec.rb
-- spec/aws/models/storage/directory_spec.rb
-- spec/aws/models/storage/file_spec.rb
-- spec/aws/models/storage/files_spec.rb
 - spec/aws/requests/simpledb/batch_put_attributes_spec.rb
 - spec/aws/requests/simpledb/create_domain_spec.rb
 - spec/aws/requests/simpledb/delete_attributes_spec.rb
@@ -703,10 +699,6 @@ files:
 - spec/bluebox/models/compute/server_spec.rb
 - spec/bluebox/models/compute/servers_spec.rb
 - spec/compact_progress_bar_formatter.rb
-- spec/google/models/storage/directories_spec.rb
-- spec/google/models/storage/directory_spec.rb
-- spec/google/models/storage/file_spec.rb
-- spec/google/models/storage/files_spec.rb
 - spec/google/requests/storage/copy_object_spec.rb
 - spec/google/requests/storage/delete_bucket_spec.rb
 - spec/google/requests/storage/delete_object_spec.rb
@@ -772,7 +764,10 @@ files:
 - spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
 - spec/vcloud/vcloud_spec.rb
 - tests/aws/helper.rb
+- tests/aws/models/storage/directories_tests.rb
 - tests/aws/models/storage/directory_tests.rb
+- tests/aws/models/storage/file_tests.rb
+- tests/aws/models/storage/files_tests.rb
 - tests/aws/requests/compute/address_tests.rb
 - tests/aws/requests/compute/availability_zone_tests.rb
 - tests/aws/requests/compute/image_tests.rb
@@ -791,16 +786,31 @@ files:
 - tests/bluebox/requests/compute/template_tests.rb
 - tests/go_grid/helper.rb
 - tests/go_grid/requests/compute/image_tests.rb
+- tests/google/models/storage/directories_tests.rb
+- tests/google/models/storage/directory_tests.rb
+- tests/google/models/storage/file_tests.rb
+- tests/google/models/storage/files_tests.rb
 - tests/helper.rb
 - tests/helper_tests.rb
-- tests/helpers/model_helper.rb
+- tests/helpers/storage/directories_tests.rb
+- tests/helpers/storage/directory_tests.rb
+- tests/helpers/storage/file_tests.rb
+- tests/helpers/storage/files_tests.rb
 - tests/linode/helper.rb
 - tests/linode/requests/compute/datacenter_tests.rb
 - tests/linode/requests/compute/distribution_tests.rb
 - tests/linode/requests/compute/linode_tests.rb
 - tests/linode/requests/compute/linodeplans_tests.rb
+- tests/local/models/storage/directories_tests.rb
+- tests/local/models/storage/directory_tests.rb
+- tests/local/models/storage/file_tests.rb
+- tests/local/models/storage/files_tests.rb
 - tests/lorem.txt
 - tests/rackspace/helper.rb
+- tests/rackspace/models/storage/directories_tests.rb
+- tests/rackspace/models/storage/directory_tests.rb
+- tests/rackspace/models/storage/file_tests.rb
+- tests/rackspace/models/storage/files_tests.rb
 - tests/rackspace/requests/compute/address_tests.rb
 - tests/rackspace/requests/compute/flavor_tests.rb
 - tests/rackspace/requests/compute/image_tests.rb