ditty 0.9.1 → 0.10.1

data/lib/ditty/generators/crud_generator.rb

@@ -31,6 +31,8 @@ module Ditty
       def create_model
         filename = File.join("lib/#{folder}/models", "#{model_name.underscore}.rb")
         template '../templates/model.rb.erb', filename
+      rescue StandardError => e
+        puts "Could not generate model for #{model_name}: #{e.message}"
       end
 
       def create_controller
@@ -38,16 +40,22 @@ module Ditty
         template '../templates/controller.rb.erb', filename
         # TODO: Insert the route into the component file
         # insert_into_file 'config.ru', "use #{class_name}\n", after: 'run ApplicationController\n'
+      rescue StandardError => e
+        puts "Could not generate controller for #{model_name}: #{e.message}"
       end
 
       def create_policy
         filename = File.join("lib/#{folder}/policies", "#{policy_name.underscore}.rb")
         template '../templates/policy.rb.erb', filename
+      rescue StandardError => e
+        puts "Could not generate policy for #{model_name}: #{e.message}"
       end
 
       def create_type
         filename = File.join("lib/#{folder}/types", "#{model_name.underscore}_type.rb")
         template '../templates/type.rb.erb', filename
+      rescue StandardError => e
+        puts "Could not generate type for #{model_name}: #{e.message}"
       end
 
       def create_views
@@ -58,47 +66,49 @@ module Ditty
 
       private
 
-      def meta_columns
-        %i[id guid slug created_at updated_at]
-      end
-
-      def columns
-        require "#{folder}/models/#{model_name.underscore}"
-        name.constantize.columns
-      rescue StandardError
-        []
-      end
-
-      def schema
-        require "#{folder}/models/#{model_name.underscore}"
-        name.constantize.db_schema
-      rescue StandardError
-        []
-      end
-
-      def many_to_ones
-        DB.foreign_key_list(model_name.underscore.pluralize)
-      end
-
-      def name_column(table)
-        candidates = DB.schema(table.to_sym).to_h.keys - DB.foreign_key_list(table.to_sym).map { |e| e[:columns] }.flatten
-        (candidates - meta_columns).first
-      end
-
-      def graphql_types
-        @graphql_types ||= Hash.new('String').merge(
-          integer: 'Integer',
-          boolean: 'Boolean',
-          datetime: 'GraphQL::Types::ISO8601DateTime'
-        )
-      end
-
-      def input_types
-        @input_types ||= Hash.new('text').merge(
-          integer: 'number',
-          datetime: 'date'
-        )
-      end
+        def meta_columns
+          %i[id guid slug created_at updated_at]
+        end
+
+        def columns
+          require "#{folder}/models/#{model_name.underscore}"
+          name.constantize.columns
+        rescue StandardError
+          []
+        end
+
+        def schema
+          require "#{folder}/models/#{model_name.underscore}"
+          name.constantize.db_schema
+        rescue StandardError
+          []
+        end
+
+        def many_to_ones
+          DB.foreign_key_list(model_name.underscore.pluralize)
+        end
+
+        def name_column(table)
+          candidates = DB.schema(table.to_sym).to_h.keys - DB.foreign_key_list(table.to_sym).map do |e|
+                                                             e[:columns]
+                                                           end.flatten
+          (candidates - meta_columns).first
+        end
+
+        def graphql_types
+          @graphql_types ||= Hash.new('String').merge(
+            integer: 'Integer',
+            boolean: 'Boolean',
+            datetime: 'GraphQL::Types::ISO8601DateTime'
+          )
+        end
+
+        def input_types
+          @input_types ||= Hash.new('text').merge(
+            integer: 'number',
+            datetime: 'date'
+          )
+        end
     end
   end
 end

data/lib/ditty/generators/project_generator.rb

@@ -27,6 +27,7 @@ module Ditty
         directory 'logs'
         directory 'pids'
         directory 'public'
+        directory '../../../views', 'views'
         copy_file '.gitignore', './.gitignore'
         copy_file 'env.example', './.env'
         copy_file '.rubocop.yml', './.rubocop.yml'

data/lib/ditty/helpers/pundit.rb

@@ -16,10 +16,10 @@ module Ditty
         policy = policy(record)
         action ||= record.new? ? :create : :update
         method_name = if policy.respond_to?("permitted_attributes_for_#{action}")
-                        "permitted_attributes_for_#{action}"
-                      else
-                        'permitted_attributes'
-                      end
+          "permitted_attributes_for_#{action}"
+        else
+          'permitted_attributes'
+        end
         policy.public_send(method_name)
       end
 

data/lib/ditty/helpers/response.rb

@@ -2,8 +2,6 @@
 
 require 'csv'
 
-require 'csv'
-
 module Ditty
   module Helpers
     module Response
@@ -27,6 +25,7 @@ module Ditty
             )
           end
           format.csv do
+            attachment "#{base_path}.csv"
             CSV.generate do |csv|
               csv << result.first.for_csv.keys
               result.all.each do |r|
@@ -41,7 +40,7 @@ module Ditty
         respond_to do |format|
           format.html do
             flash[:success] = "#{heading} Created"
-            redirect with_layout(flash[:redirect_to] || "#{base_path}/#{entity.display_id}")
+            redirect with_layout(params[:redirect_to] || flash[:redirect_to] || "#{base_path}/#{entity.display_id}")
           end
           format.json do
             content_type :json
