middleman-cdn 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5860904ab2debb540a10ca58350b9056f6c0965b
-  data.tar.gz: f9ebbf66b7dee0110c6e5237173ae3e7cb3505dc
+  metadata.gz: 316430650f5872061c138b58a8762b27a35550e2
+  data.tar.gz: c6899ae2f56b98123c61cac84d77fdb4f4f866d7
 SHA512:
-  metadata.gz: 283c474a8208767535c5e84bf8077fd816b59c6a763e68fa1d69570d92973a2dc181d96b701e6ba0fe221bf56af7e541f24741c0a93da11308c6f8265fed5770
-  data.tar.gz: '09ab79b11af6b85e6b3e17bca97e8df72995342d5be81622193fd161b031637c34a77c09f9dc834f2ce8e726c58b29b88bc97dd6a28ba597368ed464fc1f0b35'
+  metadata.gz: 4961cbebfbe185e75ec74612a4a8992f88cbda4a4814a1577ab5fdc48c31c04f80ab58ad3ebd1cbb456a13553343ddbb88ae7909f31997d8828f9301e2d35e11
+  data.tar.gz: 3062f33bcad19b95088ffe2e161d7abd45994d62c1b0d9427f9e68532defa139367035c765d8f15f94a70d96890778e664a5faeea504d242159fa8f06ad92d03

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.2
+  - 2.3
+  - 2.4
 before_install:
   - gem update --system
   - gem install bundler
@@ -15,7 +15,3 @@ gemfile:
   - gemfiles/middleman_4.1.gemfile
   - gemfiles/middleman_4.2.gemfile
   - gemfiles/middleman_master.gemfile
-matrix:
-  allow_failures:
-    - rvm: 2.4.0
-      gemfile: gemfiles/middleman_4.1.gemfile

data/README.md

@@ -94,8 +94,10 @@ It's better to always invalidate only the files you need. If you're using
 generate fingerprinted CSS, JS and images, then you should never need to
 invalidate them.
 
-Note: Directories containing `index.html` files are automatically included
-when their respective `index.html` is included in the filter.
+Note: Directories containing `index.html` files are automatically included when
+their respective `index.html` is included in the filter. Both the slashed and
+non-slashed version of the directory are invalidated. e.g. The file
+`/blog/index.html` will also invalidate `/blog/` and `/blog`.
 
 Alternatively: If you're using `middleman-s3_sync` you can hook middleman-cdn into 
 it's build process. See the [instructions here](#invalidating-with-middleman-s3_sync).

data/lib/middleman-cdn/cdns/cloudflare.rb

@@ -39,7 +39,7 @@ module Middleman
           raise
         end
 
-        cloudflare = ::CloudFlare::connection(options[:client_api_key], options[:email])
+        cloudflare = ::Cloudflare::connection(options[:client_api_key], options[:email])
         if all || (options[:invalidate_zone_for_many_files] && files.count > INVALIDATE_ZONE_THRESHOLD)
           begin
             say_status("Invalidating zone #{options[:zone]}... ", newline: false)

data/lib/middleman-cdn/commands.rb

@@ -119,15 +119,24 @@ end
       end
 
       def normalize_files(files)
+        normalized_files = []
+
         # Add directories of index.html files since they have to be
         # invalidated as well if :directory_indexes is active
         files.each do |file|
+          normalized_files << file
+
+          # For /dir/index.html add /dir/
           file_dir = file.sub(/\bindex\.html\z/, '')
-          files << file_dir if file_dir != file
+          normalized_files << file_dir if file_dir != file
+
+          # For /dir/index.html add /dir
+          file_dir_no_slash = file.sub(/\/index\.html\z/, '')
+          normalized_files << file_dir_no_slash if file_dir_no_slash != file
         end
 
         # Add leading slash
-        files.map! { |f| f.start_with?('/') ? f : "/#{f}" }
+        normalized_files.map { |f| f.start_with?('/') ? f : "/#{f}" }
       end
 
       Base.register(self, 'cdn_invalidate', 'cdn_invalidate [options]', 'Invalidate CDN')

data/lib/middleman-cdn/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module CDN
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/middleman-cdn.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'fog-aws', '~> 1.4'
-  s.add_dependency 'cloudflare', '~> 2.0'
+  s.add_dependency 'cloudflare', '~> 3.0'
   s.add_dependency 'fastly', '~> 1.1'
   s.add_dependency 'maxcdn', '~> 0.1'
   s.add_dependency 'ansi', '~> 1.5'
-  s.add_dependency 'activesupport', '~> 4.1'
+  s.add_dependency 'activesupport', '>= 4.1'
   s.add_dependency 'httparty', '~> 0.13'
 
   s.add_development_dependency 'rake', '~> 0.9'
@@ -29,5 +29,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coveralls', '~> 0.7'
   s.add_development_dependency 'appraisal', '~> 2.1'
 
-  s.add_dependency 'middleman', '>= 3.3'
+  s.add_dependency 'middleman', '>= 3.2'
 end

data/spec/lib/middleman-cdn/cdns/cloudflare_spec.rb

@@ -52,7 +52,7 @@ describe Middleman::Cli::CloudFlareCDN do
 
     before do
       allow(double_cloudflare).to receive(:zone_file_purge)
-      allow(::CloudFlare).to receive(:connection).and_return(double_cloudflare)
+      allow(::Cloudflare).to receive(:connection).and_return(double_cloudflare)
     end
 
     let(:files) { (1..50).map { |i| "/test/file_#{i}.txt" } }
