middleman-cdn 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e79d37359ea1e80126fd90bee4767bde571842d
-  data.tar.gz: ede9b99ab9222ebf86bb7d3735fc6cacae481fd5
+  metadata.gz: 31655005e9acd71dfa558dbb3272beb2ae09fc1a
+  data.tar.gz: 123df0647636d59cab7640582d2c06e49b043480
 SHA512:
-  metadata.gz: 74d22ceecce8e729df8b9e11e8a840ad5c55b051730d1d962bcece2520b890bf92a792c7e920ee85317f3f775c46e5a3d1646f1ee7bbbb317121f31687f51c28
-  data.tar.gz: 87f355883c41f5956f4b6752c8ecb16a02a6228750d11f7f841c4ae5fb164c717d078f0a05189cd79f823dce88414f79e829f993a58e5ef3760a2c9d36c46809
+  metadata.gz: 76253f654ec0e6e6656707820144472b0e14ac3e49601fd5df3efbb6d6d77a53fa09d16dfa8d32a1e66158da11df069b003646b321a2b33bf723c2d8d3c8c3f4
+  data.tar.gz: 1d9671fbe2afafddfbc3980f4aadc003691a08945c7ca7d591523d2e057ccda79bf36ea261dccb910ea53f0efaadec962b0480058e1e5481751f3cbb29f150fa

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.2

data/Rakefile

@@ -3,12 +3,6 @@ require 'rspec/core/rake_task'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
-end
-
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

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

@@ -0,0 +1,23 @@
+module Middleman
+  module Cli
+
+    class BaseCDN
+      def self.example_configuration
+        config_lines = self.example_configuration_elements.map do |config_key, config_info|
+          "    #{config_key.to_s}: #{config_info[0]}".ljust(30) + " #{config_info[1]}"
+        end
+
+        <<-TEXT
+  cdn.#{self.key} = {
+#{config_lines.join("\n")}
+  }
+        TEXT
+      end
+
+      def say_status(status, newline: true, header: true)
+        ::Middleman::Cli::CDN.say_status(self.class.key, status, newline: newline, header: header)
+      end
+    end
+
+  end
+end

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

@@ -5,46 +5,48 @@ require "active_support/core_ext/string"
 module Middleman
   module Cli
 
-    class CloudFlareCDN
+    class CloudFlareCDN < BaseCDN
       def self.key
         "cloudflare"
       end
 
-      def self.example_configuration
-        <<-TEXT
-  cdn.cloudflare = {
-    client_api_key: 'I',         # default ENV['CLOUDFLARE_CLIENT_API_KEY']
-    email: 'love',               # default ENV['CLOUDFLARE_EMAIL']
-    zone: 'cats',
-    base_urls: ['http://example.com', 'https://example.com']
-  }
-TEXT
+      def self.example_configuration_elements
+        {
+          client_api_key: ['"..."', "# default ENV['CLOUDFLARE_CLIENT_API_KEY']"],
+          email: ['"..."', "# default ENV['CLOUDFLARE_EMAIL']"],
+          zone: ['"..."', ""],
+          base_urls: [['http://example.com', 'https://example.com'], ""]
+        }
       end
 
       def invalidate(options, files)
         options[:client_api_key] ||= ENV['CLOUDFLARE_CLIENT_API_KEY']
         options[:email] ||= ENV['CLOUDFLARE_EMAIL']
+
         [:client_api_key, :email, :zone, :base_urls].each do |key|
-          raise StandardError, "Configuration key cloudflare[:#{key}] is missing." if options[key].blank?
-        end
-        if options[:base_urls].is_a?(String)
-          options[:base_urls] = [options[:base_urls]]
+          if options[key].blank?
+            say_status("Error: Configuration key cloudflare[:#{key}] is missing.".light_red)
+            raise
+          end
         end
-        if !options[:base_urls].is_a?(Array) || options[:base_urls].length == 0
-          raise StandardError, "Configuration key cloudfront[:base_urls] is missing."
+
+        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)
+          raise
         end
 
