sinatra-hexacta 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf0915f37eb2114c97ebb4b7ff954a90e3c5dac391fe217d3a75053dc228220
-  data.tar.gz: 2f0a31fcc9b14ddf883c633fc6a1ba7926cbc61bb3549f167871fa494b2ad2f6
+  metadata.gz: b224f086c14afb408224b09ae099c98b916a9e7e306bfa378108cce5d69a4ff2
+  data.tar.gz: c213e3f241ba7cfc6a99dbc26f6324454e76e014cadd98e442bf916c2d4fd94b
 SHA512:
-  metadata.gz: a5bfbf816b5b2f5def09972de96976262de368922ac80a858d61610f17cd91c09f35b41cff946fb8da759be407701c7b4489d60cf44700e19fa2843061a766bf
-  data.tar.gz: 6bda67520e9f593a7524703e765066af1738b199dfa23870f8ab14ff9d79244e83bf533aaf09b658d04d0a26c82894ebde1f6cd61228ef51ed9043196ec9da5f
+  metadata.gz: 732951c6ab91c8d3293ab5b1110a4de7ed423675d694ea41c3208f5ef85dcd9f562426b661a0aa399754a9b6d07b8ea16e2ff3a33e481fff413505c967b1a548
+  data.tar.gz: 83194ef3873540372ed76f33bcda69c69aef0eae4ce8f2b5b5018a141ebe373f83f2f34987835d1086fb0bb8ac53f37467cdf446082966ca3356b1cc3536b066

data/lib/sinatra/extensions/generalmail.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+class GeneralMail < Mail
+  
+  def initialize(args)
+    super(args)
+    @subject = args[:subject]
+    @description = args[:description]
+    @link = args[:link]
+  end
+
+  def template
+    'general'
+  end
+
+  def subject
+    @subject
+  end
+
+  def values
+    data = {}
+    data["{description}"] = @description
+    data["{link}"] = @link
+    data
+  end
+
+end

data/lib/sinatra/extensions/init.rb

@@ -2,3 +2,7 @@
 require_relative 'date'
 require_relative 'antiquity'
 require_relative 'notification'
+require_relative 'mailsender'
+require_relative 'mail'
+require_relative 'generalmail'
+require_relative 'mailbuilder'

data/lib/sinatra/extensions/mail.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+class Mail
+
+  def initialize(args)
+    @receivers = args[:to]
+    @sender = args[:from]
+  end
+
+  def template
+    raise Exception, "You have to override 'template' method in #{self.class}"
+  end
+
+  def subject
+    raise Exception, "You have to override 'subject' method in #{self.class}"
+  end
+
+  def values
+    raise Exception, "You have to override 'values' method in #{self.class}"
+  end
+
+  def to
+    _receivers = {}
+    @receivers.each { |user| _receivers[user.full_name] = "Persons" }
+    _receivers
+  end
+
+  def from 
+    @sender ||= "apps@hexacta.com"
+  end
+
+  def send
+    MailSender.perform_async(self)
+  end
+
+end

data/lib/sinatra/extensions/mailbuilder.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+class MailBuilder
+
+  def to(receivers)
+    @to = receivers
+    return self
+  end
+
+  def from(sender)
+    @from = "#{sender.hxt_id}@hexacta.com"
+    return self
+  end
+
+  def subject(a_subject)
+    @subject = a_subject
+    return self
+  end
+
+  def description(a_description)
+    @description = a_description
+    return self
+  end
+
+  def link(a_link)
+    @link = a_link
+    return self
+  end
+
+  def send
+    @from ||= "apps@hexacta.com"
+    GeneralMail.new({ :to => @to,
+                      :from => @from,
+                      :subject => @subject,
+                      :description => @description,
+                      :link => @link
+                    }).send
+  end
+end

data/lib/sinatra/extensions/mailsender.rb

