remote_files 1.5.1 → 1.6.0

data/lib/remote_files.rb

@@ -24,6 +24,16 @@ module RemoteFiles
     CONFIGURATIONS[name.to_sym].from_hash(hash)
   end
 
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  def self.logger
+    return @logger if defined?(@logger)
+
+    @logger ||= defined?(Rails) ? Rails.logger : nil
+  end
+
   def self.add_store(store_identifier, options = {}, &block)
     default_configuration.add_store(store_identifier, options, &block)
   end

data/lib/remote_files/configuration.rb

@@ -11,6 +11,14 @@ module RemoteFiles
       from_hash(config)
     end
 
+    def logger=(logger)
+      @logger = logger
+    end
+
+    def logger
+      @logger ||= RemoteFiles.logger
+    end
+
     def clear
       @stores.clear
       @stores_map.clear
@@ -85,6 +93,7 @@ module RemoteFiles
           file.stored_in << store.identifier
           break
         rescue ::RemoteFiles::Error => e
+          file.logger.info(e) if file.logger
           exception = e
         end
       end

data/lib/remote_files/file.rb

@@ -13,9 +13,18 @@ module RemoteFiles
       @content       = options.delete(:content)
       @content_type  = options[:content_type]
       @configuration = RemoteFiles::CONFIGURATIONS[(options[:configuration] || :default).to_sym]
+      @logger        = options[:logger]
       @options       = options
     end
 
+    def logger=(logger)
+      @logger = logger
+    end
+
+    def logger
+      @logger ||= configuration ? configuration.logger : RemoteFiles.logger
+    end
+
     def self.from_url(url)
       RemoteFiles.default_configuration.file_from_url(url)
     end

data/lib/remote_files/version.rb

@@ -1,3 +1,3 @@
 module RemoteFiles
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 end

data/test/configuration_test.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require_relative 'test_helper'
 require 'remote_files/mock_store'
 
@@ -9,6 +10,25 @@ describe RemoteFiles::Configuration do
     @mock_store2 = @configuration.add_store(:mock2, :class => RemoteFiles::MockStore)
   end
 
+  describe '#logger' do
+    it 'defaults to RemoteFiles.logger' do
+      logger = Logger.new($stdout)
+      RemoteFiles.logger = logger
+      configuration_logger = @configuration.logger
+      RemoteFiles.logger = nil
+
+      configuration_logger.must_equal logger
+
+      new_logger = Logger.new($stdout)
+
+      @configuration.logger = new_logger
+      @configuration.logger.must_equal new_logger
+
+      @configuration.logger = nil
+      @configuration.logger.must_be_nil
+    end
+  end
+
   describe '::add_store' do
     describe 'when adding a non-primary store' do
       before { @non_primary_store = @configuration.add_store(:primary) }
@@ -64,6 +84,8 @@ describe RemoteFiles::Configuration do
 
     describe 'when the first store fails' do
       before do
+        @log = StringIO.new
+        @file.logger = Logger.new(@log)
         @mock_store1.expects(:store!).with(@file).raises(RemoteFiles::Error)
         @configuration.store_once!(@file)
       end
@@ -72,6 +94,10 @@ describe RemoteFiles::Configuration do
         @mock_store1.data['file'].must_be_nil
         @mock_store2.data['file'].must_equal(:content => 'content', :content_type => 'text/plain')
       end
+
+      it 'logs that the first store failed' do
+        @log.string.must_match /RemoteFiles::Error/
+      end
     end
 
     describe 'when alls stores fail' do

data/test/file_test.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require_relative 'test_helper'
 
 describe RemoteFiles::File do
@@ -8,6 +9,27 @@ describe RemoteFiles::File do
     @file = RemoteFiles::File.new('identifier')
   end
 
+  describe '#logger' do
+    it 'defaults to the configuration logger' do
+      configuration_logger = Logger.new($stdout)
+      configuration = RemoteFiles.configure(:test)
+      configuration.logger = configuration_logger
+
+      file = RemoteFiles::File.new('identifier', :configuration => :test)
+      file.logger.must_equal configuration_logger
+
+      new_logger = Logger.new($stdout)
+      file.logger = new_logger
+      file.logger.must_equal new_logger
+    end
+
+    it 'is settable at initialization' do
+      logger = Logger.new($stdout)
+      file = RemoteFiles::File.new('identifier', :logger => logger)
+      file.logger.must_equal logger
+    end
+  end
+
   describe '#stored?' do
     it 'should return true if the file is stored anywhere' do
       @file.stored_in << :s3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2269373992954877805
+      hash: 424450237323346317
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2269373992954877805
+      hash: 424450237323346317
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24