branchable_cdn_assets-middleman 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db8030ec152bd0407e74c622d95d127cecebe65e
-  data.tar.gz: 1a59b0c2b966dfe40f48073ea600199dfbcea039
+  metadata.gz: 3ae86e989e0f3fbc272aa429e13dfde3ff1a5c24
+  data.tar.gz: 55987dcadb5b29af7a9bb464de9c97ff2f35f212
 SHA512:
-  metadata.gz: 983fedb01fa253045cfc846fa871b47ce48566ceb19452a6019b9c3decfb86fd61ff2c83c2f32b964651c2031ff34721c02d233d47936208a9f94b9bcbfc4381
-  data.tar.gz: a72ae5b031b45fc52149b784aee430f289dc6e68d023f3a7ec4b805bee2be0662d5b03714d5a8b98dd50b12ad7ac0b4557669e90dfc10f8bd8c3007e6508caee
+  metadata.gz: 85e65c9d9a90ae327b5cf6a3442bf2cdbdb123d1139e1afe218ca0b3c63e5c653aa3e779afc12b1490d6ab0d49e0b409f827c8c55ff629f31242bbd95070d460
+  data.tar.gz: 2ac4a337fc0e61c5df01f9dc9401676918604d0774a6c7999a016d86b8a0b66c6ebdd1289bb7013df8166ad3a315069ae4ffe23efa98844710c16f92a893d9f4

data/lib/branchable_cdn_assets/middleman/extension.rb

@@ -15,7 +15,6 @@ module BranchableCDNAssets
 
       def after_configuration
         if defined?(::Sass::Script::Functions)
-          $app = @app
           ::Sass::Script::Functions.send :include, SassHelpers
         end
       end

data/lib/branchable_cdn_assets/middleman/helpers.rb

@@ -61,11 +61,14 @@ module BranchableCDNAssets
     module SassHelpers
 
       def cdn_asset_url( path, cdn=nil )
+        ::Sass::Script::String.new("url(#{cdn_asset_path(path, cdn)})")
+      end
+
+      def cdn_asset_path( path, cdn=nil )
         cdn  = cdn.value if cdn.respond_to?(:value) # have to force cdn to a string if not nil
-        file = $app.cdn_asset_url( path.value, cdn )
-        ::Sass::Script::String.new("url(\"#{file}\")")
+        file = options[:custom][:middleman_context].cdn_asset_url( path.value, cdn )
+        ::Sass::Script::String.new file, :string
       end
-      alias :cdn_asset_path :cdn_asset_url
 
     end
 

data/lib/branchable_cdn_assets/middleman/version.rb

@@ -1,5 +1,5 @@
 module BranchableCDNAssets
   module Middleman
-    VERSION = '0.7.0'  unless defined?(BranchableCDNAssets::Middleman::VERSION)
+    VERSION = '0.8.0'  unless defined?(BranchableCDNAssets::Middleman::VERSION)
   end
 end

data/spec/lib/branchable_cdn_assets/middleman/helpers_spec.rb

@@ -16,6 +16,13 @@ describe BranchableCDNAssets::Middleman::Helpers do
 
       @mm = Middleman::Fixture.app
       @extension = @mm.extensions[:cdn_assets].first[1]
+
+      # split test based on changes in v4
+      if @mm.respond_to?(:template_context_class)
+        @context = @mm.template_context_class.new(@mm)
+      else
+        @context = @mm
+      end
     end
 
     after :each do
@@ -27,26 +34,26 @@ describe BranchableCDNAssets::Middleman::Helpers do
         context "when asset is on production cdn" do
           it "returns the 'live' url of the asset" do
             allow( Asgit ).to receive(:current_branch).and_return('master')
-            expect( @mm.cdn_asset_url('image_remote_one') ).to eq 'http://production.com/image_remote_one'
+            expect( @context.cdn_asset_url('image_remote_one') ).to eq 'http://production.com/image_remote_one'
           end
         end
 
         context "when asset is on staging cdn" do
           it "returns the 'live' url of the asset" do
             allow( Asgit ).to receive(:current_branch).and_return('some_branch')
-            expect( @mm.cdn_asset_url('image_remote_two') ).to eq 'http://staging.com/some_branch/image_remote_two'
+            expect( @context.cdn_asset_url('image_remote_two') ).to eq 'http://staging.com/some_branch/image_remote_two'
           end
         end
 
         context "when asset is local" do
           it "returns the 'localhost' url of the asset" do
-            expect( @mm.cdn_asset_url('image_two') ).to eq "/assets/cdn/#{@extension.id}/image_two"
+            expect( @context.cdn_asset_url('image_two') ).to eq "/assets/cdn/#{@extension.id}/image_two"
           end
         end
 
         context "when asset is local and listed in a manifest" do
           it "returns the 'localhost' url of the asset" do
