cucumber-mailcatcher 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1fa7791588641edf58ea0e8406865ec55d26238
-  data.tar.gz: a4317311f8ceff0f21aad6c0cb7d49064e1637d0
+  metadata.gz: b59409830fa2ba344feb79c06a6e158644a21227
+  data.tar.gz: dfc0af6762b819b532df0392548fb848e3667615
 SHA512:
-  metadata.gz: 054812999f9f3378c8263dd2b8e4a2ddbac563b81dbce2975be58eaa1ee1ff0107ae75a22b004cce2cc215ab66052ec04973acdc1cc1bd4725ff7cc1ee90f4fe
-  data.tar.gz: fee6c77cbe105ac6a0fb0c53236815d1e6039a11cf300508b5c8543a3a54cdeab6da685fc864b04574522583ff6ab5c5d1407963784f93745d67130e542273ec
+  metadata.gz: 6ed9b02b721e07716174b4424eb5a55ea555c48db14d31dac24a740eeb88d8abfa35c5418b10a6d3fa869475f0bda3aa32d62d381d65fe56cbf870a46cbf0eef
+  data.tar.gz: b62d380ddde8eb3f0b9735b9e38d394eb3d86d3541fd2f2c3dc358f9440b9535af269ca4cd9bd8e9ffcbe2c5abff50dc5be5afcb0cbb58e2c2599e94a960f628

data/lib/cucumber/mailcatcher.rb

@@ -8,26 +8,33 @@ require 'cucumber/mailcatcher/http_client.rb'
 require 'cucumber/mailcatcher/version.rb'
 
 Then /^I should receive (\d+) email from "(.*?)"$/ do |count, address|
-  messages = subject.get_messages_from_email address
-  expect(messages.length).to be count
+  http = Cucumber::Mailcatcher::HttpClient.new
+  messages = http.get_messages_from_email address
+  expect(messages.length).to be count.to_i
 end
 
 Then /^I should receive (\d+) email sent to "(.*?)"$/ do |count, address|
-  messages = subject.get_messages_to_email address
-  expect(messages.length).to be count
+  http = Cucumber::Mailcatcher::HttpClient.new
+  messages = http.get_messages_to_email address
+  expect(messages.length).to be count.to_i
 end
 
 Then /^I should receive (\d+) email with subject "(.*?)"$/ do |count, subject|
-  messages = subject.get_messages_with_subject subject
-  expect(messages.length).to be count
+  http = Cucumber::Mailcatcher::HttpClient.new
+  messages = http.get_messages_with_subject subject
+  expect(messages.length).to be count.to_i
 end
 
 Then /^I should receive (\d+) email with a html body containing "(.*?)"$/ do |count, body|
-  messages = subject.get_messages_with_html_body body
-  expect(messages.length).to be count
+  http = Cucumber::Mailcatcher::HttpClient.new
+  p $EMAIL_SERVER_PATH
+  http.server_url = $EMAIL_SERVER_PATH
+  messages = http.get_messages_with_html_body body
+  expect(messages.length).to be count.to_i
 end
 
 Then /^I should receive (\d+) email with a plain body containing "(.*?)"$/ do |count, body|
-  messages = subject.get_messages_with_plain_body body
-  expect(messages.length).to be count
+  http = Cucumber::Mailcatcher::HttpClient.new
+  messages = http.get_messages_with_plain_body body
+  expect(messages.length).to be count.to_i
 end

data/lib/cucumber/mailcatcher/http_client.rb

@@ -7,70 +7,32 @@ module Cucumber
   module Mailcatcher
 
     class HttpClient
-      attr_accessor :server_url
-
-      def get_messages
-        do_get_json '/messages'
+      def self.server_url
+        @@server_url
       end
 
-      def get_messages_from_email email
-        messages = do_get_json '/messages'
-
-        messages.select { |item|
-          item if item["sender"].include?(email)
-        }
+      def self.server_url=server_url
+        @@server_url = server_url
       end
 
-      def get_messages_to_email email
-        messages = do_get_json '/messages'
-
-        messages.select { |item|
-          item if item["recipients"].include?(email) || item["recipients"].include?('<' + email + '>')
-        }
-      end
-
-      def get_messages_with_subject subject
-        messages = do_get_json '/messages'
-
-        messages.select { |item|
-          item if item["subject"].include?(subject)
-        }
-      end
-
-      def get_messages_with_html_body body
-        messages = do_get_json '/messages'
-
-        messages.select { |item|
-          response = do_get "/messages/#{item['id']}.json.html"
-          item if response.code != '404' && response.body.include?(body)
-        }
-      end
-
-      def get_messages_with_plain_body body
-        messages = do_get_json '/messages'
-
-        messages.select { |item|
-          response = do_get "/messages/#{item['id']}.json.plain"
-          item if response.code != '404' && response.body.include?(body)
-        }
-      end
+      def initialize
+        error = "Please set the Mailcatcher server url e.g. Cucumber::Mailcatcher::Api.server_url = 'http://localhost:1080'"
+        valid = @@server_url =~ /\A#{URI.regexp(%w(http https))}\z/
 
-      def delete_messages
-        do_delete '/messages'
-        true
+        raise error unless valid
       end
 
       def do_get relative_url
-        uri = URI("#{@server_url}#{relative_url}")
+        uri = URI("#{@@server_url}#{relative_url}")
         Net::HTTP.get_response(uri)
       end
 
       def do_get_json relative_url
-        JSON.load((do_get relative_url).body )
+        JSON.load((do_get relative_url).body)
       end
 
       def do_delete relative_url
-        uri = URI("#{@server_url}#{relative_url}")
+        uri = URI("#{@@server_url}#{relative_url}")
 
         request = Net::HTTP.new(uri.host,uri.port)
         request.delete(uri.path).code

data/lib/cucumber/mailcatcher/version.rb

@@ -2,6 +2,6 @@ module Cucumber
   module Mailcatcher
     NAME = "cucumber-mailcatcher"
     FOLDER = "cucumber/mailcatcher"
-    VERSION = "0.5"
+    VERSION = "0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-mailcatcher
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber