pg_rails 7.0.8.pre.alpha.82 → 7.0.8.pre.alpha.84

data/pg_engine/lib/pg_engine/utils/pg_logger.rb

@@ -5,7 +5,14 @@ require 'rainbow'
 # TODO: poder pasar blocks
 
 def pg_err(*args)
-  raise args.first if ENV.fetch('RAISE_ERRORS', false) && args.first.is_a?(Exception)
+  if ENV.fetch('RAISE_ERRORS', false)
+    # :nocov:
+    raise args.first if args.first.is_a?(Exception)
+
+    raise StandardError, args
+
+    # :nocov:
+  end
 
   byebug if ENV.fetch('BYEBUG_ERRORS', false) # rubocop:disable Lint/Debugger
 
@@ -30,6 +37,10 @@ end
 
 module PgEngine
   class PgLogger
+    def self.test_logged_messages
+      @test_logged_messages ||= []
+    end
+
     class << self
       def log(type, *args)
         notify_all(build_msg(*args), type)
@@ -41,6 +52,7 @@ module PgEngine
         send_to_logger(mensaje, type)
         send_to_rollbar(mensaje, type)
         send_to_stdout(mensaje, type) if ENV.fetch('LOG_TO_STDOUT', nil)
+        save_internal(mensaje, type) if Rails.env.test?
         nil
       end
 
@@ -61,6 +73,10 @@ module PgEngine
         Rails.logger.send(type, rainbow_wrap(mensaje, type))
       end
 
+      def save_internal(mensaje, type)
+        PgEngine::PgLogger.test_logged_messages << [type, mensaje]
+      end
+
       # Format
 
       # TODO: loguear time
@@ -110,7 +126,9 @@ module PgEngine
 
       def cleaner
         bc = ActiveSupport::BacktraceCleaner.new
-        bc.add_filter   { |line| line.gsub(%r{.*pg_rails/}, '') }
+        bc.remove_silencers!
+        pattern = %r{\A[^/]+ \([\w.]+\) }
+        bc.add_silencer { |line| pattern.match?(line) && !line.match?(/pg_contable|pg_rails/) }
         bc.add_silencer { |line| /pg_logger/.match?(line) }
         bc
       end

data/pg_engine/spec/controllers/admin/email_logs_controller_spec.rb

@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+#
+# Also compared to earlier versions of this generator, there are no longer any
+# expectations of assigns and templates rendered. These features have been
+# removed from Rails core in Rails 5, but can be added back in via the
+# `rails-controller-testing` gem.
+
+RSpec.describe Admin::EmailLogsController do
+  render_views
+  # This should return the minimal set of attributes required to create a valid
+  # EmailLog. As you add validations to EmailLog, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) do
+    attributes_for(:email_log)
+  end
+
+  let(:logged_user) { create :user, :developer }
+
+  before do
+    sign_in logged_user if logged_user.present?
+  end
+
+  describe '#mailgun_sync' do
+    subject do
+      post :mailgun_sync
+    end
+
+    before do
+      allow(PgEngine::Mailgun::LogSync).to receive(:download).and_return([])
+    end
+
+    it do
+      subject
+      expect(response).to have_http_status(:redirect)
+    end
+  end
+
+  describe 'routing' do
+    it 'routes GET index correctly' do
+      route = { get: '/a/email_logs' }
+      expect(route).to route_to(controller: 'admin/email_logs', action: 'index')
+    end
+  end
+
+  describe 'GET #index' do
+    subject do
+      get :index, params: {}
+    end
+
+    before { create :email_log }
+
+    it 'returns a success response' do
+      subject
+      expect(response).to be_successful
+    end
+
+    context 'when user is not logged in' do
+      let(:logged_user) { nil }
+
+      it 'redirects to login path' do
+        subject
+        expect(response).to redirect_to(new_user_session_path)
+      end
+    end
+
+    context 'when se pide el excel' do
+      subject do
+        get :index, params: {}, format: 'xlsx'
+      end
+
+      it 'returns a success response' do
+        subject
+        expect(response).to be_successful
+      end
+    end
+  end
+
+  describe 'GET #show' do
+    it 'returns a success response' do
+      email_log = create(:email_log)
+      get :show, params: { id: email_log.to_param }
+      expect(response).to be_successful
+    end
+  end
+
+  describe 'GET #new' do
+    it 'returns a success response' do
+      get :new, params: {}
+      expect(response).to be_successful
+    end
+  end
+
+  describe 'GET #edit' do
+    it 'returns a success response' do
+      email_log = create(:email_log)
+      get :edit, params: { id: email_log.to_param }
+      expect(response).to be_successful
+    end
+  end
+
+  describe 'POST #create' do
+    context 'with valid params' do
+      it 'creates a new EmailLog' do
+        expect do
+          post :create, params: { email_log: valid_attributes }
+        end.to change(EmailLog, :count).by(1)
+      end
+
+      it 'redirects to the created email_log' do
+        post :create, params: { email_log: valid_attributes }
+        expect(response).to redirect_to([:admin, EmailLog.last])
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+    context 'with valid params' do
+      let(:new_attributes) do
+        attributes_for(:email_log)
+      end
+
+      it 'redirects to the email_log' do
+        email_log = create(:email_log)
+        put :update, params: { id: email_log.to_param, email_log: valid_attributes }
+        expect(response).to redirect_to([:admin, email_log])
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    subject do
+      request.headers['Accept'] = 'text/vnd.turbo-stream.html,text/html'
+      delete :destroy, params: { id: email_log.to_param, redirect_to: redirect_url }
+    end
+
+    let!(:email_log) { create :email_log }
+    let(:redirect_url) { nil }
+
+    it 'destroys the requested email_log' do
+      expect { subject }.to change(EmailLog, :count).by(-1)
+    end
+
+    it 'quita el elemento de la lista' do
+      subject
+      expect(response.body).to include('turbo-stream action="remove"')
+    end
+
+    context 'si hay redirect_to' do
+      let(:redirect_url) { admin_email_logs_url }
+
+      it 'redirects to the email_logs list' do
+        subject
+        expect(response).to redirect_to(admin_email_logs_url)
+      end
+    end
+  end
+end

data/pg_engine/spec/controllers/pg_engine/base_controller_spec.rb

@@ -60,6 +60,17 @@ describe DummyBaseController do
         expect(response.body).to include '<turbo-stream action="remove" targets=".modal">'
       end
     end
+
+    context 'cuando acepta json' do
+      before do
+        request.headers['Accept'] = 'application/json'
+      end
+
+      fit do
+        subject
+        expect(response).to have_http_status(:internal_server_error)
+      end
+    end
   end
 
   describe 'not_authorized' do

data/pg_engine/spec/controllers/public/webhooks_controller_spec.rb

@@ -0,0 +1,142 @@
+require 'rails_helper'
+
+RSpec::Matchers.define_negated_matcher :not_change, :change
+
+def build_body(log_id, signature, timestamp)
+  <<~JSON
+    {
+      "signature": {
+        "timestamp": "#{timestamp}",
+        "token": "6fcc81a280a2458de8c83bf22dde8c71485be1d51333d3427e",
+        "signature": "#{signature}"
+      },
+      "event-data": {
+        "timestamp": 1715014542.2477064,
+        "ip": "66.102.8.333",
+        "event": "delivered",
+        "id": "#{log_id}",
+        "severity":"temporary",
+        "log-level": "info",
+        "message": {
+            "headers": { "message-id": "msgid@fakeapp2024.mail" }
+        },
+        "recipient": "natprobel@fakemail.com"
+      }
+    }
+  JSON
+end
+
+fdescribe Public::WebhooksController do
+  include ActiveSupport::Testing::TimeHelpers
+
+  before { travel_to Time.zone.at(1_716_564_587) }
+
+  describe '#mailgun' do
+    subject do
+      post :mailgun, body:, as: :json
+    end
+
+    let(:signature) { 'c524037907046276117758afae8a340e77a43a6e48eb35a9521426e7a3ff675b' }
+    let(:log_id) { 'log_2' }
+    let(:timestamp) { '1716564587' }
+
+    let(:body) do
+      build_body(log_id, signature, timestamp)
+    end
+
+    it do
+      subject
+      expect(response).to have_http_status(:ok)
+    end
+
+    it do
+      expect { subject }.to change(EmailLog, :count).by(1)
+    end
+
+    context 'cuando tira internal server error' do
+      let(:body) { '{ "este json": "no me sirve" }' }
+
+      it do
+        subject
+        expect(response).to have_http_status(:internal_server_error)
+      end
+
+      fit do
+        expect { subject }.to have_errored('internal server error')
+          .and(have_errored('no me sirve'))
+      end
+    end
+
+    context 'cuando no es un json' do
+      let(:body) { 'mal json' }
+
+      it do
+        subject
+        expect(response).to have_http_status(:bad_request)
+      end
+
+      fit do
+        expect { subject }.to have_warned('parser error').and(have_warned('mal json'))
+      end
+    end
+
+    context 'cuando ya existe un log con ese ID' do
+      before do
+        create(:email_log, log_id:)
+      end
+
+      it do
+        expect { subject }.to have_warned('ya existía un log con ese id')
+          .and(not_change(EmailLog, :count))
+      end
+    end
+
+    shared_context 'todo bien pero no guarda el log' do
+      it 'responds ok' do
+        subject
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'no guarda el log ;)' do
+        expect { subject }.not_to change(EmailLog, :count)
+      end
+    end
+
+    context 'si la signature no es válida' do
+      let(:signature) { 'no válida' }
+
+      it_behaves_like 'todo bien pero no guarda el log'
+
+      fit do
+        expect { subject }.to have_warned('refusing invalid signature')
+      end
+    end
+
+    context 'cuando ya se usó el token' do
+      subject do
+        post :mailgun, body: build_body('otro id', signature, timestamp), as: :json
+      end
+
+      before do
+        post :mailgun, body: build_body(log_id, signature, timestamp), as: :json
+      end
+
+      it_behaves_like 'todo bien pero no guarda el log'
+
+      fit do
+        expect { subject }.to have_warned('refusing used token')
+      end
+    end
+
+    context 'cuando la timestamp está muy lejos' do
+      let(:timestamp) { '1111111' }
+      let(:signature) { '869c06cea4be27321a6a7c6a8e3d0668bb9c2b5b3de5532f644dba181a157d9a' }
+
+      it_behaves_like 'todo bien pero no guarda el log'
+
+      fit do
+        expect { subject }.to have_warned('refusing due to timestamp')
+      end
+    end
+  end
+end

data/pg_engine/spec/factories/email_logs.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+FactoryBot.define do
+  factory :email_log do
+    email
+    log_id { Faker::Lorem.sentence }
+    event { %w[accepted delivered failed opened].sample }
+    log_level { %w[info warn error].sample }
+    severity { %w[permanent temporary].sample }
+    timestamp { '' }
+    message_id { Faker::Lorem.sentence }
+
+    trait :email_existente do
+      email { nil }
+      email_id { Email.pluck(:id).sample }
+    end
+  end
+end

data/pg_engine/spec/lib/pg_engine/mailgun/log_sync_spec.rb

@@ -1,25 +1,99 @@
 require 'rails_helper'
 require 'fileutils'
 
-describe PgEngine::Mailgun::LogSync do
+describe PgEngine::Mailgun::LogSync, vcr: { cassette_name: 'mailgun/log_sync_download',
+                                            match_requests_on: %i[method host] } do
   let(:instancia) { described_class }
 
