roadie-rails 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23523540a5595e05e87e99d0ec6f1d051d74ab5d
-  data.tar.gz: ced896acf8c012884325285a1a1924245f0b7be9
+  metadata.gz: d6b1af48e15cf35a4cc3944b04a7fce6b312c6b0
+  data.tar.gz: 13e9195d7c3fced4ef36a87a48ae1cb876132dfd
 SHA512:
-  metadata.gz: 7ff9e72292f4d00ef1bc2ce60c5b179686ffb54245779fb8e361f653f9aa0c09c9a1bba83956588eaf46f409e84b7af10bdbb74df27cc1c4939ee5d93dc56ea5
-  data.tar.gz: 530b44fd39cbc10c1ba06bdef7a553e66a57377032552d69f23e43c29cfc51e0bcda0496faf5313feeb302c5714026c1951cab8404ae41b93d1f0611600d6455
+  metadata.gz: e5d05a556b483d2450029585eaa7493cfc880ae12a41853ef78b4f199ee7840c1d4467b2efc2d3900738f0e477e5584c871461faafe69da2ad4a4184e65ed718
+  data.tar.gz: b6caa2c97ef3a25daea516fa7e0a1ad51156f48b2979b5e022ab3073438d7966add5ddad165ab6adcda1337d39f013bf1b4b2af70a4e9579565904839d8084a4

data/.travis.yml

@@ -1,22 +1,22 @@
 sudo: false
+dist: trusty
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - jruby
-  - rbx
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+  - jruby-9
+  - rbx-3
 
 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
+cache:
+  directories:
+  - .bundle
+  - spec/railsapps/rails_42/.bundle
+  - spec/railsapps/rails_42_sprockets_rails_3/.bundle
+  - spec/railsapps/rails_50/.bundle
+  - spec/railsapps/rails_51/.bundle
+bundler_args: --without guard --path=.bundle
 script: "rake"

data/Changelog.md

@@ -1,10 +1,21 @@
 ### development version
 
-[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.1...master)
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.2.0...master)
 
 * Nothing yet.
 
