mno-enterprise-core 3.0.7 → 3.1.0

data/spec/lib/mandrill_client_spec.rb

@@ -2,15 +2,20 @@ require "rails_helper"
 
 describe MandrillClient do
   subject { MandrillClient }
-  
-  describe 'email' do
+
+  before { allow(subject).to receive(:warn) }
+
+  describe '.deliver' do
+    before { MnoEnterprise::MailClient.adapter = :mandrill }
+    after { MnoEnterprise::MailClient.adapter = :test }
+
     let(:template) { :some_template }
     let(:from) {{ name: "John", email: 'j@e.com' }}
     let(:to) {{ name: "John", email: 'j@e.com' }}
     let(:vars) {{ some: 'var' }}
     
     it 'sends the right template with the right parameters' do
-      expect(subject).to receive(:send_template).with(template,[],{
+      expect(MnoEnterprise::MailAdapters::MandrillAdapter).to receive(:send_template).with(template,[],{
         from_name: from[:name],
         from_email: from[:email],
         to: [{email: to[:email], type: :to, name: to[:name]}],
@@ -18,47 +23,27 @@ describe MandrillClient do
       })
       subject.deliver(template,from,to,vars)
     end
+
+    it 'prints a deprecation warning' do
+      expect(subject).to receive(:warn)
+      subject.deliver(template,from,to,vars)
+    end
   end
   
-  describe "send_template" do
-    let!(:orig_delivery_method) { Rails.configuration.action_mailer.delivery_method }
-    before { MandrillClient.instance_variable_set("@client",nil) }
-    before { Rails.configuration.action_mailer.delivery_method = :foo_method }
-    after { Rails.configuration.action_mailer.delivery_method = orig_delivery_method }
-    
-    it 'delegates the method to a mandrill client' do
-      messages = double('messages')
-      mandrill = double('mandrill', messages: messages)
-      expect(Mandrill::API).to receive(:new).and_return(mandrill)
-      
-      args = ['template_name', [], { foo: 'bar' }]
-      expect(messages).to receive(:send_template).with(*args)
-      MandrillClient.send_template(*args)
-    end
-    
-    describe 'with nil delivery method' do
-      before { Rails.configuration.action_mailer.delivery_method = nil }
-      
-      it 'delegates the method to a mandrill client' do
-        messages = double('messages')
-        mandrill = double('mandrill', messages: messages)
-        expect(Mandrill::API).to receive(:new).and_return(mandrill)
-      
-        args = ['template_name', [], { foo: 'bar' }]
-        expect(messages).to receive(:send_template).with(*args)
-        MandrillClient.send_template(*args)
-      end
+  describe '.send_template' do
+    let(:args) { ['template_name', [], { foo: 'bar' }] }
+
+    it 'delegates the method to the email adapter' do
+      adapter = double('adapter')
+      expect(MnoEnterprise::MailClient).to receive(:adapter).and_return(adapter)
+
+      expect(adapter).to receive(:send_template).with(*args)
+      subject.send_template(*args)
     end
-    
-    describe 'with :test delivery method' do
-      before { Rails.configuration.action_mailer.delivery_method = :test }
-      
-      it 'does not send any email' do
-        # test no expectation failure
-        allow(Mandrill::API).to receive(:new).and_return(double('mandrill'))
-        MandrillClient.send_template('1',[],{})
-      end
+
+    it 'prints a deprecation warning' do
+      expect(subject).to receive(:warn)
+      subject.send_template(*args)
     end
-    
   end
-end
+end

data/spec/lib/mno_enterprise/mail_adapters/adapter_spec.rb

@@ -0,0 +1,29 @@
+require "rails_helper"
+
+describe MnoEnterprise::MailAdapters::Adapter do
+  subject { described_class }
+
+  describe '.test?' do
+    subject { described_class.test? }
+
+    around do |example|
+      orig_delivery_method = Rails.configuration.action_mailer.delivery_method
+      example.run
+      Rails.configuration.action_mailer.delivery_method = orig_delivery_method
+    end
+
+    context 'with delivery method' do
+      before { Rails.configuration.action_mailer.delivery_method = :method }
+      it { is_expected.to be false }
+    end
+    context 'with nil delivery method' do
+      before { Rails.configuration.action_mailer.delivery_method = nil }
+      it { is_expected.to be false }
+    end
+
+    context 'with :test delivery method' do
+      before { Rails.configuration.action_mailer.delivery_method = :test }
+      it { is_expected.to be true }
+    end
+  end
+end

data/spec/lib/mno_enterprise/mail_adapters/mandrill_adapter_spec.rb

@@ -0,0 +1,53 @@
+require "rails_helper"
+
+describe MnoEnterprise::MailAdapters::MandrillAdapter do
+  subject { described_class }
+
+  describe '.deliver' do
+    let(:template) { :some_template }
+    let(:from) {{ name: "John", email: 'j@e.com' }}
+    let(:to) {{ name: "John", email: 'j@e.com' }}
+    let(:vars) {{ some: 'var' }}
+
+    it 'send the correct template with the correct parameters' do
+      expect(subject).to receive(:send_template).with(template,[],{
+        from_name: from[:name],
+        from_email: from[:email],
+        to: [{email: to[:email], type: :to, name: to[:name]}],
+        global_merge_vars: [{name: vars.keys.first.to_s, content: vars.values.first}]
+      })
+      subject.deliver(template, from, to, vars)
+    end
+  end
+
+  describe '.send_template' do
+    before { described_class.instance_variable_set("@client", nil) }
+    let(:args) { ['template_name', [], { foo: 'bar', content: {} }] }
+
+    subject { described_class.send_template(*args) }
+
+    context 'when not .test?' do
+      before { allow(described_class).to receive(:test?) { false } }
+
+      it 'delegates the method to a sparkpost client' do
+        # Stub Mandrill client
+        messages = double('messages')
+        mandrill = double('mandrill', messages: messages)
+        expect(Mandrill::API).to receive(:new).and_return(mandrill)
+
+        expect(messages).to receive(:send_template).with(*args)
+        subject
+      end
+    end
+
+    context 'when .test?' do
+      before { allow(described_class).to receive(:test?) { true } }
+
+      it 'does not send any emails' do
+        # Dummy client without any methods
+        allow(Mandrill::API).to receive(:new).and_return('mandrill')
+        expect { subject }.to change(described_class.base_deliveries,:count).by(1)
+      end
+    end
+  end
+end

data/spec/lib/mno_enterprise/mail_adapters/smtp_adapter_spec.rb

@@ -0,0 +1,29 @@
+require "rails_helper"
+
+describe MnoEnterprise::MailAdapters::SmtpAdapter do
+  describe '.deliver' do
+    before { described_class.instance_variable_set("@client", nil) }
+
+    let(:template) { :some_template }
+    let(:from) {{ name: "John", email: "j@e.com" }}
+    let(:to) {{ name: "John", email: "j@e.com" }}
+    let(:vars) {{ some: 'var' }}
+    let(:opts) {{ some: 'opt' }}
+
+    subject { described_class.deliver(template, from, to, vars, opts) }   
+
+    it 'delegates the method to a smtp client' do
+      # Stub SmptClient
+      smtp = double('smtpclient')
+      smtp_mail = double('smtpmail')
+      
+      expect(MnoEnterprise::SmtpClient).to receive(:new).and_return(smtp)
+      
+      expect(smtp).to receive(:deliver).with(template, from, to, vars, opts).and_return(smtp_mail)
+      expect(smtp_mail).to receive(:deliver)
+
+      subject
+    end
+  end
+end
+

data/spec/lib/mno_enterprise/mail_adapters/sparkpost_adapter_spec.rb

@@ -0,0 +1,60 @@
+require "rails_helper"
+
+describe MnoEnterprise::MailAdapters::SparkpostAdapter do
+  subject { described_class }
+  before { ENV["SPARKPOST_API_KEY"] = "secret" }
+
+  describe '.deliver' do
+    let(:template) { :some_template }
+    let(:from) {{ name: "John", email: 'j@e.com' }}
+    let(:to) {{ name: "John", email: 'j@e.com' }}
+    let(:vars) {{ some: 'var' }}
+
+    it 'send the correct template with the correct parameters' do
+      expect(subject).to receive(:send_template).with(
+       template,
+       [],
+       {
+         recipients: [address: to],
+         content: {
+          from: from,
+          template_id: template
+         },
+         substitution_data: vars
+       }
+      )
+      subject.deliver(template, from, to, vars)
+    end
+  end
+
+  describe '.send_template' do
+    before { described_class.instance_variable_set("@client", nil) }
+
+    subject { described_class.send_template('template_name', [], { foo: 'bar', content: {} }) }
+
+    context 'when not .test?' do
+      before { allow(described_class).to receive(:test?) { false } }
+
+      it 'delegates the method to a sparkpost client' do
+        # Stub SparkPost client
+        transmission = double('transmission')
+        sparkpost = double('sparkpost', transmission: transmission)
+        expect(SparkPost::Client).to receive(:new).and_return(sparkpost)
+
+        expect(transmission).to receive(:send_payload)
+        subject
+      end
+    end
+
+    context 'when .test?' do
+      before { allow(described_class).to receive(:test?) { true } }
+
+      it 'does not send any emails' do
+        # Dummy client without any methods
+        allow(SparkPost::Client).to receive(:new).and_return(double('sparkpost'))
+
+        expect { subject }.to change(described_class.base_deliveries,:count).by(1)
+      end
+    end
+  end
+end

data/spec/lib/mno_enterprise/mail_client_spec.rb

@@ -0,0 +1,9 @@
+require "rails_helper"
+
+describe MnoEnterprise::MailClient do
+  subject { described_class }
+
+  describe '#deliver' do
+
+  end
+end

data/spec/lib/mno_enterprise/smtp_client_spec.rb

@@ -0,0 +1,39 @@
+require 'rails_helper'
+
+describe MnoEnterprise::SmtpClient do
+  let(:client) { described_class.send(:new) }
+
+  describe '#deliver' do
+    subject do
+      client.deliver(
+        'reset-password-instructions',
+        {name: 'John', email: 'john.doe@example.com'},
+        {name: 'Joe', email: 'joe.blogg@example.com'},
+      )
+    end
+
+    it 'calls mail with the correct params' do
+      expected_params = {
+        from: 'John <john.doe@example.com>',
+        to: 'joe.blogg@example.com',
+        subject: 'Reset password instructions',
+        template_path: 'system_notifications',
+        template_name: 'reset-password-instructions'
+      }
+      expect(client).to receive(:mail).with(expected_params)
+      subject
+    end
+  end
+
+  describe '#format_sender' do
+    it do
+      sender = {name: 'John', email: 'john.doe@example.com'}
+      expect(client.format_sender(sender)).to eq('John <john.doe@example.com>')
+    end
+  end
+  describe '#humanize' do
+    it 'returns a humanized template subject' do
+      expect(client.humanize('reset-password-instructions')).to eq('Reset password instructions')
+    end
+  end
+end

data/spec/models/mno_enterprise/ability_spec.rb

@@ -0,0 +1,21 @@
+require 'rails_helper'
+require 'cancan/matchers'
+
+# TODO: add more ability tests
+RSpec.describe MnoEnterprise::Ability, type: :model do
+  subject(:ability) { described_class.new(user) }
+  let(:user) { FactoryGirl.build(:user, admin_role: admin_role) }
+  let(:admin_role) { nil }
+  let(:organization) { FactoryGirl.build(:organization) }
+
+  before { allow(user).to receive(:role).with(organization) { nil } }
+
+  context 'when User#admin_role is admin' do
+    let(:admin_role) { 'admin' }
+    it { is_expected.to be_able_to(:manage_app_instances, organization) }
+  end
+
+  context 'when no User#admin_role' do
+    it { is_expected.not_to be_able_to(:manage_app_instances, organization) }
+  end
+end

data/spec/models/mno_enterprise/base_resource_spec.rb

@@ -2,28 +2,6 @@ require 'rails_helper'
 
 module MnoEnterprise
   RSpec.describe BaseResource, type: :model do
-    describe 'Error Handling' do
-      class Test < BaseResource; end
-
-      context 'Connection Errors' do
-        ((502..504).to_a<<407).each do |code|
-          it "handles #{code} error" do
-            api_stub_for(get: "/tests/1", code: code)
-            expect { Test.find(1) }.to raise_error(Faraday::ConnectionFailed)
-          end
-        end
-      end
-
-      context 'Server Errors' do
-        [401, 500].each do |code|
-          it "handles #{code} error" do
-            api_stub_for(get: "/tests/1", code: code)
-            expect { Test.find(1) }.to raise_error(Faraday::Error::ClientError)
-          end
-        end
-      end
-    end
-
     describe '#cache_key' do
       context 'for existing record' do
         let(:user) { build(:user) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-core
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,26 +115,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: mandrill-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.53
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.53
 - !ruby/object:Gem::Dependency
   name: deepstruct
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +183,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.5.1
+- !ruby/object:Gem::Dependency
+  name: mandrill-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.53
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.53
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -265,6 +265,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sparkpost
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 description: Core functionnality of MNOE. This handles the core functionnality.
 email:
 - developers@maestrano.com
@@ -274,7 +288,9 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - Rakefile
+- app/assets/images/mno_enterprise/login-background.jpg
 - app/assets/images/mno_enterprise/main-logo.png
+- app/assets/stylesheets/mno_enterprise/mail.css
 - app/controllers/mno_enterprise/application_controller.rb
 - app/helpers/mno_enterprise/application_helper.rb
 - app/helpers/mno_enterprise/impersonate_helper.rb
@@ -299,6 +315,22 @@ files:
 - app/models/mno_enterprise/tenant_invoice.rb
 - app/models/mno_enterprise/user.rb
 - app/pdf/mno_enterprise/invoice_pdf.rb
+- app/views/system_notifications/confirmation-instructions.html.erb
+- app/views/system_notifications/confirmation-instructions.text.erb
+- app/views/system_notifications/delete-request-instructions.html.erb
+- app/views/system_notifications/delete-request-instructions.text.erb
+- app/views/system_notifications/organization-invite-existing-user.html.erb
+- app/views/system_notifications/organization-invite-existing-user.text.erb
+- app/views/system_notifications/organization-invite-new-user.html.erb
+- app/views/system_notifications/organization-invite-new-user.text.erb
+- app/views/system_notifications/reconfirmation-instructions.html.erb
+- app/views/system_notifications/reconfirmation-instructions.text.erb
+- app/views/system_notifications/registration-instructions.html.erb
+- app/views/system_notifications/registration-instructions.text.erb
+- app/views/system_notifications/reset-password-instructions.html.erb
+- app/views/system_notifications/reset-password-instructions.text.erb
+- app/views/system_notifications/unlock-instructions.html.erb
+- app/views/system_notifications/unlock-instructions.text.erb
 - config/initializers/audit_log.rb
 - config/initializers/config.rb
 - config/locales/devise.en.yml
@@ -403,6 +435,7 @@ files:
 - lib/accountingjs_serializer.rb
 - lib/devise/controllers/extension_helpers.rb
 - lib/devise/extension_routes.rb
+- lib/devise/hooks/impersonatable.rb
 - lib/devise/hooks/password_expirable.rb
 - lib/devise/models/password_expirable.rb
 - lib/devise/models/remote_authenticatable.rb
@@ -445,10 +478,8 @@ files:
 - lib/generators/mno_enterprise/templates/scripts/upstart/app.conf
 - lib/her_extension/her_orm_adapter.rb
 - lib/her_extension/middleware/mnoe_api_v1_parse_json.rb
-- lib/her_extension/middleware/mnoe_raise_error.rb
 - lib/her_extension/model/associations/association.rb
 - lib/her_extension/model/associations/association_proxy.rb
-- lib/her_extension/model/associations/belongs_to_association.rb
 - lib/her_extension/model/associations/has_many_association.rb
 - lib/her_extension/model/attributes.rb
 - lib/her_extension/model/orm.rb
@@ -475,6 +506,13 @@ files:
 - lib/mno_enterprise/core.rb
 - lib/mno_enterprise/database_extendable.rb
 - lib/mno_enterprise/engine.rb
+- lib/mno_enterprise/mail_adapters/adapter.rb
+- lib/mno_enterprise/mail_adapters/mandrill_adapter.rb
+- lib/mno_enterprise/mail_adapters/smtp_adapter.rb
+- lib/mno_enterprise/mail_adapters/sparkpost_adapter.rb
+- lib/mno_enterprise/mail_adapters/test_adapter.rb
+- lib/mno_enterprise/mail_client.rb
+- lib/mno_enterprise/smtp_client.rb
 - lib/mno_enterprise/testing_support/ability_test_helper.rb
 - lib/mno_enterprise/testing_support/common_rake.rb
 - lib/mno_enterprise/testing_support/factories.rb
@@ -509,7 +547,14 @@ files:
 - spec/lib/her_extension/model/relation_spec.rb
 - spec/lib/mandrill_client_spec.rb
 - spec/lib/mno_enterprise/core_engine_spec.rb
+- spec/lib/mno_enterprise/mail_adapters/adapter_spec.rb
+- spec/lib/mno_enterprise/mail_adapters/mandrill_adapter_spec.rb
+- spec/lib/mno_enterprise/mail_adapters/smtp_adapter_spec.rb
+- spec/lib/mno_enterprise/mail_adapters/sparkpost_adapter_spec.rb
+- spec/lib/mno_enterprise/mail_client_spec.rb
+- spec/lib/mno_enterprise/smtp_client_spec.rb
 - spec/mno_enterprise_spec.rb
+- spec/models/mno_enterprise/ability_spec.rb
 - spec/models/mno_enterprise/app_instance_spec.rb
 - spec/models/mno_enterprise/app_spec.rb
 - spec/models/mno_enterprise/base_resource_spec.rb
@@ -550,10 +595,17 @@ test_files:
 - spec/models/mno_enterprise/app_instance_spec.rb
 - spec/models/mno_enterprise/impac/dashboard_spec.rb
 - spec/models/mno_enterprise/deletion_request_spec.rb
+- spec/models/mno_enterprise/ability_spec.rb
 - spec/models/mno_enterprise/invoice_spec.rb
 - spec/models/mno_enterprise/user_spec.rb
 - spec/models/mno_enterprise/base_resource_spec.rb
 - spec/spec_helper.rb
+- spec/lib/mno_enterprise/smtp_client_spec.rb
+- spec/lib/mno_enterprise/mail_adapters/smtp_adapter_spec.rb
+- spec/lib/mno_enterprise/mail_adapters/mandrill_adapter_spec.rb
+- spec/lib/mno_enterprise/mail_adapters/sparkpost_adapter_spec.rb
+- spec/lib/mno_enterprise/mail_adapters/adapter_spec.rb
+- spec/lib/mno_enterprise/mail_client_spec.rb
 - spec/lib/mno_enterprise/core_engine_spec.rb
 - spec/lib/her_extension/her_orm_adapter.rb
 - spec/lib/her_extension/model/relation_spec.rb