@@ -0,0 +1,88 @@
+# encoding: utf-8
+require 'singleton'
+require 'sucker_punch'
+
+class MailSender
+  include SuckerPunch::Job
+
+  attr_reader :access_token, :expire, :refresh_token
+
+  def _do_connect(uri, form={},token=nil)
+    url = URI.parse("#{uri}")
+    http = Net::HTTP.new(url.host, url.port)
+    http.read_timeout = 1000
+    http.use_ssl = (url.scheme == 'https')
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    header = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+    header["Authorization"] = "Bearer #{token}" unless token.nil?
+    request = Net::HTTP::Post.new(url, header)
+    request.form_data = form
+    http.start { |http| http.request(request) }
+  end
+
+  def _authorize_mail
+    params = [ [ "grant_type", "password" ], [ "client_id", "MailApp" ], [ "client_secret", "MailAppPRD2018!" ] ]
+    response = _do_connect("https://comunicacion.hexacta.com:4443/apptoken",params)
+    if( response.is_a?( Net::HTTPSuccess ) )
+      token = JSON.parse(response.body)
+      @access_token = token["access_token"]
+      @refresh_token = token["refresh_token"]
+      @expire  = DateTime.parse(token[".expires"])
+    else
+      NotificationSender.instance.send_error(nil,'Authorize mail failed',response.body)
+    end
+  end
+
+  def _build_map_values(mail_values)
+    values = []
+    for key in mail_values.keys
+      index = mail_values.keys.index(key)
+      values << ["MailValues[#{index}].Key", key]
+      values << ["MailValues[#{index}].Value", mail_values[key]]
+    end
+    values
+  end
+
+  def _build_to_map(to_map)
+    values = []
+    for key in to_map.keys
+      index = to_map.keys.index(key)
+      values << ["ResourcesRequest[#{index}].TypeGroup", to_map[key]]
+      values << ["ResourcesRequest[#{index}].Name", key]
+    end
+    values
+  end
+
+  def _expired?
+    expire.nil? || DateTime.now < expire
+  end
+
+  def do_send(mail)
+    begin
+      if _expired?
+        _authorize_mail
+      end
+
+      params = [ [ "ApplicationCode", 2009 ], [ "Name", mail.template ], [ "Subject", mail.subject ], [ "EmailAddress", mail.from ] ]
+      params = params + _build_map_values(mail.values) + _build_to_map(mail.to)
+
+      response = _do_connect("https://comunicacion.hexacta.com:4444/api/app/TemplateNotification/SendMail",params,@access_token)
+
+      if( !response.is_a?( Net::HTTPSuccess ) )
+        NotificationSender.instance.send_error(nil,'Send mail failed',response.body)
+      end
+    rescue StandardError => error
+      message = error.backtrace.join(',');
+      NotificationSender.instance.send_error(nil,"Mail send error",message)
+    end
+  end
+
+  def send(mail)
+    run(mail) #Async call
+  end
+
+  #For async method call
+  def perform(mail)
+    do_send(mail)
+  end
+end

data/lib/sinatra/extensions/notification.rb

@@ -1,7 +1,10 @@
 # encoding: utf-8
+require 'singleton'
+
 class NotificationSender
+  include Singleton
 
