middleman-cdn 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa1ea493606bab17daddd55eafc4a092b3e36ae
-  data.tar.gz: c1bd19c00e6049f9c0061be48fceb9837d1b91e7
+  metadata.gz: 8550558e8e045e9d7f82f7b54b44a8a41dca5077
+  data.tar.gz: bbf9bf9ee078a2f6ed00edf5e5461abf3ff183aa
 SHA512:
-  metadata.gz: fe34df0d332ba27dabd93aa024cc83d7fa62e3b1ed07384266b4c88c29f4d561ce72d2580b57da4bd08d79469c0a6b2a20ce577cafc345954ab2372a43c51928
-  data.tar.gz: 4855e0686dc2541e467ac27484e6f19daac2a4b3f3c24ef8d57c6a156160190226bfe2203f8261a59faa08b28a77177d802b14c0478c99013c5e97e925f9e205
+  metadata.gz: 459ed7ed549ffead8d05e497d2b1036d48416efaf5cce161fa8ed51ce773a6ad4a69711c51aecfb26649fb4efad7c66183113008f51ca365f7ea32476231ccc0
+  data.tar.gz: dcef7018c3c2141b8f36baae317272931b250886c3d17ffbbfc07d7be2102f72971f251db38503d972372c3965417af3ac42448794f97a332bcf5f3f72de6791

data/README.md

@@ -1,4 +1,6 @@
 # Middleman CDN
+
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/leighmcculloch/middleman-cdn?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Gem Version](https://badge.fury.io/rb/middleman-cdn.svg)](http://badge.fury.io/rb/middleman-cdn) [![Build Status](https://travis-ci.org/leighmcculloch/middleman-cdn.svg)](https://travis-ci.org/leighmcculloch/middleman-cdn) [![Coverage Status](https://img.shields.io/coveralls/leighmcculloch/middleman-cdn.svg)](https://coveralls.io/r/leighmcculloch/middleman-cdn) [![Dependency Status](https://gemnasium.com/leighmcculloch/middleman-cdn.png)](https://gemnasium.com/leighmcculloch/middleman-cdn)
 
 A [middleman](http://middlemanapp.com/) deploy tool for invalidating resources cached

data/lib/middleman-cdn/commands.rb

@@ -23,8 +23,15 @@ module Middleman
       end
 
       desc "cdn:cdn_invalidate", "Invalidate your CloudFlare or CloudFront cache"
-      def cdn_invalidate(options = nil)
+      def cdn_invalidate(*args)
         begin
+          if args.first && args.first.respond_to?(:filter)
+            options = args.first
+            files = args.drop(1)
+          else
+            files = args
+          end
+
           if options.nil?
             app_instance = ::Middleman::Application.server.inst
             unless app_instance.respond_to?(:cdn_options)
@@ -40,9 +47,16 @@ module Middleman
             raise
           end
 
-          files = list_files(options.filter)
-          self.class.say_status(nil, "Invalidating #{files.count} files with filter: " + "#{options.filter.source}")
+          unless files.empty?
+            files = normalize_files(files)
+            message = "Invalidating #{files.count} files:"
+          else
+            files = normalize_files(list_files(options.filter))
+            message = "Invalidating #{files.count} files with filter: #{options.filter.source}"
+          end
+          self.class.say_status(nil, message)
           files.each { |file| self.class.say_status(nil, " • #{file}") }
+
           return if files.empty?
 
           invalidate_all = does_filter_match_all(options.filter)
@@ -106,20 +120,21 @@ end
 
             # Remove files that do not match filter
             files.reject! { |f| f !~ filter }
-
-            # Add directories of index.html files since they have to be
-            # invalidated as well if :directory_indexes is active
-            files.each do |file|
-              file_dir = file.sub(/\bindex\.html\z/, '')
-              files << file_dir if file_dir != file
-            end
-
-            # Add leading slash
-            files.map! { |f| f.start_with?('/') ? f : "/#{f}" }
           end
         end
       end
 
+      def normalize_files(files)
+        # Add directories of index.html files since they have to be
+        # invalidated as well if :directory_indexes is active
+        files.each do |file|
+          file_dir = file.sub(/\bindex\.html\z/, '')
+          files << file_dir if file_dir != file
+        end
+
+        # Add leading slash
+        files.map! { |f| f.start_with?('/') ? f : "/#{f}" }
+      end
     end
 
     Base.map({"cdn" => "cdn_invalidate"})

data/lib/middleman-cdn/extension.rb

@@ -3,6 +3,10 @@ require 'middleman-core'
 module Middleman
   module CDN
     module Helpers
+      def cdn_invalidate(files = nil)
+        ::Middleman::Cli::CDN.new.cdn_invalidate(cdn_options, *files)
+      end
+
       def cdn_options
         ::Middleman::CDN::CDNExtension.options
       end
@@ -24,7 +28,7 @@ module Middleman
 
         app.after_configuration do
           app.after_build do
-            ::Middleman::Cli::CDN.new.cdn_invalidate(@@cdn_options) if @@cdn_options.after_build
+            cdn_invalidate if cdn_options.after_build
           end
         end
 

data/lib/middleman-cdn/version.rb

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

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

@@ -112,5 +112,61 @@ describe Middleman::Cli::CDN do
         subject.cdn_invalidate(options)
       end
     end
+
+    context "list of files provided at runtime" do
+      context "invalidate files given and not the filter" do
+        let(:options) do
+          OpenStruct.new({
+            cloudflare: {},
+            cloudfront: {},
+            fastly: {},
+            filter: /\.htm$/
+          })
+        end
+
+        it "should invalidate the files with all cdns" do
+          expect_any_instance_of(::Middleman::Cli::CloudFlareCDN).to receive(:invalidate).with(options.cloudflare, ["/image.png"], all: false)
+          expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to receive(:invalidate).with(options.cloudfront, ["/image.png"], all: false)
+          expect_any_instance_of(::Middleman::Cli::FastlyCDN).to receive(:invalidate).with(options.cloudfront, ["/image.png"], all: false)
+          subject.cdn_invalidate(options, "image.png")
+        end
+      end
+
+      context "invalidate multiple files given and not the filter" do
+        let(:options) do
+          OpenStruct.new({
+            cloudflare: {},
+            cloudfront: {},
+            fastly: {},
+            filter: /\.htm$/
+          })
+        end
+
+        it "should invalidate the files with all cdns" do
+          expect_any_instance_of(::Middleman::Cli::CloudFlareCDN).to receive(:invalidate).with(options.cloudflare, ["/image.png", "/index.html", "/"], all: false)
+          expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to receive(:invalidate).with(options.cloudfront, ["/image.png", "/index.html", "/"], all: false)
+          expect_any_instance_of(::Middleman::Cli::FastlyCDN).to receive(:invalidate).with(options.cloudfront, ["/image.png", "/index.html", "/"], all: false)
+          subject.cdn_invalidate(options, "image.png", "index.html")
+        end
+      end
+
+      context "invalidate files and still expand index.html's to directories too" do
+        let(:options) do
+          OpenStruct.new({
+            cloudflare: {},
+            cloudfront: {},
+            fastly: {},
+            filter: /\.htm$/
+          })
+        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)
+          subject.cdn_invalidate(options, "index.html")
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cdn
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog