actionmailer-with-request 0.1.1 → 0.3.0

data/.gitignore

@@ -1 +1,4 @@
-pkg/
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/Gemfile

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

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2009-2011 Simone Carletti
+
+MIT License
+
+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:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+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.

data/README

@@ -4,3 +4,33 @@ This is a simple plugin that aims to solve the problem to pass a dynamic host fo
 
 For more information, read my blog post at 
 http://www.simonecarletti.com/blog/2009/10/actionmailer-and-host-value/
+
+
+== Requirements
+
+* Rails 3
+
+Please note
+
+* ActionMailerWithRequest >= 0.3 requires Rails 3. Use TabsOnRails 0.2.x with Rails 2.
+
+
+== Installation
+
+  $ gem install actionmailer-with-request
+
+
+== Author
+
+* {Simone Carletti}[http://www.simonecarletti.com] <weppos@weppos.net>
+
+
+== Contributors
+
+Eric Anderson, Didier Lafforgue.
+
+
+== License
+
+ActionMailerWithRequest is Copyright (c) 2009-2011 Simone Carletti.
+This is Free Software distributed under the MIT license.

data/Rakefile

@@ -1,16 +1,2 @@
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "actionmailer-with-request"
-    gem.summary = "A simple plugin to make the Rails request context available for generating URLs in ActionMailer. Works with Rails 3 (not tested with 2.3.x)"
-    gem.email = "weppos@weppos.net"
-    gem.homepage = "http://github.com/weppos/actionmailer_with_request"
-    gem.authors = ["Simone Carletti"]
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/actionmailer-with-request.gemspec

@@ -1,44 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{actionmailer-with-request}
-  s.version = "0.1.1"
+  s.name        = "actionmailer-with-request"
+  s.version     = "0.3.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.description = "Let's ActionMailer know about the request context to avoid having to set a number of defaults manually."
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Simone Carletti"]
-  s.date = %q{2010-06-11}
-  s.email = %q{weppos@weppos.net}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "actionmailer-with-request.gemspec",
-     "lib/action_mailer_with_request/controller_mixin.rb",
-     "lib/action_mailer_with_request/mailer_default_url_options.rb",
-     "lib/action_mailer_with_request/railtie.rb",
-     "lib/actionmailer_with_request.rb"
-  ]
-  s.homepage = %q{http://github.com/weppos/actionmailer_with_request}
-  s.rdoc_options = ["--charset=UTF-8"]
+  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.rubygems_version = %q{1.3.6}
-  s.summary = %q{A simple plugin to make the Rails request context available for generating URLs in ActionMailer. Works with Rails 3 (not tested with 2.3.x)}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "rails", ">= 3"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.rdoc_options << "--main" << "README"
 end
-

data/init.rb

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

data/lib/actionmailer-with-request.rb

@@ -0,0 +1,12 @@
+# This file is required for BC with the existing
+# "actionmailer-with-request" Gem. When Ruby (the Rails process) loads
+# the library, it attempts to require a file called with the same name
+# of the Gem. But because the Gem file is called with underscores,
+# it won't be loaded.
+#
+# The choices were:
+#
+# 1. rename the existing Gem
+# 2. add this hack
+#
+require 'actionmailer_with_request'

data/lib/actionmailer_with_request.rb

@@ -1,4 +1,67 @@
-require 'action_mailer_with_request/controller_mixin'
-require 'action_mailer_with_request/mailer_default_url_options'
+module ActionMailerWithRequest
 
-require 'action_mailer_with_request/railtie'
+  module ControllerMixin
+
+    def self.included(base)
+      base.class_eval do
+        before_filter :store_request
+      end
+    end
+
+    def store_request
+      Thread.current[:request] = request
+    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[: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
+    end
+
+    # Get the current request. This assists in making request-based
+    # e-mail addresses. For example:
+    #
+    #   mail :from => "no-reply@#{request.try(:domain) || 'example.com'}", .....
+    #
+    # Remember if the mailer is delivered outside the context of a
+    # request then this method returns nil. Hence the try(:domain)
+    # as well as the fallback domain.
+    def request
+      Thread.current[:request]
+    end
+
+  end
+
+  class Railtie < Rails::Railtie
+    initializer 'actionmailer.with_request' do
+      ActionController::Base.send :include, ActionMailerWithRequest::ControllerMixin
+      ActionMailer::Base.send :include, ActionMailerWithRequest::MailerDefaultUrlOptions
+    end
+  end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: actionmailer-with-request
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors: 
 - Simone Carletti
@@ -14,57 +10,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +02:00
-default_executable: 
-dependencies: []
-
-description: 
+date: 2011-04-18 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "3"
+  type: :runtime
+  version_requirements: *id001
+description: Let's ActionMailer know about the request context to avoid having to set a number of defaults manually.
 email: weppos@weppos.net
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
 - .gitignore
+- Gemfile
+- LICENSE
 - README
 - Rakefile
-- VERSION
 - actionmailer-with-request.gemspec
-- lib/action_mailer_with_request/controller_mixin.rb
-- lib/action_mailer_with_request/mailer_default_url_options.rb
-- lib/action_mailer_with_request/railtie.rb
+- init.rb
+- lib/actionmailer-with-request.rb
 - lib/actionmailer_with_request.rb
-has_rdoc: true
 homepage: http://github.com/weppos/actionmailer_with_request
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: A simple plugin to make the Rails request context available for generating URLs in ActionMailer. Works with Rails 3 (not tested with 2.3.x)
+summary: Let's ActionMailer know about the website.
 test_files: []
 
+has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-0.1.1

data/lib/action_mailer_with_request/controller_mixin.rb

@@ -1,15 +0,0 @@
-module ActionMailerWithRequest
-  module ControllerMixin
-
-    def self.included(base)
-      base.class_eval do
-        before_filter :store_request
-      end
-    end
-
-    def store_request
-      Thread.current[:request] = request
-    end
-
-  end  
-end

data/lib/action_mailer_with_request/mailer_default_url_options.rb

@@ -1,19 +0,0 @@
-module ActionMailerWithRequest
-  module MailerDefaultUrlOptions
-
-    def self.included(base)
-      base.class_eval do
-        def default_url_options_with_current_request
-          host = Thread.current[:request].try(:host)
-          port = Thread.current[:request].try(:port)
-          default = {}
-          default[:host] = host if host
-          default[:port] = port if port and port != 80
-          default_url_options_without_current_request.merge(default)
-        end
-        alias_method_chain :default_url_options, :current_request
-      end
-    end
-    
-  end  
-end

data/lib/action_mailer_with_request/railtie.rb

@@ -1,11 +0,0 @@
-module ActionMailerWithRequest
-  class Railtie < Rails::Railtie
-    
-    initializer "action_mailer_with_request.default_url_options" do |app|
-      ActionController::Base.send :include, ActionMailerWithRequest::ControllerMixin
-      ActionMailer::Base.send :include, ActionMailerWithRequest::MailerDefaultUrlOptions
-      
-      Rails.logger.info("** ActionMailerWithRequest: initialized properly") if defined?(Rails)
-    end
-  end
-end