ditty 0.4.1 → 0.6.0

data/lib/ditty/services/email.rb

@@ -1,45 +1,43 @@
 # frozen_string_literal: true
 
 require 'mail'
+require 'active_support/inflector'
 require 'ditty/services/logger'
+require 'ditty/services/settings'
 
 module Ditty
   module Services
     module Email
-      CONFIG = './config/email.yml'.freeze
-
       class << self
-        def method_missing(method, *args, &block)
-          return super unless respond_to_missing?(method)
-          config!
-          Mail.send(method, *args, &block)
-        end
+        include ActiveSupport::Inflector
 
-        def respond_to_missing?(method, _include_private = false)
-          Mail.respond_to? method
+        def config!
+          cfg = config
+          Mail.defaults do
+            delivery_method cfg[:delivery_method].to_sym, (cfg[:options] || {})
+          end
         end
 
-        def config
-          @config ||= symbolize_keys File.exist?(CONFIG) ? YAML.load_file(CONFIG) : default
+        def deliver(email, to = nil, options = {})
+          config!
+          options[:to] ||= to unless to.nil?
+          email = from_symbol(email, options) if email.is_a? Symbol
+          email.deliver!
         end
 
         private
 
-        def config!
-          cfg = config
-          Mail.defaults do
-            delivery_method cfg[:delivery_method].to_sym, (cfg[:options] || {})
-          end
+        def config
+          default.merge Ditty::Services::Settings.values(:email) || {}
         end
 
         def default
           { delivery_method: :logger, logger: Ditty::Services::Logger.instance }
         end
 
-        def symbolize_keys(hash)
-          return hash.map { |v| symbolize_keys(v) } if hash.is_a? Array
-          return hash unless hash.is_a? Hash
-          Hash[hash.map { |k, v| [k.to_sym, symbolize_keys(v)] }]
+        def from_symbol(email, options)
+          require "ditty/emails/#{email}"
+          constantize("Ditty::Emails::#{classify(email)}").new(options)
         end
       end
     end

data/lib/ditty/services/logger.rb

@@ -4,23 +4,25 @@ require 'logger'
 require 'yaml'
 require 'singleton'
 require 'active_support/inflector'
+require 'ditty/services/settings'
+require 'active_support/core_ext/object/blank'
 
 module Ditty
   module Services
     class Logger
       include Singleton
 
-      CONFIG = './config/logger.yml'.freeze
       attr_reader :loggers
 
       def initialize
         @loggers = []
-        config.each do |values|
-          klass = values['class'].constantize
-          opts = tr(values['options']) || nil
+        return if config[:loggers].blank?
+        config[:loggers].each do |values|
+          klass = values[:class].constantize
+          opts = tr(values[:options]) || nil
           logger = klass.new(opts)
-          if values['level']
-            logger.level = klass.const_get(values['level'].to_sym)
+          if values[:level]
+            logger.level = klass.const_get(values[:level].to_sym)
           end
           @loggers << logger
         end
@@ -37,7 +39,7 @@ module Ditty
       private
 
       def config
-        @config ||= File.exist?(CONFIG) ? YAML.load_file(CONFIG) : default
+        default.merge Ditty::Services::Settings.values(:logger) || {}
       end
 
       def tr(val)
@@ -48,7 +50,7 @@ module Ditty
       end
 
       def default
-        [{ 'name' => 'default', 'class' => 'Logger' }]
+        { loggers: [{ name: 'default', class: 'Logger' }] }
       end
     end
   end

data/lib/ditty/services/pagination_wrapper.rb

@@ -0,0 +1,82 @@
+module Ditty
+  module Services
+    class PaginationWrapper
+      attr_reader :list
+
+      def initialize(list)
+        @list = list
+      end
+
+      def last_page?
+        if list.respond_to? :'last_page?'
+          list.last_page?
+        else
+          list.current_page == list.total_pages
+        end
+      end
+
+      def first_page?
+        if list.respond_to? :'first_page?'
+          list.first_page?
+        else
+          list.current_page == 0
+        end
+      end
+
+      def prev_page
+        if list.respond_to? :prev_page
+          list.prev_page
+        else
+          list.previous_page
+        end
+      end
+
+      def page_count
+        if list.respond_to? :page_count
+          list.page_count
+        else
+          list.total_pages
+        end
+      end
+
+      def page_size
+        if list.respond_to? :page_size
+          list.page_size
+        else
+          list.per_page
+        end
+      end
+
+      def pagination_record_count
+        if list.respond_to? :pagination_record_count
+          list.pagination_record_count
+        else
+          list.total_entries
+        end
+      end
+
+      def method_missing(method, *args)
+        return super unless respond_to_missing?(method)
+
+        list.send(method, *args)
+      end
+
+      def respond_to_missing?(method, _include_private = false)
+        list.respond_to? method
+      end
+
+      def current_page_record_range
+        if list.respond_to? :current_page_record_range
+          list.current_page_record_range
+        else
+          return (0..0) if list.current_page > page_count
+
+          a = 1 + (list.current_page - 1) * page_size
+          b = a + page_size - 1
+          b = pagination_record_count if b > pagination_record_count
+          a..b
+        end
+      end
+    end
+  end
+end

