roadie-rails 1.1.0.rc1 → 1.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6e069d2ab9315717c52c90b8546ceaed0e11886
-  data.tar.gz: ef744fe87053f03b4f01d4c30433b4bc1bb57e6c
+  metadata.gz: dcb900b0ff648dc35539039d535cd4b1ab7a67d9
+  data.tar.gz: 8ef1f9b9bfae0fc65f6e7d383a6147f68afad7ec
 SHA512:
-  metadata.gz: 5a92864739208eab2125a21d3b89de11a113c784bf48ee44ed51b41a227109addb71ad98eab4898914f58657a3c909ba8cc5eba7da6c1f279e36ca79371329c3
-  data.tar.gz: 74da180802daf9f9ed9c73d1e8de4dd21461dc9be39fc64514e8f7fca6eecf0c10090aa9974cce6deed3e787d6179d816054e4491bf9587e09312ac55291efd3
+  metadata.gz: 2f208d03f3541bbd090e849b95807dc73fcd572063dbec96b99e78262ccc11232126fa17f672ed30752d97d80e330fdff1535df7fc3444d8baad344f4617dd93
+  data.tar.gz: f84b45b790fddbae358a14049b8ee34008b175c949d2f5ca405659f5353f24c5b51176a7c8150af4a8ffbb0cd8ab8c6e6e5f25c093189b0e7cbeb7d17f7d1ace

data/Changelog.md

@@ -1,6 +1,12 @@
 ### development version
 
-[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0.rc1...master)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0.rc2...master)
+
+### development version
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0.rc1...v1.1.0.rc2)
+
+* Add support for `roadie`'s `external_asset_providers` option.
 
 ### 1.1.0.rc1
 

data/README.md

@@ -15,7 +15,7 @@ This gem hooks up your Rails application with Roadie to help you generate HTML e
 [Add this gem to your Gemfile as recommended by Rubygems][gem] and run `bundle install`.
 
 ```ruby
-gem 'roadie-rails', '~> 3.1'
+gem 'roadie-rails', '~> 1.0'
 ```
 
 ## Usage ##

data/lib/roadie/rails/options.rb

@@ -5,6 +5,7 @@ module Roadie
         :after_transformation,
         :asset_providers,
         :before_transformation,
+        :external_asset_providers,
         :keep_uninlinable_css,
         :url_options,
       ]
@@ -13,11 +14,12 @@ module Roadie
 
       def initialize(options = {})
         complain_about_unknown_keys options.keys
-        self.after_transformation  = options[:after_transformation]
-        self.asset_providers       = options[:asset_providers]
-        self.before_transformation = options[:before_transformation]
-        self.keep_uninlinable_css  = options[:keep_uninlinable_css]
-        self.url_options           = options[:url_options]
+        self.after_transformation     = options[:after_transformation]
+        self.asset_providers          = options[:asset_providers]
+        self.before_transformation    = options[:before_transformation]
+        self.external_asset_providers = options[:external_asset_providers]
+        self.keep_uninlinable_css     = options[:keep_uninlinable_css]
+        self.url_options              = options[:url_options]
       end
 
       def url_options=(options)
@@ -45,13 +47,23 @@ module Roadie
         end
       end
 
+      def external_asset_providers=(providers)
+        if providers
+          @external_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
+
       def apply_to(document)
         document.url_options = url_options
         document.before_transformation = before_transformation
         document.after_transformation = after_transformation
-        # #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
+        document.external_asset_providers = external_asset_providers if external_asset_providers
+
         document.keep_uninlinable_css = keep_uninlinable_css unless keep_uninlinable_css.nil?
       end
 
@@ -83,6 +95,10 @@ module Roadie
           before_transformation, options[:before_transformation]
         )
 
+        self.external_asset_providers = combine_providers(
+          external_asset_providers, options[:external_asset_providers]
+        )
+
         self.keep_uninlinable_css =
           options[:keep_uninlinable_css] if options.has_key?(:keep_uninlinable_css)
 

data/lib/roadie/rails/version.rb

@@ -1,5 +1,5 @@
 module Roadie
   module Rails
-    VERSION = "1.1.0.rc1"
+    VERSION = "1.1.0.rc2"
   end
 end

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

@@ -138,6 +138,19 @@ module Roadie
         end
       end
 
+      it_behaves_like "attribute", :external_asset_providers do
+        let(:provider1) { double "Asset provider 1" }
+        let(:provider2) { double "Asset provider 2" }
+
+        let(:valid_value) { ProviderList.new([provider1]) }
+        let(:other_valid_value) { ProviderList.new([provider2]) }
+
+        def expect_combinated_value(value)
+          expect(value).to be_instance_of(ProviderList)
+          expect(value.to_a).to eq([provider1, provider2])
+        end
+      end
+
       describe "asset_providers" do
         it "automatically wraps values in a ProviderList" do
           provider = double "Asset provider"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roadie-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
 platform: ruby
 authors:
 - Magnus Bergmark