branchable_cdn_assets-middleman 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ae86e989e0f3fbc272aa429e13dfde3ff1a5c24
-  data.tar.gz: 55987dcadb5b29af7a9bb464de9c97ff2f35f212
+  metadata.gz: 99ca71123259f6e204e0198b4f36ad5267dc0a4e
+  data.tar.gz: 2d3970a00b3bd71c0d76f9e73b69ae5684e023be
 SHA512:
-  metadata.gz: 85e65c9d9a90ae327b5cf6a3442bf2cdbdb123d1139e1afe218ca0b3c63e5c653aa3e779afc12b1490d6ab0d49e0b409f827c8c55ff629f31242bbd95070d460
-  data.tar.gz: 2ac4a337fc0e61c5df01f9dc9401676918604d0774a6c7999a016d86b8a0b66c6ebdd1289bb7013df8166ad3a315069ae4ffe23efa98844710c16f92a893d9f4
+  metadata.gz: d0a8957936305371b89d0f603a43400de77d963fb9d80edb98dbdbc62c153a0cf36460b0ba8b4b1d3380d9a3754dd8283cca4fe8efa87ee2830aaa072fb9390f
+  data.tar.gz: 8aec9a0e94ba141da4056c7bf291830bdad1cabd2b5eae30fb8c4cd62824b44487304fadad8ec5a23c96e3083e613b8dbd3cf0bbba2bd697c25e70ef42d3ae78

data/lib/branchable_cdn_assets/middleman/extension.rb

@@ -17,6 +17,9 @@ module BranchableCDNAssets
         if defined?(::Sass::Script::Functions)
           ::Sass::Script::Functions.send :include, SassHelpers
         end
+        if defined?(::SassC::Script::Functions)
+          ::SassC::Script::Functions.send :include, SassHelpers
+        end
       end
 
       def manipulate_resource_list resources

data/lib/branchable_cdn_assets/middleman/helpers.rb

@@ -19,7 +19,7 @@ module BranchableCDNAssets
 
         # check for file in sitemap on each extension
         sitemap_candidates = []
-        if environment != :build
+        if !build?
           extensions[:cdn_assets].each do |k, inst|
             next if cdn && inst.id != cdn
 
@@ -33,7 +33,7 @@ module BranchableCDNAssets
         extensions[:cdn_assets].each do |k, inst|
           next if cdn && inst.id != cdn
 
-          location = (environment == :build) ? :remote : :all;
+          location = build? ? :remote : :all;
           file     = inst.file_manager.find(real_path, location)
 
           file_manager_candidates.push [file, ext_trail].join('') if file && file != :local
@@ -66,10 +66,20 @@ module BranchableCDNAssets
 
       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 = options[:custom][:middleman_context].cdn_asset_url( path.value, cdn )
+        file = application_context.cdn_asset_url( path.value, cdn )
         ::Sass::Script::String.new file, :string
       end
 
+      # TODO: add a test that exercises this code
+      #
+      def application_context
+        if options.key?(:custom)
+          options[:custom][:middleman_context]
+        elsif options.key?(:sprockets)
+          options[:sprockets][:context]
+        end
+      end
+
     end
 
     class MultipleCDNError < StandardError

data/lib/branchable_cdn_assets/middleman/version.rb

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

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

@@ -58,7 +58,7 @@ describe BranchableCDNAssets::Middleman::Helpers do
 
           context "when building" do
             it "returns remote url" do
-              @mm.config[:environment] = :build
+              @mm.config[:mode] = :build
 
               allow( Asgit ).to receive(:current_branch).and_return('some_branch')
               expect( @context.cdn_asset_url('image_all') ).to eq "http://staging.com/some_branch/image_all"
@@ -185,6 +185,13 @@ describe BranchableCDNAssets::Middleman::Helpers do
           source = 'body { background: url( cdn_asset_url("image_path", "cdn2") ); }'
           Sass.compile( source, {custom: {middleman_context: @context}} )
         end
+
+        it "is called with SassC as well" do
+          expect( @context ).to receive(:cdn_asset_url).with('image_path', 'cdn2')
+
+          source = 'body { background: url( cdn_asset_url("image_path", "cdn2") ); }'
+          SassC::Engine.new(source, {custom: {middleman_context: @context}}).render
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: branchable_cdn_assets-middleman
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman