From 83d6e3eb5318bcdc4bcc2c3879c10fa6809c50fe Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Wed, 6 Aug 2014 15:18:14 -0300 Subject: Tags to be TW-Pixelated-tags --- fake-service/lib/pixelated_service/mail.rb | 28 ++++---- fake-service/spec/pixelated/mail_spec.rb | 103 +++++++++++++++++++++++++++++ fake-service/spec/smail/mail_spec.rb | 103 ----------------------------- 3 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 fake-service/spec/pixelated/mail_spec.rb delete mode 100644 fake-service/spec/smail/mail_spec.rb diff --git a/fake-service/lib/pixelated_service/mail.rb b/fake-service/lib/pixelated_service/mail.rb index 29ae5067..3e67636e 100644 --- a/fake-service/lib/pixelated_service/mail.rb +++ b/fake-service/lib/pixelated_service/mail.rb @@ -154,13 +154,13 @@ module PixelatedService ("#{INTERNAL_TO_EXTERNAL_HEADER[:to]}: #{format_header_value_out(:to, @to)}" if @to), ("#{INTERNAL_TO_EXTERNAL_HEADER[:from]}: #{format_header_value_out(:from, @from)}" if @from), ("#{INTERNAL_TO_EXTERNAL_HEADER[:subject]}: #{format_header_value_out(:subject, @subject)}" if @subject), - ("#{INTERNAL_TO_EXTERNAL_HEADER[:x_tw_smail_tags]}: #{format_header_value_out(:x_tw_smail_tags, @tags.names)}" if !@tags.names.empty?), - ("#{INTERNAL_TO_EXTERNAL_HEADER[:x_tw_smail_status]}: #{format_header_value_out(:x_tw_smail_status, @status)}" if !@status.empty?), - ("#{INTERNAL_TO_EXTERNAL_HEADER[:x_tw_smail_ident]}: #{format_header_value_out(:x_tw_smail_ident, @ident)}"), + ("#{INTERNAL_TO_EXTERNAL_HEADER[:x_tw_pixelated_tags]}: #{format_header_value_out(:x_tw_smail_tags, @tags.names)}" if !@tags.names.empty?), + ("#{INTERNAL_TO_EXTERNAL_HEADER[:x_tw_pixelated_status]}: #{format_header_value_out(:x_tw_smail_status, @status)}" if !@status.empty?), + ("#{INTERNAL_TO_EXTERNAL_HEADER[:x_tw_pixelated_ident]}: #{format_header_value_out(:x_tw_smail_ident, @ident)}"), ].compact + @headers.map { |k,v| "#{INTERNAL_TO_EXTERNAL_HEADER[k]}: #{format_header_value_out(k, v)}"}).sort.join("\n") + "\n\n#{@body}" end - SPECIAL_HEADERS = [:subject, :from, :to, :x_tw_smail_tags, :x_tw_smail_status, :x_tw_smail_ident] + SPECIAL_HEADERS = [:subject, :from, :to, :x_tw_pixelated_tags, :x_tw_smail_status, :x_tw_smail_ident] INTERNAL_TO_EXTERNAL_HEADER = { :subject => "Subject", :date => "Date", @@ -172,9 +172,9 @@ module PixelatedService :mime_version => "Mime-Version", :content_type => "Content-Type", :content_transfer_encoding => "Content-Transfer-Encoding", - :x_tw_smail_tags => "X-TW-SMail-Tags", - :x_tw_smail_status => "X-TW-SMail-Status", - :x_tw_smail_ident => "X-TW-SMail-Ident", + :x_tw_pixelated_tags => "X-TW-Pixelated-Tags", + :x_tw_pixelated_status => "X-TW-Pixelated-Status", + :x_tw_pixelated_ident => "X-TW-Pixelated-Ident", } def format_header_value_out(k,v) @@ -183,7 +183,7 @@ module PixelatedService v.strftime("%a, %d %b %Y %H:%M:%S %z") when :to, :cc, :bcc Array(v).join(", ") - when :x_tw_smail_tags, :x_tw_smail_status + when :x_tw_pixelated_tags, :x_tw_smail_status v.join(", ") else v @@ -256,9 +256,9 @@ module PixelatedService :from => formatted_header(:from, headers), :to => formatted_header(:to, headers), :headers => header_data, - :tags => formatted_header(:x_tw_smail_tags, headers), - :status => formatted_header(:x_tw_smail_status, headers), - :ident => has_header(:x_tw_smail_ident, headers, formatted_header(:x_tw_smail_ident, headers), ident), + :tags => formatted_header(:x_tw_pixelated_tags, headers), + :status => formatted_header(:x_tw_pixelated_status, headers), + :ident => has_header(:x_tw_pixelated_ident, headers, formatted_header(:x_tw_smail_ident, headers), ident), :body => body ) end @@ -284,11 +284,11 @@ module PixelatedService else vs end - when :x_tw_smail_tags + when :x_tw_pixelated_tags Tags.new *(v || "").split(/, /) - when :x_tw_smail_status + when :x_tw_pixelated_status (v || "").split(/, /).map { |ss| ss.to_sym } - when :x_tw_smail_ident + when :x_tw_pixelated_ident v.to_i else v diff --git a/fake-service/spec/pixelated/mail_spec.rb b/fake-service/spec/pixelated/mail_spec.rb new file mode 100644 index 00000000..ed09bab7 --- /dev/null +++ b/fake-service/spec/pixelated/mail_spec.rb @@ -0,0 +1,103 @@ + +fixture1 = File.read(File.join(File.dirname(__FILE__), "..", "fixtures", "mail1")) +fixture2 = File.read(File.join(File.dirname(__FILE__), "..", "fixtures", "mail2")) + +describe PixelatedService::Mail do + describe "#read" do + context("simple email") do + subject(:mail) { PixelatedService::Mail.read(fixture1) } + + it "reads the subject correctly" do + expect(mail.subject).to eq("Doloremque aliquid a facilis et sit numquam libero.") + end + + it "reads the from correctly" do + expect(mail.from).to eq("kenneth@willmsmckenzie.org") + end + + it "reads the to correctly" do + expect(mail.to).to eq("antonio@beier.biz") + end + + it "reads and parses date" do + expect(mail.headers[:date]).to eq(DateTime.parse("2014-05-29T18:56:41 -0300")) + end + + it "reads the body correctly" do + expect(mail.body).to eq(< +Mime-Version: 1.0 +Subject: Doloremque aliquid a facilis et sit numquam libero. +To: antonio@beier.biz +X-TW-Pixelated-Ident: + +Quia tempora quas laboriosam. Dolorem dolor fuga a aut minima sint. Ullam suscipit consectetur nihil. Incidunt velit aut reprehenderit. + +Laborum blanditiis praesentium soluta dolorem laudantium a. Molestiae excepturi laudantium at eos velit. Commodi quaerat suscipit laudantium sapiente aut omnis. Qui iure impedit ea dolores. Et debitis non est tempora id autem. + +Atque officia architecto sed assumenda. Inventore quia minus. Doloribus amet reiciendis ipsam aut. +MAIL + end + end + context("with multiple recipients") do + subject(:mail) { PixelatedService::Mail.read(fixture2) } + + it "writes correct output" do + expect(mail.to_s).to eq(< +Mime-Version: 1.0 +Subject: Doloremque aliquid a facilis et sit numquam libero. +To: cmurphy@thoughtworks.com, cgorslin@thoughtworks.com, cmitchel@thoughtworks.com, dnorth@thoughtworks.com, dpgoodwi@thoughtworks.com, dbodart@thoughtworks.com, dsmith@thoughtworks.com, djrice@thoughtworks.com, dwhalley@thoughtworks.com +X-TW-Pixelated-Ident: + +Quia tempora quas laboriosam. Dolorem dolor fuga a aut minima sint. Ullam suscipit consectetur nihil. Incidunt velit aut reprehenderit. + +Laborum blanditiis praesentium soluta dolorem laudantium a. Molestiae excepturi laudantium at eos velit. Commodi quaerat suscipit laudantium sapiente aut omnis. Qui iure impedit ea dolores. Et debitis non est tempora id autem. + +Atque officia architecto sed assumenda. Inventore quia minus. Doloribus amet reiciendis ipsam aut. +MAIL + end + end + end +end diff --git a/fake-service/spec/smail/mail_spec.rb b/fake-service/spec/smail/mail_spec.rb deleted file mode 100644 index 96b3bb31..00000000 --- a/fake-service/spec/smail/mail_spec.rb +++ /dev/null @@ -1,103 +0,0 @@ - -fixture1 = File.read(File.join(File.dirname(__FILE__), "..", "fixtures", "mail1")) -fixture2 = File.read(File.join(File.dirname(__FILE__), "..", "fixtures", "mail2")) - -describe PixelatedService::Mail do - describe "#read" do - context("simple email") do - subject(:mail) { PixelatedService::Mail.read(fixture1) } - - it "reads the subject correctly" do - expect(mail.subject).to eq("Doloremque aliquid a facilis et sit numquam libero.") - end - - it "reads the from correctly" do - expect(mail.from).to eq("kenneth@willmsmckenzie.org") - end - - it "reads the to correctly" do - expect(mail.to).to eq("antonio@beier.biz") - end - - it "reads and parses date" do - expect(mail.headers[:date]).to eq(DateTime.parse("2014-05-29T18:56:41 -0300")) - end - - it "reads the body correctly" do - expect(mail.body).to eq(< -Mime-Version: 1.0 -Subject: Doloremque aliquid a facilis et sit numquam libero. -To: antonio@beier.biz -X-TW-SMail-Ident: - -Quia tempora quas laboriosam. Dolorem dolor fuga a aut minima sint. Ullam suscipit consectetur nihil. Incidunt velit aut reprehenderit. - -Laborum blanditiis praesentium soluta dolorem laudantium a. Molestiae excepturi laudantium at eos velit. Commodi quaerat suscipit laudantium sapiente aut omnis. Qui iure impedit ea dolores. Et debitis non est tempora id autem. - -Atque officia architecto sed assumenda. Inventore quia minus. Doloribus amet reiciendis ipsam aut. -MAIL - end - end - context("with multiple recipients") do - subject(:mail) { PixelatedService::Mail.read(fixture2) } - - it "writes correct output" do - expect(mail.to_s).to eq(< -Mime-Version: 1.0 -Subject: Doloremque aliquid a facilis et sit numquam libero. -To: cmurphy@thoughtworks.com, cgorslin@thoughtworks.com, cmitchel@thoughtworks.com, dnorth@thoughtworks.com, dpgoodwi@thoughtworks.com, dbodart@thoughtworks.com, dsmith@thoughtworks.com, djrice@thoughtworks.com, dwhalley@thoughtworks.com -X-TW-SMail-Ident: - -Quia tempora quas laboriosam. Dolorem dolor fuga a aut minima sint. Ullam suscipit consectetur nihil. Incidunt velit aut reprehenderit. - -Laborum blanditiis praesentium soluta dolorem laudantium a. Molestiae excepturi laudantium at eos velit. Commodi quaerat suscipit laudantium sapiente aut omnis. Qui iure impedit ea dolores. Et debitis non est tempora id autem. - -Atque officia architecto sed assumenda. Inventore quia minus. Doloribus amet reiciendis ipsam aut. -MAIL - end - end - end -end -- cgit v1.2.3