ditty 0.4.1 → 0.6.0

data/lib/ditty/controllers/users.rb

@@ -60,7 +60,7 @@ module Ditty
         user.check_roles
       end
 
-      log_action("#{dehumanized}_create".to_sym) if settings.track_actions
+      broadcast(:component_create, target: self)
       create_response(user)
     end
 
@@ -81,7 +81,7 @@ module Ditty
         entity.check_roles
       end
 
-      log_action("#{dehumanized}_update".to_sym) if settings.track_actions
+      broadcast(:component_update, target: self)
       update_response(entity)
     end
 
@@ -93,13 +93,8 @@ module Ditty
       identity = entity.identity.first
       identity_params = params['identity']
 
-      unless identity_params['password'] == identity_params['password_confirmation']
-        flash[:warning] = 'Password didn\'t match'
-        return redirect back
-      end
-
       unless current_user.super_admin? || identity.authenticate(identity_params['old_password'])
-        log_action("#{dehumanized}_update_password_failed".to_sym) if settings.track_actions
+        broadcast(:identity_update_password_failed, target: self)
         flash[:danger] = 'Old Password didn\'t match'
         return redirect back
       end
@@ -107,12 +102,14 @@ module Ditty
       values = permitted_attributes(Identity, :create)
       identity.set values
       if identity.valid? && identity.save
-        log_action("#{dehumanized}_update_password".to_sym) if settings.track_actions
+        broadcast(:identity_update_password, target: self)
         flash[:success] = 'Password Updated'
         redirect back
       elsif current_user.super_admin? && current_user.id != id.to_i
+        broadcast(:identity_update_password_failed, target: self)
         haml :"#{view_location}/display", locals: { entity: entity, identity: identity, title: heading }
       else
+        broadcast(:identity_update_password_failed, target: self)
         haml :"#{view_location}/profile", locals: { entity: entity, identity: identity, title: heading }
       end
     end
@@ -127,7 +124,7 @@ module Ditty
       entity.remove_all_roles
       entity.destroy
 
-      log_action("#{dehumanized}_delete".to_sym) if settings.track_actions
+      broadcast(:component_delete, target: self)
       delete_response(entity)
     end
 

data/lib/ditty/db.rb

@@ -5,12 +5,17 @@ require 'ditty/services/logger'
 require 'active_support'
 require 'active_support/core_ext/object/blank'
 
+pool_timeout = (ENV['DB_POOL_TIMEOUT'] || 5).to_i
+
 if defined? DB
   Ditty::Services::Logger.instance.warn 'Database connection already set up'
 elsif ENV['DATABASE_URL'].blank? == false
   # Delete DATABASE_URL from the environment, so it isn't accidently
   # passed to subprocesses.  DATABASE_URL may contain passwords.
-  DB = Sequel.connect(ENV['RACK_ENV'] == 'production' ? ENV.delete('DATABASE_URL') : ENV['DATABASE_URL'])
+  DB = Sequel.connect(
+    ENV['RACK_ENV'] == 'production' ? ENV.delete('DATABASE_URL') : ENV['DATABASE_URL'],
+    pool_timeout: pool_timeout
+  )
 
   DB.sql_log_level = (ENV['SEQUEL_LOGGING_LEVEL'] || :debug).to_sym
   DB.loggers << Ditty::Services::Logger.instance

data/lib/ditty/emails/base.rb

