my_forum 0.0.1.beta17 → 0.0.1.beta18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d1e202c05804a742b9d512e36d3906628907539
-  data.tar.gz: ad40174859af4747f265f7c59de9c2cf8bc3f393
+  metadata.gz: 5514c53da96410d98cfc5924939be182c7642fcf
+  data.tar.gz: cab1bed9170f717fe9362ba9a19191dffe0c1542
 SHA512:
-  metadata.gz: ab4c08efa89eef98b122432e580ad7921238194f96831d57184a4be04e166b06132892002bb58dec2b462898606b3b056d188e7328efebd96f5632ac0058bdb8
-  data.tar.gz: f3509ae79d7074d42cb966e92fabf099ea18c5d556d4a74c8927a47b172bd191b8baa99e066dd8bbb6183604961205f51b4ab62b2d08bc38a1fb149b23694ee9
+  metadata.gz: 2e48abf56b44da7dc752c0e41da1cfa2fd1cde60e3d0d5008fd71e74d747cdc5a6b7392dda56ac3646b2400a6fe40756f244396ff05ed2ff6ca0feed70c67a57
+  data.tar.gz: b10df2275cb6a7f470040ae32cd74f28f2dc6c864922ca0e3985e664b4d7c544d84ddfdb61faf96371158f99e8fe19b1c6d58739fc948855683800de5bfdf4bc

data/app/controllers/my_forum/admin/mail_controller.rb

@@ -0,0 +1,26 @@
+require_dependency "my_forum/application_controller"
+
+module MyForum
+  class Admin::MailController < ApplicationController
+    before_filter :verify_admin
+
+    layout 'layouts/my_forum/admin_application'
+
+    def index
+      if request.post?
+        send_mails(params[:emails], params[:subject], params[:message]) unless params[:emails].blank?
+        redirect_to admin_mail_list_path
+      else
+        @users = User.all.map{ |u| [u.login, u.email]}
+      end
+    end
+
+    private
+
+    def send_mails(email_list, subject, message)
+      email_list.each do |mail|
+        UserMailer.custom_email(email: mail, subject: subject, message: message).deliver_now
+      end
+    end
+  end
+end

data/app/mailers/my_forum/user_mailer.rb

@@ -10,5 +10,10 @@ module MyForum
       @user.save
       mail(to: @user.email, subject: 'vaz.od.ua - New password')
     end
+
+    def custom_email(email:, subject:, message:)
+      @message = message
+      mail(to: email, subject: subject)
+    end
   end
 end

data/app/views/layouts/my_forum/admin_application.haml

@@ -20,6 +20,7 @@
             %li= link_to t('.manage_forums'), admin_forums_path
             %li= link_to t('.manage_roles'), admin_roles_path
             %li= link_to t('.manage_users'), admin_users_path
+            %li= link_to t('.manage_mail'), admin_mail_list_path
 
         .col-sm-9.col-md-10
           = yield

data/app/views/my_forum/admin/mail/index.haml

@@ -0,0 +1,9 @@
+%br
+= form_tag admin_mail_list_path, remote: true do
+  = select_tag :emails, options_for_select(@users), multiple: true
+  %br
+  = text_field_tag :subject
+  %br
+  = text_area_tag :message
+  %br
+  = submit_tag

data/app/views/my_forum/user_mailer/custom_email.text.erb

@@ -0,0 +1 @@
+<%= @message %>

data/config/routes.rb

@@ -30,6 +30,7 @@ MyForum::Engine.routes.draw do
     root 'dashboard#index'
 
     match 'forums', to: 'forums#index', via: [:get]
+    match 'mail_list', to: 'mail#index', via: [:get, :post]
 
     resources :users
     resources :roles

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta17"
+  VERSION = "0.0.1.beta18"
 end

data/spec/controllers/my_forum/admin/mail_controller_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+module MyForum
+  RSpec.describe Admin::MailController, type: :controller do
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta17
+  version: 0.0.1.beta18
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -185,6 +185,7 @@ files:
 - app/controllers/my_forum/admin/categories_controller.rb
 - app/controllers/my_forum/admin/dashboard_controller.rb
 - app/controllers/my_forum/admin/forums_controller.rb
+- app/controllers/my_forum/admin/mail_controller.rb
 - app/controllers/my_forum/admin/roles_controller.rb
 - app/controllers/my_forum/admin/users_controller.rb
 - app/controllers/my_forum/application_controller.rb
@@ -235,6 +236,7 @@ files:
 - app/views/my_forum/admin/dashboard/index.haml
 - app/views/my_forum/admin/forums/index.haml
 - app/views/my_forum/admin/forums/new.haml
+- app/views/my_forum/admin/mail/index.haml
 - app/views/my_forum/admin/roles/index.haml
 - app/views/my_forum/admin/roles/new.haml
 - app/views/my_forum/admin/users/index.haml
@@ -250,6 +252,7 @@ files:
 - app/views/my_forum/topics/_user_info.haml
 - app/views/my_forum/topics/new.haml
 - app/views/my_forum/topics/show.haml
+- app/views/my_forum/user_mailer/custom_email.text.erb
 - app/views/my_forum/user_mailer/reset_password_email.haml
 - app/views/my_forum/user_mailer/reset_password_email.text.erb
 - app/views/my_forum/users/edit.haml
@@ -279,6 +282,7 @@ files:
 - lib/my_forum/engine.rb
 - lib/my_forum/version.rb
 - lib/tasks/my_forum_tasks.rake
+- spec/controllers/my_forum/admin/mail_controller_spec.rb
 - spec/controllers/my_forum/private_messages_controller_spec.rb
 - spec/controllers/my_forum/users_controller_spec.rb
 - spec/dummy/README.rdoc
@@ -348,6 +352,7 @@ signing_key:
 specification_version: 4
 summary: Simple Forum
 test_files:
+- spec/controllers/my_forum/admin/mail_controller_spec.rb
 - spec/controllers/my_forum/private_messages_controller_spec.rb
 - spec/controllers/my_forum/users_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js