-            expect( @mm.cdn_asset_url('image_one') ).to eq "/assets/cdn/#{@extension.id}/image_one"
+            expect( @context.cdn_asset_url('image_one') ).to eq "/assets/cdn/#{@extension.id}/image_one"
           end
 
           context "when building" do
@@ -54,9 +61,9 @@ describe BranchableCDNAssets::Middleman::Helpers do
               @mm.config[:environment] = :build
 
               allow( Asgit ).to receive(:current_branch).and_return('some_branch')
-              expect( @mm.cdn_asset_url('image_all') ).to eq "http://staging.com/some_branch/image_all"
-              expect( @mm.cdn_asset_url('image_one') ).to eq "http://staging.com/some_branch/image_one"
-              expect( @mm.cdn_asset_url('image_prod') ).to eq "http://production.com/image_prod"
+              expect( @context.cdn_asset_url('image_all') ).to eq "http://staging.com/some_branch/image_all"
+              expect( @context.cdn_asset_url('image_one') ).to eq "http://staging.com/some_branch/image_one"
+              expect( @context.cdn_asset_url('image_prod') ).to eq "http://production.com/image_prod"
             end
           end
         end
@@ -64,7 +71,7 @@ describe BranchableCDNAssets::Middleman::Helpers do
         context "when the asset is missing" do
           it "raises an error with the asset name" do
             expect{
-              @mm.cdn_asset_url('missing_image')
+              @context.cdn_asset_url('missing_image')
             }.to raise_error BranchableCDNAssets::Middleman::FileNotFoundError, "missing asset at 'missing_image'"
           end
         end
@@ -72,11 +79,11 @@ describe BranchableCDNAssets::Middleman::Helpers do
         context "when assets have multiple extensions" do
           it "returns the url with the given extensions" do
             allow( Asgit ).to receive(:current_branch).and_return('master')
-            expect( @mm.cdn_asset_url('img.one.jpg') ).to eq "http://production.com/img.one.jpg"
+            expect( @context.cdn_asset_url('img.one.jpg') ).to eq "http://production.com/img.one.jpg"
           end
           it "raises an error if the root asset is missing" do
             expect{
-              @mm.cdn_asset_url('missing_image.1.jpg')
+              @context.cdn_asset_url('missing_image.1.jpg')
             }.to raise_error BranchableCDNAssets::Middleman::FileNotFoundError, "missing asset at 'missing_image.1.jpg'"
           end
         end
@@ -84,15 +91,15 @@ describe BranchableCDNAssets::Middleman::Helpers do
         context "with added file extensions" do
           it "returns the url with the given extensions" do
             allow( Asgit ).to receive(:current_branch).and_return('master')
-            expect( @mm.cdn_asset_url('image_one?#iefix') ).to eq "/assets/cdn/#{@extension.id}/image_one?#iefix"
-            expect( @mm.cdn_asset_url('img.one.jpg?#iefix') ).to eq "http://production.com/img.one.jpg?#iefix"
+            expect( @context.cdn_asset_url('image_one?#iefix') ).to eq "/assets/cdn/#{@extension.id}/image_one?#iefix"
+            expect( @context.cdn_asset_url('img.one.jpg?#iefix') ).to eq "http://production.com/img.one.jpg?#iefix"
           end
           it "raises an error if the root asset is missing" do
             expect{
-              @mm.cdn_asset_url('missing_image?#iefix')
+              @context.cdn_asset_url('missing_image?#iefix')
             }.to raise_error BranchableCDNAssets::Middleman::FileNotFoundError, "missing asset at 'missing_image'"
             expect{
-              @mm.cdn_asset_url('missing_image.one.jpg?#iefix')
+              @context.cdn_asset_url('missing_image.one.jpg?#iefix')
             }.to raise_error BranchableCDNAssets::Middleman::FileNotFoundError, "missing asset at 'missing_image.one.jpg'"
           end
         end
@@ -102,10 +109,10 @@ describe BranchableCDNAssets::Middleman::Helpers do
     describe "sass helpers" do
       describe "#cdn_asset_url" do
         it "calls mm#cdn_asset_url with the asset path" do
-          expect( @mm ).to receive(:cdn_asset_url).with('image_path', nil)
+          expect( @context ).to receive(:cdn_asset_url).with('image_path', nil)
 
           source = 'body { background: url( cdn_asset_url("image_path") ); }'
-          Sass.compile( source )
+          Sass.compile( source, {custom: {middleman_context: @context}} )
         end
       end
     end