@@ -0,0 +1,74 @@
+require 'haml'
+require 'ditty/components/app'
+
+module Ditty
+  module Emails
+    class Base
+      attr_accessor :options, :locals, :mail
+
+      def initialize(options = {})
+        @mail = options[:mail] || Mail.new
+        @locals = options[:locals] || {}
+        @options = base_options.merge options
+      end
+
+      def deliver!(to = nil, locals = {})
+        options[:to] = to unless to.nil?
+        @locals.merge!(locals)
+        %i[to from subject].each do |param|
+          mail.send(param, options[param]) if options[param]
+        end
+        mail.body content
+        mail.deliver!
+      end
+
+      def method_missing(method, *args, &block)
+        return super unless respond_to_missing?(method)
+        mail.send(method, *args, &block)
+      end
+
+      def respond_to_missing?(method, _include_private = false)
+        mail.respond_to? method
+      end
+
+      private
+
+      def content
+        result = Haml::Engine.new(content_haml).render(Object.new, locals)
+        return result unless options[:layout]
+        Haml::Engine.new(layout_haml).render(Object.new, content: result)
+      end
+
+      def content_haml
+        read_template(options[:view])
+      end
+
+      def layout_haml
+        read_template("layouts/#{options[:layout]}") if options[:layout]
+      end
+
+      def read_template(template)
+        File.read(find_template("emails/#{template}"))
+      end
+
+      def base_options
+        { subject: '(No Subject)', from: 'no-reply@ditty.io', view: :base }
+      end
+
+      def find_template(file)
+        template = File.expand_path("./views/#{file}.haml")
+        return template if File.file? template
+        template = File.expand_path("./#{file}.haml", App.view_folder)
+        return template if File.file? template
+        file
+      end
+
+      class << self
+        def deliver!(to = nil, options = {})
+          locals = options[:locals] || {}
+          new(options).deliver!(to, locals)
+        end
+      end
+    end
+  end
+end

data/lib/ditty/emails/forgot_password.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'ditty/emails/base'
+require 'ditty/services/email'
+
+module Ditty
+  module Emails
+    class ForgotPassword < Base
+      def initialize(options = {})
+        options = { view: :forgot_password, layout: :action, subject: 'Request to reset password' }.merge(options)
+        super(options)
+      end
+    end
+  end
+end

data/lib/ditty/helpers/authentication.rb

@@ -18,8 +18,8 @@ module Ditty
       end
 
       def current_user_id
-        return env['omniauth.auth'].uid if env['omniauth.auth']
-        env['rack.session']['user_id'] if env['rack.session']
+        return env['rack.session']['user_id'] if env['rack.session']
+        env['omniauth.auth'].uid if env['omniauth.auth']
       end
 
       def authenticate

data/lib/ditty/helpers/component.rb

@@ -2,6 +2,7 @@
 
 require 'active_support'
 require 'active_support/inflector'
+require 'will_paginate/array'
 
 module Ditty
   module Helpers
@@ -16,13 +17,15 @@ module Ditty
         count = params['count'] || 10
         page = params['page'] || 1
 
-        ds = dataset.select
-        count == 'all' ? ds : ds.paginate(page.to_i, count.to_i)
+        ds = dataset.respond_to?(:dataset) ? dataset.dataset : dataset
+        return ds if count == 'all'
+        # Account for difference between sequel paginate and will paginate
+        ds.is_a?(Array) ? ds.paginate(page: page.to_i, per_page: count.to_i) : ds.paginate(page.to_i, count.to_i)
       end
 
       def heading(action = nil)
         @headings ||= begin
-          heading = titleize(demodulize(settings.model_class))
+          heading = settings.model_class.to_s.demodulize.titleize
           h = Hash.new(heading)
           h[:new] = "New #{heading}"
           h[:list] = pluralize heading
@@ -85,7 +88,7 @@ module Ditty
       end
 
       def search(dataset)
-        return dataset if ['', nil].include?(params['q']) || searchable_fields == []
+        return dataset if ['', nil].include?(params['q']) || search_filters == []
         dataset.where Sequel.|(*search_filters)
       end
     end

data/lib/ditty/helpers/views.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'ditty/services/pagination_wrapper'
+
 module Ditty
   module Helpers
     module Views
@@ -85,12 +87,13 @@ module Ditty
         options[:form_verb] ||= :post
         options[:attributes] ||= {}
         options[:attributes] = { 'class': 'form-horizontal' }.merge options[:attributes]
