active_mailer 0.0.5 → 0.0.6

data/Gemfile

@@ -12,3 +12,4 @@ gem "pry-nav"
 gem "pry-stack_explorer"  
 
 gem "wrong"
+gem "factory_girl"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_mailer (0.0.4)
+    active_mailer (0.0.5)
       activesupport (~> 3.2)
       rails (~> 3.2)
 
@@ -52,6 +52,8 @@ GEM
     debug_inspector (0.0.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
     ffi (1.0.11)
     hike (1.2.1)
     i18n (0.6.0)
@@ -142,6 +144,7 @@ PLATFORMS
 DEPENDENCIES
   active_mailer!
   capybara (>= 0.4.0)
+  factory_girl
   pry
   pry-nav
   pry-rails

data/active_mailer.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Matt Gordon"]
   s.email       = 'support@expectedbehavior.com'
   s.files = Dir["{app,lib,config}/**/*"] + ["MIT-LICENSE", "Rakefile", "Gemfile", "README.rdoc"]
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.homepage    =
     'https://github.com/expectedbehavior/active_mailer'
   

data/app/models/active_mailer/base.rb

@@ -139,6 +139,10 @@ module ActiveMailer #:nodoc:
       end
     end
     
+    def self.layout(*args)
+      DefaultActionMailer.send("layout", *args)
+    end
+    
     def self.mailer_variable(*variable_name)
       self.mailer_variables =  Set.new(variable_name.map(&:to_s)) + (mailer_variables || [])
       attr_accessor *variable_name

data/test/active_mailer_test.rb

@@ -22,4 +22,12 @@ class ActiveMailerTest < ActiveSupport::TestCase
     assert { email.send! }
     assert { email.mailer.subject == email.subject }
   end
+  
+  test "sends with correct layout" do
+    InvitationEmail.layout "email"
+    email = create(:invitation_email)
+    assert { email.send! }
+    actual_layout = ActiveMailer::Base::DefaultActionMailer.instance_variable_get("@_layout")
+    assert { "email" == actual_layout  }
+  end
 end

data/test/fixtures/dummyapp_rails_3.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/esquivalient/code/active_mailer
   specs:
-    active_mailer (0.0.2)
+    active_mailer (0.0.5)
       activesupport (~> 3.2)
       rails (~> 3.2)
 

data/test/test_helper.rb

@@ -4,6 +4,10 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../fixtures/dummyapp_rails_3.2/config/environment.rb",  __FILE__)
 require "rails/test_help"
 
+require "factory_girl"
+include FactoryGirl::Syntax::Methods
+FactoryGirl.find_definitions
+
 # ActionMailer::Base.delivery_method = :test
 # ActionMailer::Base.perform_deliveries = true
 # ActionMailer::Base.default_url_options[:host] = "test.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport