middleman-s3_sync 3.0.30 → 3.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eec69a71b3cb5ba6681a2ea6a08e72cc79abfb1
-  data.tar.gz: 364925a716f0eb16908f79757d6802ed45e1bcf2
+  metadata.gz: 5f431194b1a96375b88da5f61aae633e9281bd3b
+  data.tar.gz: 1ee6ebd0ff9c2c793917db1caa3f44fc3d00e3bd
 SHA512:
-  metadata.gz: 8648165f7f064c871eacd58d08d255f139628d462b93a0de525583586d991f993f1d0529c3d20da9475c114c64ea2ea42f0a1c90d98addb2cd70fd4510d4a77f
-  data.tar.gz: a47176aa6031d12cafbaf911bfb1e50bfcd1efa6594f2a0cfda60df6dd4d5d5e163e55717e8b14d144bab0ad60acb085ea9f40813e1039187b0de484061d5a88
+  metadata.gz: 37ec664a5db9d9225ab9634a1a481f0e248926ee247a0c5f0a1b653737edd1b900865de2830c2f0db1356d8d9763022663b38574b8d4f2514ec81c4a833c698d
+  data.tar.gz: f6088910de0c27cd4b60ea18579709bbe0c56c45d75be7fb701e2f67d4da80246c077605c2afa74faf88b79097de1064a1c16004584bcc1b85d4ad016040782c

data/lib/middleman-s3_sync/extension.rb

@@ -4,14 +4,18 @@ require 'map'
 module Middleman
   module S3Sync
     class << self
+      attr_accessor :options
+
       def registered(app, options_hash = {}, &block)
         options = Options.new
         yield options if block_given?
 
-        @@options = options
+        @options = options
 
         app.send :include, Helpers
 
+        app.define_hook :after_s3_sync
+
         app.after_configuration do |config|
 
           # Define the after_build step after during configuration so
@@ -26,7 +30,7 @@ module Middleman
       alias :included :registered
 
       def s3_sync_options
-        @@options
+        @options
       end
 
       module Helpers

data/lib/middleman/s3_sync.rb

@@ -15,6 +15,8 @@ module Middleman
       include Status
 
       def sync
+        @app = ::Middleman::Application.server.inst
+
         unless work_to_be_done?
           say_status "\nAll S3 files are up to date."
           return
@@ -28,6 +30,11 @@ module Middleman
         create_resources
         update_resources
         delete_resources
+
+        @app.run_hook :after_s3_sync, ignored: files_to_ignore.map(&:path),
+                                      created: files_to_create.map(&:path),
+                                      updated: files_to_update.map(&:path),
+                                      deleted: files_to_delete.map(&:path)
       end
 
       def bucket

data/lib/middleman/s3_sync/options.rb

@@ -1,7 +1,7 @@
 module Middleman
   module S3Sync
     class Options
-      attr_accessor \
+      OPTIONS = [
         :prefix,
         :acl,
         :bucket,
@@ -19,6 +19,8 @@ module Middleman
         :path_style,
         :version_bucket,
         :verbose
+      ]
+      attr_accessor *OPTIONS
 
       def initialize
         # read config from .s3_sync on initialization
@@ -105,10 +107,11 @@ module Middleman
           io = File.open(config_file_path, "r")
         end
 
-        config = YAML.load(io)
+        config = YAML.load(io).symbolize_keys
 
-        self.aws_access_key_id = config["aws_access_key_id"] if config["aws_access_key_id"]
-        self.aws_secret_access_key = config["aws_secret_access_key"] if config["aws_secret_access_key"]
+        OPTIONS.each do |config_option|
+          self.send("#{config_option}=".to_sym, config[config_option]) if config[config_option]
+        end
       end
 
       protected

data/lib/middleman/s3_sync/resource.rb

@@ -1,24 +1,24 @@
 module Middleman
   module S3Sync
     class Resource
-      attr_accessor :path, :partial_s3_resource, :content_type, :gzipped
+      attr_accessor :path, :partial_s3_resource, :full_s3_resource, :content_type, :gzipped, :options
 
       CONTENT_MD5_KEY = 'x-amz-meta-content-md5'
 
       include Status
 
+      def initialize(path, partial_s3_resource)
+        @path = path
+        @partial_s3_resource = partial_s3_resource
+      end
+
       def s3_resource
         @full_s3_resource || @partial_s3_resource
       end
 
       # S3 resource as returned by a HEAD request
       def full_s3_resource
-        @full_s3_resource ||= bucket.files.head("#{options.prefix}#{path}")
-      end
-
-      def initialize(path, partial_s3_resource)
-        @path = path
-        @partial_s3_resource = partial_s3_resource
+        @full_s3_resource ||= bucket.files.head(remote_path)
       end
 
       def remote_path
@@ -122,10 +122,10 @@ module Middleman
                    :redirect
                  elsif directory?
                    :directory
-                 elsif alternate_encoding?
-                   'alternate encoding'
                  end
-        say_status "Ignoring".yellow + " #{remote_path} #{ reason ? "(#{reason})".white : "" }"
+        unless alternate_encoding?
+          say_status "Ignoring".yellow + " #{remote_path} #{ reason ? "(#{reason})".white : "" }"
+        end
       end
 
       def to_delete?
@@ -196,7 +196,7 @@ module Middleman
       end
 
       def remote?
-        s3_resource
+        !!s3_resource
       end
 
       def redirect?
@@ -253,7 +253,7 @@ module Middleman
       end
 
       def options
-        Middleman::S3Sync.s3_sync_options
+        @options || Middleman::S3Sync.s3_sync_options
       end
     end
   end

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.30"
+    VERSION = "3.0.31"
   end
 end

data/spec/options_spec.rb

@@ -105,7 +105,8 @@ describe Middleman::S3Sync::Options do
   context "#read_config" do
     let(:aws_access_key_id) { "foo" }
     let(:aws_secret_access_key) { "bar" }
-    let(:config) { { "aws_access_key_id" => aws_access_key_id, "aws_secret_access_key" => aws_secret_access_key } }
+    let(:bucket) { "baz" }
+    let(:config) { { "aws_access_key_id" => aws_access_key_id, "aws_secret_access_key" => aws_secret_access_key, "bucket" => bucket } }
     let(:file) { StringIO.new(YAML.dump(config)) }
 
     before do
@@ -114,5 +115,6 @@ describe Middleman::S3Sync::Options do
 
     its(:aws_access_key_id) { should eq(aws_access_key_id) }
     its(:aws_secret_access_key) { should eq(aws_secret_access_key) }
+    its(:bucket) { should eq(bucket) }
   end
 end

data/spec/resource_spec.rb

@@ -2,4 +2,148 @@ require 'spec_helper'
 
 describe Middleman::S3Sync::Resource do
 
+  let(:options) {
+    Middleman::S3Sync::Options.new
+  }
+
+  before do
+    Middleman::S3Sync.options = options
+    options.build_dir = "build"
+    options.prefer_gzip = false
+  end
+
+  context "a new resource" do
+    subject(:resource) { Middleman::S3Sync::Resource.new('path/to/resource.html', nil) }
+
+    context "without a prefix" do
+      before do
+        allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(true)
+      end
+
+      its(:status) { should eq :new }
+
+      it "does not have a remote equivalend" do
+        expect(resource).not_to be_remote
+      end
+
+      it "exits locally" do
+        expect(resource).to be_local
+      end
+
+      its(:path) { should eq 'path/to/resource.html'}
+      its(:local_path) { should eq 'build/path/to/resource.html' }
+      its(:remote_path) { should eq 'path/to/resource.html' }
+    end
+
+    context "with a prefix set" do
+      before do
+        allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(true)
+        options.prefix = "bob"
+      end
+
+      it "does not have a remote equivalent" do
+        expect(resource).not_to be_remote
+      end
+
+      it "exists locally" do
+        expect(resource).to be_local
+      end
+
+      its(:path) { should eq 'path/to/resource.html' }
+      its(:local_path) { should eq 'build/path/to/resource.html' }
+      its(:remote_path) { should eq 'bob/path/to/resource.html' }
+    end
+
+    context "gzipped" do
+      before do
+        allow(File).to receive(:exist?).with('build/path/to/resource.html.gz').and_return(true)
+        options.prefer_gzip = true
+      end
+
+      it "does not have a remote equivalent" do
+        expect(resource).not_to be_remote
+      end
+
+      it "exists locally" do
+        expect(resource).to be_local
+      end
+
+      its(:path) { should eq 'path/to/resource.html' }
+      its(:local_path) { should eq 'build/path/to/resource.html.gz' }
+      its(:remote_path) { should eq 'path/to/resource.html' }
+    end
+  end
+
+  context "the file does not exist locally" do
+    subject(:resource) { Middleman::S3Sync::Resource.new('path/to/resource.html', remote) }
+
+    let(:remote) { double("remote") }
+
+    before do
+        allow(remote).to receive(:key).and_return('path/to/resource.html')
+        allow(remote).to receive(:metadata).and_return({})
+        resource.full_s3_resource = remote
+    end
+
+    context "without a prefix" do
+      before do
+        allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(false)
+      end
+
+      its(:status) { should eq :deleted }
+      it "does not have a remote equivalent" do
+        expect(resource).to be_remote
+      end
+
+      it "exits locally" do
+        expect(resource).not_to be_local
+      end
+
+      its(:path) { should eq 'path/to/resource.html'}
+      its(:local_path) { should eq 'build/path/to/resource.html' }
+      its(:remote_path) { should eq 'path/to/resource.html' }
+    end
+
+    context "with a prefix set" do
+      before do
+        allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(false)
+        allow(remote).to receive(:key).and_return('bob/path/to/resource.html')
+        options.prefix = "bob"
+      end
+
+      its(:status) { should eq :deleted }
+      it "does not have a remote equivalent" do
+        expect(resource).to be_remote
+      end
+
+      it "exists locally" do
+        expect(resource).not_to be_local
+      end
+
+      its(:path) { should eq 'path/to/resource.html' }
+      its(:local_path) { should eq 'build/path/to/resource.html' }
+      its(:remote_path) { should eq 'bob/path/to/resource.html' }
+    end
+
+    context "gzipped" do
+      before do
+        allow(File).to receive(:exist?).with('build/path/to/resource.html.gz').and_return(false)
+        allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(false)
+        options.prefer_gzip = true
+      end
+
+      its(:status) { should eq :deleted }
+      it "does not have a remote equivalent" do
+        expect(resource).to be_remote
+      end
+
+      it "exists locally" do
+        expect(resource).not_to be_local
+      end
+
+      its(:path) { should eq 'path/to/resource.html' }
+      its(:local_path) { should eq 'build/path/to/resource.html' }
+      its(:remote_path) { should eq 'path/to/resource.html' }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.0.30
+  version: 3.0.31
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core