@@ -62,6 +61,8 @@ module Ditty
         respond_to do |format|
           format.html do
             title = heading(:read) + (entity.respond_to?(:name) ? ": #{entity.name}" : '')
+            last_modified entity.updated_at if entity.respond_to?(:updated_at)
+            etag entity.etag if entity.respond_to?(:etag)
             haml :"#{view_location}/display",
                  locals: { entity: entity, title: title, actions: actions },
                  layout: layout
@@ -76,12 +77,6 @@ module Ditty
               csv << entity.for_csv.values
             end
           end
-          format.csv do
-            CSV.generate do |csv|
-              csv << entity.for_csv.keys
-              csv << entity.for_csv.values
-            end
-          end
         end
       end
 
@@ -90,7 +85,7 @@ module Ditty
           format.html do
             # TODO: Ability to customize the return path and message?
             flash[:success] = "#{heading} Updated"
-            redirect with_layout(flash[:redirect_to] || back || "#{base_path}/#{entity.display_id}")
+            redirect with_layout(params[:redirect_to] || flash[:redirect_to] || "#{base_path}/#{entity.display_id}")
           end
           format.json do
             content_type :json
@@ -103,7 +98,7 @@ module Ditty
         respond_to do |format|
           format.html do
             flash[:success] = "#{heading} Deleted"
-            redirect with_layout(flash[:redirect_to] || back || base_path)
+            redirect with_layout(params[:redirect_to] || flash[:redirect_to] || back || base_path)
           end
           format.json do
             content_type :json

data/lib/ditty/helpers/views.rb

@@ -62,13 +62,13 @@ module Ditty
         messages = flash(key).collect do |message|
           "  <div class='alert alert-#{message[0]} alert-dismissable' role='alert'>#{message[1]}</div>\n"
         end
-        "<div id='#{id}'>\n" + messages.join + '</div>'
+        "<div id='#{id}'>\n#{messages.join}</div>"
       end
 
       def query_string(add = {})
         qs = params.clone.merge(add)
         qs.delete('captures')
-        Rack::Utils.build_query qs
+        Rack::Utils.build_query(qs.delete_if { |_k, v| v == '' })
       end
 
       def delete_form(entity, label = 'Delete')
@@ -94,7 +94,7 @@ module Ditty
       def form_tag(url, options = {}, &block)
         options[:form_verb] ||= :post
         options[:attributes] ||= {}
-        options[:attributes] = { 'class': 'form-horizontal' }.merge options[:attributes]
+        options[:attributes] = { class: 'form-horizontal' }.merge options[:attributes]
         options[:url] = options[:form_verb].to_sym == :get ? url : with_layout(url)
         haml :'partials/form_tag', locals: options.merge(block: block)
       end
@@ -138,6 +138,24 @@ module Ditty
           haml_tag :a, name, html_options
         end
       end
+
+      def sort_ui(field)
+        haml :'partials/sort_ui', locals: { field: field }
+      end
+
+      def sort_query(field)
+        query_string(
+          order: params[:sort] == field.to_s && params[:order] == 'asc' ? 'desc' : 'asc',
+          sort: field,
+        )
+      end
+
+      def sort_icon(field)
+        return 'fa-sort' unless params[:sort] == field.to_s
+        return 'fa-sort-up' if params[:order] == 'asc'
+
+        'fa-sort-down'
+      end
     end
   end
 end

data/lib/ditty/listener.rb

@@ -66,7 +66,7 @@ module Ditty
     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_/, '')
+      "#{target.class.to_s.demodulize.underscore}_#{method.to_s.gsub(/^component_/, '')}"
     end
 
     def log_action(values)

data/lib/ditty/models/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'digest/sha2'
 require 'sequel'
 
 module Ditty
@@ -12,6 +13,10 @@ module Ditty
       self[:slug] || self[:guid] || self[:id]
     end
 
+    def etag
+      Digest::SHA2.hexdigest values.to_json
+    end
+
     alias for_csv for_json
   end
 end

data/lib/ditty/models/identity.rb

@@ -55,7 +55,7 @@ module Ditty
           # 1 Special Character
           # 1 Number
           # At least 8 characters
-          %r[\A(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#&$*)(}{%^=_+|\\:";'<>,.\-\/?\[\]])(?=.*[0-9]).{8,}\Z],
+          %r[\A(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#&$*)(}{%^=_+|\\:";'<>,.\-/?\[\]])(?=.*[0-9]).{8,}\Z],
           :password,
           message: 'is not strong enough'
         )
@@ -72,12 +72,12 @@ module Ditty
 
     private
 
-    def encrypt_password
-      self.crypted_password = ::BCrypt::Password.create(password)
-    end
+      def encrypt_password
+        self.crypted_password = ::BCrypt::Password.create(password)
+      end
 
-    def password_required
-      crypted_password.blank? || !password.blank?
-    end
+      def password_required
+        crypted_password.blank? || !password.blank?
+      end
   end
 end

data/lib/ditty/models/user.rb

@@ -40,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
@@ -57,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

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

@@ -3,7 +3,6 @@
 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
@@ -23,26 +22,36 @@ 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|
-            req = config.dig(provider, :require) || "omniauth/#{provider}"
-            begin
-              require req
+          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
@@ -50,6 +59,7 @@ module Ditty
           require 'ditty/controllers/auth_controller'
           {
             identity: {
+              available: true,
               arguments: [
                 {
                   fields: [:username],

data/lib/ditty/services/email.rb

@@ -34,21 +34,21 @@ module Ditty
 
         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
-          }
-        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