roadie 2.1.0 → 2.2.0

data/Changelog.md

@@ -1,9 +1,23 @@
 ### dev
 
-[full changelog](https://github.com/Mange/roadie/compare/v2.1.0.pre2...master)
+[full changelog](https://github.com/Mange/roadie/compare/v2.2.0...master)
 
 * Nothing yet
 
+### 2.2.0
+
+[full changelog](https://github.com/Mange/roadie/compare/v2.1.0...v2.2.0)
+
+* Enhancements:
+  * Support for the `url_options` method inside mailer instances
+    * You can now dynamically alter the URL options on a per-email basis
+
+### 2.1.0
+
+[full changelog](https://github.com/Mange/roadie/compare/v2.1.0.pre2...v2.1.0)
+
+* Full release!
+
 ### 2.1.0.pre2
 
 [full changelog](https://github.com/Mange/roadie/compare/v2.1.0.pre1...v2.1.0.pre2)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roadie (2.1.0)
+    roadie (2.2.0)
       actionmailer (~> 3.1.0)
       css_parser
       nokogiri (>= 1.4.4)

data/lib/roadie/action_mailer_extensions.rb

@@ -38,7 +38,6 @@ module Roadie
       end
 
       def inline_style_response(response)
-        url_options = Rails.application.config.action_mailer.default_url_options
         if response[:content_type] == 'text/html'
           response.merge :body => Roadie.inline_css(Roadie.current_provider, css_targets, response[:body], url_options)
         else

data/lib/roadie/railtie.rb

@@ -1,4 +1,5 @@
 require 'action_mailer'
+require 'roadie'
 require 'roadie/action_mailer_extensions'
 
 module Roadie
@@ -16,7 +17,9 @@ module Roadie
     config.roadie.provider = nil
 
     initializer "roadie.extend_action_mailer" do
-      ActionMailer::Base.send :include, Roadie::ActionMailerExtensions
+      ActiveSupport.on_load(:action_mailer) do
+        include Roadie::ActionMailerExtensions
+      end
     end
   end
 end

data/lib/roadie/version.rb

@@ -1,3 +1,3 @@
 module Roadie
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/spec/integration_spec.rb

@@ -17,12 +17,15 @@ module Roadie
         headers('X-Spam' => 'No way! Trust us!')
         mail(:subject => 'Buy cheap v1agra', :to => to)
       end
+
+      def url_options
+        # This allows apps to calculate any options on a per-email basis
+        super.merge(:protocol => 'https')
+      end
     end
 
     before(:each) do
-      Rails.application.config.action_mailer.default_url_options = {:host => "example.app.org"}
-
-      Rails.stub(:root => FIXTURES_PATH)
+      change_default_url_options(:host => 'example.app.org')
       mailer.delivery_method = :test
     end
 
@@ -37,7 +40,7 @@ module Roadie
         document = Nokogiri::HTML.parse(html_part.body.decoded)
         document.should have_selector('html > head + body')
         document.should have_selector('body #message h1')
-        document.should have_styling('background' => 'url(http://example.app.org/images/dots.png) repeat-x').at_selector('body')
+        document.should have_styling('background' => 'url(https://example.app.org/images/dots.png) repeat-x').at_selector('body')
         document.should have_selector('strong[contains("quota")]')
       end
 

data/spec/lib/roadie_spec.rb

@@ -23,7 +23,7 @@ describe Roadie do
   end
 
   describe ".current_provider" do
-    let(:provider) { Object.new }
+    let(:provider) { double("provider instance") }
 
     context "with a set provider in the config" do
       it "uses the set provider" do

data/spec/spec_helper.rb

@@ -15,18 +15,15 @@ end
 require 'rspec'
 require 'rails'
 require 'sprockets'
-require 'roadie'
+
+require 'roadie/railtie'
+require 'action_mailer/railtie'
 
 FIXTURES_PATH = Pathname.new(File.dirname(__FILE__)).join('fixtures')
-Roadie::Railtie.run_initializers
 
-class TestApplication
+class TestApplication < Rails::Application
   def config
-    @config ||= OpenStruct.new({
-      :action_mailer => OpenStruct.new(:default_url_options => {:host => "example.com"}),
-      :assets => OpenStruct.new(:enabled => false),
-      :roadie => OpenStruct.new(:provider => nil),
-    })
+    @config
   end
 
   def assets
@@ -38,11 +35,23 @@ class TestApplication
   def root
     FIXTURES_PATH
   end
+
+  def reset_test_config
+    @config = OpenStruct.new({
+      :action_mailer => OpenStruct.new(:default_url_options => {}),
+      :assets => OpenStruct.new(:enabled => false),
+      :roadie => OpenStruct.new(:provider => nil),
+    })
+    change_default_url_options(:host => "example.com")
+  end
 end
 
+ActionMailer::Railtie.run_initializers(:default, Rails.application)
+Roadie::Railtie.run_initializers(:default, Rails.application)
+
 RSpec.configure do |c|
   c.before(:each) do
-    Rails.stub(:application => TestApplication.new)
+    Rails.application.reset_test_config
   end
 end
 

data/spec/support/change_url_options.rb

@@ -0,0 +1,5 @@
+# ActionMailer::Base loads the default_url_options on startup via its Railtie
+def change_default_url_options(new_options)
+  Rails.application.config.action_mailer.default_url_options = new_options
+  ActionMailer::Base.default_url_options = new_options
+end

metadata

@@ -2,7 +2,7 @@
 name: roadie
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Magnus Bergmark
@@ -183,6 +183,7 @@ files:
 - spec/lib/roadie_spec.rb
 - spec/shared_examples/asset_provider_examples.rb
 - spec/spec_helper.rb
+- spec/support/change_url_options.rb
 - spec/support/have_attribute_matcher.rb
 - spec/support/have_selector_matcher.rb
 - spec/support/have_styling_matcher.rb
@@ -231,6 +232,7 @@ test_files:
 - spec/lib/roadie_spec.rb
 - spec/shared_examples/asset_provider_examples.rb
 - spec/spec_helper.rb
+- spec/support/change_url_options.rb
 - spec/support/have_attribute_matcher.rb
 - spec/support/have_selector_matcher.rb
 - spec/support/have_styling_matcher.rb