funktional 3.0.6 → 3.1.6

data/funktional.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{funktional}
-  s.version = "3.0.6"
+  s.version = "3.1.6"
   
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brent Greeff and Felix Clack"]
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
     "lib/funktional.rb",
     "lib/funktional/assertion.rb",
     "lib/funktional/assigned_assertion.rb",
+    "lib/funktional/email.rb",
     "lib/funktional/attribute_test_helper.rb",
     "lib/funktional/context.rb",
     "lib/funktional/context/assigned_should_block.rb",
@@ -47,6 +48,7 @@ Gem::Specification.new do |s|
     "lib/funktional.rb",
     "lib/funktional/assertion.rb",
     "lib/funktional/assigned_assertion.rb",
+    "lib/funktional/email.rb",
     "lib/funktional/attribute_test_helper.rb",
     "lib/funktional/context.rb",
     "lib/funktional/context/assigned_should_block.rb",

data/lib/funktional.rb

@@ -8,6 +8,7 @@ require 'funktional/test_class_methods'
 require 'funktional/assertion'
 require 'funktional/recursive_assertion'
 require 'funktional/assigned_assertion'
+require 'funktional/email'
 require 'funktional/email_assertion'
 require 'funktional/flashed_assertion'
 require 'funktional/model_assertions'

data/lib/funktional/email.rb

@@ -0,0 +1,76 @@
+module Funktional
+  class Email
+    
+    def self.find_closest(emails, expected)
+      emails = emails.map { |email| new(email, expected) }
+      emails.sort.first
+    end
+    
+    attr_accessor :original
+    attr_accessor :matches
+    
+    def initialize(email, expected)
+      @original = email
+      @expected = expected
+      calculate_matches
+    end
+    
+    def calculate_matches
+      @matches = {}
+      @expected.map { |expect| self.send "check_#{expect.first}" }
+    end
+    
+    def <=>(other)
+      other.total_matches <=> total_matches
+    end
+    
+    def total_matches
+      if @matches.has_key? :containing
+        @matches.size + (@matches[:containing].size - 1)
+      else
+        @matches.size
+      end
+    end
+    
+    def check_from
+      @matches[:from] = from if from.present? and (@expected[:from] == from)
+    end
+    
+    def check_to
+      @matches[:to] = to if to.present? and (@expected[:to] == to)
+    end
+    
+    def check_subject
+      if subject.present? and (@expected[:subject] == subject)
+        @matches[:subject] = subject
+      end
+    end
+    
+    def check_containing
+      should_contain = @expected[:containing]
+      should_contain = [should_contain] unless should_contain.is_a? Array
+      matches = []
+      
+      should_contain.each do |should_i|
+        matches << should_i if body =~ /#{Regexp.escape(should_i)}/
+      end
+      @matches[:containing] = matches if matches.any?
+    end
+    
+    def from
+      @original.from[0]
+    end
+    
+    def to
+      @original.to[0]
+    end
+    
+    def subject
+      @original.subject
+    end
+    
+    def body
+      @original.body.raw_source
+    end
+  end
+end

data/lib/funktional/email_assertion.rb

@@ -1,11 +1,12 @@
 module Funktional
   class EmailAssertion < Funktional::Assertion
+    
     def initialize(expectations)
       if ActionMailer::Base.deliveries.size < 1
         flunk 'No emails have been sent'
       end
       
-      email = ActionMailer::Base.deliveries.last
+      email = Email.find_closest(ActionMailer::Base.deliveries, expectations)
       
       expectations.each_key do |key|
         case key
@@ -16,7 +17,7 @@ module Funktional
           when :subject
             then assert_equal expectations[:subject], email.subject
           when :containing
-            then check_containing(expectations[:containing], email.body.raw_source)
+            then check_containing(expectations[:containing], email.body)
           else
             flunk "Assertion key: [#{key}] not recognised"
         end
@@ -27,14 +28,14 @@ module Funktional
       if email_from.nil?
         flunk 'email is missing a [from]'
       end
-      assert_equal expected_from, email_from[0]
+      assert_equal expected_from, email_from
     end
     
     def check_to(expected_to, email_to)
       if email_to.nil?
         flunk 'email is missing a [to]'
       end
-      assert_equal expected_to, email_to[0]
+      assert_equal expected_to, email_to
     end
     
     def check_containing(should_contain, body)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: funktional
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 15
   prerelease: false
   segments: 
   - 3
-  - 0
+  - 1
   - 6
-  version: 3.0.6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Brent Greeff and Felix Clack
@@ -30,6 +30,7 @@ extra_rdoc_files:
 - lib/funktional.rb
 - lib/funktional/assertion.rb
 - lib/funktional/assigned_assertion.rb
+- lib/funktional/email.rb
 - lib/funktional/attribute_test_helper.rb
 - lib/funktional/context.rb
 - lib/funktional/context/assigned_should_block.rb
@@ -62,6 +63,7 @@ files:
 - lib/funktional.rb
 - lib/funktional/assertion.rb
 - lib/funktional/assigned_assertion.rb
+- lib/funktional/email.rb
 - lib/funktional/attribute_test_helper.rb
 - lib/funktional/context.rb
 - lib/funktional/context/assigned_should_block.rb