middleman-s3_sync 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43571ce8542c63438002421697693bdb2df3811d
-  data.tar.gz: deef0be22c915cf14538f00a3c2403820d6328ac
+  metadata.gz: e3827f761cc837c4b40aab6fd29a7737fc7039b1
+  data.tar.gz: 3c42ac240f148cb08d7daa3e72dacb29c11c59c0
 SHA512:
-  metadata.gz: 7c63611753c1cc11b91d9893c8e0470b94b99c65142631d920cf78b184e852833c62891834a8d716f05393a605237089f5b48f785a63e9c288084ced1ed9cf37
-  data.tar.gz: 9a4897fe6772f0bb913871cfa400cbc2b751a8ede6b8f1a08280065f677292c3771649343996b6695dc89cef373edc32988811732386c23a60c43065b66bf749
+  metadata.gz: edbf4fb9046f29261590403220112597f01221350ac223b815856d7a89f833969fbf2a9eb9cb430a9241ffc37603e8baa049baa6ddc64ac1f5b62c6205773453
+  data.tar.gz: 370d1524220e776febbce93868341fc2d381163768dbfb7b698c64e802625f495aefa0ff833735c270362d9c16f0d812523c517ac0ea05c71c7551e3c8b93efe

data/.travis.yml

@@ -3,9 +3,8 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-- 2.0.0
-- 2.1.5
 - 2.2.3
+- 2.3.1
 
 notifications:
   webhooks:

data/README.md

