middleman-cdn 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abdeed280f1aac94088448fea0eb57cf6d9197b4
-  data.tar.gz: b035ab9491fd8621f60e3d16801fc561ce293de1
+  metadata.gz: c7df50ddbc16cbcc2aad12f23bc81f594664f71c
+  data.tar.gz: 2bbb29162f24ed5fb9470847460b3052612ed87b
 SHA512:
-  metadata.gz: 70069cc04651195fc537cbdb8ec83b41c656db7c519d7b8ff5a8fa9d127688038c7fb306e547108b9efa739fc0c1def0a88405ef3d42b00a3f25a99005c77eda
-  data.tar.gz: 4e076e4122b5ab56087670508670fffc9de01fa6bee1944574ec7032c6b3d5a7731c7aec4c6b5497184685ddae72915ef019109386363b40d5f8618bf8cc6e73
+  metadata.gz: 6413c23a7d9080e4846e2c73db67736aa03292567b2e85e6d3ee35ba8468f5a0fe27b11ea2bd4d152136a926317019176da5211e402a961dea6a9529b19495c7
+  data.tar.gz: 70f29c73716425f684dabf4887fcb262362912de4f5e22b0751412a0fba1a7363297ca845960dbb20092367549291826b72f96f6a6199079cb35a08193a538c9

data/lib/middleman-cdn/commands.rb

@@ -24,14 +24,16 @@ module Middleman
         if options.nil?
           app_instance = ::Middleman::Application.server.inst
           unless app_instance.respond_to?(:cdn_options)
-            raise Error, "ERROR: You need to activate the cdn extension in config.rb.\n#{example_configuration}"
+            self.class.say_status(nil, "Error: You need to activate the cdn extension in config.rb.\n#{example_configuration}".light_red)
+            raise
           end
           options = app_instance.cdn_options
         end
         options.filter ||= /.*/
 
         if cdns.all? { |cdn| options.public_send(cdn.key.to_sym).nil? }
-          raise Error, "ERROR: You must specify a config for one of the supported CDNs.\n#{example_configuration}"
+          self.class.say_status(nil, "Error: You must specify a config for one of the supported CDNs.\n#{example_configuration}".light_red)
+          raise
         end
 
         files = list_files(options.filter)
@@ -56,7 +58,7 @@ module Middleman
         end
       end
 
-      protected
+      private
 
       def cdns
         [
@@ -72,7 +74,7 @@ module Middleman
       def example_configuration
         <<-TEXT
 
-The example configuration is:
+Example configuration:
 activate :cdn do |cdn|
 #{cdns.map(&:example_configuration).join}
   cdn.filter            = /\.html/i  # default /.*/

data/lib/middleman-cdn/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module CDN
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

data/middleman-cdn.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'fog', '~> 1.9'
   s.add_dependency 'cloudflare', '~> 2.0'
-  s.add_dependency 'fastly', '~> 1.1'
   s.add_dependency 'colorize', '~> 0.7'
   s.add_dependency 'activesupport', '~> 4.1'
 

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

@@ -1,23 +1,108 @@
 require 'spec_helper'
-require 'fog/aws/models/cdn/distributions'
 
 describe Middleman::Cli::CDN do
-  let(:cdn) { described_class.new }
-  let(:options) do
-    OpenStruct.new({
-      cloudflare: nil,
-      cloudfront: {
-        access_key_id: 'access_key_id_123',
-        secret_access_key: 'secret_access_key_123',
-        distribution_id: 'distribution_id_123',
-      },
-      filter: /.*/,
-      after_build: 'after_build_123'
-    })
+  let(:subject) { described_class.new }
+
+  describe '.exit_on_failure?' do
+    it "should return true" do
+      expect(described_class.exit_on_failure?).to eq(true)
+    end
+  end
+
+  describe '.say_status' do
+    context "defaults" do
+      it "should say" do
+        described_class.say_status(nil, "a status")
+      end
+    end
   end
-  let(:distribution) { double('distribution', invalidations: double('invalidations')) }
 
-  describe '#invalidate' do
-    # TODO
+  describe '#cdn_invalidate' do
+    before do
+      allow(Dir).to receive(:chdir).with(anything) { |path, &block| block.call }
+      allow(Dir).to receive(:glob).with('**/*', File::FNM_DOTMATCH).and_return([".", "index.html", "image.png"])
+      allow(File).to receive(:directory?).with(".").and_return(true)
+      allow(File).to receive(:directory?).with("index.html").and_return(false)
+      allow(File).to receive(:directory?).with("image.png").and_return(false)
+    end
+
+    context "all files matched" do
+      context "no cdn provided" do
+        let(:options) do
+          OpenStruct.new({
+            filter: /.*/
+          })
+        end
+
+        it "should invalidate the files with only cloudflare" do
+          expect_any_instance_of(::Middleman::Cli::CloudFlareCDN).to_not receive(:invalidate)
+          expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to_not receive(:invalidate)
+          expect { subject.cdn_invalidate(options) }.to raise_error(RuntimeError)
+        end
+      end
+
+      context "one cdn provided" do
+        let(:options) do
+          OpenStruct.new({
+            cloudflare: {},
+            filter: /.*/
+          })
+        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::CloudFrontCDN).to_not receive(:invalidate)
+          subject.cdn_invalidate(options)
+        end
+      end
+
+      context "all cdns provided" do
+        let(:options) do
+          OpenStruct.new({
+            cloudflare: {},
+            cloudfront: {},
+            filter: /.*/
+          })
+        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", "/"])
+          subject.cdn_invalidate(options)
+        end
+      end
+    end
+
+    context "some files matched" do
+      let(:options) do
+        OpenStruct.new({
+          cloudflare: {},
+          cloudfront: {},
+          filter: /\.html/
+        })
+      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", "/"])
+        subject.cdn_invalidate(options)
+      end
+    end
+
+    context "no files matched" do
+      let(:options) do
+        OpenStruct.new({
+          cloudflare: {},
+          cloudfront: {},
+          filter: /\.htm$/
+        })
+      end
+
+      it "should invalidate the files with all cdns" do
+        expect_any_instance_of(::Middleman::Cli::CloudFlareCDN).to_not receive(:invalidate)
+        expect_any_instance_of(::Middleman::Cli::CloudFrontCDN).to_not receive(:invalidate)
+        subject.cdn_invalidate(options)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cdn
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: fastly
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement