premailer-rails 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d3d9d793a427df886ea2b99af60ce466db67bd2
-  data.tar.gz: 3849875af6ec63a8194008c94ab543a0b8fbd920
+  metadata.gz: 921889a0d16fba418ad624860751a2859349477e
+  data.tar.gz: 6766aae6456138af9b603c99b6792261081ed02c
 SHA512:
-  metadata.gz: e99f797aaa7f53584f5b8b63b5a20358be04e70a6c3677774abaf04814ceb1574393b7532dad24e36c5accc2ab86bed46aac6efc7967534afb1a5d9880be1dfe
-  data.tar.gz: 17df1bf7a56bba9ed2474f85012b78d810b924b28efe756827ae66494a5948065dbb4f1aeae8dfc94744d2a830e18fd7f82ade8a90ec63f60a41481623c4e64d
+  metadata.gz: ee8d13c60df7937a75c413cc54263ba36b101f15cead9b8c3b1881f3e208b9cf16a6a1781d47492c2afa69360d79674a431e2273777d3d0abc322745637645c3
+  data.tar.gz: 32aa76f207b989cf6799e01d2a8de70e1044a4d61b3d23d85f7adaba7b82d03343bd2d686b043b65f0bc9535905817d2ff250de00bae5d616313e9342d5ff6de

data/.travis.yml

@@ -3,20 +3,13 @@ language: ruby
 cache: bundler
 script: bundle exec rspec
 rvm:
-  - 2.3.0
-  - ruby-head
-  - jruby
-  - rbx-2
+  - 2.4.1
 env:
-  global:
-    - JRUBY_OPTS="--2.0"
   matrix:
     - ACTION_MAILER_VERSION=4
-    - ACTION_MAILER_VERSION=5.beta
+    - ACTION_MAILER_VERSION=5
     - ACTION_MAILER_VERSION=master
 matrix:
   fast_finish: true
   allow_failures:
     - env: ACTION_MAILER_VERSION=master
-    - env: ACTION_MAILER_VERSION=5.beta
-    - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.9.6
+
+- Handle `relative_url_root` in when loading CSS from file system
+
 ## v1.9.5
 
 - Mention license in gemspec

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-action_mailer_version = ENV.fetch('ACTION_MAILER_VERSION', '4')
+action_mailer_version = ENV.fetch('ACTION_MAILER_VERSION', '5')
 
 if action_mailer_version == 'master'
   git 'git://github.com/rails/rails.git' do

data/README.md

@@ -87,7 +87,8 @@ gem 'hpricot'
 
 If both gems are loaded for some reason, premailer chooses hpricot.
 
-That's it!
+You can also explicitly configure the apapter as documented
+[here](https://github.com/premailer/premailer#adapters).
 
 ## Configuration
 

data/VERSION

@@ -1 +1 @@
-1.9.5
+1.9.6

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

@@ -5,9 +5,23 @@ class Premailer
         extend self
 
         def load(url)
+          file = file_name(url)
+          File.read(file) if File.file?(file)
+        end
+
+        def file_name(url)
           path = URI(url).path
-          file_path = "public#{path}"
-          File.read(file_path) if File.file?(file_path)
+          if relative_url_root
+            path = path.sub(/\A#{relative_url_root.chomp('/')}/, '')
+          end
+          "public#{path}"
+        end
+
+        def relative_url_root
+          defined?(::Rails) &&
+            ::Rails.respond_to?(:configuration) &&
+            ::Rails.configuration.respond_to?(:relative_url_root) &&
+            ::Rails.configuration.relative_url_root
         end
       end
     end

data/spec/spec_helper.rb

@@ -11,6 +11,10 @@ if RUBY_ENGINE == 'ruby'
   end
 end
 
+# Temporary fix for missing require. See
+# https://github.com/rails/rails/pull/28835
+require 'active_support/rescuable'
+
 require 'premailer/rails'
 
 require 'support/stubs/action_mailer'

data/spec/unit/css_loaders/file_system_loader_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Premailer::Rails::CSSLoaders::FileSystemLoader do
+  before do
+    allow(Rails.configuration)
+      .to receive(:assets).and_return(double(prefix: '/assets'))
+  end
+
+  describe '#file_name' do
+    subject { described_class.file_name(asset) }
+    let(:relative_url_root) { nil }
+
+    before do
+      config = double(relative_url_root: relative_url_root)
+      allow(Rails).to receive(:configuration).and_return(config)
+    end
+
+    context 'when relative_url_root is not set' do
+      let(:asset) { '/assets/application.css' }
+      it { is_expected.to eq('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') }
+    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') }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -166,6 +166,7 @@ files:
 - spec/support/stubs/action_mailer.rb
 - spec/support/stubs/rails.rb
 - spec/unit/css_loaders/asset_pipeline_loader_spec.rb
+- spec/unit/css_loaders/file_system_loader_spec.rb
 - spec/unit/css_loaders/network_loader_spec.rb
 - spec/unit/customized_premailer_spec.rb
 - spec/unit/premailer_rails_spec.rb
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Easily create styled HTML emails in Rails.
@@ -220,7 +221,7 @@ test_files:
 - spec/support/stubs/action_mailer.rb
 - spec/support/stubs/rails.rb
 - spec/unit/css_loaders/asset_pipeline_loader_spec.rb
+- spec/unit/css_loaders/file_system_loader_spec.rb
 - spec/unit/css_loaders/network_loader_spec.rb
 - spec/unit/customized_premailer_spec.rb
 - spec/unit/premailer_rails_spec.rb
-has_rdoc: