nanoc 4.0.0b2 → 4.0.0b3

data/test/extra/deployers/test_fog.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
   def test_run
     if_have 'fog' do
@@ -128,4 +126,151 @@ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
       assert_equal 'I am a dog!', File.read('mylocalcloud/mybucket/bark')
     end
   end
+
+  def test_upload
+    if_have 'fog' do
+      fog = Nanoc::Extra::Deployers::Fog.new(
+        'output/', provider: 'aws')
+
+      key_old = '__old'
+      key_same = '__same'
+      key_new = '__new'
+
+      File.write(key_same, 'hallo')
+      File.write(key_new, 'hallo new')
+
+      etags = {
+        key_same => '598d4c200461b81522a3328565c25f7c',
+        key_new => '598d4c200461b81522a3328565c25f7c',
+      }
+
+      keys_to_destroy = [key_old, key_same, key_new]
+      keys_to_invalidate = []
+
+      s3_files = mock
+      s3_files.stubs(:create)
+      s3_directory = mock
+      s3_directory.stubs(:files).returns(s3_files)
+
+      # key_same
+      refute fog.send(:needs_upload?, key_same, key_same, etags)
+      fog.send(
+        :upload, key_same, key_same, etags, keys_to_destroy, keys_to_invalidate, s3_directory)
+
+      assert_equal([key_old, key_new], keys_to_destroy)
+      assert_equal([], keys_to_invalidate)
+
+      # key_new
+      assert fog.send(:needs_upload?, key_new, key_new, etags)
+      fog.send(
+        :upload, key_new, key_new, etags, keys_to_destroy, keys_to_invalidate, s3_directory)
+
+      assert_equal([key_old], keys_to_destroy)
+      assert_equal([key_new], keys_to_invalidate)
+    end
+  end
+
+  def test_read_etags_with_local_provider
+    if_have 'fog' do
+      fog = Nanoc::Extra::Deployers::Fog.new(
+        'output/', provider: 'local')
+
+      files = [
+        mock('file_a'),
+        mock('file_b'),
+      ]
+
+      assert_equal({}, fog.send(:read_etags, files))
+    end
+  end
+
+  def test_read_etags_with_aws_provider
+    if_have 'fog' do
+      fog = Nanoc::Extra::Deployers::Fog.new(
+        'output/', provider: 'aws')
+
+      files = [
+        mock('file_a', key: 'key_a', etag: 'etag_a'),
+        mock('file_b', key: 'key_b', etag: 'etag_b'),
+      ]
+
+      expected = {
+        'key_a' => 'etag_a',
+        'key_b' => 'etag_b',
+      }
+
+      assert_equal(expected, fog.send(:read_etags, files))
+    end
+  end
+
+  def test_calc_local_etag_with_local_provider
+    if_have 'fog' do
+      fog = Nanoc::Extra::Deployers::Fog.new(
+        'output/', provider: 'local')
+
+      file_path = 'blah.tmp'
+      File.write(file_path, 'hallo')
+
+      assert_nil fog.send(:calc_local_etag, file_path)
+    end
+  end
+
+  def test_calc_local_etag_with_aws_provider
+    if_have 'fog' do
+      fog = Nanoc::Extra::Deployers::Fog.new(
+        'output/', provider: 'aws')
+
+      file_path = 'blah.tmp'
+      File.write(file_path, 'hallo')
+
+      assert_equal(
+        '598d4c200461b81522a3328565c25f7c',
+        fog.send(:calc_local_etag, file_path))
+    end
+  end
+
+  def test_needs_upload_with_missing_remote_etag
+    if_have 'fog' do
+      fog = Nanoc::Extra::Deployers::Fog.new(
+        'output/', provider: 'aws')
+
+      file_path = 'blah.tmp'
+      File.write(file_path, 'hallo')
+
+      key = 'some_key'
+      etags = {}
+
+      assert fog.send(:needs_upload?, key, file_path, etags)
+    end
+  end
+
+  def test_needs_upload_with_different_etags
+    if_have 'fog' do
+      fog = Nanoc::Extra::Deployers::Fog.new(
+        'output/', provider: 'aws')
+
+      file_path = 'blah.tmp'
+      File.write(file_path, 'hallo')
+
+      key = 'some_key'
+      etags = { key => 'some_etag' }
+
+      assert fog.send(:needs_upload?, key, file_path, etags)
+    end
+  end
+
+  def test_needs_upload_with_identical_etags
+    if_have 'fog' do
+      fog = Nanoc::Extra::Deployers::Fog.new(
+        'output/', provider: 'aws')
+
+      file_path = 'blah.tmp'
+      File.write(file_path, 'hallo')
+
+      key = 'some_key'
+      etags = { key => '598d4c200461b81522a3328565c25f7c' }
+
+      refute fog.send(:needs_upload?, key, file_path, etags)
+    end
+  end
 end

data/test/extra/deployers/test_rsync.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
   def test_run_without_dst
     # Create deployer

data/test/extra/test_filesystem_tools.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::FilesystemToolsTest < Nanoc::TestCase
   def setup
     super

data/test/extra/test_link_collector.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
   def test_all
     # Create dummy data

