branchable_cdn_assets-middleman 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9ae41911f2c5847089e9f35916266e6af72f5c5
-  data.tar.gz: 50534f96859ea1fb073d75f1a71068ecad23e6b3
+  metadata.gz: c130145cf4f67c1f884a85a31cc1e24abaa68b5a
+  data.tar.gz: 8c26d06ccb56d4890f7ea8bd7e04be6c0d63ee02
 SHA512:
-  metadata.gz: df4c5833e1795f56d7f39ab50cb79b68daaa5d725bb27a69650a7090882a7dfa918f338c0c71bf1e250ea7aed31b84081a5162d447be740558981925744f85ef
-  data.tar.gz: 179305796158df8cbba3512aeb6c1bdb98cad9214001ced1e08d550b007351b3fdedee020ce408b412e23e0e21441414beccfedfc1773d15daeff07d1d1ce58d
+  metadata.gz: 85e82fe4001cdc02abf6c2d34eb53ff9621507b36cfe47f86b9824fa591c5cd2ef3c02ad0d90e0cf944ce843bbcd98af9dd779aeabe5e297af10b1934b652c79
+  data.tar.gz: f8b9d059cc4cef0e02e4b3c6936d48a85eee79f3b2be4aa7bd594460147bc5f45af12dfa9467d146391f49a12fb8eea593cb362879303f8d1c9e9ceff612d178

data/lib/branchable_cdn_assets/middleman/helpers.rb

@@ -10,17 +10,24 @@ module BranchableCDNAssets
       # @return [String] path to asset
       def cdn_asset_url path
 
+        # remove trailing characters after extension
+        ext_trail = path.match(/\.\w+([\#\?\&]\S+)/).to_a
+        ext_trail = ext_trail[1] || ''
+
+        real_path = path.sub(ext_trail, '')
+
         # check for file in sitemap
-        if environment != :build && resource = sitemap.find_resource_by_path( File.join( "assets/cdn", path ) )
-          return "/" + resource.destination_path
+        if environment != :build && resource = sitemap.find_resource_by_path( File.join( "assets/cdn", real_path ) )
+          return "/" + [resource.destination_path, ext_trail].join
         end
 
         # check for the file in the file_manager
-        file = extensions[:cdn_assets].file_manager.find(path)
-        return file if file && file != :local
+        file = extensions[:cdn_assets].file_manager.find(real_path)
+
+        return [file, ext_trail].join if file && file != :local
 
         # not found at any location
-        raise "missing asset at '#{path}'"
+        raise "missing asset at '#{real_path}'"
       end
       alias :cdn_asset_path :cdn_asset_url
 

data/lib/branchable_cdn_assets/middleman/rake_tasks.rb

@@ -13,14 +13,18 @@ module BranchableCDNAssets
         end
       end
 
-      attr_reader :mm
-
       def initialize namespace
-        @mm = ::Middleman::Application.server.inst
-        @file_manager   = FileManager.new @mm.extensions[:cdn_assets].config
         @rake_namespace = namespace
       end
 
+      def mm
+        @_mm ||= ::Middleman::Application.server.inst
+      end
+
+      def file_manager
+        @_file_manager ||= FileManager.new mm.extensions[:cdn_assets].config
+      end
+
     end
 
   end

data/lib/branchable_cdn_assets/middleman/version.rb

@@ -1,5 +1,5 @@
 module BranchableCDNAssets
   module Middleman
-    VERSION = '0.5.0'
+    VERSION = '0.5.2'
   end
 end

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

@@ -5,8 +5,8 @@ describe CDNAssets::Middleman::Helpers do
 
   before :each do
     Given.fixture 'base'
-    Given.file 'cdn/production.manifest', "image_one\nimage_remote_one\n"
-    Given.file 'cdn/staging.manifest', "image_one\nimage_remote_two\n"
+    Given.file 'cdn/production.manifest', "image_one\nimage_remote_one\nimg.one.jpg"
+    Given.file 'cdn/staging.manifest',    "image_one\nimage_remote_two\n"
     Given.file 'cdn/image_one', ''
     Given.file 'cdn/image_two', ''
 
@@ -53,6 +53,32 @@ describe CDNAssets::Middleman::Helpers do
           }.to raise_error "missing asset at 'missing_image'"
         end
       end
+
+      context "when assets have multiple extensions" do
+        it "returns the url with the given extensions" do
+          expect( @mm.cdn_asset_url('img.one.jpg') ).to eq '/assets/cdn/img.one.jpg'
+        end
+        it "raises an error if the root asset is missing" do
+          expect{
+            @mm.cdn_asset_url('missing_image.1.jpg')
+          }.to raise_error "missing asset at 'missing_image.1.jpg'"
+        end
+      end
+
+      context "with added file extensions" do
+        it "returns the url with the given extensions" do
+          expect( @mm.cdn_asset_url('image_one?#iefix') ).to eq '/assets/cdn/image_one?#iefix'
+          expect( @mm.cdn_asset_url('img.one.jpg?#iefix') ).to eq '/assets/cdn/img.one.jpg?#iefix'
+        end
+        it "raises an error if the root asset is missing" do
+          expect{
+            @mm.cdn_asset_url('missing_image?#iefix')
+          }.to raise_error "missing asset at 'missing_image'"
+          expect{
+            @mm.cdn_asset_url('missing_image.one.jpg?#iefix')
+          }.to raise_error "missing asset at 'missing_image.one.jpg'"
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: branchable_cdn_assets-middleman
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Middleman Adaptor for branchable_cdn_assets