roadie 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb9d9810978beb19ef7c13d2ef8953827b418bb1
-  data.tar.gz: db5db2dc87d93790b131fd0b3c515e9c24114525
+  metadata.gz: 3e46e63eac0d8ed2687129918a809ae20203b1e3
+  data.tar.gz: 5e6e1a556dbc197c61b5d209f85c123ae1075e1c
 SHA512:
-  metadata.gz: 7cf63f4924682f07f21960926b8b804e9d82e7db8b8c90b2e658557983e9e098534841b823d162736a3d3cc973c23f568987db3e3911fbadcdc0234998c09587
-  data.tar.gz: c65545723737f33444e7c2797a8b01b288d0945a556100217fe7b0f86748bcfbc00908e1cd2204ea21fe26b543f0ebbf40e510831ba681fa6f66cc43ec67e981
+  metadata.gz: 3dd556c62999f098e98863d52292b7bb80752695ba68fe9d2309c791334f5ae950b47717482a7f1a18fd00284f84c5eae404f7747d26287ee8a34891bd1c7759
+  data.tar.gz: 1bbd2fbc9ef860af00a4b1da17507e341679ee555e11447749103958383d5713fed349cd73b68e928103309283dea9342c35a49a69d7d1dfc4b549c1e3fe1d14

data/Changelog.md

@@ -1,9 +1,20 @@
 ### dev
 
