roadie 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5824c94736e27c2a19d255fe99c7083ad42772b7
-  data.tar.gz: 0c8a41f35860a127e707f6fa115bb15399dbed8d
+  metadata.gz: 149e5b897cfd1808633c9b03e3e4b35fc08f23d4
+  data.tar.gz: 1bc5e6e5526f128be884f85a06923f2fbf50ce30
 SHA512:
-  metadata.gz: 031ee1cede388f42a4bfbb05ecddcfaf7d42867e28f9e1f08e5645a6fc24efe5dc0a113553ceb6c987eb844ff1fc53e2814eb656ad9ea03709f68662d4f8dc2a
-  data.tar.gz: 290f00e6c0be0773af92d676ec8e7fa4524ecdad17c688ed5fbddc5afd88a7425779cf589f51822270ebc9f6936cf20f417fc2ff79b0aa0b625db63297959488
+  metadata.gz: e3f0f67f6b32561f32b021f09d374b07bb75a7d1e644b0d04e551ba89a135725019c4347b3a2fcf32941a5a15b2b8941dd11dde706d636da567727cab8b69683
+  data.tar.gz: ff65e28f825d90b61959eab22e916046835efe6305b37af0d19a7526dfd760ec59a767d28517dda26883f5572866e67e431f2f3fe35f0cb9db9c67add5da9b0a

data/Changelog.md

@@ -1,9 +1,17 @@
 ### dev
 
