middleman-cdn 0.1.16 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60f2541eb1776a574ad18d1ce8874c1a9c9c3d2b
-  data.tar.gz: 9907f3298da6d149a4434ccf92678dba9cca26d1
+  metadata.gz: 5860904ab2debb540a10ca58350b9056f6c0965b
+  data.tar.gz: f9ebbf66b7dee0110c6e5237173ae3e7cb3505dc
 SHA512:
-  metadata.gz: e4aefc1cc4929f72e5dc5b7ddd6898c575f36d8c930cfa9645e02031c97031afbe2dcb78bbfaa1b2eab35cf5280061e54d105432fc57c6741b6d750ffcf42049
-  data.tar.gz: e9e1082251b096c0054f1132ef9c5161ac5569b73d3ed0d70ff827f3a8a13049116b4727a4f10c2374ed2eef9c4827c2dceedceab378abecd5453b0d6a7ec0b9
+  metadata.gz: 283c474a8208767535c5e84bf8077fd816b59c6a763e68fa1d69570d92973a2dc181d96b701e6ba0fe221bf56af7e541f24741c0a93da11308c6f8265fed5770
+  data.tar.gz: '09ab79b11af6b85e6b3e17bca97e8df72995342d5be81622193fd161b031637c34a77c09f9dc834f2ce8e726c58b29b88bc97dd6a28ba597368ed464fc1f0b35'

data/.gitignore

@@ -4,3 +4,4 @@ coverage
 *.sublime-*
 *.gem
 pkg
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -1,8 +1,21 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 before_install:
+  - gem update --system
   - gem install bundler
+gemfile:
+  - gemfiles/middleman_3.3.gemfile
+  - gemfiles/middleman_3.4.gemfile
+  - gemfiles/middleman_3_stable.gemfile
+  - gemfiles/middleman_4.0.gemfile
+  - gemfiles/middleman_4.1.gemfile
+  - gemfiles/middleman_4.2.gemfile
+  - gemfiles/middleman_master.gemfile
+matrix:
+  allow_failures:
+    - rvm: 2.4.0
+      gemfile: gemfiles/middleman_4.1.gemfile

data/Appraisals

@@ -0,0 +1,27 @@
+appraise 'middleman_3.3' do
+  gem 'middleman', '~> 3.3.0'
+end
+
+appraise 'middleman_3.4' do
+  gem 'middleman', '~> 3.4.0'
+end
+
+appraise 'middleman_3_stable' do
+  gem 'middleman', github: 'middleman/middleman', branch: 'v3-stable'
+end
+
+appraise 'middleman_4.0' do
+  gem 'middleman', '~> 4.0.0'
+end
+
+appraise 'middleman_4.1' do
+  gem 'middleman', '~> 4.1.0'
+end
+
+appraise 'middleman_4.2' do
+  gem 'middleman', '~> 4.2.0'
+end
+
+appraise 'middleman_master' do
+  gem 'middleman', github: 'middleman/middleman'
+end

data/README.md

