middleman-s3_sync 3.0.37 → 3.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a3d596b258f8ad284fe69c1ec98d9a81d012095
-  data.tar.gz: 19f15e444a731602a38c004ca41216f3296de52c
+  metadata.gz: 45f758d7d204535650c4e825a52abc4e69bcf086
+  data.tar.gz: 3462381561ce1d269f3dc39a9786237d9c9bef9d
 SHA512:
-  metadata.gz: ab5b04bc4666c9c14bcfe9d24e51690ab542b78ad3e1e8f9453773f2f76ada44bcf622cc23dee4f1f760b100cff6b51a3b4e74b35584cd8302f71be7eeb1a60f
-  data.tar.gz: 690186a84248f7fe826708a8bd64be308e5a8581b0cdc5a0f8a7f0742b32d3a7dcb66f1e7b8a86f39c9f33c0b4d3b433b06afd27da101867a5c0533dc52335c4
+  metadata.gz: abc5a66bbd74569d75078288b52cabaf77c1e9afd9b5a687efb9033b2ec879e5f72fa9f722097107e625cc91bdb9cf1ef6c8c8c15e7176338118ad073a3e6185
+  data.tar.gz: 9953b988d69940aa385e23a1182fdaa60ce215de6dd05e20702fc2ccc5f6e32725415c586b2923bc27efdfca9c3f6aba1c93203086fd25c0a80a2d02dfb01bec

data/.travis.yml

@@ -3,6 +3,8 @@ language: ruby
 rvm:
 - 1.9.3
 - 2.0.0
+- 2.1.5
+
 env:
   global:
   - secure: ! 'dQ/vYDmUZEW9LD8IyTRFoRFo24w2yJTYQHuAS24vfKToDZ0BO2/Tpq5lh0vb

data/lib/middleman-s3_sync/extension.rb

@@ -17,6 +17,10 @@ module Middleman
         app.define_hook :after_s3_sync
 
         app.after_configuration do |config|
+          # Record the http_prefix if it is set. We will need it while setting
+          # the options to detect whether it is set and adjust the prefix value
+          # accordingly
+          options.http_prefix = app.respond_to? :http_prefix ? app.http_prefix : nil
 
           # Define the after_build step after during configuration so
           # that it's pushed to the end of the callback chain

data/lib/middleman/s3_sync/options.rb

@@ -3,6 +3,7 @@ module Middleman
     class Options
       OPTIONS = [
         :prefix,
+        :http_prefix,
         :acl,
         :bucket,
         :region,
@@ -83,8 +84,17 @@ module Middleman
         (@path_style.nil? ? true : @path_style)
       end
 
+      def prefix=(prefix)
+        http_prefix = @http_prefix ? @http_prefix.sub(%r{^/}, "") : ""
+        if http_prefix.split("/").first == prefix
+          @prefix = ""
+        else
+          @prefix = prefix
+        end
+      end
+
       def prefix
-        @prefix.nil? ? "" : "#{@prefix}/"
+        @prefix.blank? ? "" : "#{@prefix}/"
       end
 
       def version_bucket

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.37"
+    VERSION = "3.0.38"
   end
 end

data/spec/options_spec.rb

@@ -117,4 +117,14 @@ describe Middleman::S3Sync::Options do
     its(:aws_secret_access_key) { should eq(aws_secret_access_key) }
     its(:bucket) { should eq(bucket) }
   end
+
+  context "prefix with http_prefix" do
+    before do
+      options.http_prefix = "/blog"
+      options.prefix = "blog"
+    end
+
+    its(:prefix) { should eq("")}
+  end
+
 end

data/spec/resource_spec.rb

@@ -22,7 +22,7 @@ describe Middleman::S3Sync::Resource do
 
       its(:status) { should eq :new }
 
-      it "does not have a remote equivalend" do
+      it "does not have a remote equivalent" do
         expect(resource).not_to be_remote
       end
 

metadata

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