middleman-cdn 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1126fd1f909909f010c506e2239341214a4ef80
-  data.tar.gz: 6ee82a56f22971322621659548ff8430e9259f8a
+  metadata.gz: 4aa1ea493606bab17daddd55eafc4a092b3e36ae
+  data.tar.gz: c1bd19c00e6049f9c0061be48fceb9837d1b91e7
 SHA512:
-  metadata.gz: 9dbf7a85e93f6ed5caba2d3264379114fd318d04449c2b2487127095ee8ab0534ff767e39a7a6d5c7c745341a684093b3ea4b4daa4a96d33dd4f9be947b2f2cf
-  data.tar.gz: 2540c95e40446f4ac123da08e4929df6e2926481ff287c402824a4f8177256b7df42241f68f5ae29a82e1f8bc788d45a4164e6273a39f790f95ab01e4b57850e
+  metadata.gz: fe34df0d332ba27dabd93aa024cc83d7fa62e3b1ed07384266b4c88c29f4d561ce72d2580b57da4bd08d79469c0a6b2a20ce577cafc345954ab2372a43c51928
+  data.tar.gz: 4855e0686dc2541e467ac27484e6f19daac2a4b3f3c24ef8d57c6a156160190226bfe2203f8261a59faa08b28a77177d802b14c0478c99013c5e97e925f9e205

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

@@ -19,34 +19,45 @@ module Middleman
         }
       end
 
-      def invalidate(options, files)
+      def invalidate(options, files, all: false)
         options[:client_api_key] ||= ENV['CLOUDFLARE_CLIENT_API_KEY']
         options[:email] ||= ENV['CLOUDFLARE_EMAIL']
 
         [:client_api_key, :email, :zone, :base_urls].each do |key|
           if options[key].blank?
-            say_status("Error: Configuration key cloudflare[:#{key}] is missing.".light_red)
+            say_status("Error: Configuration key cloudflare[:#{key}] is missing.".red)
             raise
           end
         end
 
         options[:base_urls] = [options[:base_urls]] if options[:base_urls].is_a?(String)
         if !options[:base_urls].is_a?(Array)
-          say_status("Error: Configuration key cloudflare[:base_urls] must be an array and contain at least one base url.".light_red)
+          say_status("Error: Configuration key cloudflare[:base_urls] must be an array and contain at least one base url.".red)
           raise
         end
 
         cloudflare = ::CloudFlare::connection(options[:client_api_key], options[:email])
-        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(", " + "error: #{e.message}".light_red, header: false)
-            else
-              say_status("✔".light_green, header: false)
+        if all
+          begin
+            say_status("Invalidating zone #{options[:zone]}... ", newline: false)
+            cloudflare.fpurge_ts(options[:zone])
+          rescue => e
+            say_status(", " + "error: #{e.message}".red, header: false)
+          else
+            say_status("✔".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(", " + "error: #{e.message}".red, header: false)
+              else
+                say_status("✔".green, header: false)
+              end
             end
           end
         end

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

@@ -19,12 +19,12 @@ module Middleman
         }
       end
 
-      def invalidate(options, files)
+      def invalidate(options, files, all: false)
         options[:access_key_id] ||= ENV['AWS_ACCESS_KEY_ID']
         options[:secret_access_key] ||= ENV['AWS_SECRET_ACCESS_KEY']
         [:access_key_id, :secret_access_key, :distribution_id].each do |key|
           if options[key].blank?
-            say_status("Error: Configuration key cloudfront[:base_urls] is missing.".light_red)
+            say_status("Error: Configuration key cloudfront[:base_urls] is missing.".red)
             raise
           end
         end
@@ -44,7 +44,7 @@ module Middleman
             say_status("Invalidation status is #{invalidation.status}. Expected 'InProgress'.".red.bold, header: false)
             raise
           end
-          say_status("✔".light_green, header: false)
+          say_status("✔".green, header: false)
         else
           slices = files.each_slice(INVALIDATION_LIMIT)
           say_status("Invalidating #{files.count} files in #{slices.count} batch(es) ")
@@ -52,7 +52,7 @@ module Middleman
             say_status("Invalidating batch #{i + 1}... ", newline: false)
             invalidation = distribution.invalidations.create(:paths => slice)
             invalidation.wait_for { ready? } unless i == slices.count - 1
