ditty 0.8.0 → 0.10.2

data/lib/ditty/models/user.rb

@@ -17,11 +17,20 @@ module Ditty
 
     def role?(check)
       @roles ||= Hash.new do |h, k|
-        h[k] = !roles_dataset.first(name: k).nil?
+        role_or_descendant = roles.find do |role|
+          role.name == k || role.descendants.map(&:name).include?(k)
+        end
+        h[k] = !role_or_descendant.nil?
       end
       @roles[check]
     end
 
+    def all_roles
+      roles.inject([]) do |memo, role|
+        memo + [role] + role.descendants
+      end.uniq
+    end
+
     def method_missing(method_sym, *arguments, &block)
       if respond_to_missing?(method_sym)
         role?(method_sym[0..-2])
@@ -31,7 +40,9 @@ module Ditty
     end
 
     def respond_to_missing?(name, _include_private = false)
-      name[-1] == '?'
+      return true if name[-1] == '?'
+
+      super
     end
 
     def gravatar
@@ -48,6 +59,12 @@ module Ditty
       validates_format(/\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :email)
     end
 
+    def before_save
+      super
+      self.name = nil if name.blank?
+      self.surname = nil if surname.blank?
+    end
+
     # Add the basic roles and identity
     def after_create
       super
@@ -68,6 +85,10 @@ module Ditty
       email
     end
 
+    def display_name
+      name || username
+    end
+
     class << self
       def anonymous_user
         role = ::Ditty::Role.find_or_create(name: 'anonymous')

data/lib/ditty/policies/role_policy.rb

@@ -25,7 +25,7 @@ module Ditty
     end
 
     def permitted_attributes
-      [:name]
+      %i[parent_id name]
     end
 
     class Scope < ApplicationPolicy::Scope

data/lib/ditty/policies/user_login_trait_policy.rb

@@ -13,7 +13,7 @@ module Ditty
     end
 
     def read?
-      user && (record.user_id || user.super_admin?)
+      user && (record.user_id == user.id || user.super_admin?)
     end
 
     def update?

data/lib/ditty/policies/user_policy.rb

@@ -26,7 +26,7 @@ module Ditty
     end
 
     def delete?
-      create?
+      create? && record&.super_admin? == false
     end
 
     def permitted_attributes

data/lib/ditty/services/authentication.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require 'ditty/controllers/application'
+require 'ditty/controllers/application_controller'
 require 'ditty/services/settings'
 require 'ditty/services/logger'
-require 'backports/2.4.0/hash/compact'
 
 require 'omniauth'