-        options[:url] = options[:form_verb].to_sym == :get  ? url : with_layout(url)
+        options[:url] = options[:form_verb].to_sym == :get ? url : with_layout(url)
         haml :'partials/form_tag', locals: options.merge(block: block)
       end
 
       def pagination(list, base_path, qp = {})
-        return unless list.respond_to? :pagination_record_count
+        return unless list.respond_to?(:pagination_record_count) || list.respond_to?(:total_entries)
+        list = Ditty::Services::PaginationWrapper.new(list)
         locals = {
           first_link: "#{base_path}?" + query_string(qp.merge(page: 1)),
           next_link: list.last_page? ? '#' : "#{base_path}?" + query_string(qp.merge(page: list.next_page)),

data/lib/ditty/listener.rb

@@ -1,23 +1,57 @@
 # frozen_string_literal: true
 
+require 'active_support'
+require 'active_support/inflector'
 require 'wisper'
 
 module Ditty
   class Listener
+    EVENTS = %i[
+      component_list component_create component_read component_update component_delete
+      user_register user_login user_logout user_failed_login
+      identity_update_password identity_update_password_failed
+    ].freeze
+
     def initialize
       @mutex = Mutex.new
     end
 
     def method_missing(method, *args)
-      vals = { action: method }
-      return unless args[0].is_a? Hash
-      vals[:user] = args[0][:user] if args[0] && args[0].key?(:user)
-      vals[:details] = args[0][:details] if args[0] && args[0].key?(:details)
-      @mutex.synchronize { Ditty::AuditLog.create vals }
+      return unless args[0].is_a?(Hash) && args[0][:target] && args[0][:target].settings.track_actions
+
+      log_action({
+        user: args[0][:target].current_user,
+        action: action_from(args[0][:target], method),
+        details: args[0][:details]
+      }.merge(args[0][:values] || {}))
+    end
+
+    def respond_to_missing?(method, _include_private = false)
+      EVENTS.include? method
+    end
+
+    def user_register(event)
+      user = event[:values][:user]
+      log_action({
+        user: user,
+        action: action_from(event[:target], :user_register),
+        details: event[:details]
+      }.merge(event[:values] || {}))
+
+      # Create the SA user if none is present
+      sa = Role.find_or_create(name: 'super_admin')
+      return if User.where(roles: sa).count.positive?
+      user.add_role sa
+    end
+
+    def action_from(target, method)
+      return method unless method.to_s.start_with? 'component_'
+      target.class.to_s.demodulize.underscore + '_' + method.to_s.gsub(/^component_/, '')
     end
 
-    def respond_to_missing?(_method, _include_private = false)
-      true
+    def log_action(values)
+      values[:user] ||= values[:target].current_user if values[:target]
+      @mutex.synchronize { Ditty::AuditLog.create values }
     end
   end
 end

data/lib/ditty/models/user.rb

@@ -15,11 +15,14 @@ module Ditty
     one_to_many :audit_logs
 
     def role?(check)
-      !roles_dataset.first(name: check).nil?
+      @roles ||= Hash.new do |h,k|
+        h[k] = !roles_dataset.first(name: k).nil?
+      end
+      @roles[check]
     end
 
     def method_missing(method_sym, *arguments, &block)
-      if method_sym.to_s[-1] == '?'
+      if respond_to_missing?(method_sym)
         role?(method_sym[0..-2])
       else
         super
@@ -48,8 +51,9 @@ module Ditty
     end
 
     def check_roles
-      return if role?('anonymous')
-      add_role Role.find_or_create(name: 'user') unless role?('user')
+      return if roles_dataset.first(name: 'anonymous')
+      return if roles_dataset.first(name: 'user')
+      add_role Role.find_or_create(name: 'user')
     end
 
     def index_prefix

data/lib/ditty/policies/identity_policy.rb

@@ -15,9 +15,9 @@ module Ditty
     class Scope < ApplicationPolicy::Scope
       def resolve
         if user.super_admin?
-          scope.all
+          scope
         else
-          []
+          scope.where(id: -1)
         end
       end
     end

data/lib/ditty/rake_tasks.rb

@@ -32,6 +32,7 @@ module Ditty
           puts 'Preparing the Ditty public folder'
           Dir.mkdir 'public' unless File.exist?('public')
           ::Ditty::Components.public_folder.each do |path|
+            puts "Checking #{path}"
             FileUtils.cp_r "#{path}/.", 'public' unless File.expand_path("#{path}/.").eql? File.expand_path('public')
           end
 
@@ -41,7 +42,7 @@ module Ditty
             FileUtils.cp_r "#{path}/.", 'migrations' unless File.expand_path("#{path}/.").eql? File.expand_path('migrations')
           end
           puts 'Migrations added:'
-          Dir.foreach('migrations').sort.each { |x| puts x if File.file?("migrations/#{x}") }
+          Dir.foreach('migrations').sort.each { |x| puts x if File.file?("migrations/#{x}") && x[-3..-1] == '.rb' }
         end
 
         desc 'Migrate Ditty database to latest version'
@@ -57,7 +58,7 @@ module Ditty
 
           desc 'Check if the migration is current'
           task :check do
-            ::DB.loggers << Logger.new($stdout)
+            ::DB.loggers << Logger.new($stdout) if ::DB.loggers.count.zero?
             puts 'Running Ditty Migrations check'
             ::Sequel.extension :migration
             begin
@@ -70,7 +71,7 @@ module Ditty
 
           desc 'Migrate Ditty database to latest version'
           task :up do
-            ::DB.loggers << Logger.new($stdout)
+            ::DB.loggers << Logger.new($stdout) if ::DB.loggers.count.zero?
             puts 'Running Ditty Migrations up'
             ::Sequel.extension :migration
             ::Sequel::Migrator.apply(::DB, folder)
@@ -78,7 +79,7 @@ module Ditty
 
           desc 'Remove the whole Ditty database. You WILL lose data'
           task :down do
-            ::DB.loggers << Logger.new($stdout)
+            ::DB.loggers << Logger.new($stdout) if ::DB.loggers.count.zero?
             puts 'Running Ditty Migrations down'
             ::Sequel.extension :migration
             ::Sequel::Migrator.apply(::DB, folder, 0)
@@ -86,7 +87,7 @@ module Ditty
 
           desc 'Reset the Ditty database. You WILL lose data'
           task :bounce do
-            ::DB.loggers << Logger.new($stdout)
+            ::DB.loggers << Logger.new($stdout) if ::DB.loggers.count.zero?
             puts 'Running Ditty Migrations bounce'
             ::Sequel.extension :migration
             ::Sequel::Migrator.apply(::DB, folder, 0)

data/lib/ditty/services/authentication.rb

@@ -0,0 +1,55 @@
+require 'ditty/models/identity'
+require 'ditty/controllers/main'
+require 'ditty/services/settings'
+require 'ditty/services/logger'
+
+require 'omniauth'
+OmniAuth.config.logger = Ditty::Services::Logger.instance
+OmniAuth.config.on_failure = proc { |env|
+  OmniAuth::FailureEndpoint.new(env).redirect_to_failure
+}
+
+module Ditty
+  module Services
+    module Authentication
+      class << self
+        def providers
+          config.keys
+        end
+
+        def setup
+          providers.each do |provider|
+            require "omniauth/#{provider}"
+          end
+        end
+
+        def config
+          default.merge Ditty::Services::Settings.values(:authentication) || {}
+        end
+
+        def provides?(provider)
+          providers.include? provider.to_sym
+        end
+
+        def default
+          {
+            identity: {
+              arguments: [
+                {
+                  fields: [:username],
+                  callback_path: '/auth/identity/callback',
+                  model: Ditty::Identity,
+                  on_login: Ditty::Main,
+                  on_registration: Ditty::Main,
+                  locate_conditions: ->(req) { { username: req['username'] } }
+                }
+              ],
+            }
+          }
+        end
+      end
+    end
+  end
+end
+
+Ditty::Services::Authentication.setup