-  def self.send_to(user,creator,title,message,label,link=nil)
+  def send_to(user,creator,title,message,label,link=nil)
     notification = Notification.find_or_create(:user_id => user.id,
                                 :creator_id => creator.id,
                                 :title => title,
@@ -16,13 +19,13 @@ class NotificationSender
     notification
   end
 
-  def self.send_to_subscriptors(creator,title,message,label,link=nil)
+  def send_to_subscriptors(creator,title,message,label,link=nil)
     Subscription.where(:label => label).all.each do |subscription|
-      notification = NotificationSender.send_to(subscription.user,creator,title,message,label,link)
+      notification = send_to(subscription.user,creator,title,message,label,link)
     end
   end
 
-  def self.send_error(creator,title,message)
+  def send_error(creator,title,message)
     Subscription.where(:label => 'error').all.each do |subscription|
       creator = subscription.user if creator.nil?
       notification = Notification.find(:user_id => subscription.user_id,
@@ -32,7 +35,7 @@ class NotificationSender
                                        :label => 'error',
                                        :read_date => nil)
       if notification.nil?
-        notification = NotificationSender.send_to(subscription.user,creator,title,message,'error')
+        notification = send_to(subscription.user,creator,title,message,'error')
       end
     end
 

data/lib/sinatra/handlers/errors.rb

@@ -18,7 +18,7 @@ module Sinatra
         if code == 500
           title = env['sinatra.error'].message.split(':')[0].gsub('#<','');
           message = (["in #{request.url}"] + env['sinatra.error'].backtrace).join(',');
-          NotificationSender.send_error(authenticated(User),title,message)
+          NotificationSender.instance.send_error(authenticated(User),title,message)
         end
         slim "#{Hexacta::GEM_FILE_DIR}/errors/#{code}".to_sym, locals: { :params => params }
       end

data/lib/sinatra/handlers/notifications.rb

@@ -11,10 +11,10 @@ module Sinatra
 
       post '/notification' do
         if params[:user_ids].blank?
-          NotificationSender.send_to_subscriptors(authenticated(User),params[:title],params[:message],params[:label])
+          NotificationSender.instance.send_to_subscriptors(authenticated(User),params[:title],params[:message],params[:label])
         else
           for id in params[:user_ids]
-            NotificationSender.send_to(User.find(:id => id),authenticated(User),params[:title],params[:message],params[:label])
+            NotificationSender.instance.send_to(User.find(:id => id),authenticated(User),params[:title],params[:message],params[:label])
           end
         end
         redirect back

data/lib/sinatra/helpers/schedule.rb

@@ -21,7 +21,7 @@ module Sinatra
             rescue StandardError => error
               title = error.message.split(':')[0].gsub('#<','');
               message = error.backtrace.join(',');
-              NotificationSender.send_error(nil,title,message)
+              NotificationSender.instance.send_error(nil,title,message)
             end
 
           end
@@ -50,7 +50,7 @@ module Sinatra
             rescue error
               title = error.message.split(':')[0].gsub('#<','');
               message = error.backtrace.join(',');
-              NotificationSender.send_error(nil,title,message)
+              NotificationSender.instance.send_error(nil,title,message)
             end
 
           end

data/lib/sinatra/hexacta.rb

@@ -35,6 +35,11 @@ module Sinatra
   end
 end
 
+unless Gem.loaded_specs["sinatra-hexacta"].nil?
+  FileUtils.remove_dir "/app/views/sinatra-hexacta" if Dir.exist? "/app/views/sinatra-hexacta"
+  FileUtils.remove_dir "/app/public/sinatra-hexacta" if Dir.exist? "/app/public/sinatra-hexacta"
+end
+
 require_relative 'helpers/init'
 require_relative 'handlers/init'
 require_relative 'extensions/init'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Marco Zanger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies: []
 description: A gem to support general functionality accross all apps
 email: mzanger@hexacta.com
@@ -18,7 +18,11 @@ extra_rdoc_files: []
 files:
 - lib/sinatra/extensions/antiquity.rb
 - lib/sinatra/extensions/date.rb
+- lib/sinatra/extensions/generalmail.rb
 - lib/sinatra/extensions/init.rb
+- lib/sinatra/extensions/mail.rb
+- lib/sinatra/extensions/mailbuilder.rb
+- lib/sinatra/extensions/mailsender.rb
 - lib/sinatra/extensions/notification.rb
 - lib/sinatra/handlers/errors.rb
 - lib/sinatra/handlers/init.rb
@@ -31,7 +35,6 @@ files:
 - lib/sinatra/helpers/init.rb
 - lib/sinatra/helpers/inputs.rb
 - lib/sinatra/helpers/libraries.rb
-- lib/sinatra/helpers/mailer.rb
 - lib/sinatra/helpers/reports.rb
 - lib/sinatra/helpers/schedule.rb
 - lib/sinatra/helpers/subscriptions.rb

data/lib/sinatra/helpers/mailer.rb

@@ -1,74 +0,0 @@
-# encoding: utf-8
-require 'sucker_punch'
-
-module Sinatra
-  module MailHelper
-
-    attr_reader :access_token, :expire, :refresh_token
-
-    def _do_connect(uri, form={},token=nil)
-      url = URI.parse("#{uri}")
-      http = Net::HTTP.new(url.host, url.port)
-      http.read_timeout = 1000
-      http.use_ssl = (url.scheme == 'https')
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      header = { 'Content-Type' => 'application/x-www-form-urlencoded' }
-      header["Authorization"] = "Bearer #{token}" unless token.nil?
-      request = Net::HTTP::Post.new(url, header)
-      request.form_data = form
-      http.start {|http| http.request(request) }
-    end
-
-    def _authorize_mail
-      params = [ [ "grant_type", "password" ], [ "client_id", "MailApp" ], [ "client_secret", "MailAppPRD2018!" ] ]
-      response = _do_connect("https://comunicacion.hexacta.com:4443/apptoken",params)
-      if( response.is_a?( Net::HTTPSuccess ) )
-        token = JSON.parse(response.body)
-        @access_token = token["access_token"]
-        @refresh_token = token["refresh_token"]
-        @expire  = DateTime.parse(token[".expires"])
-      else
-        p "Didn't succeed :("
-      end
-    end
-
-    def _build_map_values(mail_values)
-      values = []
-      for key in mail_values.keys
-        index = mail_values.keys.index(key)
-        values << ["MailValues[#{index}].Key", key]
-        values << ["MailValues[#{index}].Value", mail_values[key]]
-      end
-      values
-    end
-
-    def _build_to_map(to_map)
-      values = []
-      for key in to_map.keys
-        index = to_map.keys.index(key)
-        values << ["ResourcesRequest[#{index}].TypeGroup", to_map[key]]
-        values << ["ResourcesRequest[#{index}].Name", key]
-      end
-      values
-    end
-
-    def _expired?
-      expire.nil? || DateTime.now < expire
-    end
-
-    def send_mail(template,subject,mail_values={},to_map)
-      if _expired?
-        _authorize_mail
-      end
-      params = [ [ "ApplicationCode", 1 ], [ "Name", template ], [ "Subject", subject ], [ "EmailAddress", "apps@hexacta.com" ] ]
-      params = params + _build_map_values(mail_values) + _build_to_map(to_map)
-      response = do_connect("https://comunicacion.hexacta.com:4444/api/app/TemplateNotification/SendMail",params,@access_token)
-      if( !response.is_a?( Net::HTTPSuccess ) )
-        p "Didn't succeed :("
-      end
-    end
-
-  end
-
-  helpers MailHelper
-end