defog 0.7.0 → 0.7.1

data/README.rdoc

@@ -219,14 +219,15 @@ Defog is currently known to work on:
 * Fog Storage: :local, :AWS
 
 The above storage providers are what the author uses.  Please fork and add
-others!  (There's just a very small amount of provider-specific code in {one
- file}[https://github.com/ronen/defog/blob/master/lib/defog/fog_wrapper.rb],
- plus spec examples.)
+others!  (There's just a very small amount of provider-specific code in
+one file, https://github.com/ronen/defog/blob/master/lib/defog/fog_wrapper.rb,
+plus appropriate rspec examples.)
 
 == History
 
 Release Notes:
 
+* 0.7.1 - Add key info to message if there's an exception when getting file
 * 0.7.0 - Add :query option to Handle#url
 * 0.6.1 - Bug fix (caching)
 * 0.6.0 - Add logging

data/lib/defog/fog_wrapper.rb

@@ -29,6 +29,8 @@ module Defog #:nodoc: all
       path.open("w#{encoding}") do |f|
         f.write(fog_head(key).body)
       end
+    rescue
+      raise $!, "#{provider} #{location}: #{key}: #{$!}"
     end
 
     def put_file(key, path, encoding)

data/lib/defog/version.rb

@@ -1,3 +1,3 @@
 module Defog
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/file_spec.rb

@@ -11,7 +11,7 @@ shared_examples "get proxy" do
   end
 
   it "should raise error if remote doesn't exist" do
-    expect { @proxy.file("nonesuch", @mode) }.should raise_error(Defog::Error::NoCloudFile)
+    expect { @proxy.file("nonesuch", @mode) }.to raise_error(Defog::Error::NoCloudFile)
   end
 
   it "should overwrite existing proxy if it's not valid " do
@@ -31,6 +31,14 @@ shared_examples "get proxy" do
     should_not_log /Download/
     handle.open(@mode)
   end
+
+  it "should include key info in exception messages" do
+    create_remote("error me")
+    File.any_instance.should_receive(:write) { raise Encoding::UndefinedConversionError, "dummy" }
+    expect {
+      @proxy.file(key, "r")
+    }.to raise_error Encoding::UndefinedConversionError, /#{key}/
+  end
 end
 
 shared_examples "read" do
@@ -106,7 +114,7 @@ shared_examples "create" do
       file.write("ignore me")
       proxy_path.unlink
     end
-    expect {remote_body}.should raise_error
+    expect {remote_body}.to raise_error
   end
 
   it "should not create remote if :synchronize => false" do
@@ -114,7 +122,7 @@ shared_examples "create" do
     file = @proxy.file(key, @mode)
     create_proxy("ignore me")
     file.close(:synchronize => false)
-    expect {remote_body}.should raise_error
+    expect {remote_body}.to raise_error
   end
 
   it "should create remote asynchronously if :synchronize => async" do
@@ -122,7 +130,7 @@ shared_examples "create" do
     file = @proxy.file(key, @mode)
     create_proxy("upload me in thread")
     Thread.should_receive(:new) { |&block|
-      expect {remote_body}.should raise_error
+      expect {remote_body}.to raise_error
       block.call
     }
     file.close(:synchronize => :async)
@@ -250,7 +258,7 @@ shared_examples "a proxy file" do |proxyargs|
   end
 
   it "should raise error on bad mode" do
-    expect { @proxy.file(key, "xyz") }.should raise_error(ArgumentError)
+    expect { @proxy.file(key, "xyz") }.to raise_error(ArgumentError)
   end
 
   it "should have a nice to_s" do

data/spec/handle_spec.rb

@@ -123,7 +123,6 @@ describe Defog::Handle do
       t = Time.now + 10*60
       #Fog::Storage::AWS::File.any_instance.should_receive(:url).with(t, "response-content-disposition" => "attachment")
       url = @proxy.file(key).url(:expiry => t, :query => {"response-content-disposition" => "attachment"})
-      puts url
       url.should include "response-content-disposition=attachment"
     end
 

data/spec/proxy_spec.rb

@@ -138,19 +138,19 @@ shared_examples "a proxy" do |args|
     end
 
     it "should fail normally when trying to proxy a file that doesn't exist" do
-      expect { @proxy.file("nonesuch", "r") }.should raise_error(Defog::Error::NoCloudFile)
+      expect { @proxy.file("nonesuch", "r") }.to raise_error(Defog::Error::NoCloudFile)
     end
 
     it "should raise an error trying to proxy a file larger than the cache" do
       create_remote("x" * 101)