data/test/extra/test_piper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Extra::PiperTest < Nanoc::TestCase
   def test_basic
     stdout = StringIO.new

data/test/filters/test_asciidoc.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::AsciiDocTest < Nanoc::TestCase
   def test_filter
     skip_unless_have_command 'asciidoc'

data/test/filters/test_bluecloth.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::BlueClothTest < Nanoc::TestCase
   def test_filter
     if_have 'bluecloth' do

data/test/filters/test_coffeescript.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::CoffeeScriptTest < Nanoc::TestCase
   def test_filter
     if_have 'coffee-script' do

data/test/filters/test_colorize_syntax.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::ColorizeSyntaxTest < Nanoc::TestCase
   CODERAY_PRE  = '<div class="CodeRay"><div class="code">'
   CODERAY_POST = '</div></div>'

data/test/filters/test_erb.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::ERBTest < Nanoc::TestCase
   def test_filter_with_instance_variable
     # Create filter

data/test/filters/test_erubis.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::ErubisTest < Nanoc::TestCase
   def test_filter_with_instance_variable
     if_have 'erubis' do

data/test/filters/test_haml.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::HamlTest < Nanoc::TestCase
   def test_filter
     if_have 'haml' do

data/test/filters/test_handlebars.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
   def test_filter
     if_have 'handlebars' do

data/test/filters/test_kramdown.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::KramdownTest < Nanoc::TestCase
   def test_filter
     if_have 'kramdown' do

data/test/filters/test_less.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::LessTest < Nanoc::TestCase
   def test_filter
     if_have 'less' do

data/test/filters/test_markaby.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::MarkabyTest < Nanoc::TestCase
   def test_filter
     if_have 'markaby' do

data/test/filters/test_maruku.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::MarukuTest < Nanoc::TestCase
   def test_filter
     if_have 'maruku' do

data/test/filters/test_mustache.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::MustacheTest < Nanoc::TestCase
   def test_filter
     if_have 'mustache' do

data/test/filters/test_pandoc.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::PandocTest < Nanoc::TestCase
   def test_filter
     if_have 'pandoc-ruby' do

data/test/filters/test_rainpress.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::RainpressTest < Nanoc::TestCase
   def test_filter
     if_have 'rainpress' do

data/test/filters/test_rdiscount.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::RDiscountTest < Nanoc::TestCase
   def test_filter
     if_have 'rdiscount' do

data/test/filters/test_rdoc.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::RDocTest < Nanoc::TestCase
   def test_filter
     # Get filter

data/test/filters/test_redcarpet.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::RedcarpetTest < Nanoc::TestCase
   def test_find
     if_have 'redcarpet' do

data/test/filters/test_redcloth.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::RedClothTest < Nanoc::TestCase
   def test_filter
     if_have 'redcloth' do

data/test/filters/test_relativize_paths.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
   def test_filter_html_with_double_quotes
     # Create filter with mock item

data/test/filters/test_rubypants.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::RubyPantsTest < Nanoc::TestCase
   def test_filter
     if_have 'rubypants' do

data/test/filters/test_sass.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::SassTest < Nanoc::TestCase
   def test_filter
     if_have 'sass' do

data/test/filters/test_slim.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::SlimTest < Nanoc::TestCase
   def test_filter
     if_have 'slim' do

data/test/filters/test_typogruby.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::TypogrubyTest < Nanoc::TestCase
   def test_filter
     if_have 'typogruby' do

data/test/filters/test_uglify_js.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
   def test_filter
     if_have 'uglifier' do

data/test/filters/test_xsl.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'tempfile'
 
 class Nanoc::Filters::XSLTest < Nanoc::TestCase

data/test/filters/test_yui_compressor.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Filters::YUICompressorTest < Nanoc::TestCase
   def test_filter_javascript
     if_have 'yuicompressor' do

data/test/gem_loader.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 begin
   require 'rubygems'
 

data/test/helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Set up gem loading (necessary for cri dependency)
 require File.dirname(__FILE__) + '/gem_loader.rb'
 
@@ -107,7 +105,7 @@ EOS
           io << 'string_pattern_type: legacy' << "\n"
           io << 'data_sources:' << "\n"
           io << '  -' << "\n"
-          io << '    type: filesystem_unified' << "\n"
+          io << '    type: filesystem' << "\n"
           io << '    identifier_type: legacy' << "\n"
         end
 

data/test/helpers/test_blogging.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
   include Nanoc::Helpers::Blogging
   include Nanoc::Helpers::Text

data/test/helpers/test_breadcrumbs.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
   include Nanoc::Helpers::Breadcrumbs
 

data/test/helpers/test_capturing.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
   include Nanoc::Helpers::Capturing
 

data/test/helpers/test_filtering.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
   include Nanoc::Helpers::Filtering
 

data/test/helpers/test_html_escape.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Helpers::HTMLEscapeTest < Nanoc::TestCase
   include Nanoc::Helpers::HTMLEscape
 

data/test/helpers/test_link_to.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Helpers::LinkToTest < Nanoc::TestCase
   include Nanoc::Helpers::LinkTo
 

data/test/helpers/test_rendering.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
   include Nanoc::Helpers::Rendering
 

data/test/helpers/test_tagging.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
   include Nanoc::Helpers::Tagging