actionmailer-with-request 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 25400e6c63a4368d905d31e9515fd6f586313914
+  data.tar.gz: '08ad57e560161d0e98c6e89627a221a4ec343561'
+SHA512:
+  metadata.gz: 2a8fef1b17eb43a4145fee2ca76122970bbe5626d1d66228efbb0fe805c96e10410d0971050ac836590dd22ec8e289735a5550a068a9bf95217e8a6d25e32848
+  data.tar.gz: c320af0011018e009a8c224b1f6bfe2b8ab74d2a9cc91f944e847e3c445f6f68b4eda58d40f7caa08a3aee77b5bac42aea064712b825af611e980eb1b68ea166

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+#### Release 0.5.0
+
+- CHANGED: Minimum Rails version is now 5.
+- CHANGED: Minimum Ruby version is now 2.2.2+ as Rails 5.
+
+#### Release 0.4.0
+
+- CHANGED: Fix to avoid thread collision.
+
+#### Release 0.3.0
+
+- CHANGED: Minimum Rails version is now 3.
+
+#### Release 0.2.0
+
+- CHANGED: Minimum Rails version is now 2.
+

data/Gemfile

@@ -1,4 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in macair:actionmailer_with_request.gemspec
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+Copyright (c) 2009-2016 Simone Carletti <weppos@weppos.net>
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -8,31 +8,31 @@ http://www.simonecarletti.com/blog/2009/10/actionmailer-and-host-value/
 
 ## Requirements
 
-- Rails 3
+- Rails 5
 
-Please note
-
-- ActionMailerWithRequest >= 0.3 requires Rails 3.
-- Use ActionMailerWithRequest 0.2.x with Rails 2.
+For an older versions of Ruby use a previous release.
 
 
 ## Installation
 
-  $ gem install actionmailer-with-request
+You can install the gem manually:
 
+```shell
+$ gem install actionmailer-with-request
+```
 
-## Author
+Or use Bundler and define it as a dependency in your `Gemfile`:
 
-- [Simone Carletti](http://www.simonecarletti.com/) <weppos@weppos.net>
+```ruby
+gem 'actionmailer-with-request'
+```
 
 
-## Contributors
+## Changelog
 
-- Eric Anderson
-- Didier Lafforgue
+See the [CHANGELOG.md](CHANGELOG.md) file for details.
 
 
 ## License
 
-Copyright (c) 2009-2012 Simone Carletti.
-This is Free Software distributed under the MIT license.
+Copyright (c) 2009-2017 [Simone Carletti](https://simonecarletti.com/). This is Free Software distributed under the MIT license.

data/Rakefile

@@ -1,6 +1 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-task :default do
-  puts "No tasks here!"
-end
+require "bundler/gem_tasks"

data/actionmailer-with-request.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+require "actionmailer_with_request/version"
 
 Gem::Specification.new do |s|
   s.name        = "actionmailer-with-request"
-  s.version     = "0.4.0"
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = "Simone Carletti"
-  s.email       = "weppos@weppos.net"
-  s.homepage    = "http://github.com/weppos/actionmailer_with_request"
-  s.summary     = "Let's ActionMailer know about the website."
+  s.version     = ActionMailerWithRequest::VERSION
+  s.authors     = ["Simone Carletti"]
+  s.email       = ["weppos@weppos.net"]
+  s.homepage    = "https://github.com/weppos/actionmailer_with_request"
+  s.summary     = "Let's ActionMailer know about the website"
   s.description = "Let's ActionMailer know about the request context to avoid having to set a number of defaults manually."
 
+  s.require_paths = ["lib"]
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.license       = 'MIT'
 
-  s.add_dependency "rails", ">= 3"
+  s.add_dependency "rails", ">= 5"
 end

data/lib/actionmailer_with_request.rb

@@ -1,9 +1,11 @@
+require_relative "actionmailer_with_request/version"
+
 module ActionMailerWithRequest
 
-  module ControllerMixin
+  module RequestRecorder
     def self.included(base)
       base.class_eval do
-        before_filter :store_request
+        before_action :store_request
       end
     end
 
@@ -12,35 +14,31 @@ module ActionMailerWithRequest
     end
   end
 
-  module MailerDefaultUrlOptions
-    def self.included(base)
-      base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        # Extends ActionMailer#default_url_options capabilities
-        # by merging the latest request context into the default url options.
-        #
-        # Returns the default url options Hash.
-        def default_url_options_with_current_request(*args)
-          defaults = {}
-          request  = Thread.current["actiondispatch.request"]
-
-          if request
-            host     = request.host
-            port     = request.port
-            protocol = request.protocol
-            standard_port = request.standard_port
-
-            defaults[:protocol] = protocol
-            defaults[:host]     = host
-            defaults[:port]     = port if port != standard_port
-          end
-
-          default_url_options_without_current_request(*args).merge(defaults)
-        end
-
-        alias_method_chain :default_url_options, :current_request
-      RUBY
+  module DefaultUrlOptionsOverride
+    # Extends ActionMailer#default_url_options capabilities
+    # by merging the latest request context into the default url options.
+    #
+    # Returns the default url options Hash.
+    def default_url_options(*args)
+      defaults = {}
+      request  = Thread.current["actiondispatch.request"]
+
+      if request
+        host     = request.host
+        port     = request.port
+        protocol = request.protocol
+        standard_port = request.standard_port
+
+        defaults[:protocol] = protocol
+        defaults[:host]     = host
+        defaults[:port]     = port if port != standard_port
+      end
+
+      super.merge(defaults)
     end
+  end
 
+  module RequestAccess
     # Get the current request. This assists in making request-based
     # e-mail addresses. For example:
     #
@@ -56,8 +54,9 @@ module ActionMailerWithRequest
 
   class Railtie < Rails::Railtie
     initializer 'actionmailer.with_request' do
-      ActionController::Base.send :include, ActionMailerWithRequest::ControllerMixin
-      ActionMailer::Base.send :include, ActionMailerWithRequest::MailerDefaultUrlOptions
+      ActionController::Base.send :include, ActionMailerWithRequest::RequestRecorder
+      ActionMailer::Base.prepend ActionMailerWithRequest::DefaultUrlOptionsOverride
+      ActionMailer::Base.include ActionMailerWithRequest::RequestAccess
     end
   end
 end

data/lib/actionmailer_with_request/version.rb

@@ -0,0 +1,3 @@
+module ActionMailerWithRequest
+  VERSION = "0.5.0".freeze
+end

metadata

@@ -1,76 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer-with-request
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
 description: Let's ActionMailer know about the request context to avoid having to
   set a number of defaults manually.
-email: weppos@weppos.net
+email:
+- weppos@weppos.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - actionmailer-with-request.gemspec
-- init.rb
 - lib/actionmailer-with-request.rb
 - lib/actionmailer_with_request.rb
-homepage: http://github.com/weppos/actionmailer_with_request
-licenses: []
+- lib/actionmailer_with_request/version.rb
+homepage: https://github.com/weppos/actionmailer_with_request
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2861886898297731627
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2861886898297731627
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
-summary: Let's ActionMailer know about the website.
+specification_version: 4
+summary: Let's ActionMailer know about the website
 test_files: []

data/init.rb

@@ -1 +0,0 @@
-require 'actionmailer_with_request'