-### 1.1.0
+### 1.2.0
+
+[full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.1...v1.2.0)
+
+**Note:** Support for Rails < 4.2 is now dropped.
+
+**Note:** Support for Ruby < 2.2 is now dropped.
+
+* Sprockets 4.0 support (#60) - [Miklós Fazekas (mfazekas)](https://github.com/mfazekas)
+* Rails 5.1 support (#70) - [Gleb Mazovetskiy (glebm)](https://github.com/glebm)
+
+### 1.1.1
 
 [full changelog](https://github.com/Mange/roadie-rails/compare/v1.1.0...v1.1.1)
 

data/LICENSE.txt

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

data/README.md

@@ -276,21 +276,15 @@ end
 Tested with [Travis CI](http://travis-ci.org) using [almost all combinations of](http://travis-ci.org/#!/Mange/roadie-rails):
 
 * Ruby:
-  * MRI 1.9.3
-  * MRI 2.0
-  * MRI 2.1
   * MRI 2.2
-  * MRI 2.3.0
+  * MRI 2.3
+  * MRI 2.4
   * JRuby (latest)
-  * Rubinius (failures on Rubinius will not fail the build due to a long history of instability in `rbx`)
+  * Rubinius 3
 * Rails
-  * 3.0
-  * 3.1
-  * 3.2
-  * 4.0
-  * 4.1
   * 4.2
-  * 5.0 (but only on Ruby 2.2+)
+  * 5.0
+  * 5.1
 
 Let me know if you want any other combination supported officially.
 
@@ -318,7 +312,7 @@ After running `rake` for the first time and you want to keep running tests witho
 
 (The MIT License)
 
-Copyright © 2013-2016 [Magnus Bergmark](https://github.com/Mange) <magnus.bergmark@gmail.com>, et. al.
+Copyright © 2013-2017 [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,16 @@ require "bundler/gem_tasks"
 
 desc "Install gems for embedded Rails apps"
 task :install_gems do
-  sh "./setup.sh install #{RUBY_VERSION}"
+  Bundler.with_clean_env do
+    sh "./setup.sh install"
+  end
+end
+
+desc "Update gems for embedded Rails apps"
+task :update_gems do
+  Bundler.with_clean_env do
+    sh "./setup.sh update"
+  end
 end
 
 desc "Run specs"
@@ -10,5 +19,5 @@ task :spec do
   sh "bundle exec rspec -f progress"
 end
 
-desc "Default: Install gems and run specs"
-task :default => [:install_gems, :spec]
+desc "Default: Update gems and run specs"
+task :default => [:update_gems, :spec]

data/lib/roadie/rails/asset_pipeline_provider.rb

@@ -12,11 +12,19 @@ module Roadie
 
       def find_stylesheet(name)
         if (asset = find_asset_in_pipeline(name))
-          Stylesheet.new("#{asset.pathname} (live compiled)", asset.to_s)
+          Stylesheet.new("#{filename(asset)} (live compiled)", asset.to_s)
         end
       end
 
       private
+      def filename(asset)
+        if asset.respond_to?(:filename) # sprockets 4 or later
+          asset.filename
+        else
+          asset.pathname
+        end
+      end
+
       def find_asset_in_pipeline(name)
         normalized_name = normalize_asset_name(name)
         @pipeline[normalized_name] || @pipeline[remove_asset_digest(normalized_name)]

data/lib/roadie/rails/version.rb

@@ -1,5 +1,5 @@
 module Roadie
   module Rails
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   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", "< 5.1"
+  spec.add_dependency "railties", ">= 3.0", "< 5.2"
 
-  spec.add_development_dependency "rails", ">= 3.0", "< 5.1"
+  spec.add_development_dependency "rails", ">= 4.2", "< 5.2"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-rails"

data/setup.sh

@@ -14,18 +14,16 @@ function green() {
 }
 
 function update() {
+  bundle config --local path .bundle
   bundle update | grep -ve "^Using "
 }
 
 function install() {
-  bundle install --quiet && green "  OK"
+  bundle install --quiet --path=.bundle && 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
@@ -36,15 +34,10 @@ if [[ $1 == "install" ]]; then
 
   for app_path in $root/spec/railsapps/rails_*; do
     (
-      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
+      header "Rails app $(basename $app_path)"
+      cd $app_path
+      echo "Installing gems for $(basename $app_path)"
+      install
     )
   done
   echo ""

data/spec/integration_spec.rb

@@ -8,23 +8,12 @@ describe "Integrations" do
   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),
-    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)
+    RailsApp.new("Rails 4.2.x (with sprockets-rails 3)", 'rails_42_sprockets_rails_3', runner: :bin, asset_pipeline: true, digests: true, sprockets: 3),
+    RailsApp.new("Rails 5.0.x", 'rails_50', runner: :bin, asset_pipeline: true, digests: true, sprockets: 3),
+    RailsApp.new("Rails 5.1.0", 'rails_51', runner: :bin, asset_pipeline: true, digests: true, sprockets: 3)
   ]
 
-  # 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 }
@@ -44,7 +33,7 @@ describe "Integrations" do
         expect(document).to have_selector('body h1')
 
         if app.digested?
-          if app.sprockets3?
+          if app.sprockets3_or_later?
             expected_image_url = 'https://example.app.org/assets/rails-322506f9917889126e81df2833a6eecdf2e394658d53dad347e9882dd4dbf28e.png'
           else
             expected_image_url = 'https://example.app.org/assets/rails-231a680f23887d9dd70710ea5efd3c62.png'

data/spec/railsapps/rails_42/Gemfile

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

data/spec/railsapps/rails_42/app/assets

@@ -0,0 +1 @@
+spec/railsapps/rails_42/app/../../shared/pipeline/app/assets

data/spec/railsapps/rails_42/app/mailers

@@ -0,0 +1 @@
+spec/railsapps/rails_42/app/../../shared/all/app/mailers

data/spec/railsapps/rails_42/app/views

@@ -0,0 +1 @@
+spec/railsapps/rails_42/app/../../shared/all/app/views

data/spec/railsapps/rails_42_sprockets_rails_3/Gemfile

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

data/spec/railsapps/rails_42_sprockets_rails_3/app/assets

@@ -0,0 +1 @@
+spec/railsapps/rails_42_sprockets_rails_3/app/../../shared/pipeline/app/assets

data/spec/railsapps/rails_42_sprockets_rails_3/app/mailers

@@ -0,0 +1 @@
+spec/railsapps/rails_42_sprockets_rails_3/app/../../shared/all/app/mailers

data/spec/railsapps/rails_42_sprockets_rails_3/app/views

@@ -0,0 +1 @@
+spec/railsapps/rails_42_sprockets_rails_3/app/../../shared/all/app/views

data/spec/railsapps/rails_50/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '>= 5.0.0.beta3', '< 5.1'
-gem 'sqlite3'
+gem 'rails', '~> 5.0.2'
 gem 'sass-rails'
 gem 'sprockets-rails'
 

data/spec/railsapps/rails_50/app/assets

@@ -0,0 +1 @@
+spec/railsapps/rails_50/app/../../shared/pipeline/app/assets

data/spec/railsapps/rails_50/app/views

@@ -0,0 +1 @@
+spec/railsapps/rails_50/app/../../shared/all/app/views

data/spec/railsapps/rails_50/bin/rails

@@ -1,9 +1,4 @@
 #!/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/application.rb

@@ -1,6 +1,9 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'action_view/railtie'
+require 'sprockets/railtie'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.

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

@@ -6,7 +6,6 @@ Rails.application.configure do
   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

data/spec/railsapps/{rails_41 → rails_51}/.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# 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:
@@ -7,10 +7,11 @@
 # Ignore bundler config.
 /.bundle
 
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
-
 # Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore Byebug command history file.
+.byebug_history

data/spec/railsapps/rails_51/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.1.0'
+gem 'sass-rails'
+gem 'sprockets-rails'
+gem 'listen'
+
+gem 'roadie-rails', path: '../../..'

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

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

data/spec/railsapps/rails_51/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_51/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_51/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>