middleman-cdn 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 316430650f5872061c138b58a8762b27a35550e2
-  data.tar.gz: c6899ae2f56b98123c61cac84d77fdb4f4f866d7
+  metadata.gz: f975832d615b4eadaa5cd9faeee9666f4ac7e28c
+  data.tar.gz: da8f4109334891f5baf7f5497fe8ac9c946512b8
 SHA512:
-  metadata.gz: 4961cbebfbe185e75ec74612a4a8992f88cbda4a4814a1577ab5fdc48c31c04f80ab58ad3ebd1cbb456a13553343ddbb88ae7909f31997d8828f9301e2d35e11
-  data.tar.gz: 3062f33bcad19b95088ffe2e161d7abd45994d62c1b0d9427f9e68532defa139367035c765d8f15f94a70d96890778e664a5faeea504d242159fa8f06ad92d03
+  metadata.gz: b59a7548cbb4fdfd2572bfe12c04bbf5bc85987b411d5a409a4f3329333975791fb2a1303703c97e13b6886d9a5b5ba91f6d5f40b86d302799609cdb2e656ff7
+  data.tar.gz: 744d1709675329e9494957f6ad43cf389c9117c2727225d0a41b888b7c9c3a021dfd9f871306defe01dad765a983a2827c1c33495ae1b22f25152673109098c8

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

@@ -39,29 +39,29 @@ module Middleman
           raise
         end
 
-        cloudflare = ::Cloudflare::connection(options[:client_api_key], options[:email])
+        cloudflare = ::Cloudflare::connect(key: options[:client_api_key], email: options[:email])
+        zone = cloudflare.zones.find_by_name(options[:zone])
         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])
+            say_status("Invalidating zone #{zone}... ", newline: false)
+            zone.purge_cache
           rescue => e
             say_status(", " + ANSI.red{ "error: #{e.message}" }, header: false)
           else
             say_status(ANSI.green{ "✔" }, header: false)
           end
         else
-          options[:base_urls].each do |base_url|
-            files.each do |file|
-              begin
-                url = "#{base_url}#{file}"
-                say_status("Invalidating #{url}... ", newline: false)
-                cloudflare.zone_file_purge(options[:zone], "#{base_url}#{file}")
-              rescue => e
-                say_status(", " + ANSI.red{ "error: #{e.message}" }, header: false)
-              else
-                say_status(ANSI.green{ "✔" }, header: false)
-              end
+          begin
+            urls = options[:base_urls].map do |base_url|
+              files.map { |file| "#{base_url}#{file}" }
             end
+
+            say_status("Invalidating #{urls}... ", newline: false)
+            zone.purge_cache(files: urls.flatten)
+          rescue => e
+            say_status(", " + ANSI.red{ "error: #{e.message}" }, header: false)
+          else
+            say_status(ANSI.green{ "✔" }, header: false)
           end
         end
       end

data/lib/middleman-cdn/version.rb

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

data/middleman-cdn.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'fog-aws', '~> 1.4'
-  s.add_dependency 'cloudflare', '~> 3.0'
+  s.add_dependency 'cloudflare', '~> 3.2.1'
   s.add_dependency 'fastly', '~> 1.1'
   s.add_dependency 'maxcdn', '~> 0.1'
   s.add_dependency 'ansi', '~> 1.5'

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

@@ -2,31 +2,25 @@ 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")
+    expect(double_zone).to receive(:purge_cache).once.with(no_args)
     subject.invalidate(options, files, all: all)
   end
 
   it "should not invalidate individual files" do
-    expect(double_cloudflare).to_not receive(:zone_file_purge)
+    expect(double_zone).to_not receive(:purge_cache).with(files: file_urls)
     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)
+    expect(double_zone).to_not receive(:purge_cache).with(no_args)
     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
+    expect(double_zone).to receive(:purge_cache).once.ordered.with(files: file_urls)
     subject.invalidate(options, files, all: all)
   end
 end
@@ -47,15 +41,61 @@ describe Middleman::Cli::CloudFlareCDN do
     end
   end
 
+  describe "Cloudflare API" do
+    let(:options) do
+      {
+        key: '000000000000000000000',
+        email: 'test@example.com'
+      }
+    end
+
+    let(:cloudflare_module) { ::Cloudflare }
+    let(:cloudflare) { cloudflare_module.connect(options) }
+
+    it "should have #connect method" do
+      expect(cloudflare_module).to respond_to(:connect).with_keywords(:key, :email)
+    end
+
+    context 'zones' do
+      it "should have #zones method" do
+        expect(cloudflare).to respond_to(:zones)
+      end
+
+      it "should have #zones.find_by_name method" do
+        expect(cloudflare.zones).to respond_to(:find_by_name).with(1).argument
+      end
+    end
+
+    context 'zone' do
+      before(:each) do
+        allow(cloudflare_response).to receive(:result) { double }
+        allow_any_instance_of(zone_class).to receive(:get) { cloudflare_response }
+      end
+
+      let(:zone_class) { ::Cloudflare::Zone }
+      let(:zone) { zone_class.new('http://example.com') }
+      let(:cloudflare_response) { double }
+
+      it "should have #purge_cache method" do
+        expect(zone).to respond_to(:purge_cache)
+      end
+    end
+  end
+
   describe '#invalidate' do
     let(:double_cloudflare) { double("::Cloudflare") }
+    let(:double_zone) { double("::Cloudflare::Zone") }
 
     before do
-      allow(double_cloudflare).to receive(:zone_file_purge)
-      allow(::Cloudflare).to receive(:connection).and_return(double_cloudflare)
+      allow(double_zone).to receive(:purge_cache)
+      allow(::Cloudflare).to receive(:connect).and_return(double_cloudflare)
+      allow(double_cloudflare).to receive_message_chain('zones.find_by_name').and_return(double_zone)
     end
 
     let(:files) { (1..50).map { |i| "/test/file_#{i}.txt" } }
+    let(:http_file_urls) { files.map { |file| "http://example.com#{file}" } }
+    let(:https_file_urls) { files.map { |file| "https://example.com#{file}" } }
+    let(:file_urls) { http_file_urls.concat(https_file_urls) }
     let(:all) { false }
 
     context "all options provided" do
@@ -69,7 +109,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(:connect).with(key: "000000000000000000000", email: "test@example.com")
         subject.invalidate(options, files)
       end
 
@@ -99,9 +139,7 @@ describe Middleman::Cli::CloudFlareCDN do
         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
+          expect(double_zone).to receive(:purge_cache).once.with(files: file_urls)
           subject.invalidate(options, files)
         end
       end
@@ -142,7 +180,7 @@ describe Middleman::Cli::CloudFlareCDN do
 
       context "and errors occurs when purging" do
         before do
-          allow(double_cloudflare).to receive(:zone_file_purge).and_raise(StandardError)
+          allow(double_zone).to receive(:purge_cache).and_raise(StandardError)
         end
 
         it "should output saying error information" do
@@ -166,7 +204,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(:connect).with(key: "111111111111111111111", email: "test-env@example.com")
         subject.invalidate(options, files)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cdn
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: fastly
   requirement: !ruby/object:Gem::Requirement