middleman-s3_sync 3.0.25 → 3.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53f0c96631ec71ebe886bd3ced01e219472f1f84
-  data.tar.gz: b21736f5dc8297323c381d7e1aec408840ded0d1
+  metadata.gz: 45957c6108653a82b46a661ad75eb1b77f5e6af7
+  data.tar.gz: 163a94c3b0130c78a31850caa6448bb759aa9691
 SHA512:
-  metadata.gz: d7af119cda3ba1ef4f4ad99575450c7d2c42760dd2625efd2cfd7d93ec1bfab79ca5e03ec1935e929bf065587ddeaef032dee108145d4eac1f2da4e7e6abd8d2
-  data.tar.gz: 3acc9be46d830b93d01c8b66c94ea30eb72eb09b519589458ccf5617e8bb9f44600328a74e2184828e070e52129b438154512d655fe0f34fd32ce52d9749250e
+  metadata.gz: eb34b8decbcf29d9022eca8ce05128e46a5df26a85e1d0ec8c76ad85d954aef4b424d420f34a8bcf09db7fff1dffc79e74c612b5ed912291ea849ea33324f1ee
+  data.tar.gz: 96e6f7fbb1a200e51a5df31460860859d956421f451a3561a75759ef9d97d2b112b930e506c4d392cf695a85c9180d9aaec849b3887d4b35055cd4a6be6ff425

data/lib/middleman/s3_sync.rb

@@ -29,7 +29,7 @@ module Middleman
       end
 
       def bucket
-        @bucket ||= connection.directories.get(s3_sync_options.bucket)
+        @bucket ||= connection.directories.get(s3_sync_options.bucket, :prefix => s3_sync_options.prefix)
       end
 
       protected
@@ -46,7 +46,7 @@ module Middleman
       def resources
         @resources ||= paths.pmap(32) do |p|
           progress_bar.increment
-          S3Sync::Resource.new(p, bucket_files.find { |f| f.key == p }).tap(&:status)
+          S3Sync::Resource.new(p, bucket_files.find { |f| f.key == "#{s3_sync_options.prefix}#{p}" }).tap(&:status)
         end
       end
 
@@ -70,14 +70,14 @@ module Middleman
                              local_paths.reject! { |p| p =~ /\.gz$/ && File.exist?(p.gsub(/\.gz$/, '')) }
                            end
 
-                           local_paths.pmap(32) { |p| p.sub(/^#{build_dir}\//, '') }
+                           local_paths.pmap(32) { |p| p.gsub(/#{build_dir}\//, s3_sync_options.prefix) }
                          end
       end
 
       def remote_paths
         @remote_paths ||= bucket_files.map(&:key)
       end
-      
+
       def bucket_files
         @bucket_files ||= [].tap { |files|
           bucket.files.each { |f|

data/lib/middleman/s3_sync/options.rb

@@ -80,6 +80,10 @@ module Middleman
         (@path_style.nil? ? true : @path_style)
       end
 
+      def prefix
+        @prefix.nil? ? "" : "#{@prefix}/"
+      end
+
       # Read config options from an IO stream and set them on `self`. Defaults
       # to reading from the `.s3_sync` file in the MM project root if it exists.
       #

data/lib/middleman/s3_sync/resource.rb

@@ -13,7 +13,7 @@ module Middleman
 
       # S3 resource as returned by a HEAD request
       def full_s3_resource
-        @full_s3_resource ||= bucket.files.head(path)
+        @full_s3_resource ||= bucket.files.head("#{options.prefix}#{path}")
       end
 
       def initialize(path, partial_s3_resource)
@@ -97,7 +97,7 @@ module Middleman
           @gzipped = true
           local_path += ".gz"
         end
-        local_path
+        local_path.sub(options.prefix, '')
       end
 
       def destroy!

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.25"
+    VERSION = "3.0.26"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.0.25
+  version: 3.0.26
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core