@@ -125,6 +132,13 @@ describe BranchableCDNAssets::Middleman::Helpers do
       @mm = Middleman::Fixture.app
       @cdn1 = @mm.extensions[:cdn_assets]["instance_0"]
       @cdn2 = @mm.extensions[:cdn_assets]["instance_1"]
+
+      # split test based on changes in v4
+      if @mm.respond_to?(:template_context_class)
+        @context = @mm.template_context_class.new(@mm)
+      else
+        @context = @mm
+      end
     end
 
     after :all do
@@ -138,25 +152,25 @@ describe BranchableCDNAssets::Middleman::Helpers do
           it "finds remote files on correct cdn" do
             allow( Asgit ).to receive(:current_branch).and_return('master')
 
-            expect( @mm.cdn_asset_url('image_remote_cdn1') ).to eq 'http://production.com/image_remote_cdn1'
-            expect( @mm.cdn_asset_url('image_remote_cdn2') ).to eq 'http://production.com/image_remote_cdn2'
+            expect( @context.cdn_asset_url('image_remote_cdn1') ).to eq 'http://production.com/image_remote_cdn1'
+            expect( @context.cdn_asset_url('image_remote_cdn2') ).to eq 'http://production.com/image_remote_cdn2'
           end
 
           it "finds local files on correct cdn" do
-            expect( @mm.cdn_asset_url('image_cdn') ).to  eq "/assets/cdn/cdn1/image_cdn"
-            expect( @mm.cdn_asset_url('image_cdn2') ).to eq "/assets/cdn/cdn2/image_cdn2"
+            expect( @context.cdn_asset_url('image_cdn') ).to  eq "/assets/cdn/cdn1/image_cdn"
+            expect( @context.cdn_asset_url('image_cdn2') ).to eq "/assets/cdn/cdn2/image_cdn2"
           end
         end
 
         context "when file exists on multiple cdns" do
           it "returns file on given cdn" do
-            expect( @mm.cdn_asset_url('image_local', 'cdn1') ).to eq "/assets/cdn/cdn1/image_local"
-            expect( @mm.cdn_asset_url('image_local', 'cdn2') ).to eq "/assets/cdn/cdn2/image_local"
+            expect( @context.cdn_asset_url('image_local', 'cdn1') ).to eq "/assets/cdn/cdn1/image_local"
+            expect( @context.cdn_asset_url('image_local', 'cdn2') ).to eq "/assets/cdn/cdn2/image_local"
           end
 
           it "raises error if a cdn key isn't given" do
             expect{
-              @mm.cdn_asset_url('image_local')
+              @context.cdn_asset_url('image_local')
             }.to raise_error BranchableCDNAssets::Middleman::MultipleCDNError
           end
         end
@@ -166,10 +180,10 @@ describe BranchableCDNAssets::Middleman::Helpers do
     describe "sass helpers" do
       describe "#cdn_asset_url" do
         it "is called with the cdn argument if given" do
-          expect( @mm ).to receive(:cdn_asset_url).with('image_path', 'cdn2')
+          expect( @context ).to receive(:cdn_asset_url).with('image_path', 'cdn2')
 
           source = 'body { background: url( cdn_asset_url("image_path", "cdn2") ); }'
-          Sass.compile( source )
+          Sass.compile( source, {custom: {middleman_context: @context}} )
         end
       end
     end

data/spec/support/middleman/browser.rb

@@ -4,7 +4,12 @@ module Middleman
     attr_reader :browser
 
     def initialize app
-      app_on_rack = app.class.to_rack_app
+      if app.class.respond_to?(:to_rack_app)
+        app_on_rack = app.class.to_rack_app
+      else
+        require 'middleman-core/rack'
+        app_on_rack = Middleman::Rack.new(app)
+      end
       @browser    = ::Rack::Test::Session.new( ::Rack::MockSession.new(app_on_rack) )
     end
 
@@ -12,5 +17,9 @@ module Middleman
       browser.get( URI.escape(path) ).body
     end
 
+    def get_response path
+      browser.get( URI.escape(path) )
+    end
+
   end
-end
+end

data/spec/support/middleman/fixture.rb

@@ -1,14 +1,31 @@
+begin
+  require 'middleman-core/rack'
+rescue LoadError
+end
+
+
 module Middleman
   module Fixture
 
     class << self
+
       def app &block
         ENV['MM_ROOT'] = Given::TMP
-        Middleman::Application.server.inst do
-          instance_eval(&block) if block
+
+        if Middleman::Application.respond_to?(:server)
+          app = Middleman::Application.server.inst do
+            instance_eval(&block) if block
+          end
+        else
+          app = Middleman::Application.new do
+            instance_eval(&block) if block
+          end
         end
+
+        app
       end
+
     end
 
   end
-end
+end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: branchable_cdn_assets-middleman
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: branchable_cdn_assets
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="