premailer-rails 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d3ecd8b9d9f55c3039cad6467d7de1fc2676565
-  data.tar.gz: 985538b2930d3bae69fe75b9415af3f4d4f411eb
+  metadata.gz: 7ef9ec48ca64d88fcd427db297397c18a20f6711
+  data.tar.gz: f6c87f62f912f57f0d5f302138abd6160a65d99d
 SHA512:
-  metadata.gz: 4e13cd460126fb67c58f89d186157463ca47162a228cc12e46dfc373bd9773d30a11ba318c9ea36d1892474b94bf3a2008c49e847ed35b049acf095f6da517d0
-  data.tar.gz: c0cdc0051dd65ef19bffb36378943733c4f66f68c3ef8662f77a66763a4439f8024daf20b1a35f5d11285bb730bc8ef256eed8ea8460fee387fa2fdda8f9a39b
+  metadata.gz: aa2493ad95cdc85442f350a4d613ce66a996b114ac2054dd0c2a145f9ce54c844371dbbb053e4011e3a4a95a4a2986e98037d2d6fe00a8879bfec2f0edf952bd
+  data.tar.gz: 946de795ff75887899fb882ed7b74d0497b5e78af394f118c4369f8c779aede8626f08def7bfd5675b645f925b882f596d04269f40719c1c50a80b8d653ab14e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.8.2
+
+- `Premailer::Rails::CSSLoaders::NetworkLoader` is more resilient and works even
+  if the Rails asset host is set without a URI scheme. (panthomakos)
+
 ## v1.8.1
 
 - Add support for longer fingerprint generated by sprocket 3.

data/README.md

@@ -1,4 +1,4 @@
-ki premailer-rails
+# premailer-rails
 
 CSS styled emails without the hassle.
 

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.8.2

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

@@ -12,29 +12,29 @@ class Premailer
         def uri_for_url(url)
           uri = URI(url)
 
-          if not valid_uri?(uri) and defined?(::Rails)
-            scheme, host =
-              asset_host.split(%r{:?//})
+          if uri.host.present?
+            return uri if uri.scheme.present?
+            URI("http://#{uri.to_s}")
+          elsif asset_host_present?
+            scheme, host = asset_host.split(%r{:?//})
+            scheme, host = host, scheme if host.nil?
             scheme = 'http' if scheme.blank?
-            uri.scheme ||= scheme
-            uri.host ||= host
+            path = url
+            URI(File.join("#{scheme}://#{host}", path))
           end
-
-          uri if valid_uri?(uri)
         end
 
         def valid_uri?(uri)
           uri.host.present? && uri.scheme.present?
         end
 
-        def asset_host
-          host = ::Rails.configuration.action_controller.asset_host
+        def asset_host_present?
+          ::Rails.configuration.action_controller.asset_host.present?
+        end
 
-          if host.respond_to?(:call)
-            host.call
-          else
-            host
-          end
+        def asset_host
+          config = ::Rails.configuration.action_controller.asset_host
+          config.respond_to?(:call) ? config.call : config
         end
       end
     end

data/spec/unit/css_loaders/network_loader_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Premailer::Rails::CSSLoaders::NetworkLoader do
+  describe '#uri_for_url' do
+    subject { described_class.uri_for_url(url) }
+    let(:asset_host) { nil }
+
+    before do
+      action_controller = double(asset_host: asset_host)
+      config = double(action_controller: action_controller)
+      allow(Rails).to receive(:configuration).and_return(config)
+    end
+
+    context 'with a valid URL' do
+      let(:url) { 'http://example.com/test.css' }
+      it { is_expected.to eq(URI(url)) }
+    end
+
+    context 'with a protocol relative URL' do
+      let(:url) { '//example.com/test.css' }
+      it { is_expected.to eq(URI("http://#{url}")) }
+    end
+
+    context 'with a file path' do
+      let(:url) { '/assets/foo.css' }
+
+      context 'and a domain as asset host' do
+        let(:asset_host) { 'example.com' }
+        it { is_expected.to eq(URI("http://example.com#{url}")) }
+      end
+
+      context 'and a URL as asset host' do
+        let(:asset_host) { 'https://example.com' }
+        it { is_expected.to eq(URI("https://example.com/assets/foo.css")) }
+      end
+
+      context 'and a protocol relative URL as asset host' do
+        let(:asset_host) { '//example.com' }
+        it { is_expected.to eq(URI("http://example.com/assets/foo.css")) }
+      end
+
+      context 'and a proc as asset host' do
+        let(:asset_host) { ->{ 'example.com' } }
+        it { is_expected.to eq(URI("http://example.com/assets/foo.css")) }
+      end
+
+      context 'without an asset host' do
+        let(:asset_host) { nil }
+        it { is_expected.not_to be }
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -163,6 +163,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/network_loader_spec.rb
 - spec/unit/customized_premailer_spec.rb
 - spec/unit/premailer_rails_spec.rb
 homepage: https://github.com/fphilipe/premailer-rails
@@ -198,5 +199,6 @@ 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/network_loader_spec.rb
 - spec/unit/customized_premailer_spec.rb
 - spec/unit/premailer_rails_spec.rb