ditty 0.10.1 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e785b1b4a84258a46e98753a5de394897bc6d002b88d2fc6629b30b33b52614e
-  data.tar.gz: '094a55847cc4ec09bf1dc9307c9efcffa5b59b498fd407de5950e656e5a5e516'
+  metadata.gz: 0ecdd202f458e55d205e3e77b295a3c8908f7d3ecaf3d894fa9ae09c62d8b4fd
+  data.tar.gz: bcc5967235a668d896cee25228130b1ab2d98761dc2fb2125d5f7f2d2912881b
 SHA512:
-  metadata.gz: fa7d54c43ac02d1f04a690f2bca5a529b3c65eefa0f287ab44594910bca2b8022656b58e2aef805a52307364481c35be2ba1b1e4b3a97b3450cab1b9acb27d1f
-  data.tar.gz: 847143f0f0d20c67b3451a86e780ec44b914210ceec4498c9218ebc05f7f7277107b1998ca5f273aad0ad1ad45ceb051b81204fe87e6cb91e88ee2ef6af7b49c
+  metadata.gz: 45c0c4fb7acb614ce8cbfda366908fcaee02482d9601c26fe797ff5012a7bbeff0e81897141a33ce2c3d31064529401ea0c35f194852969262b263a306760b3c
+  data.tar.gz: c471989b26228ad7a08f933e8c1c747a8f5fd9ec21fd0fc1515a496c63d98446a2a7505802d01c4110bbcb514d6876e85b0c611dc4c438750aaff4e507948f64

data/.travis.yml

@@ -1,9 +1,10 @@
 sudo: false
 language: ruby
 rvm:
+  - 3.2
+  - 3.1
   - 3.0
   - 2.7
-  - 2.6
 gemfile: Gemfile.ci
 env:
   matrix:
@@ -17,7 +18,7 @@ before_script:
   - bundle exec rake ditty:prep
 script:
   - bundle exec rake
-  - bundle exec rubocop --fail-level W lib views spec
+  - bundle exec rubocop -c .rubocop.yml --fail-level W lib views spec
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 after_success:

data/Readme.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/EagerELK/ditty.svg?branch=master)](https://travis-ci.org/EagerELK/ditty)
+[![Build Status](https://app.travis-ci.com/EagerELK/ditty.svg?branch=master)](https://app.travis-ci.com/github/EagerELK/ditty)
 [![Code Climate](https://codeclimate.com/github/EagerELK/ditty/badges/gpa.svg)](https://codeclimate.com/github/EagerELK/ditty)
 [![Test Coverage](https://codeclimate.com/github/EagerELK/ditty/badges/coverage.svg)](https://codeclimate.com/github/EagerELK/ditty/coverage)
 [![Inline docs](http://inch-ci.org/github/EagerELK/ditty.svg?branch=master)](http://inch-ci.org/github/EagerELK/ditty)

data/ditty.gemspec

@@ -41,13 +41,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bcrypt', '>= 3.1'
   spec.add_dependency 'browser', '>= 5.3'
   spec.add_dependency 'dotenv', '>= 2'
-  spec.add_dependency 'haml', '>= 5.1.2'
+  spec.add_dependency 'haml', '~> 5.1', '>= 5.1.2' # Going to 6 creates a `undefined method capture_html` and breaks a lot of other stuff
   spec.add_dependency 'logger', '>= 1.0'
   spec.add_dependency 'mail', '>= 1.7'
   spec.add_dependency 'oga', '>= 2.14'
-  spec.add_dependency 'omniauth', '~> 1.0'
-  spec.add_dependency 'omniauth-identity', '~> 1.0'
-  spec.add_dependency 'pundit', '~> 1.0'
+  spec.add_dependency 'omniauth', '>= 1.0'
+  spec.add_dependency 'omniauth-identity', '>= 1.0'
+  spec.add_dependency 'pundit', '>= 2.0'
   spec.add_dependency 'rack-contrib', '>= 2.0'
   spec.add_dependency 'rack_csrf', '>= 2.0'
   spec.add_dependency 'rake', '>= 13.0'
@@ -59,5 +59,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '>= 0.20'
   spec.add_dependency 'tilt', '>= 2'
   spec.add_dependency 'will_paginate', '>= 3.1'
-  spec.add_dependency 'wisper', '~> 2.0'
+  spec.add_dependency 'wisper', '>= 2.0'
 end

data/lib/ditty/cli.rb

@@ -31,6 +31,7 @@ module Ditty
     require './application' if File.exist?('application.rb')
     require 'ditty/db' unless defined?(DB)
     ::Ditty::Components.tasks
+
     def server
       # Ensure the token files are present
       Rake::Task['ditty:generate_tokens'].invoke
@@ -47,8 +48,14 @@ module Ditty
       Rake::Task['ditty:seed'].invoke
 
       # RackUP!
+      rack_opts = {
+        environment: ENV['APP_ENV'] || 'development',
+        Port: ENV['APP_PORT'] || 9292,
+        Host: ENV['APP_HOST'] || '0.0.0.0',
+        config: 'config.ru'
+      }
       puts 'Starting the Ditty Server'
-      Rack::Server.start(config: 'config.ru')
+      Rack::Server.start(rack_opts)
     end
 
     desc 'migrate', 'Run the Ditty migrations'

data/lib/ditty/components/ditty.rb

@@ -66,8 +66,9 @@ module Ditty
         load
 
         sa = ::Ditty::Role.find_or_create(name: 'super_admin')
-        admin = ::Ditty::Role.find_or_create(name: 'admin') { |e| e.parent = sa }
-        ::Ditty::Role.find_or_create(name: 'user') { |e| e.parent = admin }
+        admin = ::Ditty::Role.find_or_create(name: 'admin') { |rec| rec.parent = sa }
+        ::Ditty::Role.find_or_create(name: 'user') { |rec| rec.parent = admin }
+        ::Ditty::Role.find_or_create(name: 'anonymous')
       end
     end
 

data/lib/ditty/controllers/application_controller.rb

@@ -36,7 +36,6 @@ module Ditty
 
     register Sinatra::Flash, Sinatra::RespondWith
 
-    use Rack::Csrf, raise: ENV['APP_ENV'] == 'development' unless ENV['APP_ENV'] == 'test'
     use Rack::JSONBodyParser
     use Rack::MethodOverride
     use Rack::NestedParams

data/lib/ditty/controllers/component_controller.rb

@@ -7,6 +7,8 @@ require 'sinatra/json'
 
 module Ditty
   class ComponentController < ApplicationController
+    use Rack::Csrf, raise: ENV['APP_ENV'] == 'development' unless ENV['APP_ENV'] == 'test'
+
     helpers Helpers::Component, Helpers::Response
 
     set base_path: nil
@@ -37,9 +39,7 @@ module Ditty
     after do
       return if settings.environment == 'production'
 
-      if (response.successful? || response.redirection?) && @skip_verify == false && (settings.environment != 'production')
-        verify_authorized
-      end
+      verify_authorized if (response.successful? || response.redirection?) && @skip_verify == false
     end
 
     after '/' do
@@ -65,7 +65,7 @@ module Ditty
 
       entity = settings.model_class.new(permitted_parameters(settings.model_class, :create))
       haml :"#{view_location}/new",
-           locals: { entity: entity, title: heading(:new) },
+           locals: { entity: entity, title: heading(:new), actions: actions(action: :new) },
            layout: layout
     end
 
@@ -98,7 +98,7 @@ module Ditty
 
       flash[:redirect_to] = "#{base_path}/#{entity.display_id}" unless flash.keep(:redirect_to)
       haml :"#{view_location}/edit",
-           locals: { entity: entity, title: heading(:edit) },
+           locals: { entity: entity, title: heading(:edit), actions: actions(entity: entity, action: :edit) },
            layout: layout
     end
 

data/lib/ditty/controllers/users_controller.rb

@@ -15,10 +15,10 @@ module Ditty
     set track_actions: true
 
     # New
-    get '/new' do
+    get '/new/?' do
       authorize settings.model_class, :create
 
-      locals = { title: heading(:new), entity: User.new, identity: Identity.new }
+      locals = { title: heading(:new), entity: User.new, identity: Identity.new, actions: actions(action: :new) }
       haml :"#{view_location}/new", locals: locals
     end
 
@@ -60,7 +60,7 @@ module Ditty
     end
 
     # Update
-    put '/:id' do |id|
+    put '/:id/?' do |id|
       entity = dataset.first(settings.model_class.primary_key => id)
       halt 404 unless entity
       authorize entity, :update
@@ -80,7 +80,7 @@ module Ditty
       update_response(entity)
     end
 
-    put '/:id/identity' do |id|
+    put '/:id/identity/?' do |id|
       entity = dataset.first(settings.model_class.primary_key => id)
       halt 404 unless entity
       authorize entity, :update
@@ -88,13 +88,13 @@ module Ditty
       identity = entity.identity.first
       identity_params = params['identity']
 
-      unless current_user.super_admin? || identity.authenticate(identity_params['old_password'])
+      if (current_user.super_admin? == false || current_user_id == entity.id) && identity.authenticate(identity_params['old_password']) == false
         broadcast(:identity_update_password_failed, target: self)
         flash[:danger] = 'Old Password didn\'t match'
-        return redirect back
+        return redirect(with_layout(params[:redirect_to] || flash[:redirect_to] || back))
       end
 
-      values = permitted_parameters(Identity, :create)
+      values = permitted_parameters(Identity, :update)
       identity.set values
       if identity.valid?
         identity.save_changes
@@ -111,7 +111,7 @@ module Ditty
     end
 
     # Delete
-    delete '/:id', provides: %i[html json] do |id|
+    delete '/:id/?', provides: %i[html json] do |id|
       entity = dataset.first(settings.model_class.primary_key => id)
       halt 404 unless entity
       authorize entity, :delete
@@ -125,13 +125,13 @@ module Ditty
     end
 
     # Profile
-    get '/profile' do
+    get '/profile/?' do
       entity = current_user
       halt 404 unless entity
       authorize entity, :read
 
       flash[:redirect_to] = request.path
-      haml :"#{view_location}/profile", locals: { entity: entity, identity: entity.identity.first, title: 'My Account' }
+      haml :"#{view_location}/profile", locals: { entity: entity, identity: entity.identity.first, title: 'My Account', actions: actions(entity: entity, action: :read) }
     end
   end
 end

data/lib/ditty/db.rb

@@ -8,7 +8,7 @@ require 'active_support/core_ext/object/blank'
 pool_timeout = (ENV['DB_POOL_TIMEOUT'] || 5).to_i
 
 if defined? DB
-  ::Ditty::Services::Logger.warn 'Database connection already set up'
+  ::Ditty::Services::Logger.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.
@@ -29,5 +29,5 @@ elsif ENV['DATABASE_URL'].blank? == false
   Sequel::Model.plugin :update_or_create
   Sequel::Model.plugin :validation_helpers
 else
-  ::Ditty::Services::Logger.error 'No database connection set up'
+  ::Ditty::Services::Logger.error '*** NO DATABASE CONNECTION SET UP ***'
 end

data/lib/ditty/emails/base.rb

@@ -71,7 +71,7 @@ module Ditty
           template = File.expand_path("./views/#{file}.haml")
           return template if File.file? template
 
-          template = File.expand_path("./#{file}.haml", App.view_folder)
+          template = File.expand_path("./#{file}.haml", ::Ditty::Ditty.view_folder)
           return template if File.file? template
 
           file

data/lib/ditty/generators/project_generator.rb

@@ -41,9 +41,9 @@ module Ditty
         copy_file 'sidekiq.rb', './config/sidekiq.rb'
         copy_file 'sidekiq.yml', './config/sidekiq.yml'
 
-        copy_file 'spec_helper.rb', './specs/spec_helper.rb'
-        copy_file '../../../spec/support/api_shared_examples.rb', './specs/support/api_shared_examples.rb'
-        copy_file '../../../spec/support/crud_shared_examples.rb', './specs/support/crud_shared_examples.rb'
+        copy_file 'spec_helper.rb', './spec/spec_helper.rb'
+        copy_file '../../../spec/support/api_shared_examples.rb', './spec/support/api_shared_examples.rb'
+        copy_file '../../../spec/support/crud_shared_examples.rb', './spec/support/crud_shared_examples.rb'
 
         template 'settings.yml.erb', './config/settings.yml'
       end

data/lib/ditty/helpers/authentication.rb

@@ -9,6 +9,10 @@ module Ditty
         return nil if current_user_id.nil?
 
         @current_user ||= User[current_user_id]
+      rescue Sequel::DatabaseError => e
+        Services::Logger.warn "Could not fetch current user: #{e.message} / #{current_user_id}"
+        Services::Logger.debug e
+        nil
       end
 
       def current_user=(user)

data/lib/ditty/helpers/pundit.rb

@@ -5,7 +5,7 @@ require 'pundit'
 module Ditty
   module Helpers
     module Pundit
-      include ::Pundit
+      include ::Pundit::Authorization
 
       def authorize(record, query)
         query = :"#{query}?" unless query[-1] == '?'
@@ -24,7 +24,7 @@ module Ditty
       end
 
       def permitted_parameters(record, action = nil)
-        param_key = PolicyFinder.new(record).param_key
+        param_key = ::Pundit::PolicyFinder.new(record).param_key
         policy_fields = permitted_attributes(record, action)
         request.params.fetch(param_key, {}).select do |key, _value|
           policy_fields.include? key.to_sym

data/lib/ditty/helpers/response.rb

@@ -6,10 +6,9 @@ module Ditty
   module Helpers
     module Response
       def list_response(result, view: 'index')
+        actions = actions(action: :list)
         respond_to do |format|
           format.html do
-            actions = {}
-            actions["#{base_path}/new"] = "New #{heading}" if policy(settings.model_class).create?
             haml :"#{view_location}/#{view}",
                  locals: { list: result, title: heading(:list), actions: actions },
                  layout: layout
@@ -49,15 +48,16 @@ module Ditty
         end
       end
 
-      def actions(entity = nil)
+      def actions(entity: nil, action: nil)
         actions = {}
-        actions["#{base_path}/#{entity.display_id}/edit"] = "Edit #{heading}" if entity && policy(entity).update?
-        actions["#{base_path}/new"] = "New #{heading}" if policy(settings.model_class).create?
+        actions["#{base_path}/#{entity.display_id}/edit"] = "Edit #{heading}" if entity && policy(entity).update? && action != :edit
+        actions[base_path] = "List #{heading(:list)}" if policy(entity || settings.model_class).list? && action != :list
+        actions["#{base_path}/new"] = "New #{heading}" if policy(entity || settings.model_class).create? && action != :new
         actions
       end
 
       def read_response(entity)
-        actions = actions(entity)
+        actions = actions(entity: entity, action: :read)
         respond_to do |format|
           format.html do
             title = heading(:read) + (entity.respond_to?(:name) ? ": #{entity.name}" : '')

data/lib/ditty/helpers/views.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ditty/services/pagination_wrapper'
+require 'digest/sha2'
 
 module Ditty
   module Helpers
@@ -156,6 +157,14 @@ module Ditty
 
         'fa-sort-down'
       end
+
+      def static_headers(view)
+        view_path = "views/#{view}.haml"
+        return unless File.exist?(view_path)
+
+        last_modified File.mtime(view_path)
+        etag Digest::SHA2.hexdigest(File.read(view_path))
+      end
     end
   end
 end

data/lib/ditty/listener.rb

@@ -70,11 +70,14 @@ module Ditty
     end
 
     def log_action(values)
-      values[:user] ||= values[:target].current_user if values[:target]
+      require 'ditty/models/audit_log'
+
+      values[:user] ||= values[:target].current_user if values[:target] && values[:target].respond_to?(:current_user)
       @mutex.synchronize { ::Ditty::AuditLog.create values }
     end
 
     def user_traits(target)
+      return {} unless target.respond_to?(:current_user) && target.respond_to?(:browser)
       {
         user_id: target.current_user&.id,
         platform: target.browser.platform.name,

data/lib/ditty/models/identity.rb

@@ -21,9 +21,9 @@ module Ditty
     end
 
     def authenticate(unencrypted)
-      return false if crypted_password.blank?
+      return false if crypted_password.blank? || ::BCrypt::Password.new(crypted_password) != unencrypted
 
-      self if ::BCrypt::Password.new(crypted_password) == unencrypted
+      self
     end
 
     def persisted?
@@ -37,6 +37,10 @@ module Ditty
       }
     end
 
+    def uid
+      user&.id
+    end
+
     # Validation
     def validate
       super
@@ -65,7 +69,7 @@ module Ditty
     end
 
     # Callbacks
-    def before_save
+    def before_validation
       super
       encrypt_password unless password == '' || password.nil?
     end
@@ -77,7 +81,7 @@ module Ditty
       end
 
       def password_required
-        crypted_password.blank? || !password.blank?
+        crypted_password.blank? || password.present?
       end
   end
 end

data/lib/ditty/models/user.rb

@@ -4,6 +4,7 @@ require 'ditty/models/base'
 require 'digest/md5'
 require 'active_support'
 require 'active_support/core_ext/object/blank'
+require 'ditty/models/role'
 
 # Why not store this in Elasticsearch?
 module Ditty
@@ -88,20 +89,5 @@ module Ditty
     def display_name
       name || username
     end
-
-    class << self
-      def anonymous_user
-        role = ::Ditty::Role.find_or_create(name: 'anonymous')
-        ::Ditty::User.where(roles: role).first
-      end
-
-      def create_anonymous_user(email = 'anonymous@ditty.io')
-        return if anonymous_user
-
-        user = ::Ditty::User.find_or_create(email: email)
-        user.remove_role ::Ditty::Role.find_or_create(name: 'user')
-        user.add_role ::Ditty::Role.find_or_create(name: 'anonymous') unless user.role?('anonymous')
-      end
-    end
   end
 end

data/lib/ditty/services/pagination_wrapper.rb

@@ -75,7 +75,7 @@ module Ditty
         else
           return (0..0) if list.current_page > page_count
 
-          a = 1 + (list.current_page - 1) * page_size
+          a = 1 + ((list.current_page - 1) * page_size)
           b = a + page_size - 1
           b = pagination_record_count if b > pagination_record_count
           a..b

data/lib/ditty/services/settings.rb

@@ -55,7 +55,11 @@ module Ditty
         attr_writer :values
 
         def read(filename)
-          base = YAML.safe_load(ERB.new(File.read(filename)).result).deep_symbolize_keys
+          base = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
+            ::YAML.safe_load(ERB.new(File.read(filename)).result, permitted_classes: [Symbol])
+          else
+            ::YAML.safe_load(ERB.new(File.read(filename)).result, [Symbol])
+          end.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

data/lib/ditty/tasks/ditty.rake

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'fileutils'
+
 namespace :ditty do
   desc 'Run the ditty console'
   task :console do
@@ -34,17 +36,37 @@ namespace :ditty do
   end
 
   namespace :prep do
+    desc 'Create a user'
+    task :user, [:email, :password] do |_t, args|
+      require 'ditty/listener'
+
+      identity = Ditty::Identity.new(username: args[:email], password: args[:password])
+      identity.password_confirmation = identity.password
+      user = Ditty::User.new(email: identity.username)
+      begin
+        identity.valid?
+        DB.transaction do
+          user.save_changes
+          user.add_identity identity
+          Ditty::Listener.new.user_register(target: self, values: { user: user })
+        end
+      rescue StandardError => e
+        Ditty::Services::Logger.error "Could not regster super user: #{e.message}"
+        Ditty::Services::Logger.debug e
+      end
+    end
+
     desc 'Check that the required Ditty folders are present'
     task :folders do
       puts 'Prepare the Ditty folders'
-      Dir.mkdir 'pids' unless File.exist?('pids')
-      Dir.mkdir 'logs' unless File.exist?('logs')
+      FileUtils.mkdir_p 'pids'
+      FileUtils.mkdir_p 'logs'
     end
 
     desc 'Check that the public folder is present and populated'
     task :public do
       puts 'Preparing the Ditty public folder'
-      Dir.mkdir 'public' unless File.exist?('public')
+      FileUtils.mkdir_p 'public'
       ::Ditty::Components.public_folder.each do |path|
         puts "Checking #{path}"
         path = "#{path}/."
@@ -55,7 +77,7 @@ namespace :ditty do
     desc 'Check that the migrations folder is present and populated'
     task :migrations do
       puts 'Preparing the Ditty migrations folder'
-      Dir.mkdir 'migrations' unless File.exist?('migrations')
+      FileUtils.mkdir_p 'migrations'
       ::Ditty::Components.migrations.each do |path|
         path = "#{path}/."
         FileUtils.cp_r path, 'migrations' unless File.expand_path(path).eql? File.expand_path('migrations')

data/lib/ditty/templates/settings.yml.erb

@@ -7,6 +7,16 @@ logger:
       class: Logger
       level: DEBUG
       options: logs/<%%= ENV['APP_ENV'] %>.log
+# email:
+#   from_address: 'no-reply@ditty.io'
+#   delivery_method: smtp
+#   options:
+#     address: smtp.server
+#     port: 25
+#     user_name: 'SMTPUSERNAME'
+#     password: 'SMTPPASSWORD'
+#     authentication: login
+#     enable_starttls_auto: true
 # authentication:
 #   google_oauth2:
 #     login_prompt: Log in with Google

data/lib/ditty/templates/views/index.haml.tt

@@ -1,29 +1,31 @@
 .row
   .col-md-12
     = haml :'partials/search'
-    %table.table.table-striped.table-bordered.table-hover
-      %thead.thead-dark
-        %tr
-          <%- columns.each do |col| -%>
-          %th <%= col.to_s.titleize %>
-          <%- end %>
-          %th
-      %tbody
-        - if list.count > 0
-          - list.all.each do |entity|
-            %tr
-              <%- columns.each do |col| -%>
-              %td= entity.<%= col %>
-              <%- end %>
-              %td
-                %a{ href: "#{base_path}/#{entity.display_id}", title: 'Show' }
-                  %i.fa.fa-search
-                - if policy(entity).update?
-                  %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
-                    %i.fa.fa-edit
-        - else
+    .card.card-default.shadow.table-responsive
+      %table.table.table-striped.table-bordered.table-hover.mb-0
+        %thead.thead-dark
           %tr
-            %td.text-center{ colspan: <%= columns.count + 1 %> } No <%= model_name.pluralize %>
+            <%- columns.each do |col| -%>
+            %th <%= col.to_s.titleize %>
+            <%- end %>
+            %th
+        %tbody
+          - if list.count > 0
+            - list.all.each do |entity|
+              %tr
+                <%- columns.each do |col| -%>
+                %td= entity.<%= col %>
+                <%- end %>
+                %td
+                  %a{ href: "#{base_path}/#{entity.display_id}", title: 'Show' }
+                    %i.fa.fa-search
+                  - if policy(entity).update?
+                    %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
+                      %i.fa.fa-edit
+          - else
+            %tr
+              %td.text-center{ colspan: <%= columns.count + 1 %> } No <%= model_name.pluralize %>
 
-- if list.count > 0
-  = pagination(list, base_path)
+      - if list.count > 0
+        .card-body
+          = pagination(list, base_path)

data/lib/ditty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ditty
-  VERSION = '0.10.1'
+  VERSION = '0.11.1'
 end

data/views/audit_logs/index.haml

@@ -1,36 +1,38 @@
 .row
   .col-md-12
     = haml :'partials/search'
-    %table.table.table-striped.table-bordered.table-hover
-      %thead.thead-dark
-        %tr
-          %th= "User #{sort_ui(:user)}"
-          %th= "Action #{sort_ui(:action)}"
-          %th= "Details #{sort_ui(:details)}"
-          %th= "IP Address #{sort_ui(:ip_address)}"
-          %th= "Browser #{sort_ui(:browser)}"
-          %th= "Device #{sort_ui(:device)}"
-          %th= "Platform #{sort_ui(:platform)}"
-          %th= "Created At #{sort_ui(:created_at)}"
-      %tbody
-        - if list.count > 0
-          - list.all.each do |entity|
-            %tr
-              %td
-                -if entity.user
-                  %a{ href: "#{settings.map_path}/users/#{entity.user.id}" }= entity.user.email
-                -else
-                  None
-              %td= entity.action
-              %td= entity.details
-              %td= entity.ip_address || 'Unknown'
-              %td= entity.browser || 'Unknown'
-              %td= entity.device || 'Unknown'
-              %td= entity.platform || 'Unknown'
-              %td= entity.created_at&.strftime('%Y-%m-%d %H:%M:%S') || 'Unknown'
-        - else
+    .card.card-default.shadow.table-responsive
+      %table.table.table-striped.table-bordered.table-hover.mb-0
+        %thead.thead-dark
           %tr
-            %td.text-center{ colspan: 4 } No records
+            %th= "User #{sort_ui(:user)}"
+            %th= "Action #{sort_ui(:action)}"
+            %th= "Details #{sort_ui(:details)}"
+            %th= "IP Address #{sort_ui(:ip_address)}"
+            %th= "Browser #{sort_ui(:browser)}"
+            %th= "Device #{sort_ui(:device)}"
+            %th= "Platform #{sort_ui(:platform)}"
+            %th= "Created At #{sort_ui(:created_at)}"
+        %tbody
+          - if list.count > 0
+            - list.all.each do |entity|
+              %tr
+                %td
+                  -if entity.user
+                    %a{ href: "#{settings.map_path}/users/#{entity.user.id}" }= entity.user.email
+                  -else
+                    None
+                %td= entity.action
+                %td= entity.details
+                %td= entity.ip_address || 'Unknown'
+                %td= entity.browser || 'Unknown'
+                %td= entity.device || 'Unknown'
+                %td= entity.platform || 'Unknown'
+                %td= entity.created_at&.strftime('%Y-%m-%d %H:%M:%S') || 'Unknown'
+          - else
+            %tr
+              %td.text-center{ colspan: 4 } No records
 
-- if list.count > 0
-  = pagination(list, base_path)
+      - if list.count > 0
+        .card-body
+          = pagination(list, base_path)

data/views/auth/identity.haml

@@ -1,8 +1,8 @@
 = form_tag("#{settings.map_path}/auth/identity/callback", attributes: { class: 'user' }) do
   .form-group
-    %input.form-control.form-control-user{ name: 'username', type: 'email', 'aria-describedby': 'emailHelp', placeholder: 'Enter Email Address...' }
+    %input.form-control.form-control-user{ name: 'username', type: 'email', 'aria-describedby': 'emailHelp', placeholder: 'Enter Email Address...', required: true }
   .form-group
-    %input.form-control.form-control-user{ name: 'password', type: 'password', placeholder: 'Password' }
+    %input.form-control.form-control-user{ name: 'password', type: 'password', placeholder: 'Password', required: true }
   / .form-group
   /   .custom-control.custom-checkbox.small
   /     <input type="checkbox" class="custom-control-input" id="customCheck">

data/views/layout.haml

@@ -45,11 +45,14 @@
 
       #content-wrapper.d-flex.flex-column
         #content
-          = haml :'partials/topbar'
+          = haml :'partials/topbar', locals: { title: (defined?(title) ? title : nil) }
           .container-fluid
-            / TODO
-            / .row
-            /   .col-md-12
+            - if (defined?(hide_title).nil? || hide_title == false) && defined?(title)
+              .row.mb-2
+                .col-md-9.my-auto
+                  %h1.text-dark= title
+                .col.md-3.text-right.my-auto
+                  = haml :'partials/actions', locals: { actions: defined?(actions) ? actions : {} }
             = haml :'partials/notifications'
 
             = yield

data/views/partials/actions.haml

@@ -1,15 +1,13 @@
-- if defined?(actions)
+- if defined?(actions) && actions != nil
   - if actions.count > 1
     - link, text = actions.shift
     .btn-group.text-right
       %a.btn.btn-primary{ href: link }= text
-      %button.btn.btn-primary.dropdown-toggle{ type: 'button', id: 'actions-toggle', data: { toggle: 'dropdown' } }
+      %button.btn.btn-primary.dropdown-toggle{ type: 'button', id: 'actions-toggle', data: { toggle: 'dropdown' }, 'aria-haspopup': 'true', 'aria-expanded': 'false' }
         %span.caret
         %span.sr-only Toggle Dropdown
-      %ul.dropdown-menu{ 'aria-labelledby': 'actions-toggle' }
-        -actions.each do |k, v|
-          %li
-            %a{ href: k }= v
-  - elsif actions.count > 0
-    -actions.each do |k, v|
-      %a.btn.btn-primary{ href: k }= v
+      .dropdown-menu
+        - actions.each do |k, v|
+          %a.dropdown-item{ href: k }= v
+  - elsif actions.count == 1
+    %a.btn.btn-primary{ href: actions.keys.first }= actions.values.first

data/views/partials/footer.haml

@@ -3,11 +3,4 @@
   .container.my-auto
     -if ENV['SKIP_BRANDING'].blank?
       .copyright.text-center.my-auto.text-dark
-        %p
-          Copyright ©
-          %a{ href: 'https://hackerpla.net/requestd', target: '_blank' }
-            HackerPlanet
-          2020
-        %p.mb-0
-          %a{ href: 'https://hackerpla.net/requestd', target: '_blank' }
-            %img.rounded{ src: 'http://hackerpla.net/wp-content/uploads/2014/07/HP_1C_128x128.png', height: 60 }
+        %span Copyright © Ditty.io 2019

data/views/partials/user_associations.haml

@@ -21,8 +21,8 @@
         - users = user_options.select { |k, v| entity.users.map(&:id).include?(k) == false }
         - if users && users.count.positive?
           = new_form_tag "#{base_path}/#{entity.display_id}/users" do
-            .input-group
-              %select.form-control{ name: "#{group}[user_id]", id: 'user_id' }
+            .input-group.tall-select2
+              %select.form-control.select2{ name: "#{group}[user_id]", id: 'user_id' }
                 %option{ value: '' } Select User
                 - users.each do |key, value|
                   %option{ value: key }= value

data/views/roles/index.haml

@@ -1,27 +1,29 @@
 .row
   .col-md-12
     = haml :'partials/search'
-    %table.table.table-striped.table-bordered.table-hover
-      %thead.thead-dark
-        %tr
-          %th= "Name#{sort_ui(:name)}"
-          %th Parent
-          %th
-      %tbody
-        - if list.count > 0
-          - list.all.each do |entity|
-            %tr
-              %td
-                %a{ href: "#{base_path}/#{entity.display_id}" }= entity.name
-              %td
-                %a{ href: "#{base_path}/#{entity.parent_id}" }= entity.parent&.name || '(None)'
-              %td
-                - if policy(entity).update?
-                  %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
-                    %i.fa.fa-edit
-        - else
+    .card.card-default.shadow.table-responsive
+      %table.table.table-striped.table-bordered.table-hover.mb-0
+        %thead.thead-dark
           %tr
-            %td.text-center{ colspan: 3 } No Roles
+            %th= "Name#{sort_ui(:name)}"
+            %th Parent
+            %th
+        %tbody
+          - if list.count > 0
+            - list.all.each do |entity|
+              %tr
+                %td
+                  %a{ href: "#{base_path}/#{entity.display_id}" }= entity.name
+                %td
+                  %a{ href: "#{base_path}/#{entity.parent_id}" }= entity.parent&.name || '(None)'
+                %td
+                  - if policy(entity).update?
+                    %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
+                      %i.fa.fa-edit
+          - else
+            %tr
+              %td.text-center{ colspan: 3 } No Roles
 
-- if list.count > 0
-  = pagination(list, base_path)
+      - if list.count > 0
+        .card-body
+          = pagination(list, base_path)

data/views/user_login_traits/index.haml

@@ -1,28 +1,31 @@
 .row
   .col-md-12
     = haml :'partials/search'
-    %table.table.table-striped.table-bordered.table-hover
-      %thead.thead-dark
-        %tr
-          %th= "User #{sort_ui(:user_id)}"
-          %th= "IP Address #{sort_ui(:ip_address)}"
-          %th= "Device #{sort_ui(:device)}"
-          %th= "Platform #{sort_ui(:platform)}"
-          %th= "Browser #{sort_ui(:browser)}"
-          %th= "Last Seen #{sort_ui(:updated_at)}"
-      %tbody
-        - if list.count.positive?
-          - list.all.each do |entity|
-            %tr
-              %td= entity.user&.email || 'Unknown'
-              %td
-                %a{ href: "#{base_path}/#{entity.display_id}" }= entity.ip_address || 'Unknown'
-              %td= entity.device || 'Unknown'
-              %td= entity.platform || 'Unknown'
-              %td= entity.browser || 'Unknown'
-              %td= entity.updated_at
-        - else
+    .card.card-default.shadow.table-responsive
+      %table.table.table-striped.table-bordered.table-hover.mb-0
+        %thead.thead-dark
           %tr
-            %td.text-center{ colspan: 6 } No records
+            %th= "User #{sort_ui(:user_id)}"
+            %th= "IP Address #{sort_ui(:ip_address)}"
+            %th= "Device #{sort_ui(:device)}"
+            %th= "Platform #{sort_ui(:platform)}"
+            %th= "Browser #{sort_ui(:browser)}"
+            %th= "Last Seen #{sort_ui(:updated_at)}"
+        %tbody
+          - if list.count.positive?
+            - list.all.each do |entity|
+              %tr
+                %td= entity.user&.email || 'Unknown'
+                %td
+                  %a{ href: "#{base_path}/#{entity.display_id}" }= entity.ip_address || 'Unknown'
+                %td= entity.device || 'Unknown'
+                %td= entity.platform || 'Unknown'
+                %td= entity.browser || 'Unknown'
+                %td= entity.updated_at
+          - else
+            %tr
+              %td.text-center{ colspan: 6 } No records
 
-=pagination(list, base_path)
+      - if list.count > 0
+        .card-body
+          = pagination(list, base_path)

data/views/users/index.haml

@@ -1,35 +1,37 @@
 .row
   .col-md-12
     = haml :'partials/search'
-    %table.table.table-striped.table-bordered.table-hover
-      %thead.thead-dark
-        %tr
-          %th= "Email #{sort_ui(:email)}"
-          %th= "Name #{sort_ui(:name)}"
-          %th= "Surname #{sort_ui(:surname)}"
-          %th Roles
-          %th= "Signed Up #{sort_ui(:created_at)}"
-          %th
-      %tbody
-        - if list.count > 0
-          - list.all.each do |entity|
-            %tr
-              %td
-                - if policy(entity).read?
-                  %a{ href: "#{base_path}/#{entity.display_id}" }= entity.email
-                - else
-                  = entity.email
-              %td= entity.name
-              %td= entity.surname
-              %td= entity.all_roles.map(&:name).map(&:titlecase).join(', ')
-              %td= entity.created_at.strftime('%Y-%m-%d')
-              %td
-                - if policy(entity).update?
-                  %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
-                    %i.fa.fa-edit
-        - else
+    .card.card-default.shadow.table-responsive
+      %table.table.table-striped.table-bordered.table-hover.mb-0
+        %thead.thead-dark
           %tr
-            %td.text-center{ colspan: 6 } No records
+            %th= "Email #{sort_ui(:email)}"
+            %th= "Name #{sort_ui(:name)}"
+            %th= "Surname #{sort_ui(:surname)}"
+            %th Roles
+            %th= "Signed Up #{sort_ui(:created_at)}"
+            %th
+        %tbody
+          - if list.count > 0
+            - list.all.each do |entity|
+              %tr
+                %td
+                  - if policy(entity).read?
+                    %a{ href: "#{base_path}/#{entity.display_id}" }= entity.email
+                  - else
+                    = entity.email
+                %td= entity.name
+                %td= entity.surname
+                %td= entity.all_roles.map(&:name).map(&:titlecase).join(', ')
+                %td= entity.created_at.strftime('%Y-%m-%d')
+                %td
+                  - if policy(entity).update?
+                    %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
+                      %i.fa.fa-edit
+          - else
+            %tr
+              %td.text-center{ colspan: 6 } No records
 
-- if list.count > 0
-  = pagination(list, base_path)
+      - if list.count > 0
+        .card-body
+          = pagination(list, base_path)

data/views/users/profile.haml

@@ -37,7 +37,7 @@
       .card-body
         %h4.card-title Change Password
         = edit_form_tag("#{base_path}/#{entity.display_id}/identity") do
-          - if current_user.super_admin? == false
+          - if current_user.super_admin? == false || current_user_id == entity.id
             = form_control(:old_password, identity, type: 'password', placeholder: 'Your current password', value: '')
           = form_control(:password, identity, type: 'password', placeholder: 'Your new password')
           = form_control(:password_confirmation, identity, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password')

data/views/users/user.haml

@@ -1,4 +1,4 @@
 = form_control(:name, user)
 = form_control(:surname, user)
 - if policy(user).permitted_attributes.include? :role_id
-  = form_control(:role_id, user, type: 'select', options: Ditty::Role.order(:name).as_hash(:id, :name), name: 'user[role_id][]', value: user.new? ? [] : user.roles_dataset.map(:id), multiple: true)
+  = form_control(:role_id, user, type: 'select', options: Ditty::Role.select(:id, :name).order(:name).as_hash(:id, :name), name: 'user[role_id][]', value: user.new? ? [] : user.roles_dataset.map(:id), multiple: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.1
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -294,6 +294,9 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.2
@@ -301,6 +304,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.2
@@ -350,44 +356,44 @@ dependencies:
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-identity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -546,14 +552,14 @@ dependencies:
   name: wisper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Sinatra Based Application Framework
@@ -733,7 +739,6 @@ files:
 - views/partials/search.haml
 - views/partials/sidebar.haml
 - views/partials/sort_ui.haml
-- views/partials/timespan_selector.haml
 - views/partials/topbar.haml
 - views/partials/user_associations.haml
 - views/quick_start.haml

data/views/partials/timespan_selector.haml

@@ -1,64 +0,0 @@
-- if defined?(context)
-  - if context.interval
-    %li.nav-item.dropdown.no-arrow
-      %a#intervalDropdown.nav-link.dropdown-toggle{ href: '#', role: 'button', 'aria-haspopup': 'true', 'area-expanded': 'false', 'data-toggle': 'dropdown' }
-        %span.mr-2.d-none.d-lg-inline.text-gray-600
-          Interval /
-          %strong
-            = context.interval
-      .dropdown-menu.dropdown-menu-right.shadow.animated--grow-in{ 'aria-labelledby': 'intervalDropdown' }
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '1m'))}", class: context.interval == '1m' ? 'active' : '' }
-          1 Minute
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '5m'))}", class: context.interval == '5m' ? 'active' : '' }
-          5 Minutes
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '15m'))}", class: context.interval == '15m' ? 'active' : '' }
-          15 Minutes
-        .dropdown-divider
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '1h'))}", class: context.interval == '1h' ? 'active' : '' }
-          1 Hour
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '3h'))}", class: context.interval == '3h' ? 'active' : '' }
-          3 Hours
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '6h'))}", class: context.interval == '6h' ? 'active' : '' }
-          6 Hours
-        .dropdown-divider
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '1d'))}", class: context.interval == '1d' ? 'active' : '' }
-          1 Day
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '2d'))}", class: context.interval == '2d' ? 'active' : '' }
-          2 Days
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(interval: '1w'))}", class: context.interval == '1w' ? 'active' : '' }
-          1 Week
-
-  - if context.timespan
-    %li.nav-item.dropdown.no-arrow
-      %a#timespanDropdown.nav-link.dropdown-toggle{ href: '#', role: 'button', 'aria-haspopup': 'true', 'area-expanded': 'false', 'data-toggle': 'dropdown' }
-        %span.mr-2.d-none.d-lg-inline.text-gray-600
-          Timespan /
-          %strong
-            = context.timespan.split('/').first
-      .dropdown-menu.dropdown-menu-right.shadow.animated--grow-in{ 'aria-labelledby': 'timespanDropdown' }
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '1h', interval: ''))}", class: context.timespan == '1h' ? 'active' : '' }
-          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
-          1 Hour
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '1d', interval: ''))}", class: context.timespan == '1d' ? 'active' : '' }
-          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
-          1 Day
-        .dropdown-divider
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '1w/d', interval: ''))}", class: context.timespan == '1w/d' ? 'active' : '' }
-          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
-          1 Week
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '2w/d', interval: ''))}", class: context.timespan == '2w/d' ? 'active' : '' }
-          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
-          2 Weeks
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '1M/d', interval: ''))}", class: context.timespan == '1M/d' ? 'active' : '' }
-          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
-          1 Month
-        .dropdown-divider
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '3M/d', interval: ''))}", class: context.timespan == '3M/d' ? 'active' : '' }
-          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
-          3 Months
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '6M/d', interval: ''))}", class: context.timespan == '6M/d' ? 'active' : '' }
-          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
-          6 Months
-        %a.dropdown-item{ href: "?#{URI.encode_www_form(and_params.merge(timespan: '1y/d', interval: ''))}", class: context.timespan == '1y/d' ? 'active' : '' }
-          %i.fas.fa-chevron-right.fa-sm.fa-fw.mr-2.text-gray-400
-          1 Year