premailer-rails 1.9.6 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921889a0d16fba418ad624860751a2859349477e
-  data.tar.gz: 6766aae6456138af9b603c99b6792261081ed02c
+  metadata.gz: 34449fbe39f5a20061a3f6b389a95c4286b6a2cc
+  data.tar.gz: 551a7262f0926f02554a6bea9c47eb4446d04d82
 SHA512:
-  metadata.gz: ee8d13c60df7937a75c413cc54263ba36b101f15cead9b8c3b1881f3e208b9cf16a6a1781d47492c2afa69360d79674a431e2273777d3d0abc322745637645c3
-  data.tar.gz: 32aa76f207b989cf6799e01d2a8de70e1044a4d61b3d23d85f7adaba7b82d03343bd2d686b043b65f0bc9535905817d2ff250de00bae5d616313e9342d5ff6de
+  metadata.gz: 507c28b394a9ec1fdf24e6a51b45f0cad7ac6b7ad3012f7c5993db164eeb1f100d9a410a10d4d5876f68cf9e8f9a3a2febf8a5cad5cc116823abaa84714ba8e7
+  data.tar.gz: f3fb70d57c1acf9e196dadc98c53061ed45b2604c9a721e8eff194dd9e42b45243c5c07b4bcaa6b555ae97e5d163ba27c65cb6dcbfab61ed9b4f2168f813f853

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.9.7
+
+- Use `Rails.root` in `FileSystemLoader` (@stanhu, #195)
+
 ## v1.9.6
 
 - Handle `relative_url_root` in when loading CSS from file system

data/VERSION

@@ -1 +1 @@
-1.9.6
+1.9.7

data/lib/premailer/rails/css_loaders/file_system_loader.rb

@@ -14,7 +14,15 @@ class Premailer
           if relative_url_root
             path = path.sub(/\A#{relative_url_root.chomp('/')}/, '')
           end
-          "public#{path}"
+          asset_filename(path)
+        end
+
+        def asset_filename(filename)
+          if defined?(::Rails) && ::Rails.respond_to?(:root)
+            File.join(::Rails.root, 'public', filename)
+          else
+            File.join('public', filename)
+          end
         end
 
         def relative_url_root

data/spec/unit/css_loaders/file_system_loader_spec.rb

@@ -4,6 +4,8 @@ describe Premailer::Rails::CSSLoaders::FileSystemLoader do
   before do
     allow(Rails.configuration)
       .to receive(:assets).and_return(double(prefix: '/assets'))
+    allow(Rails)
+      .to receive(:root).and_return(Pathname.new('/rails_root'))
   end
 
   describe '#file_name' do
@@ -17,19 +19,19 @@ describe Premailer::Rails::CSSLoaders::FileSystemLoader do
 
     context 'when relative_url_root is not set' do
       let(:asset) { '/assets/application.css' }
-      it { is_expected.to eq('public/assets/application.css') }
+      it { is_expected.to eq(File.join(Rails.root, 'public/assets/application.css')) }
     end
 
     context 'when relative_url_root is set' do
       let(:relative_url_root) { '/foo' }
       let(:asset) { '/foo/assets/application.css' }
-      it { is_expected.to eq('public/assets/application.css') }
+      it { is_expected.to eq(File.join(Rails.root, 'public/assets/application.css')) }
     end
 
     context 'when relative_url_root has a trailing slash' do
       let(:relative_url_root) { '/foo/' }
       let(:asset) { '/foo/assets/application.css' }
-      it { is_expected.to eq('public/assets/application.css') }
+      it { is_expected.to eq(File.join(Rails.root, 'public/assets/application.css')) }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.7
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer