simply_stored 0.2.4 → 0.2.5

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =============
 
+
+0.2.5
+=============
+
+- Allow to pass a custom logger to S3-attachments / RightAws
+
 - Support :order option to has_many associations and classes, e.g:
 
     @user.posts(:order => :desc)

data/README.md

@@ -177,7 +177,8 @@ Both the CouchDB backend and the SimpleDB backend have support for S3 attachment
                                :access_key => 'my-AWS-key-id',
                                :secret_access_key => 'psst!-secret',
                                :location => :eu,
-                               :after_delete => :delete
+                               :after_delete => :delete,
+                               :logger => Logger.new('/dev/null')
       
     end
     

data/lib/simply_stored/storage.rb

@@ -6,7 +6,7 @@ module SimplyStored
       end
       
       def s3_connection(name)
-        @_s3_connection ||= RightAws::S3.new(_s3_options[name][:access_key], _s3_options[name][:secret_access_key], :multi_thread => true, :ca_file => _s3_options[name][:ca_file])
+        @_s3_connection ||= RightAws::S3.new(_s3_options[name][:access_key], _s3_options[name][:secret_access_key], :multi_thread => true, :ca_file => _s3_options[name][:ca_file], :logger => _s3_options[name][:logger])
       end
     
       def s3_bucket(name)
@@ -107,7 +107,8 @@ module SimplyStored
           :ssl => true, 
           :location => :us, # use :eu for European buckets
           :ca_file => nil, # point to CA file for SSL certificate verification
-          :after_delete => :nothing # or :delete to delete the item on S3 after it is deleted in the DB
+          :after_delete => :nothing, # or :delete to delete the item on S3 after it is deleted in the DB,
+          :logger => nil # use the default RightAws logger (stdout)
         }.update(options)
         self._s3_options ||= {}
         self._s3_options[name] = options

data/test/simply_stored_couch_test.rb

@@ -1295,7 +1295,7 @@ class CouchTest < Test::Unit::TestCase
       context "when saving the attachment" do
         should "fetch the collection" do
           @log_item.log_data = "Yay! It logged!"
-          RightAws::S3.expects(:new).with('abcdef', 'secret!', :multi_thread => true, :ca_file => nil).returns(@s3)
+          RightAws::S3.expects(:new).with('abcdef', 'secret!', :multi_thread => true, :ca_file => nil, :logger => nil).returns(@s3)
           @log_item.save
         end
       
@@ -1349,6 +1349,16 @@ class CouchTest < Test::Unit::TestCase
             @log_item.save
           end
         end
+        
+        should "pass the logger object down to RightAws" do
+          logger = mock()
+          @log_item.log_data = "Yay! log me"
+          CouchLogItem._s3_options[:log_data][:bucket] = 'mybucket'
+          CouchLogItem._s3_options[:log_data][:logger] = logger
+          
+          RightAws::S3.expects(:new).with(anything, anything, {:logger => logger, :ca_file => nil, :multi_thread => true}).returns(@s3)
+          @log_item.save
+        end
       
         should "not upload the attachment when it hasn't been changed" do
           @bucket.expects(:put).never
@@ -1465,7 +1475,7 @@ class CouchTest < Test::Unit::TestCase
           CouchLogItem._s3_options[:log_data][:location] = :eu
           CouchLogItem._s3_options[:log_data][:ca_file] = '/etc/ssl/ca.crt'
           
-          RightAws::S3.expects(:new).with('abcdef', 'secret!', :multi_thread => true, :ca_file => '/etc/ssl/ca.crt').returns(@s3)
+          RightAws::S3.expects(:new).with('abcdef', 'secret!', :multi_thread => true, :ca_file => '/etc/ssl/ca.crt', :logger => nil).returns(@s3)
           
           @log_item.log_data
         end

data/test/simply_stored_simpledb_test.rb

@@ -1190,7 +1190,7 @@ class SimplyStoredTest < Test::Unit::TestCase
         context "when saving the attachment" do
           should "fetch the collection" do
             @log_item.log_data = "Yay! It logged!"
-            RightAws::S3.expects(:new).with('abcdef', 'secret!', :multi_thread => true, :ca_file => nil).returns(@s3)
+            RightAws::S3.expects(:new).with('abcdef', 'secret!', :multi_thread => true, :ca_file => nil, :logger => nil).returns(@s3)
             @log_item.save
           end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simply_stored
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Mathias Meyer, Jonathan Weiss