-            say_status("✔".light_green, header: false)
+            say_status("✔".green, header: false)
           end
         end
         say_status("It might take 10 to 15 minutes until all files are invalidated.")

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

@@ -17,19 +17,19 @@ module Middleman
         }
       end
 
-      def invalidate(options, files)
+      def invalidate(options, files, all: false)
         options[:api_key] ||= ENV['FASTLY_API_KEY']
 
         [:api_key, :base_urls].each do |key|
           if options[key].blank?
-            say_status("Error: Configuration key fastly[:#{key}] is missing.".light_red)
+            say_status("Error: Configuration key fastly[:#{key}] is missing.".red)
             raise
           end
         end
 
         options[:base_urls] = [options[:base_urls]] if options[:base_urls].is_a?(String)
         if !options[:base_urls].is_a?(Array)
-          say_status("Error: Configuration key fastly[:base_urls] must be an array and contain at least one base url.".light_red)
+          say_status("Error: Configuration key fastly[:base_urls] must be an array and contain at least one base url.".red)
           raise
         end
 
@@ -44,9 +44,9 @@ module Middleman
               say_status("Invalidating #{url}... ", newline: false)
               fastly.purge("#{base_url}#{file}")
             rescue => e
-              say_status(", " + "error: #{e.message}".light_red, header: false)
+              say_status(", " + "error: #{e.message}".red, header: false)
             else
-              say_status("✔".light_green, header: false)
+              say_status("✔".green, header: false)
             end
           end
         end

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

@@ -19,14 +19,14 @@ module Middleman
         }
       end
 
-      def invalidate(options, files)
+      def invalidate(options, files, all: false)
         options[:alias] ||= ENV['MAXCDN_ALIAS']
         options[:consumer_key] ||= ENV['MAXCDN_CONSUMER_KEY']
         options[:consumer_secret] ||= ENV['MAXCDN_CONSUMER_SECRET']
 
         [:alias, :consumer_key, :consumer_secret, :zone_id].each do |key|
           if options[key].blank?
-            say_status("Error: Configuration key maxcdn[:#{key}] is missing.".light_red)
+            say_status("Error: Configuration key maxcdn[:#{key}] is missing.".red)
             raise
           end
         end
@@ -37,9 +37,9 @@ module Middleman
           say_status("Invalidating #{files.count} files...", newline: false)
           maxcdn.purge(options[:zone_id], files)
         rescue => e
-          say_status(", " + "error: #{e.message}".light_red, header: false)
+          say_status(", " + "error: #{e.message}".red, header: false)
         else
-          say_status("✔".light_green, header: false)
+          say_status("✔".green, header: false)
         end
       end
     end

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

@@ -22,13 +22,13 @@ module Middleman
         }
       end
 
-      def invalidate(options, files)
+      def invalidate(options, files, all: false)
         options[:username] ||= ENV['RACKSPACE_USERNAME']
         options[:api_key] ||= ENV['RACKSPACE_API_KEY']
 
         [:username, :api_key, :region, :container].each do |key|
           if options[key].blank?
-            say_status("Error: Configuration key rackspace[:#{key}] is missing.".light_red)
+            say_status("Error: Configuration key rackspace[:#{key}] is missing.".red)
             raise
           end
         end
@@ -54,9 +54,9 @@ module Middleman
           say_status("Invalidating #{file}...", newline: false)
           rackspace_client.invalidate(region, container, file, notification_email: notification_email)
         rescue => e
-          say_status(" error: #{e.message}".light_red, header: false)
+          say_status(" error: #{e.message}".red, header: false)
         else
-          say_status("✔".light_green, header: false)
+          say_status("✔".green, header: false)
         end
       end
     end

data/lib/middleman-cdn/commands.rb

@@ -28,7 +28,7 @@ module Middleman
           if options.nil?
             app_instance = ::Middleman::Application.server.inst
             unless app_instance.respond_to?(:cdn_options)
-              self.class.say_status(nil, "Error: You need to activate the cdn extension in config.rb.\n#{example_configuration}".light_red)
+              self.class.say_status(nil, "Error: You need to activate the cdn extension in config.rb.\n#{example_configuration}".red)
               raise
             end
             options = app_instance.cdn_options
@@ -36,18 +36,20 @@ module Middleman
           options.filter ||= /.*/
 
           if cdns.all? { |cdn| options.public_send(cdn.key.to_sym).nil? }
-            self.class.say_status(nil, "Error: You must specify a config for one of the supported CDNs.\n#{example_configuration}".light_red)
+            self.class.say_status(nil, "Error: You must specify a config for one of the supported CDNs.\n#{example_configuration}".red)
             raise
           end
 
           files = list_files(options.filter)
-          self.class.say_status(nil, "Invalidating #{files.count} files with filter: " + "#{options.filter.source}".magenta.bold)
+          self.class.say_status(nil, "Invalidating #{files.count} files with filter: " + "#{options.filter.source}")
           files.each { |file| self.class.say_status(nil, " • #{file}") }
           return if files.empty?
 
+          invalidate_all = does_filter_match_all(options.filter)
+
           cdns_keyed.each do |cdn_key, cdn|
             cdn_options = options.public_send(cdn_key.to_sym)
-            cdn.new.invalidate(cdn_options, files) unless cdn_options.nil?
+            cdn.new.invalidate(cdn_options, files, all: invalidate_all) unless cdn_options.nil?
           end
         rescue SystemExit, Interrupt
           self.class.say_status(nil, nil, header: false)
@@ -56,7 +58,7 @@ module Middleman
 
       def self.say_status(cdn, status, newline: true, header: true, wait_enter: false)
         message = ""
-        message << "#{:cdn.to_s.rjust(12).light_green.bold}  #{cdn.try(:yellow).try(:bold)}" if header
+        message << "#{:cdn.to_s.rjust(12).green}  #{cdn.try(:yellow)}" if header
         message << " " if header && cdn
         message << status if status
         print message
@@ -92,6 +94,10 @@ end
         TEXT
       end
 
+      def does_filter_match_all(filter)
+        [".*", ".+"].include?(filter.source)
+      end
+
       def list_files(filter)
         Dir.chdir('build/') do
           Dir.glob('**/*', File::FNM_DOTMATCH).tap do |files|

data/lib/middleman-cdn/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module CDN
-    VERSION = '0.1.10'
+    VERSION = '0.1.11'
   end
 end

data/middleman-cdn.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'coveralls', '~> 0.7'
 
-  s.add_dependency 'middleman-core', '~> 3.0'
+  s.add_dependency 'middleman-core', '~> 3.3'
 end

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

@@ -73,6 +73,22 @@ describe Middleman::Cli::CloudFlareCDN do
         expect { subject.invalidate(options, files) }.to output(/✔/).to_stdout
       end
 
+      context "matches all files" 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: true)
+        end
+
+        it "should not invalidate individual files" do
+          expect(double_cloudflare).not_to receive(:zone_file_purge)
+          subject.invalidate(options, files, all: true)
+        end
+      end
+
       context "and errors occurs when purging" do
         before do
           allow(double_cloudflare).to receive(:zone_file_purge).and_raise(StandardError)

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

@@ -51,7 +51,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", "/"])
+          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_not receive(:invalidate)
           expect_any_instance_of(::Middleman::Cli::FastlyCDN).to_not receive(:invalidate)
           subject.cdn_invalidate(options)
@@ -69,9 +69,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", "/"])
-          expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to receive(:invalidate).with(options.cloudfront, ["/index.html", "/image.png", "/"])
-          expect_any_instance_of(::Middleman::Cli::FastlyCDN).to receive(:invalidate).with(options.fastly, ["/index.html", "/image.png", "/"])
+          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)
           subject.cdn_invalidate(options)
         end
       end
@@ -88,9 +88,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", "/"])
-        expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to receive(:invalidate).with(options.cloudfront, ["/index.html", "/"])
-        expect_any_instance_of(::Middleman::Cli::FastlyCDN).to receive(:invalidate).with(options.cloudfront, ["/index.html", "/"])
+        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)
         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.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 description: Invalidate a specific set of files in your CloudFlare or CloudFront cache
 email: 
 executables: []