roadie-rails 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af45ff8198c174ab196aa56d43b41c9a6fe4beb
-  data.tar.gz: 1dccbfa2e869c0e4bdac53aa5216d7dc943586a6
+  metadata.gz: efaf6815da593d05a20328278f909f231dc8bbd6
+  data.tar.gz: a10608ebd49ff20b563c91bf2ec12ff897ea1504
 SHA512:
-  metadata.gz: abc12ed74b832165ae530fd1a177e543ee09aafca39674923d52479aa0d916f9385e9a233a6de436e0bf73b1ca2f7d19ce31816f88432c0ab99f20eb49e337c2
-  data.tar.gz: 5c5863831c581517ab0c7e6f1a6cc3623f3690e2c5538e305184c9bac0ad2e2c184e119e4019918f7c222fc8653924b1d66f4ba039125650e6c78136373b38e2
+  metadata.gz: 9dd71e5444a0301a31bad73ad028022e97fbefefb4c88fc396b58b2fe17be612f4e17164c9243d7a2e6cb765eaba3f218c54d523f93238a4afafa0dc6a80f4c0
+  data.tar.gz: 282668f5b404bc3dbadeb3d401aef896768d37a189a482fc15303a6adf9264a1ee55dd7cd10f0b9d5db4e43122c1a0516dcc069233278240526dbd86331c529b

data/Changelog.md

@@ -1,12 +1,19 @@
 ### development version
 
