middleman-cdn 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c8c316517f0c2673b971da4bfb0c637cb09b9a4
-  data.tar.gz: c68675ee11af145c82dd4e64a72135baa5522d0d
+  metadata.gz: 62d3fe98c429ea088be61b3ecd2d31287dff6eb7
+  data.tar.gz: b07a340fb289b103d506eceb007f6a0e5d8156c5
 SHA512:
-  metadata.gz: a490b5271e455b88f523cc937c58d7a55e29fdf0f0b321d5ad5ff24fd1913898268e7bc985e7b5904cc3bb2ca327c1adf501c6b5b630c7d2df8b5e94a59fac21
-  data.tar.gz: aea229478874d90b8f0c3526c557daada1066b581e9cd7b8c9f99b5c16170aed949f92fdba11eb9a956cf57b092cdfaa33936072fab5d8fa83da42382ae6f31f
+  metadata.gz: 4b07e0cceefa744a5dcbdb36a55ef35ccc994b01f37da02ee4c0447b761865772f0fd374c16faf857788e5d82d0f3f1236fc345c6d4c2e9a24c9adc042a47855
+  data.tar.gz: e1f798d993d882e51f27bb6ff964b0dafcd1311718c56509a30676772a9328b44f787020098ca5f92c3df7160f40eab8b18dbab91aa995dc45940912c3bca5eb

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.5
-  - 2.2.1
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3.0
+before_install:
+  - gem install bundler

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

@@ -6,6 +6,8 @@ module Middleman
   module Cli
 
     class CloudFlareCDN < BaseCDN
+      INVALIDATE_ZONE_THRESHOLD = 50
+
       def self.key
         "cloudflare"
       end
@@ -15,7 +17,8 @@ module Middleman
           client_api_key: ['"..."', "# default ENV['CLOUDFLARE_CLIENT_API_KEY']"],
           email: ['"..."', "# default ENV['CLOUDFLARE_EMAIL']"],
           zone: ['"..."', ""],
-          base_urls: [['http://example.com', 'https://example.com'], ""]
+          base_urls: [['http://example.com', 'https://example.com'], ""],
+          invalidate_zone_for_many_files: [true, "# default true"]
         }
       end
 
@@ -37,7 +40,7 @@ module Middleman
         end
 
         cloudflare = ::CloudFlare::connection(options[:client_api_key], options[:email])
-        if all
+        if all || (options[:invalidate_zone_for_many_files] && files.count > INVALIDATE_ZONE_THRESHOLD)
           begin
             say_status("Invalidating zone #{options[:zone]}... ", newline: false)
             cloudflare.fpurge_ts(options[:zone])

data/lib/middleman-cdn/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module CDN
-    VERSION = '0.1.14'
+    VERSION = '0.1.15'
   end
 end

data/middleman-cdn.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.version     = Middleman::CDN::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Leigh McCulloch"]
+  s.licenses    = ["MIT"]
   s.homepage    = "https://github.com/leighmcculloch/middleman-cdn"
   s.summary     = %q{Invalidate CloudFlare or CloudFront cache after deployment}
   s.description = %q{Invalidate a specific set of files in your CloudFlare or CloudFront cache}

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

@@ -2,6 +2,36 @@
 require 'spec_helper'
 require 'lib/middleman-cdn/cdns/base_protocol'
 
+shared_examples "invalidating the entire zone" do
+  before do
+    allow(double_cloudflare).to receive(:fpurge_ts)
+  end
+
+  it "should invalidate the entire zone" do
+    expect(double_cloudflare).to receive(:fpurge_ts).once.with("example.com")
+    subject.invalidate(options, files, all: all)
+  end
+
+  it "should not invalidate individual files" do
+    expect(double_cloudflare).to_not receive(:zone_file_purge)
+    subject.invalidate(options, files, all: all)
+  end
+end
+
+shared_examples "invalidating individual files" do
+  it "should not invalidate the entire zone" do
+    expect(double_cloudflare).to_not receive(:fpurge_ts)
+    subject.invalidate(options, files, all: all)
+  end
+
+  it "should invalidate individual files" do
+    files.each do |file|
+      expect(double_cloudflare).to receive(:zone_file_purge).once.ordered.with("example.com", "http://example.com#{file}")
+    end
+    subject.invalidate(options, files, all: all)
+  end
+end
+
 describe Middleman::Cli::CloudFlareCDN do
   it_behaves_like "BaseCDN"
 