-[full changelog](https://github.com/Mange/roadie/compare/v3.0.0...master)
+[full changelog](https://github.com/Mange/roadie/compare/v3.0.1...master)
 
 * Nothing yet.
 
+### 3.0.1
+
+[full changelog](https://github.com/Mange/roadie/compare/v3.0.0...v3.0.1)
+
+* Enhancements:
+  * `CssNotFound` can take a provider which will be shown in error messages.
+* Bug fixes:
+  * URL rewriter no longer raises on absolute URLs that cannot be parsed by `URI`. Absolute URLs are completely ignored.
+  * URL rewriter supports urls without a scheme (like `//assets.myapp.com/foo`).
+  * URL rewriter no longer crashes on absolute URLs without a path (like `myapp://`).
+
 ### 3.0.0
 
 [full changelog](https://github.com/Mange/roadie/compare/v3.0.0.pre1...v3.0.0)

data/README.md

@@ -107,7 +107,7 @@ Example:
 
 ```ruby
 # /home/user/foo/stylesheets/primary.css
-body { color: blue; }
+body { color: green; }
 
 # /home/user/foo/script.rb
 html = <<-HTML
@@ -176,7 +176,7 @@ class UserAssetsProvider
   end
 
   def find_stylesheet!(name)
-    find_stylesheet(name) or raise Roadie::CssNotFound.new(name)
+    find_stylesheet(name) or raise Roadie::CssNotFound.new(name, "does not match a user stylesheet", self)
   end
 
   # Instead of implementing #find_stylesheet!, you could also:
@@ -243,7 +243,7 @@ Tested with [Travis CI](http://travis-ci.org) using:
 
 Let me know if you want any other VM supported officially.
 
-Rubinius support is experimental since it it currently hindered by a Rubinius bug that will probably be fixed shortly.
+Rubinius support is experimental since it is currently hindered by a Rubinius bug that will probably be fixed shortly.
 
 ### Versioning ###
 
@@ -274,7 +274,7 @@ Documentation
 
 * [Online documentation for gem](http://rubydoc.info/gems/roadie/frames)
 * [Online documentation for master](http://rubydoc.info/github/Mange/roadie/master/frames)
-* [Online documentation for Roadie 2.4](http://rubydoc.info/gems/roadie/2.4/frames)
+* [Online documentation for Roadie 2.4.3](http://rubydoc.info/gems/roadie/2.4.3/frames)
 * [Changelog](https://github.com/Mange/roadie/blob/master/Changelog.md)
 
 Running specs

data/lib/roadie/asset_provider.rb

@@ -5,7 +5,7 @@ module Roadie
   # It helps you by declaring {#find_stylesheet!} in the terms of #find_stylesheet in your own class.
   module AssetProvider
     def find_stylesheet!(name)
-      find_stylesheet(name) or raise CssNotFound, name
+      find_stylesheet(name) or raise CssNotFound.new(name, nil, self)
     end
   end
 end

data/lib/roadie/errors.rb

@@ -40,18 +40,22 @@ module Roadie
     # The name of the stylesheet that cannot be found
     attr_reader :css_name
 
-    def initialize(css_name, extra_message = nil)
+    # Provider used when finding
+    attr_reader :provider
+
+    # TODO: Change signature in the next major version of Roadie.
+    def initialize(css_name, extra_message = nil, provider = nil)
       @css_name = css_name
+      @provider = provider
       super build_message(extra_message)
     end
 
     private
     def build_message(extra_message)
-      if extra_message
-        %(Could not find stylesheet "#{css_name}": #{extra_message})
-      else
-        %(Could not find stylesheet "#{css_name}")
-      end
+      message = %(Could not find stylesheet "#{css_name}")
+      message << ": #{extra_message}" if extra_message
+      message << "\nUsed provider:\n#{provider}" if provider
+      message
     end
   end
 end

data/lib/roadie/filesystem_provider.rb

@@ -30,8 +30,8 @@ module Roadie
       if File.exist? file_path
         Stylesheet.new file_path, File.read(file_path)
       else
-        clean_name = File.basename file_path
-        raise CssNotFound.new(clean_name, %{#{file_path} does not exist. (Original name was "#{name}")})
+        basename = File.basename file_path
+        raise CssNotFound.new(basename, %{#{file_path} does not exist. (Original name was "#{name}")}, self)
       end
     end
 

data/lib/roadie/provider_list.rb

@@ -44,6 +44,14 @@ module Roadie
       nil
     end
 
+    def to_s
+      list = @providers.map { |provider|
+        # Indent every line one level
+        provider.to_s.split("\n").join("\n\t")
+      }
+      "ProviderList: [\n\t#{list.join(",\n\t")}\n]"
+    end
+
     # ProviderList can be coerced to an array. This makes Array#flatten work
     # with it, among other things.
     def to_ary() to_a end

data/lib/roadie/url_generator.rb

@@ -105,7 +105,9 @@ module Roadie
     end
 
     def path_is_absolute?(path)
-      not parse_path(path).relative?
+      # 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.
+      path =~ %r{^(\w+:)?//} || !parse_path(path).relative?
     end
 
     def parse_path(path)

data/lib/roadie/version.rb

@@ -1,3 +1,3 @@
 module Roadie
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/spec/lib/roadie/css_not_found_spec.rb

@@ -13,5 +13,12 @@ module Roadie
         'Could not find stylesheet "file.css": directory is missing'
       )
     end
+
+    it "shows information about used provider when given" do
+      provider = double("Some cool provider")
+      expect(CssNotFound.new('style.css', nil, provider).message).to eq(
+        %(Could not find stylesheet "style.css"\nUsed provider:\n#{provider})
+      )
+    end
   end
 end

data/spec/lib/roadie/provider_list_spec.rb

@@ -64,6 +64,20 @@ module Roadie
       }.to change(provider, :size).by(-1)
     end
 
+    it "has a readable string represenation" do
+      provider = double("Provider", to_s: "Some provider")
+      sublist = ProviderList.new([provider, provider])
+      list = ProviderList.new([provider, sublist, provider])
+      expect(list.to_s).to eql "ProviderList: [\n" +
+        "\tSome provider,\n" +
+        "\tProviderList: [\n" +
+          "\t\tSome provider,\n" +
+          "\t\tSome provider\n" +
+        "\t],\n" +
+        "\tSome provider\n" +
+      "]"
+    end
+
     describe "wrapping" do
       it "creates provider lists with the arguments" do
         expect(ProviderList.wrap(test_provider)).to be_instance_of(ProviderList)

data/spec/lib/roadie/url_generator_spec.rb

@@ -84,6 +84,21 @@ module Roadie
       it "does not touch data: URIs" do
         expect(url("data:deadbeef", host: "example.com")).to eq("data:deadbeef")
       end
+
+      it "does not touch absolute URLs without schemes" do
+        expect(url("//assets.myapp.com/foo.jpg", host: "example.com")).to eq("//assets.myapp.com/foo.jpg")
+      end
+
+      it "does not touch custom schemes" do
+        expect(url("myapp://", host: "example.com")).to eq("myapp://")
+      end
+
+      it "does not care if absolute URLs have parse errors" do
+        # Pipe character is invalid inside URLs, but that does not stop a whole
+        # lot of templating/emailing systems for using them as template
+        # markers.
+        expect(url("https://foo.com/%|MARKETING_TOKEN|%", host: "example.com")).to eq("https://foo.com/%|MARKETING_TOKEN|%")
+      end
     end
 
     # URLs in resources that are not based inside the root requires that we may

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadie
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri