roadie-rails 1.1.0.rc2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcb900b0ff648dc35539039d535cd4b1ab7a67d9
-  data.tar.gz: 8ef1f9b9bfae0fc65f6e7d383a6147f68afad7ec
+  metadata.gz: 65ec310d7987a54efad5de41cb80afdade9f53bd
+  data.tar.gz: b47b19fb46061806845b24b8a807302d23a97184
 SHA512:
-  metadata.gz: 2f208d03f3541bbd090e849b95807dc73fcd572063dbec96b99e78262ccc11232126fa17f672ed30752d97d80e330fdff1535df7fc3444d8baad344f4617dd93
-  data.tar.gz: f84b45b790fddbae358a14049b8ee34008b175c949d2f5ca405659f5353f24c5b51176a7c8150af4a8ffbb0cd8ab8c6e6e5f25c093189b0e7cbeb7d17f7d1ace
+  metadata.gz: bfbed57e1c9f8efd5cc758538e95021c921e435c89427a4ab1f68c89ae90d12b6ea15f441b792a0f5b345b07f1b855bcba5d4d4b12ed090dda4fe84933e96699
+  data.tar.gz: ab96f1282ee2d333cd4f5d251c70e5d5ff984cc951c709094fa3fdad77bef3afc8f27761a5316ca96e9d70d61e7962d0739aab22e313fb30769cbc62ce0ab3d2

data/Changelog.md

@@ -1,8 +1,18 @@
 ### development version
 
-[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0.rc2...master)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0...master)
 
-### development version
+* Nothing yet.
+
+### 1.1.0
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0.rc2...v1.1.0)
+
+* Bug fixes:
+  * Support for sprockets-rails 3 (#46) — [Rafael Mendonça França (rafaelfranca)](https://github.com/rafaelfranca)
+  * Support `Mailer#deliver!` in `AutomaticMailer` (#47) — [Julien Vanier (monkbroc)](https://github.com/monkbroc)
+
+### 1.1.0.rc2
 
 [full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0.rc1...v1.1.0.rc2)
 

data/lib/roadie/rails/inline_on_delivery.rb

@@ -7,10 +7,21 @@ module Roadie
       attr_accessor :roadie_options
 
       def deliver
+        inline_styles
+        super
+      end
+
+      def deliver!
+        inline_styles
+        super
+      end
+
+      private
+
+      def inline_styles
         if (options = roadie_options)
           MailInliner.new(self, options).execute
         end
-        super
       end
     end
   end

data/lib/roadie/rails/railtie.rb

@@ -13,8 +13,14 @@ 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 && app.assets
-          config.roadie.asset_providers << AssetPipelineProvider.new(app.assets)
+        if app.config.respond_to?(:assets) && app.config.assets.enabled != false
+          if app.assets
+            config.roadie.asset_providers << AssetPipelineProvider.new(app.assets)
+          else
+            app.config.assets.configure do |env|
+              config.roadie.asset_providers << AssetPipelineProvider.new(env)
+            end
+          end
         end
       end
     end

data/lib/roadie/rails/version.rb

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

data/roadie-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = %w[README.md Changelog.md LICENSE.txt]
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "roadie", ">= 3.1.0.rc1", "< 4.0"
+  spec.add_dependency "roadie", "~> 3.1"
   spec.add_dependency "railties", ">= 3.0", "< 4.3"
 
   spec.add_development_dependency "rails", ">= 3.0", "< 4.3"

data/spec/integration_spec.rb

@@ -8,21 +8,21 @@ describe "Integrations" do
   end
 
   [
-    RailsApp.new("Rails 3.0.x", 'rails_30', runner: :script, asset_pipeline: false),
+    RailsApp.new("Rails 3.0.x", 'rails_30', runner: :script, asset_pipeline: false, digests: false),
     ## We do not yet support live-compilation through asset pipeline
-    RailsApp.new("Rails 3.1.x", 'rails_31', runner: :script, asset_pipeline: true),
-    RailsApp.new("Rails 3.2.x", 'rails_32', runner: :script, asset_pipeline: true),
-    RailsApp.new("Rails 4.0.x", 'rails_40', runner: :bin, asset_pipeline: true),
-    RailsApp.new("Rails 4.0.x (without asset pipeline)", 'rails_40_no_pipeline', runner: :bin, asset_pipeline: false),
-    RailsApp.new("Rails 4.1.x", 'rails_41', runner: :bin, asset_pipeline: true),
-    RailsApp.new("Rails 4.2.x", 'rails_42', runner: :bin, asset_pipeline: true),
+    RailsApp.new("Rails 3.1.x", 'rails_31', runner: :script, asset_pipeline: true, digests: false),
+    RailsApp.new("Rails 3.2.x", 'rails_32', runner: :script, asset_pipeline: true, digests: false),
+    RailsApp.new("Rails 4.0.x", 'rails_40', runner: :bin, asset_pipeline: true, digests: false),
+    RailsApp.new("Rails 4.0.x (without asset pipeline)", 'rails_40_no_pipeline', runner: :bin, asset_pipeline: false, digests: false),
+    RailsApp.new("Rails 4.0.x (precompiled)", 'rails_40_precompiled', runner: :bin, asset_pipeline: true, digests: true),
+    RailsApp.new("Rails 4.1.x", 'rails_41', runner: :bin, asset_pipeline: true, digests: false),
+    RailsApp.new("Rails 4.2.x", 'rails_42', runner: :bin, asset_pipeline: true, digests: false),
+    RailsApp.new("Rails 4.2.x (with sprockets-rails 3)", 'rails_42_sprockets_rails_3', runner: :bin, asset_pipeline: true, digests: true, sprockets3: true),
   ].each do |app|
     describe "with #{app}" do
       before { app.reset }
 
-      it "inlines styles for multipart emails" do
-        email = app.read_email(:normal_email)
-
+      def validate_email(app, email)
         expect(email.to).to eq(['example@example.org'])
         expect(email.from).to eq(['john@example.com'])
         expect(email).to have(2).parts
@@ -36,7 +36,13 @@ describe "Integrations" do
         document = parse_html_in_email(email)
         expect(document).to have_selector('body h1')
 
-        if app.using_asset_pipeline?
+        if app.digested?
+          if app.sprockets3?
+            expected_image_url = 'https://example.app.org/assets/rails-322506f9917889126e81df2833a6eecdf2e394658d53dad347e9882dd4dbf28e.png'
+          else
+            expected_image_url = 'https://example.app.org/assets/rails-231a680f23887d9dd70710ea5efd3c62.png'
+          end
+        elsif app.using_asset_pipeline?
           expected_image_url = 'https://example.app.org/assets/rails.png'
         else
           expected_image_url = 'https://example.app.org/images/rails.png'
@@ -48,32 +54,16 @@ describe "Integrations" do
         email.deliver
       end
 
-      it "automatically inlines styles with automatic mailer" do
-        email = app.read_delivered_email(:normal_email)
-
-        expect(email.to).to eq(['example@example.org'])
-        expect(email.from).to eq(['john@example.com'])
-        expect(email).to have(2).parts
-
-        expect(email.text_part.body.decoded).not_to match(/<.*>/)
-
-        html = email.html_part.body.decoded
-        expect(html).to include '<!DOCTYPE'
-        expect(html).to include '<head'
-
-        document = parse_html_in_email(email)
-        expect(document).to have_selector('body h1')
+      it "inlines styles for multipart emails" do
+        validate_email app, app.read_email(:normal_email)
+      end
 
-        if app.using_asset_pipeline?
-          expected_image_url = 'https://example.app.org/assets/rails.png'
-        else
-          expected_image_url = 'https://example.app.org/images/rails.png'
-        end
-        expect(document).to have_styling('background' => "url(#{expected_image_url})").at_selector('.image')
+      it "automatically inlines styles with automatic mailer" do
+        validate_email app, app.read_delivered_email(:normal_email)
+      end
 
-        # If we deliver mails we can catch weird problems with headers being invalid
-        email.delivery_method :test
-        email.deliver
+      it "automatically inlines styles with automatic mailer and forced delivery" do
+        validate_email app, app.read_delivered_email(:normal_email, force_delivery: true)
       end
 
       it "inlines no styles when roadie_options are nil" do
@@ -91,7 +81,7 @@ describe "Integrations" do
         email.deliver
       end
 
-      if app.using_asset_pipeline?
+      if app.using_asset_pipeline? || app.digested?
         it "has a AssetPipelineProvider together with a FilesystemProvider" do
           expect(app.read_providers).to eq(%w[Roadie::FilesystemProvider Roadie::Rails::AssetPipelineProvider])
         end
@@ -102,34 +92,4 @@ describe "Integrations" do
       end
     end
   end
-
-  describe "with precompiled assets" do
-    let(:app) {
-      RailsApp.new("Rails 4.0.x (precompiled)", 'rails_40_precompiled', runner: :bin, asset_pipeline: false)
-    }
-
-    before { app.reset }
-
-    let(:document) do
-      parse_html_in_email app.read_email(:normal_email)
-    end
-
-    # It still has an AssetPipelineProvider in case some asset isn't
-    # precompiled, or the user want to combine. As long as the user is using
-    # the correct asset helpers a precompiled asset will be picked up by the
-    # FilesystemProvider.
-    it "has a AssetPipelineProvider together with a FilesystemProvider" do
-      expect(app.read_providers).to eq(%w[Roadie::FilesystemProvider Roadie::Rails::AssetPipelineProvider])
-    end
-
-    it "inlines the precompiled stylesheet" do
-      # Precompiled version has green color; the file in app/assets have red
-      expect(document).to have_styling('background-color' => 'green').at_selector('body')
-    end
-
-    it "inlines images with digests" do
-      image_url = "https://example.app.org/assets/rails-231a680f23887d9dd70710ea5efd3c62.png"
-      expect(document).to have_styling('background' => "url(#{image_url})").at_selector('.image')
-    end
-  end
 end

data/spec/railsapps/rails_42_sprockets_rails_3/.gitignore

@@ -0,0 +1,16 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/spec/railsapps/rails_42_sprockets_rails_3/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gem 'rails', '4.2.0'
+gem 'sass-rails'
+gem 'sprockets-rails', '3.0.0.beta2'
+
+gem 'roadie-rails', :path => '../../..'

data/spec/railsapps/rails_42_sprockets_rails_3/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/railsapps/rails_42_sprockets_rails_3/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Rails.application

data/spec/railsapps/rails_42_sprockets_rails_3/config/application.rb

@@ -0,0 +1,13 @@
+require File.expand_path('../boot', __FILE__)
+
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "sprockets/railtie"
+
+Bundler.require(:default, Rails.env)
+
+module Rails42
+  class Application < Rails::Application
+    config.roadie.url_options = {host: 'example.app.org'}
+  end
+end

data/spec/railsapps/rails_42_sprockets_rails_3/config/boot.rb

@@ -0,0 +1,4 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/spec/railsapps/rails_42_sprockets_rails_3/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Rails42::Application.initialize!

data/spec/railsapps/rails_42_sprockets_rails_3/config/environments/development.rb

@@ -0,0 +1,9 @@
+Rails42::Application.configure do
+  config.cache_classes = false
+  config.eager_load = false
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+  config.action_mailer.raise_delivery_errors = false
+  config.active_support.deprecation = :log
+  config.assets.debug = true
+end

data/spec/railsapps/rails_42_sprockets_rails_3/config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( email.css )

data/spec/railsapps/rails_42_sprockets_rails_3/config/initializers/secret_token.rb

@@ -0,0 +1 @@
+Rails42::Application.config.secret_key_base = '4fc45a45fecece06ff370f3271d9c2f29cdd0b029bde255d77318418e5066681d42c706f5e504b9298f2b5ccbd2c013c39d474e6521ef4c4f056b1368ce22c8f'

data/spec/railsapps/rails_42_sprockets_rails_3/config/initializers/session_store.rb

@@ -0,0 +1 @@
+Rails42::Application.config.session_store :cookie_store, key: '_rails_42_session'

data/spec/railsapps/rails_42_sprockets_rails_3/config/routes.rb

@@ -0,0 +1,2 @@
+Rails42::Application.routes.draw do
+end

data/spec/support/rails_app.rb

@@ -4,11 +4,15 @@ class RailsApp
     @path = File.expand_path("../../railsapps/#{path}", __FILE__)
     @runner = options.fetch(:runner)
     @using_asset_pipeline = options.fetch(:asset_pipeline)
+    @digests = options.fetch(:digests)
+    @sprockets3 = options[:sprockets3]
     reset
   end
 
   def to_s() @name end
   def using_asset_pipeline?() @using_asset_pipeline end
+  def digested?() @digests end
+  def sprockets3?() @sprockets3 end
 
   def read_email(mail_name)
     result = run("puts Mailer.#{mail_name}.to_s")
@@ -16,8 +20,9 @@ class RailsApp
     Mail.read_from_string(result)
   end
 
-  def read_delivered_email(mail_name)
-    result = run("mail = AutoMailer.#{mail_name}; mail.delivery_method(:test); mail.deliver; puts mail.to_s")
+  def read_delivered_email(mail_name, options = {})
+    deliver = options[:force_delivery] ? "deliver!" : "deliver" 
+    result = run("mail = AutoMailer.#{mail_name}; mail.delivery_method(:test); mail.#{deliver}; puts mail.to_s")
     raise "No email returned. Did the rails application crash?" if result.strip.empty?
     Mail.read_from_string(result)
   end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: roadie-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc2
+  version: 1.1.0
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roadie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0.rc1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -258,6 +252,18 @@ files:
 - spec/railsapps/rails_42/config/initializers/secret_token.rb
 - spec/railsapps/rails_42/config/initializers/session_store.rb
 - spec/railsapps/rails_42/config/routes.rb
+- spec/railsapps/rails_42_sprockets_rails_3/.gitignore
+- spec/railsapps/rails_42_sprockets_rails_3/Gemfile
+- spec/railsapps/rails_42_sprockets_rails_3/bin/rails
+- spec/railsapps/rails_42_sprockets_rails_3/config.ru
+- spec/railsapps/rails_42_sprockets_rails_3/config/application.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/boot.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/environment.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/environments/development.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/initializers/assets.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/initializers/secret_token.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/initializers/session_store.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/routes.rb
 - spec/railsapps/shared/all/app/mailers/auto_mailer.rb
 - spec/railsapps/shared/all/app/mailers/mailer.rb
 - spec/railsapps/shared/all/app/views/mailer/normal_email.html.erb
@@ -284,12 +290,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Making HTML emails comfortable for the Rails rockstars
@@ -394,6 +400,18 @@ test_files:
 - spec/railsapps/rails_42/config/initializers/secret_token.rb
 - spec/railsapps/rails_42/config/initializers/session_store.rb
 - spec/railsapps/rails_42/config/routes.rb
+- spec/railsapps/rails_42_sprockets_rails_3/.gitignore
+- spec/railsapps/rails_42_sprockets_rails_3/Gemfile
+- spec/railsapps/rails_42_sprockets_rails_3/bin/rails
+- spec/railsapps/rails_42_sprockets_rails_3/config.ru
+- spec/railsapps/rails_42_sprockets_rails_3/config/application.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/boot.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/environment.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/environments/development.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/initializers/assets.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/initializers/secret_token.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/initializers/session_store.rb
+- spec/railsapps/rails_42_sprockets_rails_3/config/routes.rb
 - spec/railsapps/shared/all/app/mailers/auto_mailer.rb
 - spec/railsapps/shared/all/app/mailers/mailer.rb
 - spec/railsapps/shared/all/app/views/mailer/normal_email.html.erb