-OmniAuth.config.logger = Ditty::Services::Logger.instance
-OmniAuth.config.path_prefix = "#{Ditty::Application.map_path}/auth"
+OmniAuth.config.logger = ::Ditty::Services::Logger
+OmniAuth.config.path_prefix = "#{::Ditty::ApplicationController.map_path}/auth"
 OmniAuth.config.on_failure = proc { |env|
   next [400, {}, []] if env['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
 
@@ -23,38 +22,50 @@ module Ditty
         end
 
         def providers
-          config.compact.keys
+          config.compact.keys.select { |e| config[e][:available] && config[e][:enabled] != false }
         end
 
         def setup
-          providers.each do |provider|
-            begin
-              require "omniauth/#{provider}"
+          config.compact.each_key do |provider|
+            ::Ditty::Services::Logger.debug "Loading authentication provider #{provider}"
+            req = if config.dig(provider, :require)
+              [config[provider][:require]]
+            else
+              ["omniauth/#{provider}", "omniauth-#{provider}"]
+            end
+            req.find do |e|
+              require e
+              config[provider][:available] = true
+              true
             rescue LoadError
-              require "omniauth-#{provider}"
+              ::Ditty::Services::Logger.warn "Could not load authentication provider #{provider} using #{e}"
+              config[provider][:available] = false
+              false
             end
           end
         end
 
         def config
-          default.merge Ditty::Services::Settings.values(:authentication) || {}
+          @config ||= default.merge(::Ditty::Services::Settings.values(:authentication) || {})
         end
 
         def provides?(provider)
-          providers.include? provider.to_sym
+          provider = provider.to_sym
+          providers.include?(provider) && config[provider][:available] && config.dig(provider, :enabled) != false
         end
 
         def default
           require 'ditty/models/identity'
-          require 'ditty/controllers/auth'
+          require 'ditty/controllers/auth_controller'
           {
             identity: {
+              available: true,
               arguments: [
                 {
                   fields: [:username],
-                  model: Ditty::Identity,
-                  on_login: Ditty::Auth,
-                  on_registration: Ditty::Auth,
+                  model: ::Ditty::Identity,
+                  on_login: ::Ditty::AuthController,
+                  on_registration: ::Ditty::AuthController,
                   locate_conditions: ->(req) { { username: req['username'] } }
                 }
               ]
@@ -66,4 +77,4 @@ module Ditty
   end
 end
 
-Ditty::Services::Authentication.setup
+::Ditty::Services::Authentication.setup

data/lib/ditty/services/email.rb

@@ -20,31 +20,35 @@ module Ditty
           end
         end
 
-        def deliver(email, to = nil, options = {})
+        def generate(email, to = nil, options = {})
           config!
           options[:to] ||= to unless to.nil?
           options[:from] ||= config[:from] unless config[:from].nil?
           email = from_symbol(email, options) if email.is_a? Symbol
-          email.deliver!
+          email
+        end
+
+        def deliver(email, to = nil, options = {})
+          generate(email, to, options).deliver!
         end
 
         private
 
-        def config
-          @config ||= default.merge Ditty::Services::Settings.values(:email) || {}
-        end
+          def config
+            @config ||= default.merge ::Ditty::Services::Settings.values(:email) || {}
+          end
 
-        def default
-          {
-            delivery_method: :logger,
-            logger: Ditty::Services::Logger.instance
-          }
-        end
+          def default
+            {
+              delivery_method: :logger,
+              logger: ::Ditty::Services::Logger
+            }
+          end
 
-        def from_symbol(email, options)
-          require "ditty/emails/#{email}"
-          constantize("Ditty::Emails::#{classify(email)}").new(options)
-        end
+          def from_symbol(email, options)
+            require "ditty/emails/#{email}"
+            constantize("Ditty::Emails::#{classify(email)}").new(options)
+          end
       end
     end
   end

data/lib/ditty/services/logger.rb

@@ -30,40 +30,46 @@ module Ditty
         end
       end
 
+      # TODO: REfac this so that you can log something like ES to a separate logger
+
       def method_missing(method, *args, &block)
         loggers.each { |logger| logger.send(method, *args, &block) }
       end
 
       def respond_to_missing?(method, _include_private = false)
-        loggers.any? { |logger| logger.respond_to?(method) }
+        return true if loggers.any? { |logger| logger.respond_to?(method) }
+
+        super
       end
 
       private
 
-      def config
-        default.merge Ditty::Services::Settings.values(:logger) || {}
-      end
-
-      def tr(val)
-        {
-          '$stdout' => $stdout,
-          '$stderr' => $stderr
-        }[val] || val
-      end
+        def config
+          default.merge ::Ditty::Services::Settings.values(:logger) || {}
+        end
 
-      def default
-        { loggers: [{ name: 'default', class: 'Logger' }] }
-      end
+        def tr(val)
+          {
+            '$stdout' => $stdout,
+            '$stderr' => $stderr
+          }[val] || val
+        end
 
-      class << self
-        def method_missing(method, *args, &block)
-          instance.send(method, *args, &block)
+        def default
+          { loggers: [{ name: 'default', class: 'Logger' }] }
         end
 
-        def respond_to_missing?(method, _include_private)
-          instance.respond_to? method
+        class << self
+          def method_missing(method, *args, &block)
+            instance.send(method, *args, &block)
+          end
+
+          def respond_to_missing?(method, _include_private)
+            return true if instance.respond_to?(method)
+
+            super
+          end
         end
-      end
     end
   end
 end

data/lib/ditty/services/pagination_wrapper.rb

@@ -10,18 +10,18 @@ module Ditty
       end
 
       def last_page?
-        if list.respond_to? :'last_page?'
+        if list.respond_to? :last_page?
           list.last_page?
         else
-          list.current_page == list.total_pages
+          list.next_page.nil?
         end
       end
 
       def first_page?
-        if list.respond_to? :'first_page?'
+        if list.respond_to? :first_page?
           list.first_page?
         else
-          list.current_page == 0
+          list.previous_page.nil?
         end
       end
 
@@ -64,7 +64,9 @@ module Ditty
       end
 
       def respond_to_missing?(method, _include_private = false)
-        list.respond_to? method
+        return true if list.respond_to?(method)
+
+        super
       end
 
       def current_page_record_range

data/lib/ditty/services/settings.rb

@@ -25,20 +25,21 @@ module Ditty
           from = values
           if keys.count > 1 && scope?(keys.first)
             from = values(keys.first)
-            keys = keys[1..-1]
+            keys = keys[1..]
             key = keys.join('.')
           end
-          from[key.to_sym] || from.dig(*keys)
+          key = key.to_sym if key.respond_to?(:to_sym)
+          from[key] || from.dig(*keys)
         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
+                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) : {}

data/lib/ditty/tasks/ditty.rake

@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 
 namespace :ditty do
+  desc 'Run the ditty console'
+  task :console do
+    require 'irb'
+    ARGV.clear
+    IRB.start
+  end
+
   desc 'Prepare Ditty'
   task prep: ['generate_tokens', 'prep:folders', 'prep:public', 'prep:migrations']
 
@@ -31,6 +38,7 @@ namespace :ditty do
     task :folders do
       puts 'Prepare the Ditty folders'
       Dir.mkdir 'pids' unless File.exist?('pids')
+      Dir.mkdir 'logs' unless File.exist?('logs')
     end
 
     desc 'Check that the public folder is present and populated'
@@ -53,7 +61,7 @@ namespace :ditty do
         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}") && x[-3..-1] == '.rb' }
+      Dir.foreach('migrations').sort.each { |x| puts x if File.file?("migrations/#{x}") && x[-3..] == '.rb' }
     end
   end
 
@@ -81,6 +89,16 @@ namespace :ditty do
       end
     end
 
+    desc 'Migrate Ditty database to the specified version'
+    task :run, [:version] do |_t, args|
+      ::DB.loggers << Logger.new($stdout) if ::DB.loggers.count.zero?
+      raise 'No version specified' unless args[:version]
+
+      puts "** [ditty] Running Ditty Migrations to #{args[:version]}"
+      ::Sequel.extension :migration
+      ::Sequel::Migrator.run(::DB, folder, target: args[:version].to_i)
+    end
+
     desc 'Migrate Ditty database to latest version'
     task :up do
       ::DB.loggers << Logger.new($stdout) if ::DB.loggers.count.zero?

data/lib/ditty/tasks/omniauth-ldap.rake

@@ -4,7 +4,7 @@ namespace :ditty do
   namespace :ldap do
     desc 'Check the LDAP settings'
     task :check do
-      settings = Ditty::Services::Settings[:authentication][:ldap][:arguments].first
+      settings = ::Ditty::Services::Settings[:authentication][:ldap][:arguments].first
       ldap = Net::LDAP.new host: settings[:host], port: settings[:port]
       ldap.authenticate settings[:bind_dn], settings[:password] if settings[:bind_dn]
       raise 'Could not bind to LDAP server' unless ldap.bind
@@ -18,7 +18,7 @@ namespace :ditty do
       require 'ditty/services/settings'
       require 'ditty/models/role'
 
-      settings = Ditty::Services::Settings[:authentication][:ldap][:arguments].first
+      settings = ::Ditty::Services::Settings[:authentication][:ldap][:arguments].first
       ldap = Net::LDAP.new host: settings[:host], port: settings[:port]
       ldap.authenticate settings[:bind_dn], settings[:password] if settings[:bind_dn]
       if ldap.bind

data/lib/ditty/templates/.gitignore

@@ -0,0 +1,5 @@
+.token_secret
+.session_secret
+gems
+logs/*
+migrations

data/lib/ditty/templates/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/lib/ditty/templates/.rubocop.yml

@@ -0,0 +1,7 @@
+require:
+  - rubocop-rspec
+  - rubocop-performance
+  - rubocop-thread_safety
+  - rubocop-sequel
+  - ditty/rubocop
+

data/lib/ditty/templates/Rakefile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'dotenv/load'
+
+require 'rake'
+require 'ditty'
+require 'ditty/db' if ENV['DATABASE_URL']
+require 'ditty/memcached' if ENV['MEMCACHED_URL']
+
+require './application'
+
+Ditty::Components.tasks