added cache_dir and cache_workers options to cache results (11)

- cosmetics

lib/image_optim/cache.rb

@@ -25,8 +25,7 @@ def fetch(original)
 
       digest = digest(original, original.image_format)
       cached = @cache_dir / digest
-      return if cached.file? && cached.zero?
-      return CachePath.convert(cached) if cached.file?
+      return cached.size? ? CachePath.convert(cached) : nil if cached.file?
 
       optimized = yield
 

lib/image_optim/runner/option_parser.rb

@@ -143,6 +143,19 @@ def wrap_regex(width)
     options[:pack] = pack
   end
 
+  op.separator nil
+  op.separator '  Caching:'
+
+  op.on('--cache-dir DIR', 'Cache optimized images '\
+        'into the specified directory') do |cache_dir|
+    options[:cache_dir] = cache_dir
+  end
+
+  op.on('--cache-worker-digests', 'Cache worker digests '\
+        '(updating workers invalidates cache)') do |cache_worker_digests|
+    options[:cache_worker_digests] = cache_worker_digests
+  end
+
   op.separator nil
   op.separator '  Disabling workers:'
 
@@ -203,19 +216,6 @@ def wrap_regex(width)
     end
   end
 
-  op.separator nil
-  op.separator '  Caching:'
-
-  op.on('--cache-dir DIR', 'Cache optimized images '\
-        'into the specified directory') do |cache_dir|
-    options[:cache_dir] = cache_dir
-  end
-
-  op.on('--cache-worker-digests', 'Cache worker digests '\
-        '(updating workers invalidates cache)') do |cache_worker_digests|
-    options[:cache_worker_digests] = cache_worker_digests
-  end
-
   op.separator nil
   op.separator '  Common options:'
 

spec/image_optim/cache_spec.rb

@@ -83,7 +83,7 @@
       it 'executes block and write to cache when cached file does not exist' do
         cached_s = cached.to_s
         allow(FileTest).to receive(:file?).with(cached_s).and_return(false)
-        allow(FileTest).to receive(:zero?).with(cached_s).and_return(false)
+        allow(FileTest).to receive(:size?).with(cached_s).and_return(1)
         allow(FileUtils).to receive(:mv)
         allow(File).to receive(:rename)
 
@@ -93,7 +93,7 @@
       it 'returns cached file when it exists and options match' do
         cached_s = cached.to_s
         allow(FileTest).to receive(:file?).with(cached_s).and_return(true)
-        allow(FileTest).to receive(:zero?).with(cached_s).and_return(false)
+        allow(FileTest).to receive(:size?).with(cached_s).and_return(1)
         expect(FileUtils).not_to receive(:mv)
         expect(File).not_to receive(:rename)
 
@@ -133,7 +133,7 @@
       it 'executes block and write to cache when cached file does not exist' do
         cached_s = cached.to_s
         allow(FileTest).to receive(:file?).with(cached_s).and_return(false)
-        allow(FileTest).to receive(:zero?).with(cached_s).and_return(false)
+        allow(FileTest).to receive(:size?).with(cached_s).and_return(1)
         allow(FileUtils).to receive(:mv)
         allow(File).to receive(:rename)
 
@@ -143,7 +143,7 @@
       it 'returns cached file when it exists and both options+workers match' do
         cached_s = cached.to_s
         allow(FileTest).to receive(:file?).with(cached_s).and_return(true)
-        allow(FileTest).to receive(:zero?).with(cached_s).and_return(false)
+        allow(FileTest).to receive(:size?).with(cached_s).and_return(1)
         expect(FileUtils).not_to receive(:mv)
         expect(File).not_to receive(:rename)