ditty 0.8.0 → 0.9.0

data/lib/ditty/controllers/{audit_logs.rb → audit_logs_controller.rb}

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'ditty/controllers/component'
+require 'ditty/controllers/component_controller'
 require 'ditty/models/audit_log'
 require 'ditty/policies/audit_log_policy'
 
 module Ditty
-  class AuditLogs < Ditty::Component
+  class AuditLogsController < ::Ditty::ComponentController
     set model_class: AuditLog
 
     SEARCHABLE = %i[details platform device browser ip_address].freeze

data/lib/ditty/controllers/{auth.rb → auth_controller.rb}

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'ditty/controllers/application'
+require 'ditty/controllers/application_controller'
 require 'ditty/services/email'
 require 'securerandom'
 
 module Ditty
-  class Auth < Application
+  class AuthController < ApplicationController
     set track_actions: true
 
     def redirect_path
       return "#{settings.map_path}/" if omniauth_redirect_path.nil?
-      return "#{settings.map_path}/" if omniauth_redirect_path =~ %r{/#{settings.map_path}/auth/?}
+      return "#{settings.map_path}/" if omniauth_redirect_path.match? %r{/#{settings.map_path}/auth/?}
 
       omniauth_redirect_path
     end
@@ -67,7 +67,7 @@ module Ditty
       authorize ::Ditty::Identity, :login
       redirect settings.map_path if authenticated?
 
-      haml :'auth/login', locals: { title: 'Log In' }
+      haml :'auth/login', locals: { title: 'Log In' }, layout: :blank
     end
 
     # Custom login form for LDAP to allow CSRF checks. Set the `request_path` for
@@ -76,13 +76,13 @@ module Ditty
       authorize ::Ditty::Identity, :login
       redirect settings.map_path if authenticated?
 
-      haml :'auth/ldap', locals: { title: 'Company Log In' }
+      haml :'auth/ldap', locals: { title: 'Company Log In' }, layout: :blank
     end
 
     get '/forgot-password' do
       authorize ::Ditty::Identity, :forgot_password
 
-      haml :'auth/forgot_password', locals: { title: 'Forgot your password?' }
+      haml :'auth/forgot_password', locals: { title: 'Forgot your password?' }, layout: :blank
     end
 
     post '/forgot-password' do
@@ -97,14 +97,14 @@ module Ditty
         identity.update(reset_token: token, reset_requested: Time.now)
         # Send Email
         reset_url = "#{request.base_url}#{settings.map_path}/reset-password?token=#{token}"
-        Ditty::Services::Email.deliver(
+        ::Ditty::Services::Email.deliver(
           :forgot_password,
           email,
           locals: { identity: identity, reset_url: reset_url, request: request }
         )
       end
       flash[:info] = 'An email was sent to the email provided with instructions on how to reset your password'
-      redirect '/login'
+      redirect "#{settings.map_path}/auth/login"
     end
 
     get '/reset-password' do
@@ -114,7 +114,7 @@ module Ditty
       identity = Identity[reset_token: params[:token]]
       halt 404 unless identity&.reset_requested && identity.reset_requested > (Time.now - (24 * 60 * 60))
 
-      haml :'auth/reset_password', locals: { title: 'Reset your password', identity: identity }
+      haml :'auth/reset_password', locals: { title: 'Reset your password', identity: identity }, layout: :blank
     end
 
     put '/reset-password' do
@@ -124,15 +124,15 @@ module Ditty
       halt 404 unless identity
       authorize identity, :reset_password
 
-      identity_params = permitted_attributes(Identity, :update)
+      identity_params = permitted_parameters(Identity, :update)
       identity.set identity_params.merge(reset_token: nil, reset_requested: nil)
-      if identity.valid? && identity.save
+      if identity.valid? && identity.save_changes
         broadcast(:identity_update_password, target: self)
         flash[:success] = 'Password Updated'
         redirect "#{settings.map_path}/auth/login"
       else
         broadcast(:identity_update_password_failed, target: self)
-        haml :'auth/reset_password', locals: { title: 'Reset your password', identity: identity }
+        haml :'auth/reset_password', locals: { title: 'Reset your password', identity: identity }, layout: :blank
       end
     end
 
@@ -141,7 +141,7 @@ module Ditty
       authorize ::Ditty::User.new, :register
 
       identity = Identity.new
-      haml :'auth/register', locals: { title: 'Register', identity: identity }
+      haml :'auth/register', locals: { title: 'Register', identity: identity }, layout: :blank
     end
 
     # Register Action
@@ -152,8 +152,9 @@ module Ditty
       authorize user, :register
 
       begin
+        identity.valid?
         DB.transaction do
-          user.save
+          user.save_changes
           user.add_identity identity
           broadcast(:user_register, target: self, values: { user: user })
           flash[:info] = 'Successfully Registered. Please log in'
@@ -161,7 +162,7 @@ module Ditty
         end
       rescue Sequel::ValidationFailed
         flash.now[:warning] = 'Could not complete the registration. Please try again.'
-        haml :'auth/register', locals: { identity: identity }
+        haml :'auth/register', locals: { identity: identity }, layout: :blank
       end
     end
 
@@ -172,7 +173,7 @@ module Ditty
 
       halt 200 if request.xhr?
       flash[:info] = 'Logged Out'
-      redirect(Ditty::Services::Settings[:logout_redirect_path] || "#{settings.map_path}/")
+      redirect(::Ditty::Services::Settings[:logout_redirect_path] || "#{settings.map_path}/")
     end
 
     # Unauthenticated

data/lib/ditty/controllers/{component.rb → component_controller.rb}

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'ditty/controllers/application'
+require 'ditty/controllers/application_controller'
 require 'ditty/helpers/component'
 require 'ditty/helpers/response'
 require 'sinatra/json'
 
 module Ditty
-  class Component < Application
+  class ComponentController < ApplicationController
     helpers Helpers::Component, Helpers::Response
 
     set base_path: nil
@@ -16,7 +16,12 @@ module Ditty
     set heading: nil
 
     def read(id)
-      dataset.first(settings.model_class.primary_key => id)
+      dataset.with_pk(id)
+    end
+
+    def read!(id)
+      halt 404 unless (entity = read(id))
+      entity
     end
 
     def skip_verify!
@@ -25,7 +30,7 @@ module Ditty
 
     def trigger(event, attribs = {})
       attribs[:target] ||= self
-      send(event, attribs) if self.respond_to? event
+      send(event, attribs) if respond_to? event
       broadcast(event, attribs)
     end
 
@@ -58,8 +63,7 @@ module Ditty
     get '/new/?' do
       authorize settings.model_class, :create
 
-      entity = settings.model_class.new(permitted_attributes(settings.model_class, :create))
-      session[:redirect_to] = request.fullpath
+      entity = settings.model_class.new(permitted_parameters(settings.model_class, :create))
       haml :"#{view_location}/new",
            locals: { entity: entity, title: heading(:new) },
            layout: layout
@@ -67,11 +71,11 @@ module Ditty
 
     # Create
     post '/' do
-      entity = settings.model_class.new(permitted_attributes(settings.model_class, :create))
+      entity = settings.model_class.new(permitted_parameters(settings.model_class, :create))
       authorize entity, :create
 
       entity.db.transaction do
-        entity.save # Will trigger a Sequel::ValidationFailed exception if the model is incorrect
+        entity.save_changes # Will trigger a Sequel::ValidationFailed exception if the model is incorrect
         trigger :component_create, entity: entity
       end
 
@@ -80,8 +84,7 @@ module Ditty
 
     # Read
     get '/:id/?' do |id|
-      entity = read(id)
-      halt 404 unless entity
+      entity = read!(id)
       authorize entity, :read
 
       trigger :component_read, entity: entity
@@ -90,10 +93,10 @@ module Ditty
 
     # Update Form
     get '/:id/edit/?' do |id|
-      entity = read(id)
-      halt 404 unless entity
+      entity = read!(id)
       authorize entity, :update
 
+      flash[:redirect_to] = "#{base_path}/#{entity.display_id}"
       haml :"#{view_location}/edit",
            locals: { entity: entity, title: heading(:edit) },
            layout: layout
@@ -101,13 +104,12 @@ module Ditty
 
     # Update
     put '/:id/?' do |id|
-      entity = read(id)
-      halt 404 unless entity
+      entity = read!(id)
       authorize entity, :update
 
       entity.db.transaction do
-        entity.set(permitted_attributes(settings.model_class, :update))
-        entity.save # Will trigger a Sequel::ValidationFailed exception if the model is incorrect
+        entity.set(permitted_parameters(settings.model_class, :update))
+        entity.save_changes # Will trigger a Sequel::ValidationFailed exception if the model is incorrect
         trigger :component_update, entity: entity
       end
 
@@ -115,8 +117,7 @@ module Ditty
     end
 
     delete '/:id/?' do |id|
-      entity = read(id)
-      halt 404 unless entity
+      entity = read!(id)
       authorize entity, :delete
 
       entity.db.transaction do

data/lib/ditty/controllers/{main.rb → main_controller.rb}

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
-require 'ditty/controllers/application'
+require 'ditty/controllers/application_controller'
 require 'ditty/models/role'
 require 'ditty/models/user'
+require 'ditty/services/settings'
 
 module Ditty
-  class Main < Application
+  class MainController < ApplicationController
     set track_actions: true
 
     before '/' do
@@ -17,6 +18,9 @@ module Ditty
 
     # Home Page
     get '/' do
+      home_page = Services::Settings['ditty.home_page']
+      redirect "#{settings.map_path}#{home_page}" if home_page
+
       authenticate!
       haml :index, locals: { title: 'Home' }
     end

data/lib/ditty/controllers/roles_controller.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'ditty/controllers/component_controller'
+require 'ditty/models/role'
+require 'ditty/policies/role_policy'
+
+module Ditty
+  class RolesController < ::Ditty::ComponentController
+    SEARCHABLE = %i[name].freeze
+
+    set model_class: Role
+
+    helpers do
+      def parent_options(entity)
+        return policy_scope(::Ditty::Role) if entity.new?
+
+        policy_scope(::Ditty::Role)
+          .exclude(id: [entity.id] + entity.descendants.map(&:id))
+          .order(:name)
+      end
+    end
+  end
+end

data/lib/ditty/controllers/{user_login_traits.rb → user_login_traits_controller.rb}

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-require 'ditty/controllers/component'
+require 'ditty/controllers/component_controller'
 require 'ditty/models/user_login_trait'
 require 'ditty/policies/user_login_trait_policy'
 
 module Ditty
-  class UserLoginTraits < Ditty::Component
+  class UserLoginTraitsController < ::Ditty::ComponentController
     SEARCHABLE = %i[platform device browser ip_address].freeze
     FILTERS = [
       { name: :user, field: 'user.email' }
     ].freeze
 
-    set base_path: 'login-traits'
+    set base_path: '/login-traits'
     set model_class: UserLoginTrait
+    set heading: 'Login'
     # set track_actions: true
   end
 end

data/lib/ditty/controllers/{users.rb → users_controller.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ditty/controllers/component'
+require 'ditty/controllers/component_controller'
 require 'ditty/models/user'
 require 'ditty/models/user_login_trait'
 require 'ditty/policies/user_policy'
@@ -8,7 +8,7 @@ require 'ditty/models/identity'
 require 'ditty/policies/identity_policy'
 
 module Ditty
-  class Users < Ditty::Component
+  class UsersController < ::Ditty::ComponentController
     SEARCHABLE = %i[name surname email].freeze
 
     set model_class: User
@@ -28,8 +28,8 @@ module Ditty
 
       locals = { title: heading(:new) }
 
-      user_params = permitted_attributes(User, :create)
-      identity_params = permitted_attributes(Identity, :create)
+      user_params = permitted_parameters(User, :create)
+      identity_params = permitted_parameters(Identity, :create)
       user_params['email'] = identity_params['username']
       roles = user_params.delete('role_id')
 
@@ -38,7 +38,7 @@ module Ditty
 
       DB.transaction(isolation: :serializable) do
         begin
-          identity.save
+          identity.save_changes
         rescue Sequel::ValidationFailed
           raise unless request.accept? 'text/html'
 
@@ -46,7 +46,7 @@ module Ditty
           locals = { title: heading(:new), entity: user, identity: identity }
           return haml(:"#{view_location}/new", locals: locals)
         end
-        user.save
+        user.save_changes
         user.add_identity identity
 
         roles&.each do |role_id|
@@ -65,10 +65,10 @@ module Ditty
       halt 404 unless entity
       authorize entity, :update
 
-      values = permitted_attributes(settings.model_class, :update)
+      values = permitted_parameters(settings.model_class, :update)
       roles  = values.delete('role_id')
       entity.set values
-      entity.save # Will trigger a Sequel::ValidationFailed exception if the model is incorrect
+      entity.save_changes # Will trigger a Sequel::ValidationFailed exception if the model is incorrect
 
       if roles
         entity.remove_all_roles
@@ -94,9 +94,9 @@ module Ditty
         return redirect back
       end
 
-      values = permitted_attributes(Identity, :create)
+      values = permitted_parameters(Identity, :create)
       identity.set values
-      if identity.valid? && identity.save
+      if identity.valid? && identity.save_changes
         broadcast(:identity_update_password, target: self)
         flash[:success] = 'Password Updated'
         redirect back
@@ -129,6 +129,7 @@ module Ditty
       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' }
     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.instance.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.
@@ -18,7 +18,7 @@ elsif ENV['DATABASE_URL'].blank? == false
   )
 
   DB.sql_log_level = (ENV['SEQUEL_LOGGING_LEVEL'] || :debug).to_sym
-  DB.loggers << Ditty::Services::Logger.instance if ENV['DB_DEBUG'].to_i == 1
+  DB.loggers << ::Ditty::Services::Logger if ENV['DB_DEBUG'].to_i == 1
   DB.extension(:pagination)
   DB.extension(:schema_caching)
   DB.load_schema_cache?('./config/schema.dump')
@@ -26,6 +26,7 @@ elsif ENV['DATABASE_URL'].blank? == false
   Sequel::Model.plugin :validation_helpers
   Sequel::Model.plugin :update_or_create
   Sequel::Model.plugin :timestamps, update_on_create: true
+  Sequel::Model.plugin :auto_validations
 else
-  Ditty::Services::Logger.instance.error 'No database connection set up'
+  ::Ditty::Services::Logger.error 'No database connection set up'
 end

data/lib/ditty/emails/base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'haml'
-require 'ditty/components/app'
+require 'ditty/components/ditty'
 
 module Ditty
   module Emails
@@ -23,7 +23,10 @@ module Ditty
           @locals[param] ||= options[param]
           mail.send(param, options[param])
         end
-        mail.body content
+        html = content
+        mail.html_part do
+          body html
+        end
         mail.deliver!
       end
 

data/lib/ditty/generators/crud_generator.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'thor/group'
+require 'active_support/inflector'
+
+module Ditty
+  module Generators
+    class CrudGenerator < Thor::Group
+      include Thor::Actions
+      attr_reader :namespace, :folder, :views_folder, :controller_name, :model_name, :policy_name # , :file_name
+
+      desc 'Create a CRUD Endpoint including the Model, Controller, Policy, Views and GraphQL Types'
+      argument :name, type: :string, desc: 'Name of the Model, eg. MyApp::User'
+
+      # --no-views make views optional
+      class_option :views, type: :boolean, default: true, desc: 'Generate views for controller'
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
+      def setup
+        @namespace       = name.deconstantize
+        @folder          = namespace.underscore
+        @model_name      = name.demodulize
+        @views_folder    = File.join('views', model_name.pluralize.underscore)
+        @controller_name = "#{model_name.pluralize}Controller"
+        @policy_name     = "#{model_name}Policy"
+      end
+
+      def create_model
+        filename = File.join("lib/#{folder}/models", "#{model_name.underscore}.rb")
+        template '../templates/model.rb.erb', filename
+      end
+
+      def create_controller
+        filename = File.join("lib/#{folder}/controllers", "#{controller_name.underscore}.rb")
+        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'
+      end
+
+      def create_policy
+        filename = File.join("lib/#{folder}/policies", "#{policy_name.underscore}.rb")
+        template '../templates/policy.rb.erb', filename
+      end
+
+      def create_type
+        filename = File.join("lib/#{folder}/types", "#{model_name.underscore}_type.rb")
+        template '../templates/type.rb.erb', filename
+      end
+
+      def create_views
+        return unless options[:views]
+
+        directory '../templates/views', views_folder
+      end
+
+      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
+    end
+  end
+end