middleman-s3_sync 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ea0d9098ccfca7a420089e791da7f7881298c5c
-  data.tar.gz: 93b501fb586db5be0cd329c448ac2edb5da3c044
+  metadata.gz: bbe1bbc3f37ac9a58dc960c2851e4cca0da2d9af
+  data.tar.gz: dabc060ce159efcd4da2914c287bd472de251d2c
 SHA512:
-  metadata.gz: 1d4b328645fe0171b6b5f01c0b0f2f19428c17a06b0e0af8bfa9b908763982e5a12b52b2c33e7b1a57b4e7e6bdd424ae27e302d97b17db7a8f08654868239615
-  data.tar.gz: 9d427de8aca80db2ff476dc42da6a2fc11bb769651c8f16a24780dbc0b9a9ae51459a038ae8c85abff8a45c5728d511791254bdc8566368f8d066a1d0089453a
+  metadata.gz: 4373ce2b29ba731e7bbbc4669985dc053237346af133bb393ff3ad77d9e1452c68c0cb7d677750a4fccfce1c7dc0486d9b277c380c94c5458e35b7bfb1026ead
+  data.tar.gz: 086a206d09def300b30a0360d8f3734779cee3eced112569f5ccd1bf301406245acf41647f871eee2d4aba3c8021fe8fbd8009e0b3e8283077916be67344da22

data/README.md

@@ -60,6 +60,7 @@ The following defaults apply to the configuration items:
 | -----------------          | ----------------------------       |
 | aws_access_key_id          | ```ENV['AWS_ACCESS_KEY_ID']```     |
 | aws_secret_access_key      | ```ENV['AWS_SECRET_ACCESS_KEY']``` |
+| bucket                     | ```ENV['AWS_BUCKET']```            |
 | delete                     | ```true```                         |
 | after_build                | ```false```                        |
 | prefer_gzip                | ```true```                         |
@@ -113,6 +114,7 @@ map to the following values:
 | --------------------- | ---------------------------------- |
 | aws_access_key_id     | ```ENV['AWS_ACCESS_KEY_ID']```     |
 | aws_secret_access_key | ```ENV['AWS_SECRET_ACCESS_KEY']``` |
+| bucket                | ```ENV['AWS_BUCKET']```            |
 
 The environment is used when the credentials are not set in the activate
 method or passed through the ```.s3_sync``` configuration file.

data/lib/middleman-s3_sync/commands.rb

@@ -33,7 +33,9 @@ module Middleman
         aliases: '-n'
 
       def s3_sync
-        ::Middleman::S3Sync.app = ::Middleman::Application.server.inst
+        ::Middleman::S3Sync.app = ::Middleman::Application.server.inst do
+          config[:environment] = :build
+        end
 
         s3_sync_options = ::Middleman::S3Sync.s3_sync_options
 

data/lib/middleman-s3_sync/extension.rb

@@ -8,7 +8,7 @@ module Middleman
     option :prefix, nil, 'Path prefix of the resource we are looking for on the server.'
     option :http_prefix, nil, 'Path prefix of the resources'
     option :acl, 'public-read', 'ACL for the resources being pushed to S3'
-    option :bucket, 'nil', 'The name of the bucket we are pushing to.'
+    option :bucket, nil, 'The name of the bucket we are pushing to.'
     option :region, 'us-east-1', 'The name of the AWS region hosting the S3 bucket'
     option :aws_access_key_id, ENV['AWS_ACCESS_KEY_ID'] , 'The AWS access key id'
     option :aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY'], 'The AWS secret access key'
@@ -35,6 +35,7 @@ module Middleman
       read_config
       options.aws_access_key_id ||= ENV['AWS_ACCESS_KEY_ID']
       options.aws_secret_access_key ||= ENV['AWS_SECRET_ACCESS_KEY']
+      options.bucket ||= ENV['AWS_BUCKET']
       options.http_prefix = app.http_prefix if app.respond_to? :http_prefix
       options.build_dir ||= app.build_dir if app.respond_to? :build_dir
       ::Middleman::S3Sync.s3_sync_options = s3_sync_options
@@ -68,9 +69,9 @@ module Middleman
         io = File.open(config_file_path, "r")
       end
 
-      config = YAML.load(io).symbolize_keys
+      config = (YAML.load(io) || {}).symbolize_keys
 
-      OPTIONS.each do |config_option|
+      options.all_settings.map(&:key).each do |config_option|
         self.send("#{config_option}=".to_sym, config[config_option]) if config[config_option]
       end
     end

data/lib/middleman/s3_sync/resource.rb

@@ -166,7 +166,7 @@ module Middleman
       end
 
       def local?
-        File.exist?(local_path)
+        File.exist?(local_path) && resource
       end
 
       def remote?
@@ -210,8 +210,8 @@ module Middleman
       end
 
       def content_type
-        @content_type ||= Middleman::S3Sync.content_types[path]
-        @content_type ||= resource.content_type
+        @content_type ||= Middleman::S3Sync.content_types[local_path]
+        @content_type ||= !resource.nil? ? resource.content_type : nil
       end
 
       def caching_policy

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.3.0"
+    VERSION = "3.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core