data/lib/ditty/services/settings.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require 'erb'
+require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/hash/keys'
+
+module Ditty
+  module Services
+    module Settings
+      CONFIG_FOLDER = './config'.freeze
+      CONFIG_FILE = "#{CONFIG_FOLDER}/settings.yml".freeze
+
+      class << self
+        def [](key)
+          values(key.to_sym)
+        end
+
+        def values(scope = :settings)
+          @values ||= begin
+            v = Hash.new do |h, k|
+              h[k] = if File.file?("#{CONFIG_FOLDER}/#{k}.yml")
+                       read("#{CONFIG_FOLDER}/#{k}.yml")
+                     elsif k != :settings && h[:settings].key?(k)
+                       h[:settings][k]
+                     end
+              h[k]
+            end
+            v[:settings] = File.file?(CONFIG_FILE) ? read(CONFIG_FILE) : {}
+            v
+          end
+          @values[scope]
+        end
+
+        attr_writer :values
+
+        def read(filename)
+          base = YAML.safe_load(ERB.new(File.read(filename)).result).deep_symbolize_keys
+          base.deep_merge!(base[ENV['APP_ENV'].to_sym]) unless ENV['APP_ENV'].nil? || base[ENV['APP_ENV'].to_sym].nil?
+          base
+        end
+      end
+    end
+  end
+end

data/lib/ditty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ditty
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/migrate/20180307_password_reset.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+Sequel.migration do
+  change do
+    alter_table :identities do
+      add_column :reset_token, String
+      add_column :reset_requested, DateTime
+    end
+  end
+end

data/views/audit_logs/index.haml

@@ -16,7 +16,7 @@
               %tr
                 %td
                   -if entity.user
-                    %a{ href: "/users/#{entity.user.id}" }= entity.user.email
+                    %a{ href: "#{settings.map_path}/users/#{entity.user.id}" }= entity.user.email
                   -else
                     None
                 %td

data/views/emails/base.haml

@@ -0,0 +1,2 @@
+- if defined? content
+	= content

data/views/emails/forgot_password.haml

@@ -0,0 +1,26 @@
+%p
+	Hi #{identity.user.name}
+
+%p
+	We received a request to reset the password for #{identity.username}.
+	You can use the button below to complete this request.
+	%strong
+		This reset is only valid for 24 hours
+
+%p.text-center
+	%a{ href: reset_url }
+
+%p
+	For security purposes, if you did not request this password reset,
+	please contact support.
+
+%p
+	Thanx!
+
+%ul
+	%li
+		Requesting IP:
+		= request.ip
+	%li
+		Requesting User Agent:
+		= request.user_agent

data/views/emails/layouts/action.haml