@@ -13,7 +43,7 @@ describe Middleman::Cli::CloudFlareCDN do
 
   describe '.example_configuration_elements' do
     it "should contain these keys" do
-      required_keys = [:client_api_key, :email, :zone, :base_urls]
+      required_keys = [:client_api_key, :email, :zone, :base_urls, :invalidate_zone_for_many_files]
       expect(described_class.example_configuration_elements.keys).to eq(required_keys)
     end
   end
@@ -26,7 +56,8 @@ describe Middleman::Cli::CloudFlareCDN do
       allow(::CloudFlare).to receive(:connection).and_return(double_cloudflare)
     end
 
-    let(:files) { [ "/index.html", "/", "/test/index.html", "/test/image.png" ] }
+    let(:files) { (1..50).map { |i| "/test/file_#{i}.txt" } }
+    let(:all) { false }
 
     context "all options provided" do
       let(:options) do
@@ -47,18 +78,6 @@ describe Middleman::Cli::CloudFlareCDN do
         subject.invalidate(options, files)
       end
 
-      it "should call cloudflare to purge each file for each base url" do
-        expect(double_cloudflare).to receive(:zone_file_purge).once.ordered.with("example.com", "http://example.com/index.html")
-        expect(double_cloudflare).to receive(:zone_file_purge).once.ordered.with("example.com", "http://example.com/")
-        expect(double_cloudflare).to receive(:zone_file_purge).once.ordered.with("example.com", "http://example.com/test/index.html")
-        expect(double_cloudflare).to receive(:zone_file_purge).once.ordered.with("example.com", "http://example.com/test/image.png")
-        expect(double_cloudflare).to receive(:zone_file_purge).once.ordered.with("example.com", "https://example.com/index.html")
-        expect(double_cloudflare).to receive(:zone_file_purge).once.ordered.with("example.com", "https://example.com/")
-        expect(double_cloudflare).to receive(:zone_file_purge).once.ordered.with("example.com", "https://example.com/test/index.html")
-        expect(double_cloudflare).to receive(:zone_file_purge).once.ordered.with("example.com", "https://example.com/test/image.png")
-        subject.invalidate(options, files)
-      end
-
       it "should output saying invalidating each file checkmarks" do
         files_escaped = files.map { |file| Regexp.escape(file) }
         expect { subject.invalidate(options, files) }.to output(/#{files_escaped.join(".+")}/m).to_stdout
@@ -73,22 +92,47 @@ describe Middleman::Cli::CloudFlareCDN do
         expect { subject.invalidate(options, files) }.to output(/✔/).to_stdout
       end
 
-      context "matches all files" do
+      context "max 50 files to invalidate" do
+        before do
+          expect(files.count).to be <= 50
+        end
+
+        it_behaves_like "invalidating individual files"
+
+        it "should call cloudflare to purge each file for each base url" do
+          files.each do |file|
+            expect(double_cloudflare).to receive(:zone_file_purge).once.ordered.with("example.com", "http://example.com#{file}")
+          end
+          subject.invalidate(options, files)
+        end
+      end
+
+      context "more than 50 files to invalidate" do
+        let(:files) { super() + ["/index.html"] }
+
         before do
-          allow(double_cloudflare).to receive(:fpurge_ts)
+          expect(files.count).to be > 50
         end
 
-        it "should invalidate the entire zone" do
-          expect(double_cloudflare).to receive(:fpurge_ts).once.with("example.com")
-          subject.invalidate(options, files, all: true)
+        context "invalidate_zone_for_many_files is set to true" do
+          let(:options) { super().merge(invalidate_zone_for_many_files: true) }
+
+          it_behaves_like "invalidating the entire zone"
         end
 
-        it "should not invalidate individual files" do
-          expect(double_cloudflare).not_to receive(:zone_file_purge)
-          subject.invalidate(options, files, all: true)
+        context "invalidate_zone_for_many_files is set to false" do
+          let(:options) { super().merge(invalidate_zone_for_many_files: false) }
+
+          it_behaves_like "invalidating individual files"
         end
       end
 
+      context "matching all files" do
+        let(:all) { true }
+
+        it_behaves_like "invalidating the entire zone"
+      end
+
       context "and errors occurs when purging" do
         before do
           allow(double_cloudflare).to receive(:zone_file_purge).and_raise(StandardError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cdn
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -201,7 +201,8 @@ files:
 - spec/lib/middleman-cdn/commands_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/leighmcculloch/middleman-cdn
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Invalidate CloudFlare or CloudFront cache after deployment