@@ -232,6 +232,8 @@ I'm using middleman-cdn on my personal website [leighmcculloch.com](http://leigh
 
 Middleman CDN is a fork off [Middleman CloudFront](https://github.com/andrusha/middleman-cloudfront) and I used it as the base for building this extension. The code was well structured and easy to understand. It was easy to break out the CloudFront specific logic and to add support for CloudFlare and the other CDNs. My gratitude goes to @andrusha and @manuelmeurer for their work on Middleman CloudFront.
 
+Thanks to @manuelmeurer for helping port this gem for Middleman v4 and [numerous other valuable contributions](https://github.com/leighmcculloch/middleman-cdn/commits?author=manuelmeurer).
+
 Thanks to @b4k3r for the [Cloudflare gem](https://github.com/b4k3r/cloudflare) that made invalidating CloudFlare files a breeze.
 
 Thanks to @geemus and the many contributors to the [fog gem](https://github.com/fog/fog) that made invalidating CloudFront easy.

data/gemfiles/middleman_3.3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "middleman", "~> 3.3.0"
+
+gemspec :path => "../"

data/gemfiles/middleman_3.4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "middleman", "~> 3.4.0"
+
+gemspec :path => "../"

data/gemfiles/middleman_3_stable.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "middleman", :github => "middleman/middleman", :branch => "v3-stable"
+
+gemspec :path => "../"

data/gemfiles/middleman_4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "middleman", "~> 4.0.0"
+
+gemspec :path => "../"

data/gemfiles/middleman_4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "middleman", "~> 4.1.0"
+
+gemspec :path => "../"

data/gemfiles/middleman_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "middleman", "~> 4.2.0"
+
+gemspec :path => "../"

data/gemfiles/middleman_master.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "middleman", :github => "middleman/middleman"
+
+gemspec :path => "../"

data/lib/middleman-cdn.rb

@@ -2,4 +2,4 @@ require 'middleman-core'
 require 'middleman-cdn/commands'
 require "middleman-cdn/extension"
 
-::Middleman::Extensions.register(:cdn, ::Middleman::CDN::CDNExtension)
+::Middleman::Extensions.register(:cdn, ::Middleman::CDN::Extension)

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

@@ -1,4 +1,3 @@
-#Encoding: UTF-8
 require "cloudflare"
 require "active_support/core_ext/string"
 

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

@@ -1,4 +1,4 @@
-require "fog"
+require "fog/aws"
 require "active_support/core_ext/string"
 
 module Middleman

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

@@ -1,4 +1,3 @@
-#Encoding: UTF-8
 require "fastly"
 require "active_support/core_ext/string"
 

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

@@ -1,4 +1,3 @@
-#Encoding: UTF-8
 require "maxcdn"
 require "active_support/core_ext/string"
 

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

@@ -1,4 +1,3 @@
-#Encoding: UTF-8
 require "httparty"
 require "active_support/core_ext/string"
 require "middleman-cdn/clients/rackspace.rb"

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

@@ -1,4 +1,3 @@
-#Encoding: UTF-8
 require "httparty"
 require "active_support/core_ext/string"
 

data/lib/middleman-cdn/commands.rb

@@ -11,7 +11,7 @@ require "ansi/code"
 module Middleman
   module Cli
 
-    class CDN < Thor
+    class CDN < Thor::Group
       include Thor::Actions
 
       check_unknown_options!
@@ -22,23 +22,17 @@ module Middleman
         true
       end
 
-      desc "cdn:cdn_invalidate", "Invalidate your CloudFlare or CloudFront cache"
       def cdn_invalidate(*args)
         begin
-          if args.first && args.first.respond_to?(:filter)
-            options = args.first
-            files = args.drop(1)
+          options, files = if args.first && args.first.respond_to?(:filter)
+            [args.first, args.drop(1)]
           else
-            files = args
+            [Middleman::CDN::Extension.options, args]
           end
 
           if options.nil?
-            app_instance = ::Middleman::Application.server.inst
-            unless app_instance.respond_to?(:cdn_options)
-              self.class.say_status(nil, ANSI.red{ "Error: You need to activate the cdn extension in config.rb.\n#{example_configuration}" })
-              raise
-            end
-            options = app_instance.cdn_options
+            self.class.say_status(nil, ANSI.red{ "Error: You need to activate the cdn extension in config.rb.\n#{example_configuration}" })
+            return
           end
           options.filter ||= /.*/
 
@@ -135,8 +129,10 @@ end
         # Add leading slash
         files.map! { |f| f.start_with?('/') ? f : "/#{f}" }
       end
-    end
 
-    Base.map({"cdn" => "cdn_invalidate"})
+      Base.register(self, 'cdn_invalidate', 'cdn_invalidate [options]', 'Invalidate CDN')
+
+      Base.map('cdn' => 'cdn_invalidate')
+    end
   end
 end

data/lib/middleman-cdn/extension.rb

@@ -2,47 +2,40 @@ 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
-    end
-
-    class CDNExtension < Middleman::Extension
+    class Extension < Middleman::Extension
       option :cloudflare, nil, 'CloudFlare options'
       option :cloudfront, nil, 'CloudFront options'
       option :fastly, nil, 'Fastly options'
       option :maxcdn, nil, 'MaxCDN options'
       option :rackspace, nil, 'Rackspace options'
-      option :filter, nil, 'Cloudflare options'
-      option :after_build, false, 'Cloudflare options'
+      option :filter, nil, 'Filter files to invalidate'
+      option :after_build, false, 'Invalidate automatically after build'
+
+      @@cdn_options = nil
 
       def initialize(app, options_hash = {}, &block)
         super
 
         @@cdn_options = options
-
-        app.after_configuration do
-          app.after_build do
-            cdn_invalidate if cdn_options.after_build
-          end
-        end
-
-        app.send :include, Helpers
-      end
-
-      def registered
-        included
       end
 
       def self.options
         @@cdn_options
       end
 
+      def after_build(builder)
+        ::Middleman::Cli::CDN.new.cdn_invalidate(options) if options.after_build
+      end
+
+      helpers do
+        def cdn_invalidate(files = nil)
+          ::Middleman::Cli::CDN.new.cdn_invalidate(cdn_options, *files)
+        end
+
+        def cdn_options
+          ::Middleman::CDN::Extension.options
+        end
+      end
     end
   end
 end

data/lib/middleman-cdn/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module CDN
-    VERSION = '0.1.16'
+    VERSION = '0.2.0'
   end
 end

data/middleman-cdn.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -12,13 +10,13 @@ Gem::Specification.new do |s|
   s.authors     = ["Leigh McCulloch"]
   s.licenses    = ["MIT"]
   s.homepage    = "https://github.com/leighmcculloch/middleman-cdn"
-  s.summary     = %q{Invalidate CloudFlare or CloudFront cache after deployment}
-  s.description = %q{Invalidate a specific set of files in your CloudFlare or CloudFront cache}
+  s.summary     = %q{Invalidate CloudFlare, AWS CloudFront, Rackspace, Fastly, or MaxCDN cache after deployment}
+  s.description = %q{Invalidate a specific set of files in your CloudFlare, AWS CloudFront, Rackspace, Fastly, or MaxCDN cache}
 
   s.files         = `git ls-files -z`.split("\0")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'fog', '~> 1.9'
+  s.add_dependency 'fog-aws', '~> 1.4'
   s.add_dependency 'cloudflare', '~> 2.0'
   s.add_dependency 'fastly', '~> 1.1'
   s.add_dependency 'maxcdn', '~> 0.1'
@@ -29,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 0.9'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'coveralls', '~> 0.7'
+  s.add_development_dependency 'appraisal', '~> 2.1'
 
-  s.add_dependency 'middleman-core', '~> 3.3'
+  s.add_dependency 'middleman', '>= 3.3'
 end

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

@@ -1,4 +1,3 @@
-#Encoding: UTF-8
 require 'spec_helper'
 require 'lib/middleman-cdn/cdns/base_protocol'
 

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

@@ -1,4 +1,3 @@
-#Encoding: UTF-8
 require 'spec_helper'
 require 'lib/middleman-cdn/cdns/base_protocol'
 

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

@@ -1,4 +1,3 @@
-#Encoding: UTF-8
 require 'spec_helper'
 require 'lib/middleman-cdn/cdns/base_protocol'
 

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

@@ -1,4 +1,3 @@
-#Encoding: UTF-8
 require 'spec_helper'
 require 'lib/middleman-cdn/cdns/base_protocol'
 

data/spec/lib/middleman-cdn/clients/rackspace_spec.rb

@@ -1,4 +1,3 @@
-#Encoding: UTF-8
 require 'spec_helper'
 require 'lib/middleman-cdn/clients/rackspace_response_doubles.rb'
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cdn
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.2.0
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: cloudflare
   requirement: !ruby/object:Gem::Requirement
@@ -151,20 +151,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: middleman-core
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: middleman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
-description: Invalidate a specific set of files in your CloudFlare or CloudFront cache
+description: Invalidate a specific set of files in your CloudFlare, AWS CloudFront,
+  Rackspace, Fastly, or MaxCDN cache
 email: 
 executables: []
 extensions: []
@@ -172,11 +187,19 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE
 - README-cloudflare-pagerule-example.png
 - README.md
 - Rakefile
+- gemfiles/middleman_3.3.gemfile
+- gemfiles/middleman_3.4.gemfile
+- gemfiles/middleman_3_stable.gemfile
+- gemfiles/middleman_4.0.gemfile
+- gemfiles/middleman_4.1.gemfile
+- gemfiles/middleman_4.2.gemfile
+- gemfiles/middleman_master.gemfile
 - lib/middleman-cdn.rb
 - lib/middleman-cdn/cdns/base.rb
 - lib/middleman-cdn/cdns/cloudflare.rb
@@ -220,8 +243,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: Invalidate CloudFlare or CloudFront cache after deployment
+summary: Invalidate CloudFlare, AWS CloudFront, Rackspace, Fastly, or MaxCDN cache
+  after deployment
 test_files: []