-  describe '#download',
-           vcr: { cassette_name: 'mailgun/log_sync_download',
-                  match_requests_on: %i[method host] } do
+  describe '#download' do
     subject do
       instancia.download
-      instancia.sync_redis
     end
 
     after do
-      Dir["#{instancia.dir}/*.json"].each { |file| File.delete(file) }
+      FileUtils.rm_r(instancia.log_dir)
     end
 
     let!(:email) { create :email, message_id: '66393f1bc7d4_47a5108ec1628f@notebook.mail' }
 
     it do
-      expect { subject }.to change { email.logs.to_a.length }.from(0).to(3)
+      expect { subject }.to change { email.email_logs.count }.from(0).to(3)
+                                                             .and(change(EmailLog, :count).to(8))
+    end
+  end
+
+  describe '#digest' do
+    subject do
+      instancia.digest(JSON.parse(log_data))
+    end
+
+    let(:log_data) do
+      <<~JSON
+        {
+            "timestamp": 1715014542.2477064,
+            "ip": "66.102.8.333",
+            "event": "delivered",
+            "id": "log_2",
+            "severity":"temporary",
+            "log-level": "info",
+            "message": {
+                "headers": { "message-id": "msgid@fakeapp2024.mail" }
+            },
+            "recipient": "natprobel@fakemail.com"
+        }
+      JSON
+    end
+
+    let(:expected_attributes) do
+      {
+        log_id: 'log_2',
+        event: 'delivered',
+        log_level: 'info',
+        severity: 'temporary',
+        timestamp: 1_715_014_542,
+        message_id: 'msgid@fakeapp2024.mail'
+      }
+    end
+
+    it do
+      expect { subject }.to change(EmailLog, :count).by(1)
+    end
+
+    it do
+      expect(subject).to have_attributes(expected_attributes)
+    end
+
+    context 'ya existe el log' do
+      subject do
+        instancia.digest(JSON.parse(log_data))
+        instancia.digest(JSON.parse(log_data))
+      end
+
+      it 'solo lo crea una vez' do
+        expect { subject }.to change(EmailLog, :count).by(1)
+      end
+    end
+
+    context 'cuando se asocia a un email' do
+      let!(:email) { create :email, message_id: 'msgid@fakeapp2024.mail' }
+
+      it do
+        expect(subject.email).to eq email
+      end
+
+      it 'changes email status' do
+        expect { subject }.to change { email.reload.status }.to 'delivered'
+      end
+    end
+
+    context 'cuando hay errores' do
+      subject do
+        instancia.digest({})
+      end
+
+      it do
+        expect { subject }.to raise_error(NoMethodError)
+      end
     end
   end
 end

data/pg_engine/spec/models/email_log_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# generado con pg_rails
+
+require 'rails_helper'
+
+RSpec.describe EmailLog do
+  let(:email_log) { create(:email_log) }
+
+  it 'se persiste' do
+    expect(email_log).to be_persisted
+  end
+
+  describe 'status_for_email' do
+    subject do
+      email_log.status_for_email
+    end
+
+    let(:email_log) { create(:email_log, event:, severity:) }
+    let(:severity) { nil }
+
+    context 'cuando es accepted' do
+      let(:event) { 'accepted' }
+
+      it { is_expected.to eq 'accepted' }
+    end
+
+    context 'cuando es delivered' do
+      let(:event) { 'delivered' }
+
+      it { is_expected.to eq 'delivered' }
+    end
+
+    context 'cuando hay un fallo temporario' do
+      let(:event) { 'failed' }
+      let(:severity) { 'temporary' }
+
+      it { is_expected.to eq 'accepted' }
+    end
+
+    context 'cuando hay un fallo permanente' do
+      let(:event) { 'failed' }
+      let(:severity) { 'permanent' }
+
+      it { is_expected.to eq 'rejected' }
+    end
+  end
+end

data/pg_engine/spec/models/email_spec.rb

@@ -10,4 +10,39 @@ RSpec.describe Email do
   it 'se persiste' do
     expect(email).to be_persisted
   end
+
+  describe 'update_status!' do
+    context 'cuando hay accepted y delivered' do
+      subject do
+        create :email_log, email: email.reload, event: 'accepted'
+        create :email_log, email: email.reload, event: 'delivered'
+      end
+
+      it do
+        expect { subject }.to change { email.reload.status }.to 'delivered'
+      end
+    end
+
+    context 'cuando hay accepted y fallo temporario' do
+      subject do
+        create :email_log, email: email.reload, event: 'failed', severity: 'temporary'
+        create :email_log, email: email.reload, event: 'accepted'
+      end
+
+      it do
+        expect { subject }.to change { email.reload.status }.to 'accepted'
+      end
+    end
+
+    context 'cuando hay accepted y fallo permanente' do
+      subject do
+        create :email_log, email: email.reload, event: 'accepted'
+        create :email_log, email: email.reload, event: 'failed', severity: 'permanent'
+      end
+
+      it do
+        expect { subject }.to change { email.reload.status }.to 'rejected'
+      end
+    end
+  end
 end

data/pg_layout/app/views/layouts/pg_layout/base.html.slim

@@ -33,6 +33,17 @@ html
     - if @rollbar_token.present?
       meta name="rollbar-token" content="#{@rollbar_token}"
       meta name="rollbar-env" content="#{Rails.env}"
+
+    link rel="preconnect" href="https://fonts.googleapis.com"
+    link rel="preconnect" href="https://fonts.gstatic.com" crossorigin="crossorigin"
+    link href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap" rel="stylesheet"
+    css:
+      body {
+        font-family: "Ubuntu", sans-serif;
+        font-weight: 400;
+        font-style: normal;
+      }
+
   body
     = render partial: 'pg_layout/sidebar_mobile'
 

data/pg_rails/lib/pg_rails/rspec_logger_matchers.rb

@@ -0,0 +1,62 @@
+# :nocov:
+module PgEngine
+  module Matchers
+    module PgLogger
+      class Base < RSpec::Rails::Matchers::BaseMatcher
+        def initialize(text, level)
+          super()
+          @text = text
+          @level = level
+        end
+      end
+
+      class PgHaveLogged < Base
+        def matches?(proc)
+          msg = 'have_logged only support block expectations'
+          raise ArgumentError, msg unless proc.is_a?(Proc)
+
+          original_messages = Set.new(PgEngine::PgLogger.test_logged_messages)
+          proc.call
+          logged_messages = Set.new(PgEngine::PgLogger.test_logged_messages)
+
+          @new_messages = logged_messages - original_messages
+          @new_messages.any? do |level, message|
+            if @text.present? && @level.present?
+              level == @level && message.include?(@text)
+            elsif @text.present?
+              message.include? @text
+            elsif @level.present?
+              level == @level
+            else
+              true
+            end
+          end
+        end
+
+        def failure_message
+          msg = "expected to #{@level || log}"
+          msg << "with text: #{@text}" if @text.present?
+          return unless @new_messages.any?
+
+          msg << "\nLogged messages:"
+          @new_messages.each do |level, message|
+            msg << "\n  #{level}: #{message[0..200]}"
+          end
+        end
+
+        def supports_block_expectations?
+          true
+        end
+      end
+    end
+
+    def have_errored(text = nil) # rubocop:disable Naming/PredicateName
+      PgLogger::PgHaveLogged.new(text, :error)
+    end
+
+    def have_warned(text = nil) # rubocop:disable Naming/PredicateName
+      PgLogger::PgHaveLogged.new(text, :warn)
+    end
+  end
+end
+# :nocov:

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.0.8-alpha.82'
+  VERSION = '7.0.8-alpha.84'
 end