roadie-rails 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a4b35fded61973ac9cbda12c4cbf1796becd78f
-  data.tar.gz: 6b0b437288261047b9b81693bbb0deed2807a2d4
+  metadata.gz: 6af45ff8198c174ab196aa56d43b41c9a6fe4beb
+  data.tar.gz: 1dccbfa2e869c0e4bdac53aa5216d7dc943586a6
 SHA512:
-  metadata.gz: 4b8a7542c61077ac912f2bf2d94eb5a35896d318c7e1c6e016ccb866a9db0e6785b22a58ab2e983216c64d9c33306bb736feb2bbe5afd741faf547aff06c242c
-  data.tar.gz: da357a8a917fee88860c6583acd0dbc9000778953d1bd4b3824bcd78143cc799469fb21d3f6b401acdd761f5288d201464c11c2b3c61a437d8119edc90e6219d
+  metadata.gz: abc12ed74b832165ae530fd1a177e543ee09aafca39674923d52479aa0d916f9385e9a233a6de436e0bf73b1ca2f7d19ce31816f88432c0ab99f20eb49e337c2
+  data.tar.gz: 5c5863831c581517ab0c7e6f1a6cc3623f3690e2c5538e305184c9bac0ad2e2c184e119e4019918f7c222fc8653924b1d66f4ba039125650e6c78136373b38e2

data/Changelog.md

@@ -1,6 +1,18 @@
 ### development version
 