+        cloudflare = ::CloudFlare::connection(options[:client_api_key], options[:email])
         options[:base_urls].each do |base_url|
           files.each do |file|
-            cloudflare = ::CloudFlare::connection(options[:client_api_key], options[:email])
             begin
               url = "#{base_url}#{file}"
-              ::Middleman::Cli::CDN.say_status("cloudflare".yellow + " invalidating #{url}... ", incomplete: true)
+              say_status("Invalidating #{url}... ", newline: false)
               cloudflare.zone_file_purge(options[:zone], "#{base_url}#{file}")
             rescue => e
-              ::Middleman::Cli::CDN.say_status(", " + "error: #{e.message}".light_red, header: false)
+              say_status(", " + "error: #{e.message}".light_red, header: false)
             else
-              ::Middleman::Cli::CDN.say_status("✓".light_green, header: false)
+              say_status("✔".light_green, header: false)
             end
           end
         end

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

@@ -4,31 +4,32 @@ require "active_support/core_ext/string"
 module Middleman
   module Cli
 
-    class CloudFrontCDN
+    class CloudFrontCDN < BaseCDN
       INVALIDATION_LIMIT = 1000
 
       def self.key
         "cloudfront"
       end
 
-      def self.example_configuration
-        <<-TEXT
-  cdn.cloudfront = {
-    access_key_id: 'I',          # default ENV['AWS_ACCESS_KEY_ID']
-    secret_access_key: 'love',   # default ENV['AWS_SECRET_ACCESS_KEY']
-    distribution_id: 'cats'
-  }
-TEXT
+      def self.example_configuration_elements
+        {
+          access_key_id: ['"..."', "# default ENV['AWS_ACCESS_KEY_ID']"],
+          secret_access_key: ['"..."', "# default ENV['AWS_SECRET_ACCESS_KEY']"],
+          distribution_id: ['"..."', ""]
+        }
       end
 
       def invalidate(options, files)
         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|
-          raise StandardError, "Configuration key cloudfront[:#{key}] is missing." if options[key].blank?
+          if options[key].blank?
+            say_status("Error: Configuration key cloudfront[:base_urls] is missing.".light_red)
+            raise
+          end
         end
 
