send_grid_mailer 1.1.0 → 2.0.1

data/spec/dummy/config/routes.rb

@@ -1,56 +1,3 @@
 Rails.application.routes.draw do
-  # The priority is based upon order of creation: first created -> highest priority.
-  # See how all your routes lay out with "rake routes".
-
-  # You can have the root of your site routed with "root"
-  # root 'welcome#index'
-
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
-
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
-
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
+  mount SendGridMailer::Engine => "/send_grid_mailer"
 end

data/spec/dummy/config/storage.yml

@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]

data/spec/dummy/config.ru

@@ -1,4 +1,6 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative "config/environment"
+
 run Rails.application
+Rails.application.load_server

data/spec/dummy/public/404.html

@@ -4,7 +4,7 @@
   <title>The page you were looking for doesn't exist (404)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-  body {
+  .rails-default-error-page {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
@@ -12,13 +12,13 @@
     margin: 0;
   }
 
-  div.dialog {
+  .rails-default-error-page div.dialog {
     width: 95%;
     max-width: 33em;
     margin: 4em auto 0;
   }
 
-  div.dialog > div {
+  .rails-default-error-page div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -31,13 +31,13 @@
     box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
 
-  h1 {
+  .rails-default-error-page h1 {
     font-size: 100%;
     color: #730E15;
     line-height: 1.5em;
   }
 
-  div.dialog > p {
+  .rails-default-error-page div.dialog > p {
     margin: 0 0 1em;
     padding: 1em;
     background-color: #F7F7F7;
@@ -54,7 +54,7 @@
   </style>
 </head>
 
-<body>
+<body class="rails-default-error-page">
   <!-- This file lives in public/404.html -->
   <div class="dialog">
     <div>

data/spec/dummy/public/422.html

@@ -4,7 +4,7 @@
   <title>The change you wanted was rejected (422)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-  body {
+  .rails-default-error-page {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
@@ -12,13 +12,13 @@
     margin: 0;
   }
 
-  div.dialog {
+  .rails-default-error-page div.dialog {
     width: 95%;
     max-width: 33em;
     margin: 4em auto 0;
   }
 
-  div.dialog > div {
+  .rails-default-error-page div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -31,13 +31,13 @@
     box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
 
-  h1 {
+  .rails-default-error-page h1 {
     font-size: 100%;
     color: #730E15;
     line-height: 1.5em;
   }
 
-  div.dialog > p {
+  .rails-default-error-page div.dialog > p {
     margin: 0 0 1em;
     padding: 1em;
     background-color: #F7F7F7;
@@ -54,7 +54,7 @@
   </style>
 </head>
 
-<body>
+<body class="rails-default-error-page">
   <!-- This file lives in public/422.html -->
   <div class="dialog">
     <div>

data/spec/dummy/public/500.html

@@ -4,7 +4,7 @@
   <title>We're sorry, but something went wrong (500)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-  body {
+  .rails-default-error-page {
     background-color: #EFEFEF;
     color: #2E2F30;
     text-align: center;
@@ -12,13 +12,13 @@
     margin: 0;
   }
 
-  div.dialog {
+  .rails-default-error-page div.dialog {
     width: 95%;
     max-width: 33em;
     margin: 4em auto 0;
   }
 
-  div.dialog > div {
+  .rails-default-error-page div.dialog > div {
     border: 1px solid #CCC;
     border-right-color: #999;
     border-left-color: #999;
@@ -31,13 +31,13 @@
     box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
   }
 
-  h1 {
+  .rails-default-error-page h1 {
     font-size: 100%;
     color: #730E15;
     line-height: 1.5em;
   }
 
-  div.dialog > p {
+  .rails-default-error-page div.dialog > p {
     margin: 0 0 1em;
     padding: 1em;
     background-color: #F7F7F7;
@@ -54,7 +54,7 @@
   </style>
 </head>
 
-<body>
+<body class="rails-default-error-page">
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <div>

data/spec/dummy/spec/lib/send_grid_mailer/definition_spec.rb

@@ -1,23 +1,22 @@
 require "rails_helper"
 
 describe SendGridMailer::Definition do
-  let(:personalization) { subject.send(:personalization) }
-  let(:mail) { subject.send(:mail) }
+  let(:definition) { described_class.new }
+  let(:personalization) { definition.send(:personalization) }
+  let(:mail) { definition.send(:mail) }
 
   describe "#template_id" do
     it "sets tempalte id in sengrid mail object" do
-      subject.set_template_id("X")
+      definition.set_template_id("X")
       expect(mail.template_id).to eq("X")
     end
   end
 
   describe "#substitute" do
-    before do
-      @substitution = subject.substitute("%subject%", "Hi!")
-    end
+    let!(:substitution) { definition.substitute("%definition%", "Hi!") }
 
     it "creates substitution with valid data" do
-      expect(@substitution.substitution).to eq("%subject%" => "Hi!")
+      expect(substitution).to eq("%definition%" => "Hi!")
     end
 
     it "adds substitution to personalization object" do
@@ -25,21 +24,43 @@ describe SendGridMailer::Definition do
     end
 
     it "adds substitution to collection" do
-      subject.substitute("%body%", "blah")
+      definition.substitute("%body%", "blah")
       expect(personalization.substitutions.size).to eq(2)
     end
   end
 
+  describe "#dynamic_template_data" do
+    let!(:substitution) { definition.dynamic_template_data(key: 'value') }
+
+    it "creates substitution with valid data" do
+      expect(substitution).to eq(key: 'value')
+    end
+
+    it "adds substitution to personalization object" do
+      expect(personalization.dynamic_template_data.size).to eq(1)
+    end
+
+    it "add dynamic_data to data hash" do
+      definition.dynamic_template_data(other_key: 'other_value')
+      expect(personalization.dynamic_template_data.size).to eq(2)
+    end
+
+    it "merges new keys into dynamic_data hash" do
+      definition.dynamic_template_data(other_key: 'other_value')
+      expect(personalization.dynamic_template_data).to eq(key: 'value', other_key: 'other_value')
+    end
+  end
+
   describe "#set_sender" do
     it "adds sender to mail object" do
-      subject.set_sender("sender@platan.us")
+      definition.set_sender("sender@platan.us")
       expect(mail.from).to eq("email" => "sender@platan.us")
     end
   end
 
   describe "#set_sender" do
     it "adds sender with format to mail object" do
-      subject.set_sender("Sender Name <sender@platan.us>")
+      definition.set_sender("Sender Name <sender@platan.us>")
       expect(mail.from).to eq("email" => "sender@platan.us", "name" => "Sender Name")
     end
   end
@@ -49,57 +70,65 @@ describe SendGridMailer::Definition do
     let(:m2) { "ldlsegovia@gmail.com" }
 
     it "adds recipients using splat operator" do
-      subject.set_recipients(:to, m1, m2)
+      definition.set_recipients(:to, m1, m2)
       expect(personalization.tos).to eq([{ "email" => m1 }, { "email" => m2 }])
     end
 
     it "adds recipients passing emails array" do
-      subject.set_recipients(:to, [m1, m2])
+      definition.set_recipients(:to, [m1, m2])
       expect(personalization.tos).to eq([{ "email" => m1 }, { "email" => m2 }])
     end
 
     it "adds bcc recipient" do
-      subject.set_recipients(:bcc, m1)
+      definition.set_recipients(:bcc, m1)
       expect(personalization.bccs).to eq([{ "email" => m1 }])
     end
 
     it "adds cc recipient" do
-      subject.set_recipients(:cc, m1)
+      definition.set_recipients(:cc, m1)
       expect(personalization.ccs).to eq([{ "email" => m1 }])
     end
   end
 
-  describe "#set_subject" do
-    it "adds subject to personalization object" do
-      subject.set_subject("Hi!")
+  describe "#set_definition" do
+    it "adds definition to personalization object" do
+      definition.set_subject("Hi!")
       expect(personalization.subject).to eq("Hi!")
     end
   end
 
   describe "#set_content" do
     it "adds content to mail object" do
-      subject.set_content("X")
+      definition.set_content("X")
       expect(mail.contents).to eq([{ "type" => "text/plain", "value" => "X" }])
     end
 
     it "adds content with different type" do
-      subject.set_content("X", "other/type")
+      definition.set_content("X", "other/type")
       expect(mail.contents).to eq([{ "type" => "other/type", "value" => "X" }])
     end
   end
 
   describe "#add_header" do
     it "adds headers to personalization object" do
-      subject.add_header("HEADER1", "VALUE1")
-      subject.add_header("HEADER2", "VALUE2")
+      definition.add_header("HEADER1", "VALUE1")
+      definition.add_header("HEADER2", "VALUE2")
       expect(personalization.headers).to eq("HEADER1" => "VALUE1", "HEADER2" => "VALUE2")
     end
   end
 
+  describe "#add_category" do
+    it "adds categories to mail object" do
+      definition.add_category("category1")
+      definition.add_category("category2")
+      expect(mail.categories).to eq(["category1", "category2"])
+    end
+  end
+
   describe "#add_attachment" do
     it "adds file to mail object" do
-      file = File.read(fixture_file_upload("image.png", "image/png"))
-      subject.add_attachment(file, "platanus.png", "image/png")
+      file = File.read(fixture_file_upload("spec/dummy/spec/assets/image.png"))
+      definition.add_attachment(file, "platanus.png", "image/png")
       attachment = mail.attachments.first
       expect(attachment["type"]).to match("image/png")
       expect(attachment["disposition"]).to match("inline")