-[full changelog](https://github.com/Mange/roadie/compare/v1.0.2...master)
+[full changelog](https://github.com/Mange/roadie/compare/v1.0.3...master)
+
+* Nothing yet
+
+### 1.0.3
+
+[full changelog](https://github.com/Mange/roadie/compare/v1.0.2...v1.0.3)
+
+* Bug fixes
+  * Don't change `asset_providers` of a `Roadie::Document` when applying Options with no `asset_providers` set.
+  * Support assets inside subdirectories.
+  * Don't add `AssetPipelineProvider` when asset pipeline is unavailable (e.g. inside Rails engines).
+  * Raise error when initializing `AssetPipelineProvider` with `nil` provider.
 
 ### 1.0.2
 

data/README.md

@@ -254,6 +254,23 @@ class Admin::EmailsController < AdminController
 end
 ```
 
+## Known issues ##
+
+Roadie will not be able to find your stylesheets if you have an `asset_host` configured and will ignore those lines when inlining.
+
+A workaround for this is to not use `asset_host` in your mailers:
+
+```ruby
+config.action_controller.asset_host = # ...
+config.action_mailer.asset_host = nil
+
+# or
+
+class MyMailer < ActionMailer::Base
+  self.asset_host = nil
+end
+```
+
 ## Build status ##
 
 Tested with [Travis CI](http://travis-ci.org) using [almost all combinations of](http://travis-ci.org/#!/Mange/roadie-rails):

data/lib/roadie/rails/asset_pipeline_provider.rb

@@ -5,6 +5,7 @@ module Roadie
       attr_reader :pipeline
 
       def initialize(pipeline)
+        raise ArgumentError, "You need to pass a pipeline to initialize AssetPipelineProvider" unless pipeline
         super()
         @pipeline = pipeline
       end
@@ -17,7 +18,15 @@ module Roadie
 
       private
       def normalize_asset_name(href)
-        File.basename href.split('?').first
+        remove_asset_prefix href.split('?').first
+      end
+
+      def remove_asset_prefix(path)
+        path.sub(Regexp.new("^#{Regexp.quote(asset_prefix)}/?"), "")
+      end
+
+      def asset_prefix
+        ::Rails.application.try(:config).try(:assets).try(:prefix) || "/assets"
       end
     end
   end

data/lib/roadie/rails/options.rb

@@ -30,6 +30,9 @@ module Roadie
       def asset_providers=(providers)
         if providers
           @asset_providers = ProviderList.wrap providers
+        # TODO: Raise an error when setting to nil in order to make this not a silent error.
+        # else
+        #   raise ArgumentError, "Cannot set asset_providers to nil. Set to Roadie::NullProvider if you want no external assets inlined."
         end
       end
 
@@ -37,7 +40,9 @@ module Roadie
         document.url_options = url_options
         document.before_transformation = before_transformation
         document.after_transformation = after_transformation
-        document.asset_providers = asset_providers
+        # #asset_providers default to nil in this class and it's the one option
+        # that is not allowed to be nil on Document.
+        document.asset_providers = asset_providers if asset_providers
       end
 
       def merge(options)
@@ -78,7 +83,7 @@ module Roadie
 
       def combine_providers(first, second)
         combine_nilable(first, second) do |a, b|
-          ProviderList.new a.to_a + Array.wrap(b)
+          ProviderList.new(a.to_a + Array.wrap(b))
         end
       end
 

data/lib/roadie/rails/railtie.rb

@@ -13,7 +13,7 @@ module Roadie
         # Saying config.assets.enabled here does not work in Rails 3.1-3.2, but
         # APP.config.assets work. There is a difference between "config" and
         # "app.config" on those versions.
-        if app.config.respond_to?(:assets) && app.config.assets.enabled != false
+        if app.config.respond_to?(:assets) && app.config.assets.enabled != false && app.assets
           config.roadie.asset_providers << AssetPipelineProvider.new(app.assets)
         end
       end

data/lib/roadie/rails/version.rb

@@ -1,5 +1,5 @@
 module Roadie
   module Rails
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/spec/lib/roadie/rails/asset_pipeline_provider_spec.rb

@@ -6,6 +6,12 @@ module Roadie
     describe AssetPipelineProvider do
       let(:pipeline) { FakePipeline.new }
 
+      it "requires a passed pipeline" do
+        expect {
+          AssetPipelineProvider.new(nil)
+        }.to raise_error(ArgumentError)
+      end
+
       it_behaves_like "roadie asset provider", valid_name: "existing.css", invalid_name: "bad.css" do
         subject { AssetPipelineProvider.new(pipeline) }
         before do
@@ -28,6 +34,15 @@ module Roadie
           provider = AssetPipelineProvider.new(pipeline)
           expect(provider.find_stylesheet("/assets/good.css?body=1")).not_to be_nil
         end
+
+        it "supports stylesheets inside subdirectories" do
+          pipeline.add_asset "sub/deep.css", "/path/to/sub/deep.css.scss", "body { color: green; }"
+          provider = AssetPipelineProvider.new(pipeline)
+
+          stylesheet = provider.find_stylesheet("sub/deep.css")
+          expect(stylesheet.name).to eq("/path/to/sub/deep.css.scss (live compiled)")
+          expect(stylesheet.to_s).to eq("body{color:green}")
+        end
       end
 
       class FakePipeline

data/spec/lib/roadie/rails/options_spec.rb

@@ -131,6 +131,14 @@ module Roadie
           expect(options.asset_providers.to_a).to eq([provider])
         end
       end
+
+      describe "applying to a document" do
+        it "does not change the default asset_providers if option is never set" do
+          fake_document = OpenStruct.new(asset_providers: "original")
+          Options.new.apply_to(fake_document)
+          expect(fake_document.asset_providers).to eq("original")
+        end
+      end
     end
   end
 end

data/spec/lib/roadie/rails/railtie_spec.rb

@@ -42,6 +42,19 @@ module Roadie
           expect(providers[1]).to be_instance_of(AssetPipelineProvider)
           expect(providers[1].pipeline).to eq(asset_pipeline)
         end
+
+        # This happens inside a Rails engine as the parent app is the one
+        # holding on to the pipeline.
+        it "gets no AssetPipelineProvider if assets are enabled but not available" do
+          rails_application.config.assets = ActiveSupport::OrderedOptions.new(enabled: true)
+          allow(rails_application).to receive(:assets).and_return nil
+
+          run_initializer
+
+          providers = Railtie.config.roadie.asset_providers.to_a
+          expect(providers).to have(1).item
+          expect(providers[0]).to be_instance_of(FilesystemProvider)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadie-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roadie