-        cloudfront = Fog::CDN.new({
+        cloudfront = ::Fog::CDN.new({
           :provider               => 'AWS',
           :aws_access_key_id      => options[:access_key_id],
           :aws_secret_access_key  => options[:secret_access_key]
@@ -37,22 +38,25 @@ TEXT
         distribution = cloudfront.distributions.get(options[:distribution_id])
 
         if files.count <= INVALIDATION_LIMIT
-          ::Middleman::Cli::CDN.say_status("cloudfront".yellow + " invalidating #{files.count} files... ", incomplete: true)
+          say_status("Invalidating #{files.count} files... ", newline: false)
           invalidation = distribution.invalidations.create(:paths => files)
-          raise StandardError, %(Invalidation status is #{invalidation.status}. Expected "InProgress") unless invalidation.status == 'InProgress'
-          ::Middleman::Cli::CDN.say_status("✓".light_green, header: false)
+          if invalidation.status != 'InProgress'
+            say_status("Invalidation status is #{invalidation.status}. Expected 'InProgress'.".red.bold, header: false)
+            raise
+          end
+          say_status("✔".light_green, header: false)
         else
           slices = files.each_slice(INVALIDATION_LIMIT)
-          ::Middleman::Cli::CDN.say_status("cloudfront".yellow + " invalidating #{files.count} files in #{slices.count} batch(es) ")
+          say_status("Invalidating #{files.count} files in #{slices.count} batch(es) ")
           slices.each_with_index do |slice, i|
-            ::Middleman::Cli::CDN.say_status("cloudfront".yellow + " invalidating batch #{i + 1}... ", incomplete: true)
+            say_status("Invalidating batch #{i + 1}... ", newline: false)
             invalidation = distribution.invalidations.create(:paths => slice)
             invalidation.wait_for { ready? } unless i == slices.count - 1
-            ::Middleman::Cli::CDN.say_status("✓".light_green, header: false)
+            say_status("✔".light_green, header: false)
           end
         end
-        ::Middleman::Cli::CDN.say_status("cloudfront".yellow + " It might take 10 to 15 minutes until all files are invalidated.")
-        ::Middleman::Cli::CDN.say_status("cloudfront".yellow + ' Please check the AWS Management Console to see the status of the invalidation.')
+        say_status("It might take 10 to 15 minutes until all files are invalidated.")
+        say_status('Please check the AWS Management Console to see the status of the invalidation.')
       end
     end
 

data/lib/middleman-cdn/commands.rb

@@ -1,7 +1,9 @@
 require "middleman-core/cli"
 require "middleman-cdn/extension"
+require "middleman-cdn/cdns/base.rb"
 require "middleman-cdn/cdns/cloudflare.rb"
 require "middleman-cdn/cdns/cloudfront.rb"
+require "colorize"
 
 module Middleman
   module Cli
@@ -33,7 +35,7 @@ module Middleman
         end
 
         files = list_files(options.filter)
-        ::Middleman::Cli::CDN.say_status("Invalidating #{files.count} files with filter: #{options.filter.source}")
+        self.class.say_status(nil, "Invalidating #{files.count} files with filter: " + "#{options.filter.source}".magenta.bold)
         return if files.empty?
 
         cdns_keyed.each do |cdn_key, cdn|
@@ -42,14 +44,15 @@ module Middleman
         end
       end
 
-      def self.say_status(status, incomplete: false, header: true)
+      def self.say_status(cdn, status, newline: true, header: true)
         message = ""
-        message << :cdn.to_s.rjust(12).light_green + "  " if header
+        message << "#{:cdn.to_s.rjust(12).light_green.bold}  #{cdn.try(:yellow).try(:bold)}" if header
+        message << " " if header && cdn
         message << status
-        if incomplete
-          print message
-        else
+        if newline
           puts message
+        else
+          print message
         end
       end
 

data/lib/middleman-cdn/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module CDN
-    VERSION = '0.1.3'
+    VERSION = '0.1.5'
   end
 end

data/middleman-cdn.gemspec

@@ -15,26 +15,15 @@ Gem::Specification.new do |s|
   s.description = %q{Invalidate a specific set of files in your CloudFlare or CloudFront cache}
 
   s.files         = `git ls-files -z`.split("\0")
-  s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
 
   s.add_dependency 'fog', '~> 1.9'
   s.add_dependency 'cloudflare', '~> 2.0'
-  s.add_dependency 'colorize'
+  s.add_dependency 'colorize', '~> 0.7'
+  s.add_dependency 'activesupport', '~> 4.1'
 
-  s.add_development_dependency 'cucumber', '~> 1.3'
-  s.add_development_dependency 'aruba', '~> 0.5'
-  s.add_development_dependency 'fivemat', '~> 1.3'
-  s.add_development_dependency 'simplecov', '~> 0.8'
   s.add_development_dependency 'rake', '~> 0.9'
-
   s.add_development_dependency 'rspec', '~> 3.0'
 
-  if RUBY_VERSION <= '1.9.2'
-    s.add_dependency 'middleman-core', '~> 3.0', '<= 3.2.0'
-    s.add_development_dependency 'activesupport', '< 4.0.0'
-  else
-    s.add_dependency 'middleman-core', '~> 3.0'
-    s.add_development_dependency 'activesupport', '~> 4.1'
-  end
+  s.add_dependency 'middleman-core', '~> 3.0'
 end

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

@@ -0,0 +1,52 @@
+shared_examples "BaseCDN" do
+  describe ".key" do
+    it "should have value" do
+      expect(described_class.key).to be_present
+    end
+  end
+
+  describe ".example_configuration_elements" do
+    it "should return a Hash" do
+      expect(described_class.example_configuration_elements).to be_a(Hash)
+    end
+
+    it "should return a Hash containing values that are arrays containing pairs of example values and comments" do
+      described_class.example_configuration_elements.each do |key, value|
+        expect(value).to be_a(Array)
+        expect(value.length).to eq(2)
+      end
+    end
+  end
+
+  describe ".example_configuration" do
+    before do
+      expect(described_class).to receive(:example_configuration_elements).and_return({
+        key1: ['"value"', "# comment"],
+        key2: [["arr1", "arr2"], "#"]
+      })
+    end
+
+    it "should output example keys containing the keys, values and comments" do
+      expect(described_class.example_configuration).to eq(
+      <<-TEXT
+  cdn.#{described_class.key} = {
+    key1: "value"              # comment
+    key2: ["arr1", "arr2"]     #
+  }
+TEXT
+      )
+    end
+  end
+
+  describe "#say_status" do
+    it "should use the Cli CDN class to say status" do
+      expect(::Middleman::Cli::CDN).to receive(:say_status).with(described_class.key, "status text", newline: false, header: false)
+      subject.say_status("status text", newline: false, header: false)
+    end
+
+    it "should use the Cli CDN class to say status with defaults" do
+      expect(::Middleman::Cli::CDN).to receive(:say_status).with(described_class.key, "status text", newline: true, header: true)
+      subject.say_status("status text")
+    end
+  end
+end

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

@@ -0,0 +1,251 @@
+#Encoding: UTF-8
+require 'spec_helper'
+require 'lib/middleman-cdn/cdns/base_protocol'
+
+describe Middleman::Cli::CloudFlareCDN do
+  it_behaves_like "BaseCDN"
+
+  describe '.key' do
+    it "should be 'cloudflare'" do
+      expect(described_class.key).to eq("cloudflare")
+    end
+  end
+
+  describe '.example_configuration_elements' do
+    it "should contain these keys" do
+      required_keys = [:client_api_key, :email, :zone, :base_urls]
+      expect(described_class.example_configuration_elements.keys).to eq(required_keys)
+    end
+  end
+
+  describe '#invalidate' do
+    let(:double_cloudflare) { double("::Cloudflare") }
+
+    before do
+      allow(double_cloudflare).to receive(:zone_file_purge)
+      allow(::CloudFlare).to receive(:connection).and_return(double_cloudflare)
+    end
+
+    let(:files) { [ "/index.html", "/", "/test/index.html", "/test/image.png" ] }
+
+    context "all options provided" do
+      let(:options) do
+        {
+          client_api_key: '000000000000000000000',
+          email: 'test@example.com',
+          zone: 'example.com',
+          base_urls: ['http://example.com', 'https://example.com']
+        }
+      end
+
+      it "should connect to cloudflare with credentails" do
+        expect(::CloudFlare).to receive(:connection).with("000000000000000000000", "test@example.com")
+        subject.invalidate(options, files)
+      end
+
+      it "should not raise errors" 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
+      end
+
+      it "should output indicating invalidating on all base urls" do
+        base_urls_escaped = options[:base_urls].map { |base_url| Regexp.escape(base_url) }
+        expect { subject.invalidate(options, files) }.to output(/#{base_urls_escaped.join(".+")}/m).to_stdout
+      end
+
+      it "should output saying success checkmarks" do
+        expect { subject.invalidate(options, files) }.to output(/✔/).to_stdout
+      end
+
+      context "and errors occurs when purging" do
+        before do
+          allow(double_cloudflare).to receive(:zone_file_purge).and_raise(StandardError)
+        end
+
+        it "should output saying error information" do
+          expect { subject.invalidate(options, files) }.to output(/error: StandardError/).to_stdout
+        end
+      end
+    end
+
+    context "environment variables used for credentials" do
+      before do
+        allow(ENV).to receive(:[])
+        allow(ENV).to receive(:[]).with("CLOUDFLARE_CLIENT_API_KEY").and_return("111111111111111111111")
+        allow(ENV).to receive(:[]).with("CLOUDFLARE_EMAIL").and_return("test-env@example.com")
+      end
+
+      let(:options) do
+        {
+          zone: 'example.com',
+          base_urls: ['http://example.com', 'https://example.com']
+        }
+      end
+
+      it "should connect to cloudflare with environment variable credentails" do
+        expect(::CloudFlare).to receive(:connection).with("111111111111111111111", "test-env@example.com")
+        subject.invalidate(options, files)
+      end
+
+      it "should not raise errors" do
+        subject.invalidate(options, files)
+      end
+    end
+
+    context "if client_api_key not provided" do
+      before do
+        allow(ENV).to receive(:[])
+        allow(ENV).to receive(:[]).with("CLOUDFLARE_CLIENT_API_KEY").and_return(nil)
+      end
+
+      let(:options) do
+        {
+          email: 'test@example.com',
+          zone: 'example.com',
+          base_urls: ['http://example.com', 'https://example.com']
+        }
+      end
+
+      it "should raise error" do
+        expect { subject.invalidate(options, files) }.to raise_error(RuntimeError)
+      end
+
+      it "should output saying error" do
+        expect { subject.invalidate(options, files) rescue nil }.to output(/Error: Configuration key cloudflare\[:client_api_key\] is missing\./).to_stdout
+      end
+    end
+
+    context "if email not provided" do
+      before do
+        allow(ENV).to receive(:[])
+        allow(ENV).to receive(:[]).with("CLOUDFLARE_EMAIL").and_return(nil)
+      end
+
+      let(:options) do
+        {
+          client_api_key: '000000000000000000000',
+          zone: 'example.com',
+          base_urls: ['http://example.com', 'https://example.com']
+        }
+      end
+
+      it "should raise error" do
+        expect { subject.invalidate(options, files) }.to raise_error(RuntimeError)
+      end
+
+      it "should output saying error" do
+        expect { subject.invalidate(options, files) rescue nil }.to output(/Error: Configuration key cloudflare\[:email\] is missing\./).to_stdout
+      end
+    end
+
+    context "if zone not provided" do
+      let(:options) do
+        {
+          client_api_key: '000000000000000000000',
+          email: 'test@example.com',
+          base_urls: ['http://example.com', 'https://example.com']
+        }
+      end
+
+      it "should raise error" do
+        expect { subject.invalidate(options, files) }.to raise_error(RuntimeError)
+      end
+
+      it "should output saying error" do
+        expect { subject.invalidate(options, files) rescue nil }.to output(/Error: Configuration key cloudflare\[:zone\] is missing\./).to_stdout
+      end
+    end
+
+    context "if base_urls not provided" do
+      let(:options) do
+        {
+          client_api_key: '000000000000000000000',
+          email: 'test@example.com',
+          zone: 'example.com',
+        }
+      end
+
+      it "should raise error" do
+        expect { subject.invalidate(options, files) }.to raise_error(RuntimeError)
+      end
+
+      it "should output saying error" do
+        expect { subject.invalidate(options, files) rescue nil }.to output(/Error: Configuration key cloudflare\[:base_urls\] is missing\./).to_stdout
+      end
+    end
+
+    context "if base_urls is a String" do
+      let(:options) do
+        {
+          client_api_key: '000000000000000000000',
+          email: 'test@example.com',
+          zone: 'example.com',
+          base_urls: 'http://sub.example.com'
+        }
+      end
+
+      it "should not raise error" do
+        expect { subject.invalidate(options, files) }.to_not raise_error
+      end
+
+      it "should output indicating invalidating on the one base url" do
+        base_url_escaped = Regexp.escape(options[:base_urls])
+        expect { subject.invalidate(options, files) }.to output(/#{base_url_escaped}/).to_stdout
+      end
+    end
+
+    context "if base_urls is an empty Array" do
+      let(:options) do
+        {
+          client_api_key: '000000000000000000000',
+          email: 'test@example.com',
+          zone: 'example.com',
+          base_urls: []
+        }
+      end
+
+      it "should raise error" do
+        expect { subject.invalidate(options, files) }.to raise_error(RuntimeError)
+      end
+
+      it "should output saying error" do
+        expect { subject.invalidate(options, files) rescue nil }.to output(/Error: Configuration key cloudflare\[:base_urls\] is missing\./).to_stdout
+      end
+    end
+
+    context "if base_urls is not an Array or String" do
+      let(:options) do
+        {
+          client_api_key: '000000000000000000000',
+          email: 'test@example.com',
+          zone: 'example.com',
+          base_urls: 200
+        }
+      end
+
+      it "should raise error" do
+        expect { subject.invalidate(options, files) }.to raise_error(RuntimeError)
+      end
+
+      it "should output saying error" do
+        expect { subject.invalidate(options, files) rescue nil }.to output(/Error: Configuration key cloudflare\[:base_urls\] must be an array and contain at least one base url\./).to_stdout
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+require 'spec_helper'
+require 'lib/middleman-cdn/cdns/base_protocol'
+require 'fog/aws/models/cdn/distributions'
+
+describe Middleman::Cli::CloudFrontCDN do
+  it_behaves_like "BaseCDN"
+
+  describe '.key' do
+    it "should be 'cloudfront'" do
+      expect(described_class.key).to eq("cloudfront")
+    end
+  end
+
+  describe '.example_configuration_elements' do
+    it "should contain these keys" do
+      required_keys = [:access_key_id, :secret_access_key, :distribution_id]
+      expect(described_class.example_configuration_elements.keys).to eq(required_keys)
+    end
+  end
+
+  describe '#invalidate' do
+    let(:options) do
+      {
+        access_key_id: 'access_key_id_123',
+        secret_access_key: 'secret_access_key_123',
+        distribution_id: 'distribution_id_123'
+      }
+    end
+
+    let(:double_cloudfront) { double('cloudfront', distributions: double('distributions')) }
+    let(:double_distribution) { double('distribution', invalidations: double('invalidations')) }
+
+    let(:files) { [ "/index.html", "/", "/test/index.html", "/test/image.png" ] }
+
+    before do
+      allow(::Fog::CDN).to receive(:new).and_return(double_cloudfront)
+      allow(double_cloudfront.distributions).to receive(:get).and_return(double_distribution)
+      allow(double_distribution.invalidations).to receive(:create).and_return(double('invalidation', status: 'InProgress', wait_for: ->{}, ready?: true))
+    end
+
+    it 'gets the correct distribution' do
+      expect(double_cloudfront.distributions).to receive(:get).with('distribution_id_123')
+      subject.invalidate(options, files)
+    end
+
+    context 'when the amount of files to invalidate is under the limit' do
+      it 'divides them up in packages and creates one invalidation per package' do
+        files = (1..Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT).map do |i|
+          "file_#{i}"
+        end
+        expect(double_distribution.invalidations).to receive(:create).once.with(paths: files)
+        subject.invalidate(options, files)
+      end
+    end
+
+    context 'when the amount of files to invalidate is over the limit' do
+      it 'creates only one invalidation with all of them' do
+        files = (1..(Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT * 3)).map do |i|
+          "file_#{i}"
+        end
+        expect(double_distribution.invalidations).to receive(:create).once.with(paths: files[0, Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT])
+        expect(double_distribution.invalidations).to receive(:create).once.with(paths: files[Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT, Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT])
+        expect(double_distribution.invalidations).to receive(:create).once.with(paths: files[Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT * 2, Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT])
+        subject.invalidate(options, files)
+      end
+    end
+  end
+end

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

@@ -1,5 +1,4 @@
 require 'spec_helper'
-
 require 'fog/aws/models/cdn/distributions'
 
 describe Middleman::Cli::CDN do
@@ -12,48 +11,13 @@ describe Middleman::Cli::CDN do
         secret_access_key: 'secret_access_key_123',
         distribution_id: 'distribution_id_123',
       },
-      filter: 'filter_123',
+      filter: /.*/,
       after_build: 'after_build_123'
     })
   end
   let(:distribution) { double('distribution', invalidations: double('invalidations')) }
 
   describe '#invalidate' do
-    before do
-      allow_any_instance_of(Fog::CDN::AWS::Distributions).to receive(:get).and_return(distribution)
-      allow(distribution.invalidations).to receive(:create) do
-        double('invalidation', status: 'InProgress', wait_for: ->{} )
-      end
-    end
-
-    it 'gets the correct distribution' do
-      allow(cdn).to receive(:list_files).and_return ['index.html']
-      expect_any_instance_of(Fog::CDN::AWS::Distributions).to receive(:get).with('distribution_id_123')
-      cdn.invalidate(options)
-    end
-
-    context 'when the amount of files to invalidate is under the limit' do
-      it 'divides them up in packages and creates one invalidation per package' do
-        files = (1..Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT).map do |i|
-          "file_#{i}"
-        end
-        allow(cdn).to receive(:list_files).and_return files
-        expect(distribution.invalidations).to receive(:create).once.with(paths: files)
-        cdn.invalidate(options)
-      end
-    end
-
-    context 'when the amount of files to invalidate is over the limit' do
-      it 'creates only one invalidation with all of them' do
-        files = (1..(Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT * 3)).map do |i|
-          "file_#{i}"
-        end
-        allow(cdn).to receive(:list_files).and_return files
-        expect(distribution.invalidations).to receive(:create).once.with(paths: files[0, Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT])
-        expect(distribution.invalidations).to receive(:create).once.with(paths: files[Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT, Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT])
-        expect(distribution.invalidations).to receive(:create).once.with(paths: files[Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT * 2, Middleman::Cli::CloudFrontCDN::INVALIDATION_LIMIT])
-        cdn.invalidate(options)
-      end
-    end
+    # TODO
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cdn
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -41,73 +41,31 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: fivemat
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
+        version: '4.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
 description: Invalidate a specific set of files in your CloudFlare or CloudFront cache
 email: 
 executables: []
@@ -173,13 +117,12 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Guardfile
 - LICENSE
 - README-cloudflare-pagerule-example.png
 - README.md
 - Rakefile
-- features/support/env.rb
 - lib/middleman-cdn.rb
+- lib/middleman-cdn/cdns/base.rb
 - lib/middleman-cdn/cdns/cloudflare.rb
 - lib/middleman-cdn/cdns/cloudfront.rb
 - lib/middleman-cdn/commands.rb
@@ -187,6 +130,9 @@ files:
 - lib/middleman-cdn/version.rb
 - lib/middleman_extension.rb
 - middleman-cdn.gemspec
+- spec/lib/middleman-cdn/cdns/base_protocol.rb
+- spec/lib/middleman-cdn/cdns/cloudflare_spec.rb
+- spec/lib/middleman-cdn/cdns/cloudfront_spec.rb
 - spec/lib/middleman-cdn/commands_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/leighmcculloch/middleman-cdn
@@ -212,5 +158,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Invalidate CloudFlare or CloudFront cache after deployment
-test_files:
-- features/support/env.rb
+test_files: []

data/Guardfile

@@ -1,9 +0,0 @@
-guard 'rspec', cli: '--drb --profile', all_after_pass: false do
-  # Specs
-  watch(%r(^spec/.+_spec\.rb$))
-  watch('spec/spec_helper.rb')       { 'spec' }
-  watch(%r(^spec/support/(.+)\.rb$)) { 'spec' }
-
-  # Files
-  watch(%r(^lib/(.+)\.rb$))          { |m| "spec/lib/#{m[1]}_spec.rb" }
-end

data/features/support/env.rb

@@ -1,6 +0,0 @@
-require "simplecov"
-SimpleCov.start
-PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
-require "middleman-core"
-require "middleman-core/step_definitions"
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-cdn')