letter_opener_web 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a52b402271aaa9c2010cfd193fd3858e186328f0c13b4fafb3f449ed768eb62
-  data.tar.gz: ad574fc2698517185a7b43a3dc02a431a12edf895f6bceb7b012d0cf61923f3b
+  metadata.gz: cf8f22bcc360d6d8da5a1e462a24faa5d8dfe4589a7cad91bebe688a06a1001c
+  data.tar.gz: f9cc899aee871f4d68ec12390be6470d62fba0b85123ecb38ae5a11e98899f42
 SHA512:
-  metadata.gz: a1c1eccaa4ac748e90f57069697724a9d5b9f4482f29c5e5cf1766407dc32ac85161fca9f9cce89db063b73b84b9f7ece72538eb6a78adf6f34bc02ab250a52d
-  data.tar.gz: 272edf9e6edf6912074367770a454dcc824ab1cec0eabba3b464b83eb319f744dbd6e42d0b77d5c4ef1ccc812c6df692ce8bb95d45f53b65d9e70469fb1bacb5
+  metadata.gz: 79ecd487c5042e2acfd3627a38ee8379e8a372c06a64aaa8c01be30cddf01b123dc23ec80dafe1cc94f7924698ef80304066c1b06a5d776f8304a547ddaa11be
+  data.tar.gz: c5fb0b7be26b025400c346a8d4850e834e890f578cfd6a849fd949d1b12c93999aaefef65c1e641e8a6fca2a25e866467f6f223527ed84cea94fb4022b07984e

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.ruby-version
 .yardoc
 InstalledFiles
 _yardoc

data/.rubocop.yml

@@ -1,13 +1,12 @@
 ---
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   Exclude:
     - "spec/dummy/bin/**/*"
     - "tmp/**/*"
     - "vendor/**/*"
 
-# not available in older versions of Ruby
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 
 Style/Documentation:
@@ -23,5 +22,5 @@ Metrics/BlockLength:
   Exclude:
     - spec/**/*_spec.rb
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120

data/.travis.yml

@@ -1,15 +1,14 @@
-sudo: false
 language: ruby
 
 rvm:
-  - 2.3.3
-  - 2.2.6
-  - 2.1.10
+  - "2.7"
+  - "2.6"
+  - "2.5"
 
 cache: bundler
 
 before_install:
-  - gem update --system
+  - gem install bundler -v '< 2'
 
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.4.1](https://github.com/fgrehm/letter_opener_web/compare/v1.4.0...v1.4.1) (Oct 5, 2021)
+
+  - Ensure letter is within letters base path [#110](https://github.com/fgrehm/letter_opener_web/pull/110)
+
+## [1.4.0](https://github.com/fgrehm/letter_opener_web/compare/v1.3.4...v1.4.0) (Jan 29, 2020)
+
+  - Removed the dependency on the asset pipeline. Good news for API-only apps! [#83](https://github.com/fgrehm/letter_opener_web/pull/83)
+  - Avoid `require_dependency` if Zeitwerk is enabled [#98](https://github.com/fgrehm/letter_opener_web/pull/98)
+  - Drop support for old rubies and rails. Ruby 2.5+ is supported and Rails 4 is no longer tested [#100](https://github.com/fgrehm/letter_opener_web/pull/100)
+
+## [1.3.4](https://github.com/fgrehm/letter_opener_web/compare/v1.3.3...v1.3.4) (Apr 04, 2018)
+
+### Fixed
+
+  - Due to a load order issue, sometimes the main `ApplicationController` was used by this gem (unnecessary) [#82](https://github.com/fgrehm/letter_opener_web/pull/82)
+
+## [1.3.3](https://github.com/fgrehm/letter_opener_web/compare/v1.3.2...v1.3.3) (Jan 29, 2018)
+
+  - Set `LAUNCHY_DRY_RUN` explicitly to avoid `Launchy::CommandNotFoundError` [#75](https://github.com/fgrehm/letter_opener_web/pull/75)
+  - Update Ruby matrix for test to include more recent versions [#77](https://github.com/fgrehm/letter_opener_web/pull/77)
+
 ## [1.3.2](https://github.com/fgrehm/letter_opener_web/compare/v1.3.1...v1.3.2) (Jan 14, 2018)
 
   - Disable Launchy with ENV to avoid redefining the whole delivery method [#73](https://github.com/fgrehm/letter_opener_web/pull/73)

data/Gemfile

@@ -6,3 +6,7 @@ source 'http://rubygems.org'
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
+
+group :test do
+  gem 'codecov', require: false
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014 Fabio Rehm
+Copyright (c) 2013-2018 Fabio Rehm
 
 MIT License
 

data/README.md

@@ -1,6 +1,8 @@
 # letter_opener_web
 
-[![Build Status](https://travis-ci.org/fgrehm/letter_opener_web.png?branch=master)](https://travis-ci.org/fgrehm/letter_opener_web) [![Gem Version](https://badge.fury.io/rb/letter_opener_web.png)](http://badge.fury.io/rb/letter_opener_web) [![Code Climate](https://codeclimate.com/github/fgrehm/letter_opener_web.png)](https://codeclimate.com/github/fgrehm/letter_opener_web) [![Gitter chat](https://badges.gitter.im/fgrehm/letter_opener_web.png)](https://gitter.im/fgrehm/letter_opener_web)
+[![Build Status](https://travis-ci.org/fgrehm/letter_opener_web.svg?branch=master)](https://travis-ci.org/fgrehm/letter_opener_web)
+[![Gem Version](https://badge.fury.io/rb/letter_opener_web.svg)](http://badge.fury.io/rb/letter_opener_web)
+[![Code Climate](https://codeclimate.com/github/fgrehm/letter_opener_web.svg)](https://codeclimate.com/github/fgrehm/letter_opener_web)
 
 Gives [letter_opener](https://github.com/ryanb/letter_opener) an interface for
 browsing sent emails.
@@ -13,7 +15,7 @@ First add the gem to your development environment and run the `bundle` command t
 
 ```ruby
 group :development do
-  gem 'letter_opener_web'
+  gem 'letter_opener_web', '~> 1.0'
 end
 ```
 
@@ -23,9 +25,7 @@ Add to your routes.rb:
 
 ```ruby
 Your::Application.routes.draw do
-  if Rails.env.development?
-    mount LetterOpenerWeb::Engine, at: "/letter_opener"
-  end
+  mount LetterOpenerWeb::Engine, at: "/letter_opener" if Rails.env.development?
 end
 ```
 
@@ -69,7 +69,7 @@ Some people use this gem on staging environments on Heroku and to set that up
 is just a matter of moving the gem out of the `development` group and enabling
 the route for all environments on your `routes.rb`.
 
-In order words, your `Gemfile` will have:
+In other words, your `Gemfile` will have:
 
 ```ruby
 gem 'letter_opener_web'

data/app/controllers/letter_opener_web/letters_controller.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+unless Rails.respond_to?(:autoloaders) && Rails.autoloaders.zeitwerk_enabled?
+  require_dependency 'letter_opener_web/application_controller'
+end
+
 module LetterOpenerWeb
   class LettersController < ApplicationController
-    before_action :check_style, only: [:show]
+    before_action :check_style, only: :show
     before_action :load_letter, only: %i[show attachment destroy]
 
     def index
@@ -22,6 +26,7 @@ module LetterOpenerWeb
       file     = @letter.attachments[filename]
 
       return render plain: 'Attachment not found!', status: 404 unless file.present?
+
       send_file(file, filename: filename, disposition: 'inline')
     end
 
@@ -43,7 +48,8 @@ module LetterOpenerWeb
 
     def load_letter
       @letter = Letter.find(params[:id])
-      head :not_found unless @letter.exists?
+
+      head :not_found unless @letter.valid?
     end
 
     def routes

data/app/models/letter_opener_web/letter.rb

@@ -56,17 +56,19 @@ module LetterOpenerWeb
     end
 
     def delete
-      FileUtils.rm_rf("#{LetterOpenerWeb.config.letters_location}/#{id}")
+      return unless valid?
+
+      FileUtils.rm_rf(base_dir.to_s)
     end
 
-    def exists?
-      File.exist?(base_dir)
+    def valid?
+      exists? && base_dir_within_letters_location?
     end
 
     private
 
     def base_dir
-      "#{LetterOpenerWeb.config.letters_location}/#{id}"
+      LetterOpenerWeb.config.letters_location.join(id).cleanpath
     end
 
     def read_file(style)
@@ -77,6 +79,14 @@ module LetterOpenerWeb
       File.exist?("#{base_dir}/#{style}.html")
     end
 
+    def exists?
+      File.exist?(base_dir)
+    end
+
+    def base_dir_within_letters_location?
+      base_dir.to_s.start_with?(LetterOpenerWeb.config.letters_location.to_s)
+    end
+
     def adjust_link_targets(contents)
       # We cannot feed the whole file to an XML parser as some mails are
       # "complete" (as in they have the whole <html> structure) and letter_opener
@@ -86,6 +96,7 @@ module LetterOpenerWeb
         fixed_link = fix_link_html(link)
         xml        = REXML::Document.new(fixed_link).root
         next if xml.attributes['href'] =~ /(plain|rich).html/
+
         xml.attributes['target'] = '_blank'
         xml.add_text('') unless xml.text
         contents.gsub!(link, xml.to_s)