defog 0.6.0 → 0.6.1

data/lib/defog/fog_wrapper.rb

@@ -37,12 +37,19 @@ module Defog #:nodoc: all
       path.open("r#{encoding}") do |file|
         fog_directory.files.create(:key => @prefix.to_s + key, :body => file)
       end
+      @heads.delete(key)
     end
 
     def fog_head(key)
       @heads[key] ||= fog_directory.files.head(@prefix.to_s + key)
     end
 
+    def fog_delete(key)
+      fog_head(key).destroy.tap { 
+        @heads.delete(key)
+      }
+    end
+
     def each
       prefix = @prefix.to_s
       off = prefix.size

data/lib/defog/handle.rb

@@ -46,7 +46,7 @@ module Defog
 
     # Deletes the remote cloud file if it exists
     def delete
-      fog_model.andand.destroy
+      fog_model and @proxy.fog_wrapper.fog_delete(@key)
     end
 
     # Returns the size of the remote cloud file, or nil if it doesn't exist

data/lib/defog/version.rb

@@ -1,3 +1,3 @@
 module Defog
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/file_spec.rb

@@ -4,7 +4,7 @@ shared_examples "get proxy" do
 
   it "should create proxy if remote exists" do
     create_remote("hello")
-    should_log /download/
+    should_log /Download/
     file = @proxy.file(key, @mode)
     File.exist?(file.path).should be_true
     file.close
@@ -18,7 +18,7 @@ shared_examples "get proxy" do
     create_remote("hello")
     create_proxy("goodbye")
     proxy_path.read.should == "goodbye"
-    should_log /download/
+    should_log /Download/
     @proxy.file(key, @mode)
     proxy_path.read.should == "hello"
   end
@@ -28,7 +28,7 @@ shared_examples "get proxy" do
     create_proxy("hello")
     handle = @proxy.file(key)
     handle.proxy_path.should_not_receive(:open).with(/^w/)
-    should_not_log /download/
+    should_not_log /Download/
     handle.open(@mode)
   end
 end
@@ -84,7 +84,7 @@ shared_examples "append" do
     create_remote("hello")
     @proxy.file(key, @mode, :persist => true) do |file|
       file.write "goodbye"
-      should_log /upload/
+      should_log /Upload/
     end
     proxy_path.read.should == "hellogoodbye"
   end
@@ -93,7 +93,7 @@ end
 shared_examples "create" do
 
   it "should create remote" do
-    should_log /upload/
+    should_log /Upload/
     file = @proxy.file(key, @mode)
     create_proxy("upload me")
     file.close
@@ -101,7 +101,7 @@ shared_examples "create" do
   end
 
   it "should not create remote if proxy is deleted" do
-    should_not_log /upload/
+    should_not_log /Upload/
     @proxy.file(key, @mode) do |file|
       file.write("ignore me")
       proxy_path.unlink
@@ -110,7 +110,7 @@ shared_examples "create" do
   end
 
   it "should not create remote if :synchronize => false" do
-    should_not_log /upload/
+    should_not_log /Upload/
     file = @proxy.file(key, @mode)
     create_proxy("ignore me")
     file.close(:synchronize => false)
@@ -118,7 +118,7 @@ shared_examples "create" do
   end
 
   it "should create remote asynchronously if :synchronize => async" do
-    should_log /upload/
+    should_log /Upload/
     file = @proxy.file(key, @mode)
     create_proxy("upload me in thread")
     Thread.should_receive(:new) { |&block|
@@ -138,7 +138,7 @@ shared_examples "update" do
     remote_body.should == "overwrite me"
     file = @proxy.file(key, @mode)
     create_proxy("upload me")
-    should_log /upload/
+    should_log /Upload/
     file.close
     remote_body.should == "upload me"
   end
@@ -151,13 +151,13 @@ shared_examples "update" do
       remote_body.should == "overwrite me"
       block.call
     }
-    should_log /upload/
+    should_log /Upload/
     file.close(:synchronize => :async)
     remote_body.should == "upload me"
   end
 
   it "should not overwrite remote if proxy is deleted" do
-    should_not_log /upload/
+    should_not_log /Upload/
     create_remote("keep me")
     @proxy.file(key, @mode) do |file|
       file.write("ignore me")
@@ -167,7 +167,7 @@ shared_examples "update" do
   end
 
   it "should not overwrite remote if :synchronize => false" do
-    should_not_log /upload/
+    should_not_log /Upload/
     create_remote("keep me")
     file = @proxy.file(key, @mode)
     create_proxy("ignore me")

data/spec/handle_spec.rb

@@ -27,7 +27,7 @@ shared_examples "a handle" do |proxyargs|
     :last_modified => :last_modified,
     :delete => :destroy }.each do |method, fog_method|
 
-    it "should delegate #{method.inspect} to the fog model #{fog_method.inspect}if the remote file exists" do
+    it "should delegate #{method.inspect} to the fog model #{fog_method.inspect} if the remote file exists" do
       create_remote("delegate me")
       @handle.fog_model.class.any_instance.should_receive(fog_method).and_return { "dummy" }
       @handle.send(method).should == "dummy"
@@ -61,6 +61,15 @@ shared_examples "a handle" do |proxyargs|
     @handle.fog_model.body.should == "foggy"
   end
 
+  it "should update when file changes" do
+    create_remote("abc")
+    @proxy.file(key).size.should == 3
+    @proxy.file(key).open("w") do |f|
+      f.write("defghij")
+    end
+    @proxy.file(key).size.should == 7
+  end
+
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defog
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70349591699120 !ruby/object:Gem::Requirement
+  requirement: &70295900380220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349591699120
+  version_requirements: *70295900380220
 - !ruby/object:Gem::Dependency
   name: hash_keyword_args
-  requirement: &70349591698520 !ruby/object:Gem::Requirement
+  requirement: &70295900379640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349591698520
+  version_requirements: *70295900379640
 - !ruby/object:Gem::Dependency
   name: fastandand
-  requirement: &70349591698100 !ruby/object:Gem::Requirement
+  requirement: &70295900379020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349591698100
+  version_requirements: *70295900379020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70349591697640 !ruby/object:Gem::Requirement
+  requirement: &70295900378340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349591697640
+  version_requirements: *70295900378340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70349591697160 !ruby/object:Gem::Requirement
+  requirement: &70295900377800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349591697160
+  version_requirements: *70295900377800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70349591696700 !ruby/object:Gem::Requirement
+  requirement: &70295900376820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349591696700
+  version_requirements: *70295900376820
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
-  requirement: &70349591696200 !ruby/object:Gem::Requirement
+  requirement: &70295900362380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70349591696200
+  version_requirements: *70295900362380
 description: Wrapper to fog gem, proxying access to cloud files as local files.
 email:
 - ronen@barzel.org