@@ -39,7 +39,7 @@ You need to add the following code to your ```config.rb``` file:
 
 ```ruby
 activate :s3_sync do |s3_sync|
-  s3_sync.bucket                     = 'my.bucket.com' # The name of the S3 bucket you are targetting. This is globally unique.
+  s3_sync.bucket                     = 'my.bucket.com' # The name of the S3 bucket you are targeting. This is globally unique.
   s3_sync.region                     = 'us-west-1'     # The AWS region for your bucket.
   s3_sync.aws_access_key_id          = 'AWS KEY ID'
   s3_sync.aws_secret_access_key      = 'AWS SECRET KEY'
@@ -182,6 +182,19 @@ You can specify which environment to run Middleman under using the
 
     $ middleman s3_sync --environment=production
 
+You can set up separate sync environments in config.rb like this: 
+
+```ruby
+	configure :staging do
+		activate :s3_sync do |s3_sync|
+			s3_sync.bucket = '<bucket'
+			... 
+    	end
+    end
+```
+    
+See the Usage section above for all the s3_sync. options to include. Currently, the .s3_sync file does not allow separate environments.
+
 #### Dry Run
 
 You can perform a dry run to see what would be the result of a sync

data/lib/middleman-s3_sync/extension.rb

@@ -25,6 +25,7 @@ module Middleman
     option :dry_run, false, 'Whether to perform a dry-run'
     option :index_document, nil, 'S3 custom index document path'
     option :error_document, nil, 'S3 custom error document path'
+    option :content_types, {}, 'Custom content types'
 
     expose_to_config :s3_sync_options, :default_caching_policy, :caching_policy
 

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "4.0.2"
+    VERSION = "4.0.3"
   end
 end

data/spec/caching_policy_spec.rb

@@ -7,59 +7,59 @@ describe Middleman::S3Sync::BrowserCachePolicy do
     subject(:policy) { Middleman::S3Sync::BrowserCachePolicy.new(options) }
 
     it "should be blank" do
-      policy.should_not be_nil
-
-      policy.to_s.should_not =~ /max-age=/
-      policy.to_s.should_not =~ /s-maxage=/
-      policy.to_s.should_not =~ /public/
-      policy.to_s.should_not =~ /private/
-      policy.to_s.should_not =~ /no-cache/
-      policy.to_s.should_not =~ /no-store/
-      policy.to_s.should_not =~ /must-revalidate/
-      policy.to_s.should_not =~ /proxy-revalidate/
-      policy.expires.should be_nil
+      expect(policy).to_not eq nil
+
+      expect(policy.to_s).to_not match /max-age=/
+      expect(policy.to_s).to_not match /s-maxage=/
+      expect(policy.to_s).to_not match /public/
+      expect(policy.to_s).to_not match /private/
+      expect(policy.to_s).to_not match /no-cache/
+      expect(policy.to_s).to_not match /no-store/
+      expect(policy.to_s).to_not match /must-revalidate/
+      expect(policy.to_s).to_not match /proxy-revalidate/
+      expect(policy.expires).to eq nil
     end
 
     context "setting max-age" do
       let(:options) { { max_age: 300 } }
 
-      its(:to_s) { should =~ /max-age=300/ }
+      its(:to_s) { is_expected.to match /max-age=300/ }
     end
 
     context "setting s-maxage" do
       let(:options) { { s_maxage: 300 } }
 
-      its(:to_s) { should =~ /s-maxage=300/ }
+      its(:to_s) { is_expected.to match /s-maxage=300/ }
     end
 
     context "set public flag" do
       let(:options) { { public: true } }
-      its(:to_s) { should =~ /public/ }
+      its(:to_s) { is_expected.to match /public/ }
     end
 
     context "it should set the private flag if it is set to true" do
       let(:options) { { private: true } }
-      its(:to_s) { should =~ /private/ }
+      its(:to_s) { is_expected.to match /private/ }
     end
 
     context "it should set the no-cache flag when set property" do
       let(:options) { { no_cache: true }}
-      its(:to_s) { should =~ /no-cache/ }
+      its(:to_s) { is_expected.to match /no-cache/ }
     end
 
     context "setting the no-store flag" do
       let(:options) { { no_store: true } }
-      its(:to_s) { should =~ /no-store/ }
+      its(:to_s) { is_expected.to match /no-store/ }
     end
 
     context "setting the must-revalidate policy" do
       let(:options) { { must_revalidate: true } }
-      its(:to_s) { should =~ /must-revalidate/ }
+      its(:to_s) { is_expected.to match /must-revalidate/ }
     end
 
     context "setting the proxy-revalidate policy" do
       let(:options) { { proxy_revalidate: true } }
-      its(:to_s) { should =~ /proxy-revalidate/ }
+      its(:to_s) { is_expected.to match /proxy-revalidate/ }
     end
 
     context "divide caching policiies with a comma and a space" do
@@ -67,16 +67,16 @@ describe Middleman::S3Sync::BrowserCachePolicy do
 
       it "splits policies eith commans and spaces" do
         policies = policy.to_s.split(/, /)
-        policies.length.should == 2
-        policies.first.should == 'max-age=300'
-        policies.last.should == 'public'
+        expect(policies.length).to eq 2
+        expect(policies.first).to eq 'max-age=300'
+        expect(policies.last).to eq 'public'
       end
     end
 
     context "set the expiration date" do
       let(:options) { { expires: 1.years.from_now } }
 
-      its(:expires) { should == CGI.rfc1123_date(1.year.from_now )}
+      its(:expires) { is_expected.to eq CGI.rfc1123_date(1.year.from_now )}
     end
   end
 end
@@ -92,7 +92,7 @@ describe "Storing and retrieving policies" do
   it "finds the policies by the mime-type excluding the parameters" do
     caching_policy.add_caching_policy("text/html", max_age: 300)
 
-    expect(policy).to_not be_nil
+    expect(policy).to_not eq nil
     expect(policy.policies.max_age).to eq(300)
   end
 end
@@ -107,14 +107,14 @@ describe "Handling situations where the content type is nil" do
   it "returns the default caching policy when the content type is nil" do
     caching_policy.add_caching_policy(:default, max_age:(60 * 60 * 24 * 365))
 
-    expect(caching_policy.caching_policy_for(nil)).to_not be_nil
+    expect(caching_policy.caching_policy_for(nil)).to_not eq nil
     expect(caching_policy.caching_policy_for(nil).policies[:max_age]).to eq(60 * 60 * 24 * 365)
   end
 
   it "returns the default caching policy when the content type is blank" do
     caching_policy.add_caching_policy(:default, max_age:(60 * 60 * 24 * 365))
 
-    expect(caching_policy.caching_policy_for("")).to_not be_nil
+    expect(caching_policy.caching_policy_for("")).to_not eq nil
     expect(caching_policy.caching_policy_for("").policies[:max_age]).to eq(60 * 60 * 24 * 365)
   end
 end

data/spec/resource_spec.rb

@@ -25,7 +25,7 @@ describe Middleman::S3Sync::Resource do
         allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(true)
       end
 
-      its(:status) { should eq :new }
+      its(:status) { is_expected.to eq :new }
 
       it "does not have a remote equivalent" do
         expect(resource).not_to be_remote
@@ -35,9 +35,9 @@ describe Middleman::S3Sync::Resource 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' }
+      its(:path) { is_expected.to eq 'path/to/resource.html'}
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html' }
+      its(:remote_path) { is_expected.to eq 'path/to/resource.html' }
     end
 
     context "with a prefix set" do
@@ -54,9 +54,9 @@ describe Middleman::S3Sync::Resource 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' }
+      its(:path) { is_expected.to eq 'path/to/resource.html' }
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html' }
+      its(:remote_path) { is_expected.to eq 'bob/path/to/resource.html' }
     end
 
     context "gzipped" do
@@ -73,9 +73,9 @@ describe Middleman::S3Sync::Resource 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' }
+      its(:path) { is_expected.to eq 'path/to/resource.html' }
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html.gz' }
+      its(:remote_path) { is_expected.to eq 'path/to/resource.html' }
     end
   end
 
@@ -98,7 +98,7 @@ describe Middleman::S3Sync::Resource do
         allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(false)
       end
 
-      its(:status) { should eq :deleted }
+      its(:status) { is_expected.to eq :deleted }
       it "does not have a remote equivalent" do
         expect(resource).to be_remote
       end
@@ -107,9 +107,9 @@ describe Middleman::S3Sync::Resource 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' }
+      its(:path) { is_expected.to eq 'path/to/resource.html'}
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html' }
+      its(:remote_path) { is_expected.to eq 'path/to/resource.html' }
     end
 
     context "with a prefix set" do
@@ -119,7 +119,7 @@ describe Middleman::S3Sync::Resource do
         options.prefix = "bob"
       end
 
-      its(:status) { should eq :deleted }
+      its(:status) { is_expected.to eq :deleted }
       it "does not have a remote equivalent" do
         expect(resource).to be_remote
       end
@@ -128,9 +128,9 @@ describe Middleman::S3Sync::Resource 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' }
+      its(:path) { is_expected.to eq 'path/to/resource.html' }
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html' }
+      its(:remote_path) { is_expected.to eq 'bob/path/to/resource.html' }
     end
 
     context "gzipped" do
@@ -140,7 +140,7 @@ describe Middleman::S3Sync::Resource do
         options.prefer_gzip = true
       end
 
-      its(:status) { should eq :deleted }
+      its(:status) { is_expected.to eq :deleted }
       it "does not have a remote equivalent" do
         expect(resource).to be_remote
       end
@@ -149,9 +149,9 @@ describe Middleman::S3Sync::Resource 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' }
+      its(:path) { is_expected.to eq 'path/to/resource.html' }
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html' }
+      its(:remote_path) { is_expected.to 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: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -299,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tries really, really hard not to push files to S3.