cloud_encrypted_sync_s3_adapter 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    cloud_encrypted_sync_s3_adapter (0.0.1)
+    cloud_encrypted_sync_s3_adapter (0.1.2)
       aws-sdk (~> 1.4.1)
-      cloud_encrypted_sync (~> 0.0.1)
+      cloud_encrypted_sync (~> 0.1.1)
 
 PATH
   remote: ~/workspace/cloud_encrypted_sync
   specs:
-    cloud_encrypted_sync (0.0.1)
+    cloud_encrypted_sync (0.1.1)
 
 GEM
   remote: http://rubygems.org/

data/cloud_encrypted_sync_s3_adapter.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.description = %q{Plugin adapter for CloudEncryptedSync gem that provides interface to AmazonS3.}
 
   s.add_dependency('aws-sdk', '~> 1.4.1')
-  s.add_dependency('cloud_encrypted_sync', '~> 0.1.0')
+  s.add_dependency('cloud_encrypted_sync', '~> 0.1.1')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('mocha')

data/lib/cloud_encrypted_sync_s3_adapter/adapter.rb

@@ -21,7 +21,11 @@ module CloudEncryptedSync
         end
 
         def read(key)
-          bucket.objects[key].read
+          begin
+            bucket.objects[key].read
+          rescue AWS::S3::Errors::NoSuchKey => exception
+            raise CloudEncryptedSync::Errors::NoSuchKey.new(exception.message)
+          end
         end
 
         def delete(key)

data/lib/cloud_encrypted_sync_s3_adapter/version.rb

@@ -1,3 +1,3 @@
 module CloudEncryptedSyncS3Adapter
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/unit/adapter_test.rb

@@ -4,11 +4,18 @@ module CloudEncryptedSyncS3Adapter
   class AdapterTest < ActiveSupport::TestCase
 
     def setup
-      if File.exist?(CloudEncryptedSync::Master.send(:config_file_path))
-        @config = YAML.load_file(CloudEncryptedSync::Master.send(:config_file_path))
+      if File.exist?(CloudEncryptedSync::Configuration.send(:config_file_path))
+        @config = YAML.load_file(CloudEncryptedSync::Configuration.send(:config_file_path))
       end
-      @test_bucket_name = "cloud_encrypted_sync_unit_test_bucket_#{Digest::SHA1.hexdigest(rand.to_s)}"
-      CloudEncryptedSync::Master.instance_variable_set(:@command_line_options, CloudEncryptedSync::Master.instance_variable_get(:@command_line_options).merge({:bucket => @test_bucket_name, :s3_credentials => @config['s3_credentials']}))
+      CloudEncryptedSync::Configuration.stubs(:settings).returns(
+        {
+          :excryption_key => 'abc',
+          :adapter => 's3',
+          :bucket => test_bucket_name,
+          :sync_path => '/non/existent/path',
+          :s3_credentials => @config['s3_credentials']
+        }
+      )
       create_test_bucket
     end
 
@@ -34,6 +41,9 @@ module CloudEncryptedSyncS3Adapter
 
     end
 
+    test 'should raise NoSuchKey error' do
+      assert_raises(CloudEncryptedSync::Errors::NoSuchKey) { adapter.read('nonexistentkey') }
+    end
 
     #######
     private
@@ -44,11 +54,16 @@ module CloudEncryptedSyncS3Adapter
     end
 
     def create_test_bucket
-      adapter.send(:connection).buckets.create(@test_bucket_name)
+      adapter.send(:connection).buckets.create(test_bucket_name)
     end
 
     def delete_test_bucket
       adapter.send(:bucket).delete! unless credentials == [] or !credentials.is_a?(Array)
     end
+
+    def test_bucket_name
+      @test_bucket_name ||= "cloud_encrypted_sync_unit_test_bucket_#{Digest::SHA1.hexdigest(rand.to_s)}"
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_encrypted_sync_s3_adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement