- Updated the depricated deliver method

- Fix the test cases config for data cleaner and import users
- Fix the test cases for User and Newsletter controller
- Rename the newsletter type constant
- Fix the user form

Author: Ashish944

app/controllers/light/newsletters_controller.rb

@@ -7,7 +7,7 @@ class NewslettersController < ApplicationController
                                            :show, :edit, :update, :destroy, :web_version]
 
     def index
-      type = params[:type].present? ? params[:type] : Newsletter::VALID_NEWSLETTER_TYPES[:MONTHLY]
+      type = params[:type].present? ? params[:type] : Newsletter::NEWSLETTER_TYPES[:MONTHLY]
       @newsletters = Newsletter.where(newsletter_type: type).order_by([:sent_on, :desc])
     end
 
@@ -64,13 +64,13 @@ def send_newsletter
         type = @newsletter.newsletter_type
 
         case type
-        when Newsletter::VALID_NEWSLETTER_TYPES[:OPT_IN]
+        when Newsletter::NEWSLETTER_TYPES[:OPT_IN]
           Light::OptInWorker.perform_async(@newsletter.id.to_s)
           flash[:notice] = 'Sent Opt-In newsletter successfully'
-        when Newsletter::VALID_NEWSLETTER_TYPES[:OPT_OUT]
+        when Newsletter::NEWSLETTER_TYPES[:OPT_OUT]
           Light::OptOutWorker.perform_async(@newsletter.id.to_s)
           flash[:notice] = 'Sent Opt-Out newsletter successfully'
-        when Newsletter::VALID_NEWSLETTER_TYPES[:MONTHLY]
+        when Newsletter::NEWSLETTER_TYPES[:MONTHLY]
           Light::UserWorker.perform_async(@newsletter.id.to_s)
           flash[:notice] = 'Sent Monthly newsletter successfully'
         else
@@ -87,7 +87,7 @@ def send_test_mail
       emails = params[:email][:email_id].split(',')
       unless emails.empty?
         if @newsletter
-          Light::UserMailer.welcome_message(emails, @newsletter, 'test_user_dummy_id').deliver
+          Light::UserMailer.welcome_message(emails, @newsletter, 'test_user_dummy_id').deliver_now
           flash[:notice] = 'You will receive newsletter on the given email ids shortly.'
           redirect_to newsletters_path(type: @newsletter.newsletter_type)
         else

app/controllers/light/users_controller.rb

@@ -25,7 +25,7 @@ def create
       @user = Light::User.new(users_params)
       @user.sent_on = Array.new
       if @user.save
-        @user.update(source: 'Manual', sent_on: Array.new, sidekiq_status: 'new user' )
+        @user.update(source: 'Manual', sent_on: Array.new, sidekiq_status: 'new user')
         flash[:success] = 'User created successfully'
         redirect_to users_path
       else
@@ -43,13 +43,13 @@ def unsubscribe
         )
         @message = 'Unsubscribed successfully!!'
       else
-        @message = response_message('unsubscribed')
+        @message = response_message('Unsubscribed')
       end
     end
 
     def subscribe
       if @user.present? && @user.sidekiq_status == 'Unsubscribed'
-        @user.update(
+        @user.update_attributes(
           is_subscribed: true,
           sidekiq_status: 'Subscribed',
           subscribed_at: DateTime.now,
@@ -58,7 +58,7 @@ def subscribe
         )
         @message = 'Subscribed successfully!!'
       else
-        @message = response_message('subscribed')
+        @message = response_message('Subscribed')
       end
     end
 
@@ -85,8 +85,7 @@ def destroy
     end
 
     def remove
-      if @user.present?
-        @user.destroy
+      if @user.present? && @user.destroy
         @message = 'We have removed you from our database!'
       else
         @message = 'No user with this token exists!'
@@ -104,7 +103,7 @@ def import
 
     def auto_opt_in
       @user = Light::User.new
-      @newsletters  = Light::Newsletter.all.desc(:sent_on)
+      @newsletters = Light::Newsletter.all.desc(:sent_on)
     end
 
     def opt_in
@@ -132,7 +131,6 @@ def opt_in
     end
 
     def thank_you
-
     end
 
     private
@@ -150,10 +148,10 @@ def dummy_token?
 
     def response_message(status)
       if dummy_token?
-        "#{status.capitalize} successfully!!"
+        "#{status} successfully!!"
       elsif @user.nil?
         'Hey, it seems request you are trying to access is invalid. If you have any ' +
-        'concerns about our newsletters subscription, kindly get in touch with ' +
+        "concerns about our newsletter's subscription, kindly get in touch with " +
         "<a href='mailto:[email protected]' class='email'>[email protected]</a>"
       else
         "You have already #{status}!!"

app/models/light/newsletter.rb

@@ -4,7 +4,7 @@ class Newsletter
     include Mongoid::Slug
     include Mongoid::Paperclip
 
-    VALID_NEWSLETTER_TYPES = {
+    NEWSLETTER_TYPES = {
       MONTHLY: 'Monthly Newsletter',
       OPT_IN:  'Opt-In Letter',
       OPT_OUT: 'Opt-Out Letter'
@@ -14,15 +14,15 @@ class Newsletter
     field :content,     type: String
     field :sent_on,     type: Date
     field :users_count,  type: Integer, default: 0
-    field :newsletter_type,  type: String, default: VALID_NEWSLETTER_TYPES[:MONTHLY]
+    field :newsletter_type,  type: String, default: NEWSLETTER_TYPES[:MONTHLY]
 
     validates :content, :subject, :newsletter_type, presence: true
     validates :subject, uniqueness: true
-    validates :newsletter_type, inclusion: {in: VALID_NEWSLETTER_TYPES.values}
+    validates :newsletter_type, inclusion: {in: NEWSLETTER_TYPES.values}
 
-    scope :opt_in_letters, -> { where(newsletter_type: VALID_NEWSLETTER_TYPES[:OPT_IN]) }
-    scope :opt_out_letters, -> { where(newsletter_type: VALID_NEWSLETTER_TYPES[:OPT_OUT]) }
-    scope :monthly_letters, -> { where(newsletter_type: VALID_NEWSLETTER_TYPES[:MONTHLY]) }
+    scope :opt_in_letters, -> { where(newsletter_type: NEWSLETTER_TYPES[:OPT_IN]) }
+    scope :opt_out_letters, -> { where(newsletter_type: NEWSLETTER_TYPES[:OPT_OUT]) }
+    scope :monthly_letters, -> { where(newsletter_type: NEWSLETTER_TYPES[:MONTHLY]) }
 
     has_mongoid_attached_file :photo,styles: {original: ['1920x1680>', :png],small: ['240x200!', :png]}
     validates_attachment_content_type :photo, content_type: ['image/jpg', 'image/jpeg', 'image/png', 'application/pdf']
@@ -34,11 +34,11 @@ def get_image
     end
 
     def opt_in?
-      newsletter_type.eql?(VALID_NEWSLETTER_TYPES[:OPT_IN])
+      newsletter_type.eql?(NEWSLETTER_TYPES[:OPT_IN])
     end
 
     def opt_out?
-      newsletter_type.eql?(VALID_NEWSLETTER_TYPES[:OPT_OUT])
+      newsletter_type.eql?(NEWSLETTER_TYPES[:OPT_OUT])
     end
   end
 end

app/views/light/newsletters/_form.html.haml

@@ -5,7 +5,7 @@
       = "Please Replace unsubscribe link with #{LIGHT_HOST_URL}/unsubscribe/<%= @user_id %>"
   %br
   = news.input :subject, :label => "Subject", :input_html => { :class => 'span8', :placeholder => 'Enter subject here...' }
-  = news.input :newsletter_type, collection: Light::Newsletter::VALID_NEWSLETTER_TYPES.values ,
+  = news.input :newsletter_type, collection: Light::Newsletter::NEWSLETTER_TYPES.values ,
     :label => "Type"
   = news.text_area :content, :placeholder => "Input here..", :class => "redactor", :rows => 20, :cols => 40
   = news.button :submit, class: "btn btn-primary"

app/views/light/newsletters/_newsletters.html.haml

@@ -1,10 +1,10 @@
 = render 'top_navbar'
 
 %table.table
-  -count=3
-  -@newsletters.each do |newsletter|
-    -if count > 2
-      -count=0
+  - count = 3
+  - @newsletters.each do |newsletter|
+    - if count > 2
+      - count = 0
       %tr
     %td
       %center
@@ -14,13 +14,13 @@
               = image_tag newsletter.get_image
             %div.cap
               %h4
-                = newsletter.sent_on.strftime("%B %Y")
+                = newsletter.sent_on.strftime('%B %Y')
                 = "(#{newsletter.users_count} users)"
       %center
         %hr
-          = link_to "", edit_newsletter_path(newsletter), class: "btn btn-lg icon-edit", data: { no_turbolink: true }
-          = link_to "", newsletter_path(newsletter), method: :delete, class: 'btn btn-lg icon-trash', :data => { :confirm => 'Are you sure, you want to delete newsletter?'}
-          = link_to "Send Mail", send_newsletter_path(newsletter), method: :post, :class => 'btn btn-mini btn-danger', :data => { :confirm => 'Are you sure ?'}
-          = link_to "Test Mail", test_mail_newsletter_path(newsletter), :class => 'btn btn-mini btn-success'
-    -count+=1
+          = link_to '', edit_newsletter_path(newsletter), class: 'btn btn-lg icon-edit', data: { no_turbolink: true }
+          = link_to '', newsletter_path(newsletter), method: :delete, class: 'btn btn-lg icon-trash', :data => { :confirm => 'Are you sure, you want to delete newsletter?'}
+          = link_to 'Send Mail', send_newsletter_path(newsletter), method: :post, :class => 'btn btn-mini btn-danger', :data => { :confirm => 'Are you sure ?'}
+          = link_to 'Test Mail', test_mail_newsletter_path(newsletter), :class => 'btn btn-mini btn-success'
+    - count += 1
 

app/views/light/newsletters/_top_navbar.html.haml

@@ -1,18 +1,18 @@
 = nav_bar :brand => 'Newsletters', :responsive => true, :static => :top, :fluid => :true do
   = menu_group do
-    = menu_item "Add Newsletter", new_newsletter_path
-    = menu_item "Opt in letters", newsletters_path(type: "Opt-In Letter")
-    = menu_item "Opt out letters", newsletters_path(type: "Opt-Out Letter")
-    = drop_down "Add Users" do
-      = menu_item "Add Manually", new_user_path
-      = menu_item "Import Opt-in Users", users_import_path
-      = menu_item "Google Spreadsheets", spreadsheets_path
+    = menu_item 'Add Newsletter', new_newsletter_path
+    = menu_item 'Opt in letters', newsletters_path(type: 'Opt-In Letter')
+    = menu_item 'Opt out letters', newsletters_path(type: 'Opt-Out Letter')
+    = drop_down 'Add Users' do
+      = menu_item 'Add Manually', new_user_path
+      = menu_item 'Import Opt-in Users', users_import_path
+      = menu_item 'Google Spreadsheets', spreadsheets_path
 
-    = menu_item "Show Users", users_path, ({:method => 'get'} if params[:controller] == 'light/users' && params[:action].in?(['new', 'create']))
+    = menu_item 'Show Users', users_path, ({:method => 'get'} if params[:controller] == 'light/users' && params[:action].in?(['new', 'create']))
 %br
 
 :javascript
   $(document).ready(function() {
-    $(".nav").find(".active").removeClass("active");
+    $('.nav').find('.active').removeClass('active');
     $('a[href="' + location.pathname + location.search + '"]').closest('li').addClass('active'); 
   });

app/views/light/newsletters/show.html.haml

@@ -1,9 +1,9 @@
 = render 'top_navbar'
 %h2.text-center
   = @newsletter.subject
-  = link_to "", edit_newsletter_path(@newsletter), class: "icon-edit pull-right", data: { no_turbolink: true }
+  = link_to '', edit_newsletter_path(@newsletter), class: 'icon-edit pull-right', data: { no_turbolink: true }
 = raw @newsletter.content
 %center
-  = link_to "Send Mail", send_newsletter_path(@newsletter),
+  = link_to 'Send Mail', send_newsletter_path(@newsletter),
     :class => 'btn btn-danger', :data => { :confirm => 'Are you sure ?'}, method: :post
-  = link_to "Send Test Mail", test_mail_newsletter_path(@newsletter), :class => "btn btn-success"
+  = link_to 'Send Test Mail', test_mail_newsletter_path(@newsletter), :class => 'btn btn-success'

app/views/light/users/_form.html.haml

@@ -5,7 +5,9 @@
     = simple_form_for (@user), html: {role: 'form', class: 'form-horizontal'} do |f|
       = f.input :email_id, input_html:{class: 'span3'}
       = f.input :username, input_html:{class: 'span3'}
-      = f.input :is_subscribed, :as => :select, input_html:{class: 'span3'}
+      = f.label 'Subscribed'
+      .make-switch{"data-on" => "success", "data-off" => "warning", "data-on-label" => "True", "data-off-label" => "False"}
+        = f.check_box :is_subscribed, {}, 'true', 'false'
       = f.input :joined_on, input_html: { 'data-behaviour' => 'datepicker'}, input_html:{class: 'span3'}
       = f.input :source, input_html:{class: 'span3'}
       = f.button :submit, class: "btn btn-success controls"

app/views/light/users/edit.html.haml

@@ -6,14 +6,13 @@
       %td
         = f.input :email_id, input_html:{class: 'span3'}
         = f.input :username, input_html:{class: 'span3'}
-        = f.input :is_subscribed, :as => :select, input_html:{class: 'span3'}
-        = f.input :joined_on, input_html: { 'data-behaviour' => 'datepicker'}, input_html:{class: 'span3'}
+        = f.label 'Subscribed'
+        .make-switch{'data-on': 'success', 'data-off': 'warning', 'data-on-label': 'True', 'data-off-label': 'False'}
+          = f.check_box :is_subscribed, {}, 'true', 'false'
+        %br
+        %br
+        = f.input :joined_on, input_html: {type: 'date', class: 'date-picker', value: @user.joined_on.try(:strftime, '%Y-%m-%d')}
         = f.input :source, input_html:{class: 'span3'}
         = f.button :submit, class: "btn btn-success controls"
 
-:javascript
-  $('[data-behaviour~=datepicker]').datepicker({
-    format: 'yyyy-mm-dd'
-  })
-
 

app/workers/light/enqueue.rb

@@ -5,9 +5,9 @@ class Enqueue
 
     def perform(email)
       date = Date.today.strftime("%Y%m")
-      news = Light::Newsletter.where(newsletter_type: Light::Newsletter::VALID_NEWSLETTER_TYPES[:MONTHLY]).
+      news = Light::Newsletter.where(newsletter_type: Light::Newsletter::NEWSLETTER_TYPES[:MONTHLY]).
         order_by([:sent_on, :desc]).first
-      Light::UserMailer.welcome_message(email, news, 'test_user_dummy_id').deliver if news
+      Light::UserMailer.welcome_message(email, news, 'test_user_dummy_id').deliver_now if news
     end
   end
 end

app/workers/light/hard_worker.rb

@@ -8,7 +8,7 @@ def perform(user_ids, newsletter_id, date, status = nil)
       user_ids.each do |id|
         user = Light::User.where(id: id, :sent_on.nin => [date]).first
         if user.present?
-          Light::UserMailer.welcome_message(user.email_id, newsletter, user.token).deliver
+          Light::UserMailer.welcome_message(user.email_id, newsletter, user.token).deliver_now
           sent_on = user.sent_on << date
           if status.present? && status.include?('Opt in')
             user.update_attributes(

app/workers/light/import_worker.rb

@@ -21,7 +21,7 @@ def perform(rows, email_id, source = 'Business Card')
           ) if email.present? or name.present?
           csv << [email, row[0], user.errors.messages] if user.present? and user.errors.present?
         end
-        UserMailer.import_contacts_update(email_id, file_path).deliver
+        UserMailer.import_contacts_update(email_id, file_path).deliver_now
       end
     end
   end

app/workers/light/opt_in_worker.rb

@@ -4,7 +4,7 @@ class OptInWorker
     sidekiq_options :queue => :lightair
 
     def perform(newsletter_id)
-      date = Date.today.strftime("%Y%m")
+      date = Date.today.strftime('%Y%m')
       users = Light::User.get_new_users
       number_of_opt_in_users = users.count
       number_of_opt_in_users_count = number_of_opt_in_users
@@ -16,12 +16,12 @@ def perform(newsletter_id)
           user_ids = users.limit(users_in_batch).skip(users_in_batch*current_batch).collect { |user| user.id.to_s }
           current_batch += 1
           number_of_opt_in_users -= users_in_batch
-          Light::HardWorker.perform_async(user_ids, newsletter.id.to_s, date, "Opt in mail sent")
+          Light::HardWorker.perform_async(user_ids, newsletter.id.to_s, date, 'Opt in mail sent')
         end
         opt_in_count = newsletter.users_count + number_of_opt_in_users_count
         newsletter.update_attribute(:users_count, opt_in_count)
       else
-        logger.info = "No newsletter present"
+        logger.info = 'No newsletter present'
       end
     end
   end

app/workers/light/opt_out_worker.rb

@@ -4,7 +4,7 @@ class OptOutWorker
     sidekiq_options :queue => :lightair
 
     def perform(newsletter_id)
-      date = Date.today.strftime("%Y%m")
+      date = Date.today.strftime('%Y%m')
       users = Light::User.get_new_users
       number_of_opt_out_users = users.count
       number_of_opt_out_users_count = number_of_opt_out_users

app/workers/light/user_worker.rb

@@ -12,7 +12,7 @@ def perform(newsletter_id)
       users_in_batch = 250
       newsletter = Light::Newsletter.where(id: newsletter_id).first
 
-      #newsletter = Light::Newsletter.where(newsletter_type: Light::Newsletter::VALID_NEWSLETTER_TYPES[:OPT_IN]).
+      #newsletter = Light::Newsletter.where(newsletter_type: Light::Newsletter::NEWSLETTER_TYPES[:OPT_IN]).
       #  order_by([:sent_on, :desc]).first
       if newsletter
         while number_of_subscribed_users > 0

config/routes.rb

@@ -1,17 +1,18 @@
 Light::Engine.routes.draw do
   mount RedactorRails::Engine => '/redactor_rails'
   get '/users/subscribe', to: 'users#subscribe', as: 'subscribe'
-  get '/users/remove', to: 'users#remove', as: 'remove'
+  get '/users/unsubscribe', to: 'users#unsubscribe', as: 'unsubscribe'
+  delete '/users/remove', to: 'users#remove', as: 'remove'
 
   get '/auth/:provider/callback', to: 'spreadsheets#new',    as: 'google_spreadsheet'
   get '/auth/failure',            to: 'spreadsheets#failure'
 
   match 'users/import', to: 'users#import', via: [:get, :post]
   resources :newsletters do
     member do
-      get 'test' , to: 'newsletters#test_mail' , as: 'test_mail'
-      post 'send' , to: 'newsletters#send_newsletter', as: 'send'
-      post 'sendtest' , to: 'newsletters#send_test_mail', as: 'send_test_mail'
+      get 'test', to: 'newsletters#test_mail', as: 'test_mail'
+      post 'send', to: 'newsletters#send_newsletter', as: 'send'
+      post 'sendtest', to: 'newsletters#send_test_mail', as: 'send_test_mail'
     end
   end