-[full changelog](https://github.com/Mange/roadie/compare/v1.0.3...master)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.0.4...master)
 
-* Nothing yet
+* Nothing yet.
+
+### 1.0.4
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.0.3...v1.0.4)
+
+* Enhancements:
+  * Support for Rails 4.2 — [Ryunosuke SATO (tricknotes)](https://github.com/tricknotes)
 
 ### 1.0.3
 
-[full changelog](https://github.com/Mange/roadie/compare/v1.0.2...v1.0.3)
+[full changelog](https://github.com/Mange/roadie-rails/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.
@@ -16,26 +23,26 @@
 
 ### 1.0.2
 
-[full changelog](https://github.com/Mange/roadie/compare/v1.0.1...v1.0.2)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.0.1...v1.0.2)
 
 * Bug fixes
   * Don't crash on `nil` `roadie_options`
 
 ### 1.0.1
 
-[full changelog](https://github.com/Mange/roadie/compare/v1.0.0...v1.0.1)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.0.0...v1.0.1)
 
 * Bug fixes
   * Inline HTML in emails without a plaintext part
 
 ### 1.0.0
 
-[full changelog](https://github.com/Mange/roadie/compare/v1.0.0.pre1...v1.0.0)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.0.0.pre1...v1.0.0)
 
 * Use released version of Roadie 3.0.0
 
 ### 1.0.0.pre1
 
-[full changelog](https://github.com/Mange/roadie/compare/0000000...v1.0.0.pre1)
+[full changelog](https://github.com/Mange/roadie-rails/compare/0000000...v1.0.0.pre1)
 
 * First implementation

data/README.md

@@ -247,8 +247,8 @@ class Admin::EmailsController < AdminController
   private
   def render_email(email)
     respond_to do |format|
-      format.html { render html: email.html_body.decoded }
-      format.text { render text: email.text_body.decoded }
+      format.html { render html: email.html_part.decoded }
+      format.text { render text: email.text_part.decoded }
     end
   end
 end
@@ -285,6 +285,7 @@ Tested with [Travis CI](http://travis-ci.org) using [almost all combinations of]
   * 3.2
   * 4.0
   * 4.1
+  * 4.2
 
 Let me know if you want any other combination supported officially.
 

data/lib/roadie/rails/version.rb

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

data/roadie-rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "roadie", "~> 3.0"
-  spec.add_dependency "rails", ">= 3.0", "< 4.2"
+  spec.add_dependency "rails", ">= 3.0", "< 4.3"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rspec", "~> 3.0"

data/spec/integration_spec.rb

@@ -15,6 +15,7 @@ describe "Integrations" do
     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),
   ].each do |app|
     describe "with #{app}" do
       before { app.reset }

data/spec/railsapps/rails_41/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-gem 'rails', '4.0.0'
+gem 'rails', '4.1.0'
 gem 'sass-rails', '~> 4.0.0'
 
 gem 'roadie-rails', :path => '../../..'

data/spec/railsapps/rails_42/.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/Gemfile

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

data/spec/railsapps/rails_42/app/assets/stylesheets/email.css.scss

@@ -0,0 +1,2 @@
+body { background-color: green; }
+.image { background: image-url("rails.png"); }

data/spec/railsapps/rails_42/app/mailers/auto_mailer.rb

@@ -0,0 +1,27 @@
+class AutoMailer < ActionMailer::Base
+  include Roadie::Rails::Automatic
+
+  default from: 'john@example.com'
+
+  def normal_email
+    generate_email
+  end
+
+  def disabled_email
+    generate_email
+  end
+
+  private
+  def roadie_options
+    unless action_name =~ /disabled/
+      super.combine(url_options: {protocol: "https"})
+    end
+  end
+
+  def generate_email
+    mail(to: 'example@example.org', subject: "Notification for you") do |format|
+      format.html { render :normal_email }
+      format.text { render :normal_email }
+    end
+  end
+end

data/spec/railsapps/rails_42/app/mailers/mailer.rb

@@ -0,0 +1,17 @@
+class Mailer < ActionMailer::Base
+  include Roadie::Rails::Mailer
+
+  default from: 'john@example.com'
+
+  def normal_email
+    roadie_mail(to: 'example@example.org', subject: "Notification for you") do |format|
+      format.html
+      format.text
+    end
+  end
+
+  private
+  def roadie_options
+    super.combine(url_options: {protocol: "https"})
+  end
+end

data/spec/railsapps/rails_42/app/views/auto_mailer/normal_email.html.erb

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8">
+    <%= stylesheet_link_tag "email" %>
+  </head>
+  <body>
+    <h1>Normal email</h1>
+    <div class="image"></div>
+  </body>
+</html>

data/spec/railsapps/rails_42/app/views/auto_mailer/normal_email.text

@@ -0,0 +1 @@
+Normal email

data/spec/railsapps/rails_42/app/views/mailer/normal_email.html.erb

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8">
+    <%= stylesheet_link_tag "email" %>
+  </head>
+  <body>
+    <h1>Normal email</h1>
+    <div class="image"></div>
+  </body>
+</html>

data/spec/railsapps/rails_42/app/views/mailer/normal_email.text

@@ -0,0 +1 @@
+Normal email

data/spec/railsapps/rails_42/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/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/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/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/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/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/config/initializers/secret_token.rb

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

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

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadie-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roadie
@@ -33,7 +33,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +270,25 @@ files:
 - spec/railsapps/rails_41/config/initializers/secret_token.rb
 - spec/railsapps/rails_41/config/initializers/session_store.rb
 - spec/railsapps/rails_41/config/routes.rb
+- spec/railsapps/rails_42/.gitignore
+- spec/railsapps/rails_42/Gemfile
+- spec/railsapps/rails_42/app/assets/images/rails.png
+- spec/railsapps/rails_42/app/assets/stylesheets/email.css.scss
+- spec/railsapps/rails_42/app/mailers/auto_mailer.rb
+- spec/railsapps/rails_42/app/mailers/mailer.rb
+- spec/railsapps/rails_42/app/views/auto_mailer/normal_email.html.erb
+- spec/railsapps/rails_42/app/views/auto_mailer/normal_email.text
+- spec/railsapps/rails_42/app/views/mailer/normal_email.html.erb
+- spec/railsapps/rails_42/app/views/mailer/normal_email.text
+- spec/railsapps/rails_42/bin/rails
+- spec/railsapps/rails_42/config.ru
+- spec/railsapps/rails_42/config/application.rb
+- spec/railsapps/rails_42/config/boot.rb
+- spec/railsapps/rails_42/config/environment.rb
+- spec/railsapps/rails_42/config/environments/development.rb
+- 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/spec_helper.rb
 - spec/support/have_no_styling_matcher.rb
 - spec/support/have_selector_matcher.rb
@@ -438,6 +457,25 @@ test_files:
 - spec/railsapps/rails_41/config/initializers/secret_token.rb
 - spec/railsapps/rails_41/config/initializers/session_store.rb
 - spec/railsapps/rails_41/config/routes.rb
+- spec/railsapps/rails_42/.gitignore
+- spec/railsapps/rails_42/Gemfile
+- spec/railsapps/rails_42/app/assets/images/rails.png
+- spec/railsapps/rails_42/app/assets/stylesheets/email.css.scss
+- spec/railsapps/rails_42/app/mailers/auto_mailer.rb
+- spec/railsapps/rails_42/app/mailers/mailer.rb
+- spec/railsapps/rails_42/app/views/auto_mailer/normal_email.html.erb
+- spec/railsapps/rails_42/app/views/auto_mailer/normal_email.text
+- spec/railsapps/rails_42/app/views/mailer/normal_email.html.erb
+- spec/railsapps/rails_42/app/views/mailer/normal_email.text
+- spec/railsapps/rails_42/bin/rails
+- spec/railsapps/rails_42/config.ru
+- spec/railsapps/rails_42/config/application.rb
+- spec/railsapps/rails_42/config/boot.rb
+- spec/railsapps/rails_42/config/environment.rb
+- spec/railsapps/rails_42/config/environments/development.rb
+- 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/spec_helper.rb
 - spec/support/have_no_styling_matcher.rb
 - spec/support/have_selector_matcher.rb