roadie-rails 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65ec310d7987a54efad5de41cb80afdade9f53bd
-  data.tar.gz: b47b19fb46061806845b24b8a807302d23a97184
+  metadata.gz: 23523540a5595e05e87e99d0ec6f1d051d74ab5d
+  data.tar.gz: ced896acf8c012884325285a1a1924245f0b7be9
 SHA512:
-  metadata.gz: bfbed57e1c9f8efd5cc758538e95021c921e435c89427a4ab1f68c89ae90d12b6ea15f441b792a0f5b345b07f1b855bcba5d4d4b12ed090dda4fe84933e96699
-  data.tar.gz: ab96f1282ee2d333cd4f5d251c70e5d5ff984cc951c709094fa3fdad77bef3afc8f27761a5316ca96e9d70d61e7962d0739aab22e313fb30769cbc62ce0ab3d2
+  metadata.gz: 7ff9e72292f4d00ef1bc2ce60c5b179686ffb54245779fb8e361f653f9aa0c09c9a1bba83956588eaf46f409e84b7af10bdbb74df27cc1c4939ee5d93dc56ea5
+  data.tar.gz: 530b44fd39cbc10c1ba06bdef7a553e66a57377032552d69f23e43c29cfc51e0bcda0496faf5313feeb302c5714026c1951cab8404ae41b93d1f0611600d6455

data/.travis.yml

@@ -1,15 +1,22 @@
+sudo: false
 language: ruby
 rvm:
   - 1.9.3
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - jruby
   - rbx
 
-bundler_args: --without guard
-script: "rake"
-
 matrix:
   allow_failures:
+    # Rubinius has a lot of trouble and no large following, so I'm going to
+    # allow failures on it until it gets more stable on Travis / Real Life(tm).
+    # Let me know if you need it. Patches are welcome!
     - rvm: rbx
+  fast_finish: true
+
+cache: bundler
+bundler_args: --without guard
+script: "rake"

data/Changelog.md

@@ -1,11 +1,18 @@
 ### development version
 
