tramway-mailout 0.1.0.2 → 0.1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aca20aafd1e56b9e9ad18a3cfb20687f5d7103ecfadb7922e84bc3118f20bfe
-  data.tar.gz: bba60e05f4c42a2ed4503857cabe3850ecc7ad2a69141a8b557aeda34291cddc
+  metadata.gz: fa8df14c5e40849d2ad21254078fb29ec82db0f2d5a26d2db84f40fad10dd52a
+  data.tar.gz: 2458f39fc29d97736b31be766b673b7259be8760ed1dfe1e2c1decc78738ba79
 SHA512:
-  metadata.gz: 36d2fc6af679b3764430b0751b15d5b19eeb138b3bda70f7029a41855742be21ed91d57a0c132676c1a50b8d9d31347530bb87b5537b7610458536340fb9ea3f
-  data.tar.gz: d3559e960ac46c6cfa7ad786789d80b614cb40fa1416f4edd0cd19c70c6c448c77f247aa0829dbfd3e1cda370246e94dde6083ed8a9156bc41f2db244e75c849
+  metadata.gz: c5807e0824a92e91aa5616132e4e9fe3555a03994a3790154109f724d6b32b5ede2e856e8d67eebb9ded537e1c6568c75960774d9ef014d1a6c4cc4a6437eaf9
+  data.tar.gz: 2aeedaf1103dd8fe156030d933fd90dea6dc522cdd159b9cbde32cdd85b78dc225177e4bf136667aaf02e5e7cac64ab6f87104fbf168521e390a5750804c8f9c

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -14,14 +16,11 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
-
-
 require 'bundler/gem_tasks'
 
 require 'rake/testtask'
@@ -32,5 +31,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/app/channels/tramway/mailout/application_cable/channel.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Tramway::Mailout::ApplicationCable::Channel < ActionCable::Channel::Base
 end

data/app/channels/tramway/mailout/application_cable/connection.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Tramway::Mailout::ApplicationCable::Connection < ActionCable::Connection::Base
 end

data/app/controllers/tramway/mailout/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Mailout
     class ApplicationController < ActionController::Base

data/app/forms/admin/tramway/mailout/session_form.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Admin::Tramway::Mailout::SessionForm < ::Tramway::Core::ApplicationForm
+  properties :campaign_id, :campaign_type, :mailing_state, :mailing_state_event
+end

data/app/helpers/tramway/mailout/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Mailout
     module ApplicationHelper

data/app/jobs/tramway/mailout/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Mailout
     class ApplicationJob < ActiveJob::Base

data/app/jobs/tramway/mailout/mailing_job.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class Tramway::Mailout::MailingJob < ActiveJob::Base
   queue_as :default
 
-  def perform(contacts, template, mailer, &block)
+  def perform(contacts, template, mailer, sender_email)
     contacts.each_slice(100) do |combination|
       combination.each do |contact|
-        mailer.constantize.delay.send :just_message, contact.email, template.title, template.body
+        mailer.constantize.delay.just_message contact.email, sender_email, template.title, template.filled_body(contact)
         yield if block_given?
       end
     end

data/app/mailers/tramway/mailout/application_mailer.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Tramway
   module Mailout
     class ApplicationMailer < ActionMailer::Base
-      def just_message(email, title, body)
+      def just_message(receiver_email, sender_email, title, body)
         @body = body
-        mail from: 'Test', to: email, subject: title
+        mail from: sender_email, to: receiver_email, subject: title
       end
     end
   end

data/app/models/tramway/mailout/session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tramway/mailout/job_proxy'
 
 module Tramway::Mailout
@@ -30,10 +32,11 @@ module Tramway::Mailout
 
       after_transition aborted: :during do |session|
         ::Tramway::Mailout::JobProxy.perform_job ::Tramway::Mailout::MailingJob,
-          :later,
+          :now,
           session.campaign.contacts,
           session.campaign.strategy.touches.first.mail_template,
-          ::Tramway::Mailout::ApplicationMailer
+          ::Tramway::Mailout::ApplicationMailer,
+          session.campaign.sender_email
       end
     end
 

data/app/views/tramway/mailout/application_mailer/just_message.html.haml

@@ -0,0 +1 @@
+!= @body

data/config/routes.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 Tramway::Mailout::Engine.routes.draw do
 end

data/lib/tasks/tramway/mailout_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :tramway_mailout do
 #   # Task goes here

data/lib/tramway/mailout.rb

@@ -1,4 +1,6 @@
-require "tramway/mailout/engine"
+# frozen_string_literal: true
+
+require 'tramway/mailout/engine'
 require 'tramway/mailout/generates/install_generator'
 require 'tramway/mailout/job_proxy'
 

data/lib/tramway/mailout/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sidekiq'
 
 module Tramway

data/lib/tramway/mailout/generates/install_generator.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'tramway/core/generators/install_generator'
 
 module Tramway::Mailout::Generators
   class InstallGenerator < ::Tramway::Core::Generators::InstallGenerator
     include Rails::Generators::Migration
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     def run_other_generators
       generate 'tramway:core:install'

data/lib/tramway/mailout/generates/templates/create_tramway_mailout_sessions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTramwayMailoutSessions < ActiveRecord::Migration[5.1]
   def change
     create_table :tramway_mailout_sessions do |t|

data/lib/tramway/mailout/job_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::Mailout::JobProxy
   class << self
     def perform_job(job_class, mode, *args)

data/lib/tramway/mailout/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Tramway
   module Mailout
-    VERSION = '0.1.0.2'
+    VERSION = '0.1.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-mailout
 version: !ruby/object:Gem::Version
-  version: 0.1.0.2
+  version: 0.1.0.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.1.4
 - !ruby/object:Gem::Dependency
-  name: tramway-core
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: tramway-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,12 +68,13 @@ files:
 - app/channels/tramway/mailout/application_cable/channel.rb
 - app/channels/tramway/mailout/application_cable/connection.rb
 - app/controllers/tramway/mailout/application_controller.rb
-- app/forms/tramway/mailout/session_form.rb
+- app/forms/admin/tramway/mailout/session_form.rb
 - app/helpers/tramway/mailout/application_helper.rb
 - app/jobs/tramway/mailout/application_job.rb
 - app/jobs/tramway/mailout/mailing_job.rb
 - app/mailers/tramway/mailout/application_mailer.rb
 - app/models/tramway/mailout/session.rb
+- app/views/tramway/mailout/application_mailer/just_message.html.haml
 - config/locales/state_machines.yml
 - config/routes.rb
 - lib/tasks/tramway/mailout_tasks.rake
@@ -102,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rails Engine for your mailouts

data/app/forms/tramway/mailout/session_form.rb

@@ -1,3 +0,0 @@
-class Tramway::Mailout::SessionForm < ::Tramway::Core::ApplicationForm
-  properties :campaign_id, :campaign_type, :mailing_state, :mailing_state_event
-end