@@ -0,0 +1,68 @@
+!!!
+%html{:style => "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;", :xmlns => "http://www.w3.org/1999/xhtml"}
+  %head
+    %meta{:content => "width=device-width", :name => "viewport"}/
+    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %title Actionable emails e.g. reset password
+    :css
+      img {
+      max-width: 100%;
+      }
+      body {
+      -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
+      }
+      body {
+      background-color: #f6f6f6;
+      }
+      @media only screen and (max-width: 640px) {
+        body {
+          padding: 0 !important;
+        }
+        h1 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h2 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h3 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h4 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h1 {
+          font-size: 22px !important;
+        }
+        h2 {
+          font-size: 18px !important;
+        }
+        h3 {
+          font-size: 16px !important;
+        }
+        .container {
+          padding: 0 !important; width: 100% !important;
+        }
+        .content {
+          padding: 0 !important;
+        }
+        .content-wrap {
+          padding: 10px !important;
+        }
+        .invoice {
+          width: 100% !important;
+        }
+      }
+  %body{:bgcolor => "#f6f6f6", :itemscope => "", :itemtype => "http://schema.org/EmailMessage", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;"}
+    %table.body-wrap{:bgcolor => "#f6f6f6", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; background-color: #f6f6f6; margin: 0;"}
+      %tr{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"}
+        %td{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;", :valign => "top"}
+        %td.container{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; display: block !important; max-width: 600px !important; clear: both !important; margin: 0 auto;", :valign => "top", :width => "600"}
+          .content{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; max-width: 600px; display: block; margin: 0 auto; padding: 20px;"}
+            = content
+            - if defined? footer
+              .footer{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;"}
+                %table{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;", :width => "100%"}
+                  %tr{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"}
+                    %td.aligncenter.content-block{:align => "center", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;", :valign => "top"}
+                      = footer
+        %td{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;", :valign => "top"}

data/views/emails/layouts/alert.haml

@@ -0,0 +1,88 @@
+!!!
+%html{:style => "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;", :xmlns => "http://www.w3.org/1999/xhtml"}
+  %head
+    %meta{:content => "width=device-width", :name => "viewport"}/
+    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %title Alerts e.g. approaching your limit
+    :css
+      img {
+      max-width: 100%;
+      }
+      body {
+      -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
+      }
+      body {
+      background-color: #f6f6f6;
+      }
+      @media only screen and (max-width: 640px) {
+        body {
+          padding: 0 !important;
+        }
+        h1 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h2 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h3 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h4 {
+          font-weight: 800 !important; margin: 20px 0 5px !important;
+        }
+        h1 {
+          font-size: 22px !important;
+        }
+        h2 {
+          font-size: 18px !important;
+        }
+        h3 {
+          font-size: 16px !important;
+        }
+        .container {
+          padding: 0 !important; width: 100% !important;
+        }
+        .content {
+          padding: 0 !important;
+        }
+        .content-wrap {
+          padding: 10px !important;
+        }
+        .invoice {
+          width: 100% !important;
+        }
+      }
+  %body{:bgcolor => "#f6f6f6", :itemscope => "", :itemtype => "http://schema.org/EmailMessage", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;"}
+    %table.body-wrap{:bgcolor => "#f6f6f6", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; background-color: #f6f6f6; margin: 0;"}
+      %tr{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"}
+        %td{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;", :valign => "top"}
+        %td.container{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; display: block !important; max-width: 600px !important; clear: both !important; margin: 0 auto;", :valign => "top", :width => "600"}
+          .content{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; max-width: 600px; display: block; margin: 0 auto; padding: 20px;"}
+            %table.main{:bgcolor => "#fff", :cellpadding => "0", :cellspacing => "0", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;", :width => "100%"}
+              %tr{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"}
+                %td.alert.alert-warning{:align => "center", :bgcolor => "#FF9F00", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 16px; vertical-align: top; color: #fff; font-weight: 500; text-align: center; border-radius: 3px 3px 0 0; background-color: #FF9F00; margin: 0; padding: 20px;", :valign => "top"}
+                  Warning: You're approaching your limit. Please upgrade.
+              %tr{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"}
+                %td.content-wrap{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 20px;", :valign => "top"}
+                  %table{:cellpadding => "0", :cellspacing => "0", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;", :width => "100%"}
+                    %tr{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"}
+                      %td.content-block{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;", :valign => "top"}
+                        You have
+                        %strong{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"} 1 free report
+                        remaining.
+                    %tr{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"}
+                      %td.content-block{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;", :valign => "top"}
+                        Add your credit card now to upgrade your account to a premium plan to ensure you don't miss out on any reports.
+                    %tr{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"}
+                      %td.content-block{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;", :valign => "top"}
+                        %a.btn-primary{:href => "http://www.mailgun.com", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;"} Upgrade my account
+                    %tr{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"}
+                      %td.content-block{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;", :valign => "top"}
+                        Thanks for choosing Acme Inc.
+            .footer{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;"}
+              %table{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;", :width => "100%"}
+                %tr{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"}
+                  %td.aligncenter.content-block{:align => "center", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;", :valign => "top"}
+                    %a{:href => "http://www.mailgun.com", :style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;"} Unsubscribe
+                    from these alerts.
+        %td{:style => "font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;", :valign => "top"}