@@ -69,7 +69,7 @@ describe Middleman::Cli::CloudFlareCDN do
       end
 
       it "should connect to cloudflare with credentails" do
-        expect(::CloudFlare).to receive(:connection).with("000000000000000000000", "test@example.com")
+        expect(::Cloudflare).to receive(:connection).with("000000000000000000000", "test@example.com")
         subject.invalidate(options, files)
       end
 
@@ -166,7 +166,7 @@ describe Middleman::Cli::CloudFlareCDN do
       end
 
       it "should connect to cloudflare with environment variable credentails" do
-        expect(::CloudFlare).to receive(:connection).with("111111111111111111111", "test-env@example.com")
+        expect(::Cloudflare).to receive(:connection).with("111111111111111111111", "test-env@example.com")
         subject.invalidate(options, files)
       end
 

data/spec/lib/middleman-cdn/commands_spec.rb

@@ -26,8 +26,9 @@ describe Middleman::Cli::CDN do
   describe '#cdn_invalidate' do
     before do
       allow(Dir).to receive(:chdir).with(anything) { |path, &block| block.call }
-      allow(Dir).to receive(:glob).with('**/*', File::FNM_DOTMATCH).and_return([".", "index.html", "image.png"])
+      allow(Dir).to receive(:glob).with('**/*', File::FNM_DOTMATCH).and_return([".", "index.html", "image.png", "blog/index.html"])
       allow(File).to receive(:directory?).with(".").and_return(true)
+      allow(File).to receive(:directory?).with("blog/index.html").and_return(false)
       allow(File).to receive(:directory?).with("index.html").and_return(false)
       allow(File).to receive(:directory?).with("image.png").and_return(false)
     end
@@ -57,7 +58,7 @@ describe Middleman::Cli::CDN do
         end
 
         it "should invalidate the files with only cloudflare" do
-          expect_any_instance_of(::Middleman::Cli::CloudFlareCDN).to receive(:invalidate).with(options.cloudflare, ["/index.html", "/image.png", "/"], all: true)
+          expect_any_instance_of(::Middleman::Cli::CloudFlareCDN).to receive(:invalidate).with(options.cloudflare, ["/index.html", "/", "/image.png", "/blog/index.html", "/blog/", "/blog"], all: true)
           expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to_not receive(:invalidate)
           expect_any_instance_of(::Middleman::Cli::FastlyCDN).to_not receive(:invalidate)
           subject.cdn_invalidate(options)
@@ -75,9 +76,9 @@ describe Middleman::Cli::CDN do
         end
 
         it "should invalidate the files with all cdns" do
-          expect_any_instance_of(::Middleman::Cli::CloudFlareCDN).to receive(:invalidate).with(options.cloudflare, ["/index.html", "/image.png", "/"], all: true)
-          expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to receive(:invalidate).with(options.cloudfront, ["/index.html", "/image.png", "/"], all: true)
-          expect_any_instance_of(::Middleman::Cli::FastlyCDN).to receive(:invalidate).with(options.fastly, ["/index.html", "/image.png", "/"], all: true)
+          expect_any_instance_of(::Middleman::Cli::CloudFlareCDN).to receive(:invalidate).with(options.cloudflare, ["/index.html", "/", "/image.png", "/blog/index.html", "/blog/", "/blog"], all: true)
+          expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to receive(:invalidate).with(options.cloudfront, ["/index.html", "/", "/image.png", "/blog/index.html", "/blog/", "/blog"], all: true)
+          expect_any_instance_of(::Middleman::Cli::FastlyCDN).to receive(:invalidate).with(options.fastly, ["/index.html", "/",  "/image.png", "/blog/index.html", "/blog/", "/blog"], all: true)
           subject.cdn_invalidate(options)
         end
       end
@@ -94,9 +95,9 @@ describe Middleman::Cli::CDN do
       end
 
       it "should invalidate the files with all cdns" do
-        expect_any_instance_of(::Middleman::Cli::CloudFlareCDN).to receive(:invalidate).with(options.cloudflare, ["/index.html", "/"], all: false)
-        expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to receive(:invalidate).with(options.cloudfront, ["/index.html", "/"], all: false)
-        expect_any_instance_of(::Middleman::Cli::FastlyCDN).to receive(:invalidate).with(options.cloudfront, ["/index.html", "/"], all: false)
+        expect_any_instance_of(::Middleman::Cli::CloudFlareCDN).to receive(:invalidate).with(options.cloudflare, ["/index.html", "/", "/blog/index.html", "/blog/", "/blog"], all: false)
+        expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to receive(:invalidate).with(options.cloudfront, ["/index.html", "/", "/blog/index.html", "/blog/", "/blog"], all: false)
+        expect_any_instance_of(::Middleman::Cli::FastlyCDN).to receive(:invalidate).with(options.cloudfront, ["/index.html", "/", "/blog/index.html", "/blog/", "/blog"], all: false)
         subject.cdn_invalidate(options)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cdn
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-30 00:00:00.000000000 Z
+date: 2018-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fastly
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.2'
 description: Invalidate a specific set of files in your CloudFlare, AWS CloudFront,
   Rackspace, Fastly, or MaxCDN cache
 email: 
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Invalidate CloudFlare, AWS CloudFront, Rackspace, Fastly, or MaxCDN cache