rspec-mailer_matcher 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cfeec0a2cbb116dbb947b9230d62196496c0e8193b13b8c6f9c8d5fc368f3e2
-  data.tar.gz: 5069f091c4463e70c97383a1b82418623d592264f187f4ee2da3d1717cb6aacd
+  metadata.gz: ba5fde2c0ab262b75fa9dbbbf93e7b390d2bf55aa780cfe132457716e1d8c8d0
+  data.tar.gz: d526e3c5e081c0f645b40774811661b96b12f5be4a1bd84d7e44b9a40bb0d094
 SHA512:
-  metadata.gz: 149606d6ba78736034386624c14f0dc850b85d65757f6989cfca2fde2b45214c6e50844a0bb6c71e01d6beb578841c18c5977932ffea9a393f2707831eb724b9
-  data.tar.gz: 26d8e3a23a2ed2816c298e0261477f6951bfd0695eafbe5bb2193f3698820d7e9f18b2affefe2997be23cd477fc7fff6ed9c5a289bca5a48fc49f760e586740e
+  metadata.gz: 841c3c2044b348dd668c59341c80bb581e822b43c521bcf6134cba974c0551733968d79456bc5b2249b3a5c745e8ed0b1985fad0b7920947c36b8a5676046f26
+  data.tar.gz: 257c272b6241f1f45241c90ef2e9747d04a92dbe05ce931cc3d1d603d0fa061a908b308a348580397670a0a04ce09896e8dc9a3aa377eff30cd3b9f1cd93eb35

data/Gemfile.lock

@@ -1,12 +1,66 @@
 PATH
   remote: .
   specs:
-    rspec-mailer_matcher (0.1.0)
+    rspec-mailer_matcher (0.1.1)
+      actionmailer
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
+      globalid (>= 0.3.6)
+    activesupport (5.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    builder (3.2.3)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
     diff-lcs (1.3)
+    erubi (1.8.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.4.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -21,6 +75,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -32,4 +89,4 @@ DEPENDENCIES
   rspec-mailer_matcher!
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/README.md

@@ -20,7 +20,21 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-expect { _any_action_ }.to deliver(to: 'to@example.org', from: 'from@example.org', subject: 'Hello world')
+it {
+  expect { _any_action_ }.to deliver(to: 'to@example.org', from: 'from@example.org', subject: 'Hello world')
+}
+```
+
+or using `subject` block
+
+```ruby
+subject {
+  proc { _any_action_ }
+}
+
+it {
+  is_expected.to deliver(to: 'to@example.org', from: 'from@example.org', subject: 'Hello world')
+}
 ```
 
 ## Development

data/lib/mailer_matcher/version.rb

@@ -1,3 +1,3 @@
 module MailerMatcher
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/rspec-mailer_matcher.rb

@@ -1,29 +1,32 @@
 require 'mailer_matcher/version'
+require 'action_mailer'
 
 RSpec::Matchers.define :deliver do
   supports_block_expectations
 
   match do
     mail_keys = %i[to from subject]
-    if actual.is_a?(Proc) && expected.is_a?(Hash) && (expected.keys - mail_keys).blank?
+    if actual.is_a?(Proc) && expected.is_a?(Hash) && (expected.keys - mail_keys).empty?
       deliveries = ActionMailer::Base.deliveries.clone
       actual.call
       new_deliveries = ActionMailer::Base.deliveries - deliveries
 
       expected_mail = new_deliveries.find { |mail|
-        matched = true
-        if expected[:to].present?
+        unless expected[:to].nil?
           matched = mail.to.include? expected[:to]
+          next unless matched
         end
-        if expected[:subject].present?
+        unless expected[:subject].nil?
           matched = mail.subject == expected[:subject]
+          next unless matched
         end
-        if expected[:from].present?
+        unless expected[:from].nil?
           matched = mail.from.include? expected[:from]
+          next unless matched
         end
-        matched
+        true
       }
-      expected_mail.present?
+      !expected_mail.nil?
     else
       false
     end

data/rspec-mailer_matcher.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "actionmailer"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mailer_matcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - d-mato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2019-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Rspec macther for ActionMailer