-[full changelog](https://github.com/Mange/roadie/compare/v3.0.4...master)
+[full changelog](https://github.com/Mange/roadie/compare/v3.0.5...master)
 
 * Nothing yet.
 
+### 3.0.5
+
+[full changelog](https://github.com/Mange/roadie/compare/v3.0.4...v3.0.5)
+
+* Bug fixes:
+  * Don't try to inline external stylesheets. (#106)
+  * Don't generate absolute URLs for anchor links. (Mange/roadie-rails#40)
+
 ### 3.0.4
 
 [full changelog](https://github.com/Mange/roadie/compare/v3.0.3...v3.0.4)

data/README.md

@@ -311,7 +311,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2014
+Copyright (c) 2009-2015
 
 * [Magnus Bergmark](https://github.com/Mange) <magnus.bergmark@gmail.com>
 

data/lib/roadie.rb

@@ -4,6 +4,8 @@ end
 require 'roadie/version'
 require 'roadie/errors'
 
+require 'roadie/utils'
+
 require 'roadie/stylesheet'
 require 'roadie/selector'
 require 'roadie/style_property'

data/lib/roadie/asset_scanner.rb

@@ -80,7 +80,7 @@ module Roadie
     end
 
     def read_link_element(element)
-      if element['media'] != "print" && element["href"]
+      if element['media'] != "print" && element["href"] && !Utils.path_is_absolute?(element["href"])
         asset_provider.find_stylesheet! element['href']
       end
     end

data/lib/roadie/url_generator.rb

@@ -32,7 +32,8 @@ module Roadie
 
     # Generate an absolute URL from a relative URL.
     #
-    # If the passed path is already an absolute URL, it will be returned as-is.
+    # If the passed path is already an absolute URL or just an anchor
+    # reference, it will be returned as-is.
     # If passed a blank path, the "root URL" will be returned. The root URL is
     # the URL that the {#url_options} would generate by themselves.
     #
@@ -56,8 +57,9 @@ module Roadie
     # @return [String] an absolute URL
     def generate_url(path, base = "/")
       return root_uri.to_s if path.nil? or path.empty?
+      return path if path_is_anchor?(path)
       return add_scheme(path) if path_is_schemeless?(path)
-      return path if path_is_absolute?(path)
+      return path if Utils.path_is_absolute?(path)
 
       combine_segments(root_uri, base, path).to_s
     end
@@ -113,20 +115,8 @@ module Roadie
       path =~ %r{^//\w}
     end
 
-    def path_is_absolute?(path)
-      # Ruby's URI is pretty unforgiving, but roadie aims to be. Don't involve
-      # URI for URLs that's easy to determine to be absolute.
-      # URLs starting with a scheme (http:, data:) are absolute.
-      #
-      # URLs that start with double slashes (//css/app.css) are also absolute
-      # in modern browsers, but most email clients do not understand them it.
-      path =~ %r{^\w+:} || !parse_path(path).relative?
-    end
-
-    def parse_path(path)
-      URI.parse(path)
-    rescue URI::InvalidURIError => error
-      raise InvalidUrlPath.new(path, error)
+    def path_is_anchor?(path)
+      path.start_with? '#'
     end
 
     VALID_OPTIONS = Set[:host, :port, :path, :protocol, :scheme].freeze

data/lib/roadie/utils.rb

@@ -0,0 +1,20 @@
+module Roadie
+  module Utils
+    def path_is_absolute?(path)
+      # Ruby's URI is pretty unforgiving, but roadie aims to be. Don't involve
+      # URI for URLs that's easy to determine to be absolute.
+      # URLs starting with a scheme (http:, data:) are absolute.
+      #
+      # URLs that start with double slashes (//css/app.css) are also absolute
+      # in modern browsers, but most email clients do not understand them.
+      return true if path =~ %r{^(\w+:|//)}
+
+      begin
+        !URI.parse(path).relative?
+      rescue URI::InvalidURIError => error
+        raise InvalidUrlPath.new(path, error)
+      end
+    end
+    module_function :path_is_absolute?
+  end
+end

data/lib/roadie/version.rb

@@ -1,3 +1,3 @@
 module Roadie
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

data/spec/lib/roadie/asset_scanner_spec.rb

@@ -77,6 +77,15 @@ module Roadie
         expect(scanner.find_css).to eq([])
       end
 
+      it "does not look for externally referenced stylesheets" do
+        dom = dom_fragment %(<link rel="stylesheet" href="//example.com/assets/style.css">)
+        expect(provider).not_to receive(:find_stylesheet!)
+
+        scanner = AssetScanner.new dom, provider
+
+        expect(scanner.find_css).to eq([])
+      end
+
       it "does not look for ignored referenced stylesheets" do
         dom = dom_fragment %(<link rel="stylesheet" href="/error.css" data-roadie-ignore>)
         expect(provider).not_to receive(:find_stylesheet!)

data/spec/lib/roadie/url_generator_spec.rb

@@ -60,6 +60,10 @@ module Roadie
         expect(url("http://foo.com/", host: "bar.com")).to eq("http://foo.com/")
       end
 
+      it "returns the original URL if it is just an anchor" do
+        expect(url("#top", host: "bar.com")).to eq("#top")
+      end
+
       it "returns the base URL for blank paths" do
         expect(url("", host: "foo.com")).to eq("http://foo.com")
         expect(url(nil, host: "foo.com")).to eq("http://foo.com")

data/spec/lib/roadie/utils_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+module Roadie
+  describe Utils, "path_is_absolute?" do
+    RSpec::Matchers.define :be_absolute do
+      match { |path| Utils.path_is_absolute?(path) }
+    end
+
+    it "detects absolute HTTP URLs" do
+      expect("http://example.com").to be_absolute
+      expect("https://example.com").to be_absolute
+      expect("https://example.com/path?foo=bar").to be_absolute
+    end
+
+    it "detects absolute URLs without schemes" do
+      expect("//example.com").to be_absolute
+      expect("//").to be_absolute
+    end
+
+    it "detects relative URLs without hosts" do
+      expect("path/to/me").not_to be_absolute
+      expect("/path/to/me").not_to be_absolute
+      expect("../../path").not_to be_absolute
+      expect("/").not_to be_absolute
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadie
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -108,6 +108,7 @@ files:
 - lib/roadie/upgrade_guide.rb
 - lib/roadie/url_generator.rb
 - lib/roadie/url_rewriter.rb
+- lib/roadie/utils.rb
 - lib/roadie/version.rb
 - roadie.gemspec
 - spec/fixtures/big_em.css
@@ -130,6 +131,7 @@ files:
 - spec/lib/roadie/test_provider_spec.rb
 - spec/lib/roadie/url_generator_spec.rb
 - spec/lib/roadie/url_rewriter_spec.rb
+- spec/lib/roadie/utils_spec.rb
 - spec/shared_examples/asset_provider.rb
 - spec/shared_examples/url_rewriter.rb
 - spec/spec_helper.rb
@@ -158,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Making HTML emails comfortable for the Ruby rockstars
@@ -183,6 +185,7 @@ test_files:
 - spec/lib/roadie/test_provider_spec.rb
 - spec/lib/roadie/url_generator_spec.rb
 - spec/lib/roadie/url_rewriter_spec.rb
+- spec/lib/roadie/utils_spec.rb
 - spec/shared_examples/asset_provider.rb
 - spec/shared_examples/url_rewriter.rb
 - spec/spec_helper.rb