-[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0...master)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.1...master)
 
 * Nothing yet.
 
 ### 1.1.0
 
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0...v1.1.1)
+
+* Add support for Rails 5.0 (#50) — [Scott Ringwelski (sgringwe)](https://github.com/sgringwe)
+* Also build on Ruby 2.3.0.
+
+### 1.1.0
+
 [full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0.rc2...v1.1.0)
 
 * Bug fixes:

data/Gemfile

@@ -11,4 +11,4 @@ group :development do
 end
 
 # Added here so it does not show up on the Gemspec; I only want it for CI builds
-gem 'coveralls', group: :test, require: nil
+gem 'codecov', group: :test, require: false

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Magnus Bergmark
+Copyright (c) 2013-2016 Magnus Bergmark, and contributors.
 
 MIT License
 

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build history and status](https://secure.travis-ci.org/Mange/roadie-rails.png)](http://travis-ci.org/#!/Mange/roadie-rails)
 [![Code Climate](https://codeclimate.com/github/Mange/roadie-rails.png)](https://codeclimate.com/github/Mange/roadie-rails)
-[![Coverage Status](https://coveralls.io/repos/Mange/roadie-rails/badge.png?branch=master)](https://coveralls.io/r/Mange/roadie-rails?branch=master)
+[![Code coverage status](https://codecov.io/github/Mange/roadie-rails/coverage.svg?branch=master)](https://codecov.io/github/Mange/roadie-rails?branch=master)
 [![Gem Version](https://badge.fury.io/rb/roadie-rails.png)](http://badge.fury.io/rb/roadie-rails)
 [![Dependency Status](https://gemnasium.com/Mange/roadie-rails.png)](https://gemnasium.com/Mange/roadie-rails)
 
@@ -280,8 +280,9 @@ Tested with [Travis CI](http://travis-ci.org) using [almost all combinations of]
   * MRI 2.0
   * MRI 2.1
   * MRI 2.2
+  * MRI 2.3.0
   * JRuby (latest)
-  * Rubinius (experimental)
+  * Rubinius (failures on Rubinius will not fail the build due to a long history of instability in `rbx`)
 * Rails
   * 3.0
   * 3.1
@@ -289,6 +290,7 @@ Tested with [Travis CI](http://travis-ci.org) using [almost all combinations of]
   * 4.0
   * 4.1
   * 4.2
+  * 5.0 (but only on Ruby 2.2+)
 
 Let me know if you want any other combination supported officially.
 
@@ -304,20 +306,19 @@ This project follows [Semantic Versioning][semver].
 
 ## Running specs ##
 
-Start by setting up your machine, then you can run the specs like normal:
+The default `rake` task will take care of the setup for you.
 
 ```bash
-./setup.sh install
-rake spec
+rake
 ```
 
+After running `rake` for the first time and you want to keep running tests without having to install all dependencies, you may run `guard`, `rspec` or `rake spec` depending on what you prefer.
+
 ## License ##
 
 (The MIT License)
 
-Copyright © 2013-2015
-
-* [Magnus Bergmark](https://github.com/Mange) <magnus.bergmark@gmail.com>
+Copyright © 2013-2016 [Magnus Bergmark](https://github.com/Mange) <magnus.bergmark@gmail.com>, et. al.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/Rakefile

@@ -2,7 +2,7 @@ require "bundler/gem_tasks"
 
 desc "Install gems for embedded Rails apps"
 task :install_gems do
-  sh "./setup.sh install"
+  sh "./setup.sh install #{RUBY_VERSION}"
 end
 
 desc "Run specs"

data/lib/roadie/rails/version.rb

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

data/roadie-rails.gemspec

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

data/setup.sh

@@ -21,7 +21,11 @@ function install() {
   bundle install --quiet && green "  OK"
 }
 
+
 root=$(dirname $0)
+ruby_version=$2
+
+[ -z "$ruby_version" ] && echo "Need to pass ruby version as second parameter. This is used to skip some installs due to lack of support of gems on certain ruby versions." && exit 1;
 
 # Set by Travis CI; interferes with the nested repos
 unset BUNDLE_GEMFILE
@@ -32,9 +36,15 @@ if [[ $1 == "install" ]]; then
 
   for app_path in $root/spec/railsapps/rails_*; do
     (
-      cd $app_path
-      header "Installing gems for $(basename $app_path)"
-      install
+      header "Rails app $(basename $app_path) with ruby $ruby_version"
+
+      if [[ $app_path == *rails_50 ]] && [[ $ruby_version != "2.2.2" ]] && [[ $ruby_version != "2.3.0" ]]; then
+        echo "Skipping installing gems for $(basename $app_path) because dependencies are not support for ruby version $ruby_version"
+      else
+        cd $app_path
+        echo "Installing gems for $(basename $app_path)"
+        install
+      fi
     )
   done
   echo ""

data/spec/integration_spec.rb

@@ -7,7 +7,7 @@ describe "Integrations" do
     Nokogiri::HTML.parse mail.html_part.body.decoded
   end
 
-  [
+  rails_apps = [
     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, digests: false),
@@ -17,8 +17,15 @@ describe "Integrations" do
     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|
+    RailsApp.new("Rails 4.2.x (with sprockets-rails 3)", 'rails_42_sprockets_rails_3', runner: :bin, asset_pipeline: true, digests: true, sprockets3: true)
+  ]
+
+  # Rails 5 requires at least ruby version 2.2.2
+  if RUBY_VERSION >= "2.2.2"
+    rails_apps << RailsApp.new("Rails 5.0.x", 'rails_50', runner: :bin, asset_pipeline: true, digests: true, sprockets3: true)
+  end
+
+  rails_apps.each do |app|
     describe "with #{app}" do
       before { app.reset }
 

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

@@ -13,6 +13,8 @@ Bundler.require(:default, Rails.env)
 
 module Rails40
   class Application < Rails::Application
+    config.assets.precompile += %w[email.css other.css]
+
     config.roadie.url_options = {host: 'example.app.org'}
   end
 end

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

@@ -9,6 +9,5 @@ Rails40::Application.configure do
   config.assets.debug = false
   config.assets.compile = false
   config.assets.digest = true
-  config.assets.precompile += %w[email.css other.css]
   config.assets.initialize_on_precompile = false
 end

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

@@ -8,6 +8,9 @@ Bundler.require(:default, Rails.env)
 
 module Rails42
   class Application < Rails::Application
+    config.assets.digest = false
+    config.assets.precompile += %w( email.css )
+
     config.roadie.url_options = {host: 'example.app.org'}
   end
 end

data/spec/railsapps/rails_50/.gitignore

@@ -0,0 +1,21 @@
+# See https://help.github.com/articles/ignoring-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/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore Byebug command history file.
+.byebug_history

data/spec/railsapps/rails_50/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'rails', '>= 5.0.0.beta3', '< 5.1'
+gem 'sqlite3'
+gem 'sass-rails'
+gem 'sprockets-rails'
+
+gem 'roadie-rails', path: '../../..'

data/spec/railsapps/rails_50/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_50/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_50/bin/rails

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/railsapps/rails_50/config.ru

@@ -0,0 +1,9 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+
+# Action Cable uses EventMachine which requires that all classes are loaded in advance
+Rails.application.eager_load!
+require 'action_cable/process/logging'
+
+run Rails.application

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

@@ -0,0 +1,13 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module Rails50
+  class Application < Rails::Application
+    config.roadie.url_options = { host: 'example.app.org' }
+  end
+end

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

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

data/spec/railsapps/rails_50/config/database.yml

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+
+development:
+  <<: *default
+  database: db/development.sqlite3
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: db/test.sqlite3
+
+production:
+  <<: *default
+  database: db/production.sqlite3

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

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

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

@@ -0,0 +1,13 @@
+Rails.application.configure do
+  config.cache_classes = false
+  config.eager_load = false
+  config.consider_all_requests_local = true
+  config.action_controller.perform_caching = false
+  config.cache_store = :null_store
+  config.action_mailer.raise_delivery_errors = false
+  config.active_support.deprecation = :log
+  config.active_record.migration_error = :page_load
+  config.assets.debug = true
+  config.assets.digest = true
+  config.assets.raise_runtime_errors = true
+end

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

@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+Rails.application.config.assets.precompile += %w( email.css )

data/spec/railsapps/rails_50/config/initializers/cookies_serializer.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# This is a new Rails 5.0 default, so introduced as a config to ensure apps made with earlier versions of Rails aren't affected when upgrading.
+Rails.application.config.action_dispatch.cookies_serializer = :json

data/spec/railsapps/rails_50/config/initializers/request_forgery_protection.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Enable origin-checking CSRF mitigation.
+Rails.application.config.action_controller.forgery_protection_origin_check = true

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

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.session_store :cookie_store, key: '_rails_50_session'

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

@@ -0,0 +1,6 @@
+Rails.application.routes.draw do
+  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+
+  # Serve websocket cable requests in-process
+  # mount ActionCable.server => '/cable'
+end

data/spec/spec_helper.rb

@@ -1,8 +1,11 @@
 require "rspec/collection_matchers"
 
 if ENV['CI']
-  require 'coveralls'
-  Coveralls.wear!
+  require 'simplecov'
+  SimpleCov.start
+
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
 require 'roadie-rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadie-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Magnus Bergmark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2016-03-09 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.3'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -264,6 +264,22 @@ files:
 - 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/rails_50/.gitignore
+- spec/railsapps/rails_50/Gemfile
+- spec/railsapps/rails_50/app/mailers/auto_mailer.rb
+- spec/railsapps/rails_50/app/mailers/mailer.rb
+- spec/railsapps/rails_50/bin/rails
+- spec/railsapps/rails_50/config.ru
+- spec/railsapps/rails_50/config/application.rb
+- spec/railsapps/rails_50/config/boot.rb
+- spec/railsapps/rails_50/config/database.yml
+- spec/railsapps/rails_50/config/environment.rb
+- spec/railsapps/rails_50/config/environments/development.rb
+- spec/railsapps/rails_50/config/initializers/assets.rb
+- spec/railsapps/rails_50/config/initializers/cookies_serializer.rb
+- spec/railsapps/rails_50/config/initializers/request_forgery_protection.rb
+- spec/railsapps/rails_50/config/initializers/session_store.rb
+- spec/railsapps/rails_50/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
@@ -295,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Making HTML emails comfortable for the Rails rockstars
@@ -412,6 +428,22 @@ test_files:
 - 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/rails_50/.gitignore
+- spec/railsapps/rails_50/Gemfile
+- spec/railsapps/rails_50/app/mailers/auto_mailer.rb
+- spec/railsapps/rails_50/app/mailers/mailer.rb
+- spec/railsapps/rails_50/bin/rails
+- spec/railsapps/rails_50/config.ru
+- spec/railsapps/rails_50/config/application.rb
+- spec/railsapps/rails_50/config/boot.rb
+- spec/railsapps/rails_50/config/database.yml
+- spec/railsapps/rails_50/config/environment.rb
+- spec/railsapps/rails_50/config/environments/development.rb
+- spec/railsapps/rails_50/config/initializers/assets.rb
+- spec/railsapps/rails_50/config/initializers/cookies_serializer.rb
+- spec/railsapps/rails_50/config/initializers/request_forgery_protection.rb
+- spec/railsapps/rails_50/config/initializers/session_store.rb
+- spec/railsapps/rails_50/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