-      expect { @proxy.file(key, "r") }.should raise_error(Defog::Error::CacheFull)
+      expect { @proxy.file(key, "r") }.to raise_error(Defog::Error::CacheFull)
       proxy_path.should_not be_exist
     end
 
     it "should not count existing proxy in total" do
       create_proxy("y" * 70)
       create_remote("x" * 70)
-      expect { @proxy.file(key, "r") do end }.should_not raise_error(Defog::Error::CacheFull)
+      expect { @proxy.file(key, "r") do end }.to_not raise_error(Defog::Error::CacheFull)
       proxy_path.should be_exist
       proxy_path.read.should == remote_body
     end
@@ -160,7 +160,7 @@ shared_examples "a proxy" do |args|
       create_other_proxy("b", 30)
       create_other_proxy("c", 40)
       create_remote("x" * 80)
-      expect { @proxy.file(key, "r") do end }.should_not raise_error(Defog::Error::CacheFull)
+      expect { @proxy.file(key, "r") do end }.to_not raise_error(Defog::Error::CacheFull)
       proxy_path.should be_exist
       other_proxy_path("a").should be_exist
       other_proxy_path("b").should_not be_exist
@@ -171,7 +171,7 @@ shared_examples "a proxy" do |args|
       create_other_proxy("a", 10)
       create_other_proxy("b", 30)
       create_other_proxy("c", 40)
-      expect { @proxy.file(key, "w", :size_hint => 80) do end }.should_not raise_error(Defog::Error::CacheFull)
+      expect { @proxy.file(key, "w", :size_hint => 80) do end }.to_not raise_error(Defog::Error::CacheFull)
       proxy_path.should be_exist
       other_proxy_path("a").should be_exist
       other_proxy_path("b").should_not be_exist
@@ -186,7 +186,7 @@ shared_examples "a proxy" do |args|
       @proxy.file(other_key("R"), "r") do
         @proxy.file(other_key("S"), "w") do
           create_other_proxy("S", 30)
-          expect { @proxy.file(key, "r") do end }.should_not raise_error(Defog::Error::CacheFull)
+          expect { @proxy.file(key, "r") do end }.to_not raise_error(Defog::Error::CacheFull)
           proxy_path.should be_exist
           other_proxy_path("R").should be_exist
           other_proxy_path("S").should be_exist
@@ -201,7 +201,7 @@ shared_examples "a proxy" do |args|
       create_remote("z" * 60)
       @proxy.file(other_key("R"), "r") do end
       other_proxy_path("R").should be_exist
-      expect { @proxy.file(key, "r") do end }.should_not raise_error(Defog::Error::CacheFull)
+      expect { @proxy.file(key, "r") do end }.to_not raise_error(Defog::Error::CacheFull)
       proxy_path.should be_exist
       other_proxy_path("R").should_not be_exist
     end
@@ -214,7 +214,7 @@ shared_examples "a proxy" do |args|
       create_remote("z" * 50)
       @proxy.file(other_key("R"), "r") do
         @proxy.file(other_key("S"), "r") do
-          expect { @proxy.file(key, "r") do end }.should raise_error(Defog::Error::CacheFull)
+          expect { @proxy.file(key, "r") do end }.to raise_error(Defog::Error::CacheFull)
           proxy_path.should_not be_exist
           other_proxy_path("a").should be_exist
           other_proxy_path("b").should be_exist
@@ -300,7 +300,7 @@ describe Defog::Proxy do
   end
 
   it "should raise error on bad provider" do
-    expect { Defog::Proxy.new(:provider => :nonesuch) }.should raise_error(ArgumentError)
+    expect { Defog::Proxy.new(:provider => :nonesuch) }.to raise_error(ArgumentError)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defog
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70218300244080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218300244080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hash_keyword_args
-  requirement: &70218300243200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218300243200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fastandand
-  requirement: &70218300242260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218300242260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70218300241500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218300241500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70218300240880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218300240880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70218300240200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218300240200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
-  requirement: &70218300239480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218300239480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wrapper to fog gem, proxying access to cloud files as local files.
 email:
 - ronen@barzel.org
@@ -127,15 +162,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4067277694003183593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4067277694003183593
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Wrapper to fog gem, proxying access to cloud files as local files.  Access
@@ -146,4 +187,3 @@ test_files:
 - spec/proxy_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
-has_rdoc: