mosaico 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33fbe9102d1dab2b39a3535f6d62705239318add
-  data.tar.gz: 8b3ba8eda8e70ddecaba81c43d917d9f385aace7
+  metadata.gz: eb08eed391dc9fdea93dfd8112abada6639bc06a
+  data.tar.gz: c26b82633c819545823c7572b3005e54b7156af1
 SHA512:
-  metadata.gz: 2d492517c2eb7d0a10a8c16a351c783b4f38289669f7d4e4ee54b99e2e12dff5d2d4e0f22547340e2a7b0ff0189312968209d341e2c1af868c3e184aff6e47c1
-  data.tar.gz: 35ac624b3953e9ce59402381e06b5ed710f2524921abec4ca63f836cee54a707af5029918a91c2cb523123eb26aec953a603334e45eec441dd5f526ed14414fb
+  metadata.gz: f5e720c0531c1e0a8274fe4ec630382994b76b08d769c17d4bbb5772e0ef7e4bfef9a57c29ef9123377fe13c60d56e6b63daedc93afd8e5a7e15d2b6547d7ba8
+  data.tar.gz: 6ba2611446a7b050de4f643b9e9cbcf8f78fd9adeb8fd199142f607e1fd592234628a513e21f00a83fc1842abc2b8e13802803fccea4df43c193e7c967bd73ae

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+1.1.1
+===
+* Fixed asset delivery for custom templates.
+
 1.1.0
 ===
 * Fixed asset delivery for TinyMCE plugins, themes, and skins.

data/lib/mosaico/template.rb

@@ -51,7 +51,7 @@ module Mosaico
     def asset_paths
       @asset_paths ||= list_assets.each_with_object({}) do |asset_path, ret|
         asset_path = replacement_asset_url(asset_path)
-        short_path = asset_path.sub(/\A#{File.join('mosaico', 'templates', name)}#{File::SEPARATOR}/, '')
+        short_path = asset_path.sub(/\A#{dir}#{File::SEPARATOR}?/, '')
         ret[short_path] = Mosaico.resolve_asset(asset_path)
       end
     end
@@ -75,6 +75,7 @@ module Mosaico
     end
 
     def before_register
+      Rails.application.config.assets.paths << File.dirname(dir)
       Rails.application.config.assets.precompile += list_assets
     end
 
@@ -83,11 +84,9 @@ module Mosaico
 
     def list_assets
       subdirs.flat_map do |subdir|
-        Dir.chdir(Mosaico.vendor_asset_root) do
-          # only allow images through for now
-          # TODO: what other file types are we going to need?
-          Dir.glob(File.join('mosaico', 'templates', name, subdir, '**/*.{jpg,gif,png}'))
-        end
+        # only allow images through for now
+        # TODO: what other file types are we going to need?
+        Dir.glob(File.join(dir, subdir, '**/*.{jpg,gif,png}'))
       end
     end
   end

data/lib/mosaico/versafix_template.rb

@@ -14,7 +14,7 @@ module Mosaico
         new_asset_path = original_asset_path.sub('google+', 'google_plus')
 
         Rails.application.config.assets.generated.add(new_asset_path, precompile: true) do
-          File.binread(File.join(Mosaico.vendor_asset_root, original_asset_path))
+          File.binread(original_asset_path)
         end
       end
 

data/lib/mosaico/version.rb

@@ -1,4 +1,4 @@
 module Mosaico
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
   MOSAICO_VERSION = '0.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mosaico
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-17 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css-rewrite