ditty 0.9.1 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7260a6694f316ec8f4e3388932e7a749030f7fb6fc88657012f15a863069639
-  data.tar.gz: 3f0e6db669807bc153111ceaa182cbbc5323f90f0acf535e3bdb6bd199b531cc
+  metadata.gz: e785b1b4a84258a46e98753a5de394897bc6d002b88d2fc6629b30b33b52614e
+  data.tar.gz: '094a55847cc4ec09bf1dc9307c9efcffa5b59b498fd407de5950e656e5a5e516'
 SHA512:
-  metadata.gz: fd5b41ce540f365575aeb1c7c33ffc487f87585894a0d1267428dc5bba8a60ea9b041fa9f0c8e8bcda62b265f94c989b3938c82e76a1770269a0abc8a26ed481
-  data.tar.gz: 385f6cae60979bc716d3268a07856255fc19beaa9652087c1d9f748042074c927d4fcb259188667ef6724083feb76004871c5e69e76d5c8eae4414dd63781997
+  metadata.gz: fa7d54c43ac02d1f04a690f2bca5a529b3c65eefa0f287ab44594910bca2b8022656b58e2aef805a52307364481c35be2ba1b1e4b3a97b3450cab1b9acb27d1f
+  data.tar.gz: 847143f0f0d20c67b3451a86e780ec44b914210ceec4498c9218ebc05f7f7277107b1998ca5f273aad0ad1ad45ceb051b81204fe87e6cb91e88ee2ef6af7b49c

data/.env.test

@@ -0,0 +1,2 @@
+CC_TEST_REPORTER_ID=289860573c6284a8e277de86848caba84d840be49e35f3601bcd672ab40d1e35
+DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true

data/.gitignore

@@ -16,3 +16,4 @@ vendor
 migrations
 /gems.*
 .env
+.env.*.local

data/.rubocop.yml

@@ -1,9 +1,28 @@
-require: rubocop-rspec
-
+require:
+  - rubocop-rspec
+  - rubocop-performance
+  - rubocop-thread_safety
+  - rubocop-sequel
 AllCops:
-  TargetRubyVersion: 2.7
-Metrics/LineLength:
+  NewCops: enable
+  TargetRubyVersion: 2.7.1
+  Exclude:
+    - migrate/**/*
+Layout/LineLength:
   Max: 120
 Layout/LeadingCommentSpace:
   Exclude:
     - 'config.ru'
+Layout/EndOfLine:
+  EnforcedStyle: lf
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+  IndentationWidth: 2
+Layout/IndentationConsistency:
+  EnforcedStyle: indented_internal_methods
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+Metrics/MethodLength:
+  CountAsOne: ['array', 'heredoc', 'hash']
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -1,16 +1,11 @@
 sudo: false
 language: ruby
 rvm:
+  - 3.0
   - 2.7
   - 2.6
-  - 2.5
-  - 2.4
-  - 2.3
 gemfile: Gemfile.ci
 env:
-  global:
-    - CC_TEST_REPORTER_ID=289860573c6284a8e277de86848caba84d840be49e35f3601bcd672ab40d1e35
-    - DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
   matrix:
     - DATABASE_URL="sqlite::memory:" RACK_ENV=test
 before_install:
@@ -22,7 +17,7 @@ before_script:
   - bundle exec rake ditty:prep
 script:
   - bundle exec rake
-  - bundle exec rubocop --fail-level W lib views specs
+  - bundle exec rubocop --fail-level W lib views spec
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 after_success:

data/Gemfile.ci

@@ -2,18 +2,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'faker'
-gem 'simplecov', '~> 0.13.0'
-gem 'sqlite3'
-
-if RUBY_VERSION < '2.1'
-  gem 'sidekiq', '3.0.0'
-  gem 'activesupport', '<4.0.0'
-  gem 'omniauth', '~>1.4.2'
-elsif RUBY_VERSION < '2.2.0'
-  gem 'sidekiq', '4.0.0'
-  gem 'activesupport', '<5.0.0'
-else
-  gem 'activesupport'
-end

data/ditty.gemspec

@@ -21,37 +21,41 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '>= 1'
-  spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'dotenv'
+  spec.add_development_dependency 'database_cleaner', '~> 1.0'
   spec.add_development_dependency 'factory_bot'
-  spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'faker'
   spec.add_development_dependency 'racksh'
+  spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'rubocop-sequel'
   spec.add_development_dependency 'rubocop-thread_safety'
+  spec.add_development_dependency 'simplecov', '~> 0.13.0'
+  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'timecop'
 
-  spec.add_dependency 'activesupport', '>= 3'
-  spec.add_dependency 'bcrypt', '~> 3.1'
-  spec.add_dependency 'browser', '~> 2.5'
+  spec.add_dependency 'activesupport', '>= 6'
+  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 'logger', '~> 1.0'
+  spec.add_dependency 'haml', '>= 5.1.2'
+  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 'rack-contrib', '~> 1.0'
-  spec.add_dependency 'rack_csrf', '~> 1.0'
-  spec.add_dependency 'rake', '~> 12.0'
-  spec.add_dependency 'sequel', '>= 4.0'
-  spec.add_dependency 'sinatra', '>= 2.0'
-  spec.add_dependency 'sinatra-contrib', '~> 2.0'
-  spec.add_dependency 'sinatra-flash', '~> 0.3'
-  spec.add_dependency 'sinatra-param', '~> 1.5'
+  spec.add_dependency 'rack-contrib', '>= 2.0'
+  spec.add_dependency 'rack_csrf', '>= 2.0'
+  spec.add_dependency 'rake', '>= 13.0'
+  spec.add_dependency 'sequel', '>= 5.0'
+  spec.add_dependency 'sinatra', '>= 2.1'
+  spec.add_dependency 'sinatra-contrib', '>= 2.0'
+  spec.add_dependency 'sinatra-flash', '>= 0.3'
+  spec.add_dependency 'sinatra-param', '>= 1.6'
   spec.add_dependency 'thor', '>= 0.20'
   spec.add_dependency 'tilt', '>= 2'
   spec.add_dependency 'will_paginate', '>= 3.1'

data/lib/ditty.rb

@@ -96,9 +96,9 @@ module Ditty
 
     # Return an ordered list of navigation items:
     # `[{order:0, link:'/users/', text:'Users'}, {order:1, link:'/roles/', text:'Roles'}]
-    def self.navigation
+    def self.navigation(request)
       nav = components.each_with_object([]) do |comp, memo|
-        memo.concat comp[1].navigation if comp[1].respond_to?(:navigation)
+        memo.concat comp[1].navigation(request) if comp[1].respond_to?(:navigation)
       end
       nav.sort_by { |v| v[:order] }
     end

data/lib/ditty/cli.rb

@@ -11,6 +11,10 @@ require 'ditty/generators/project_generator'
 require 'ditty/generators/migration_generator'
 require 'ditty/components/ditty'
 
+# TODO: Component generator
+# TODO: Add requires into application.rb
+# TODO: Add requires into schema.rb
+
 module Ditty
   class CLI < Thor
     include Thor::Actions
@@ -25,6 +29,7 @@ module Ditty
 
     desc 'server', 'Start the Ditty server'
     require './application' if File.exist?('application.rb')
+    require 'ditty/db' unless defined?(DB)
     ::Ditty::Components.tasks
     def server
       # Ensure the token files are present

data/lib/ditty/components/ditty.rb

@@ -29,10 +29,6 @@ module Ditty
       File.expand_path('../../../views', __dir__)
     end
 
-    def self.public_folder
-      File.expand_path('../../../public', __dir__)
-    end
-
     def self.routes
       load
       {
@@ -45,20 +41,21 @@ module Ditty
       }
     end
 
-    def self.navigation
+    def self.navigation(_request)
       load
 
       [
         {
           group: 'User Management',
-          order: 10,
+          order: 50,
           icon: 'lock',
           target: ::Ditty::User,
           items: [
             { order: 10, link: '/users/', text: 'Users', target: ::Ditty::User, icon: 'user' },
             { order: 20, link: '/roles/', text: 'Roles', target: ::Ditty::Role, icon: 'check-square' },
             { order: 30, link: '/audit-logs/', text: 'Audit Logs', target: ::Ditty::AuditLog, icon: 'history' },
-            { order: 40, link: '/login-traits/', text: 'User Login Traits', target: ::Ditty::UserLoginTrait, icon: 'list' }
+            { order: 40, link: '/login-traits/', text: 'User Login Traits', target: ::Ditty::UserLoginTrait,
+              icon: 'list' }
           ]
         }
       ]

data/lib/ditty/controllers/application_controller.rb

@@ -20,7 +20,7 @@ module Ditty
   class ApplicationController < Sinatra::Base
     include ActiveSupport::Inflector
 
-    set :root, ENV['APP_ROOT'] || ::File.expand_path(::File.dirname(__FILE__) + '/../../../')
+    set :root, ENV['APP_ROOT'] || ::File.expand_path("#{::File.dirname(__FILE__)}/../../../")
     set :map_path, nil
     set :view_location, nil
     set :view_folder, nil
@@ -37,7 +37,7 @@ module Ditty
     register Sinatra::Flash, Sinatra::RespondWith
 
     use Rack::Csrf, raise: ENV['APP_ENV'] == 'development' unless ENV['APP_ENV'] == 'test'
-    use Rack::PostBodyContentTypeParser
+    use Rack::JSONBodyParser
     use Rack::MethodOverride
     use Rack::NestedParams
 
@@ -149,7 +149,8 @@ module Ditty
           haml :'400', locals: { title: '4 oh oh' }, layout: layout
         end
         format.json do
-          json code: 400, errors: { env['sinatra.error'].param => env['sinatra.error'].message }, full_errors: [env['sinatra.error'].message]
+          json code: 400, errors: { env['sinatra.error'].param => env['sinatra.error'].message },
+               full_errors: [env['sinatra.error'].message]
         end
       end
     end
@@ -238,8 +239,8 @@ module Ditty
         request.path_info = request.path_info.gsub(/.csv$/, '')
       elsif request.env['ACCEPT']
         content_type request.env['ACCEPT']
-      else
-        content_type(:json) if request.accept.count.eql?(1) && request.accept.first.to_s.eql?('*/*')
+      elsif request.accept.count.eql?(1) && request.accept.first.to_s.eql?('*/*')
+        content_type(:json)
       end
     end
 

data/lib/ditty/controllers/audit_logs_controller.rb

@@ -25,6 +25,8 @@ module Ditty
     end
 
     def list
+      return super if params[:sort]
+
       super.order(:created_at).reverse
     end
 

data/lib/ditty/controllers/auth_controller.rb

@@ -24,7 +24,7 @@ module Ditty
 
       broadcast("before_#{provider}_login".to_sym, env['omniauth.auth'])
       user = User.first(email: env['omniauth.auth']['info']['email'])
-      user = register_user if user.nil? && authorize(current_user, :register?)
+      user = register_user if user.nil? && authorize(::Ditty::User, :register?)
       return failed_login if user.nil?
 
       broadcast("#{provider}_login".to_sym, user)
@@ -96,7 +96,7 @@ module Ditty
         token = SecureRandom.hex(16)
         identity.update(reset_token: token, reset_requested: Time.now)
         # Send Email
-        reset_url = "#{request.base_url}#{settings.map_path}/reset-password?token=#{token}"
+        reset_url = "#{request.base_url}#{settings.map_path}/auth/reset-password?token=#{token}"
         ::Ditty::Services::Email.deliver(
           :forgot_password,
           email,
@@ -105,6 +105,9 @@ module Ditty
       end
       flash[:info] = 'An email was sent to the email provided with instructions on how to reset your password'
       redirect "#{settings.map_path}/auth/login"
+    rescue Sinatra::Param::InvalidParameterError
+      flash[:warning] = 'Email address not provided'
+      redirect back
     end
 
     get '/reset-password' do

data/lib/ditty/controllers/component_controller.rb

@@ -37,8 +37,8 @@ module Ditty
     after do
       return if settings.environment == 'production'
 
-      if (response.successful? || response.redirection?) && @skip_verify == false
-        verify_authorized if settings.environment != 'production'
+      if (response.successful? || response.redirection?) && @skip_verify == false && (settings.environment != 'production')
+        verify_authorized
       end
     end
 
@@ -96,7 +96,7 @@ module Ditty
       entity = read!(id)
       authorize entity, :update
 
-      flash[:redirect_to] = "#{base_path}/#{entity.display_id}"
+      flash[:redirect_to] = "#{base_path}/#{entity.display_id}" unless flash.keep(:redirect_to)
       haml :"#{view_location}/edit",
            locals: { entity: entity, title: heading(:edit) },
            layout: layout

data/lib/ditty/controllers/user_login_traits_controller.rb

@@ -8,12 +8,39 @@ module Ditty
   class UserLoginTraitsController < ::Ditty::ComponentController
     SEARCHABLE = %i[platform device browser ip_address].freeze
     FILTERS = [
-      { name: :user, field: 'user.email' }
+      { name: :user, field: 'user.email' },
+      { name: :platform },
+      { name: :device },
+      { name: :browser }
     ].freeze
 
     set base_path: '/login-traits'
     set model_class: UserLoginTrait
     set heading: 'Login'
     # set track_actions: true
+
+    helpers do
+      def user_options
+        policy_scope(::Ditty::User).as_hash(:email, :email)
+      end
+
+      def platform_options
+        policy_scope(::Ditty::UserLoginTrait).select(:platform).distinct.as_hash(:platform, :platform)
+      end
+
+      def device_options
+        policy_scope(::Ditty::UserLoginTrait).select(:device).distinct.as_hash(:device, :device)
+      end
+
+      def browser_options
+        policy_scope(::Ditty::UserLoginTrait).select(:browser).distinct.as_hash(:browser, :browser)
+      end
+    end
+
+    def list
+      return super if params[:sort]
+
+      super.order(:updated_at).reverse
+    end
   end
 end

data/lib/ditty/controllers/users_controller.rb

@@ -55,7 +55,7 @@ module Ditty
         user.check_roles
       end
 
-      broadcast(:component_create, target: self)
+      broadcast(:component_create, target: self, entity: user)
       create_response(user)
     end
 
@@ -96,7 +96,8 @@ module Ditty
 
       values = permitted_parameters(Identity, :create)
       identity.set values
-      if identity.valid? && identity.save_changes
+      if identity.valid?
+        identity.save_changes
         broadcast(:identity_update_password, target: self)
         flash[:success] = 'Password Updated'
         redirect back

data/lib/ditty/db.rb

@@ -23,10 +23,11 @@ elsif ENV['DATABASE_URL'].blank? == false
   DB.extension(:schema_caching)
   DB.load_schema_cache?('./config/schema.dump')
 
-  Sequel::Model.plugin :validation_helpers
-  Sequel::Model.plugin :update_or_create
-  Sequel::Model.plugin :timestamps, update_on_create: true
   Sequel::Model.plugin :auto_validations
+  Sequel::Model.plugin :string_stripper
+  Sequel::Model.plugin :timestamps, update_on_create: true
+  Sequel::Model.plugin :update_or_create
+  Sequel::Model.plugin :validation_helpers
 else
   ::Ditty::Services::Logger.error 'No database connection set up'
 end

data/lib/ditty/emails/base.rb

@@ -37,50 +37,52 @@ module Ditty
       end
 
       def respond_to_missing?(method, _include_private = false)
-        mail.respond_to? method
+        return true if mail.respond_to?(method)
+
+        super
       end
 
       private
 
-      def content
-        result = Haml::Engine.new(content_haml).render(Object.new, locals)
-        return result unless options[:layout]
+        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, locals.merge(content: result))
-      end
+          Haml::Engine.new(layout_haml).render(Object.new, locals.merge(content: result))
+        end
 
-      def content_haml
-        read_template(options[:view])
-      end
+        def content_haml
+          read_template(options[:view])
+        end
 
-      def layout_haml
-        read_template("layouts/#{options[:layout]}") if options[:layout]
-      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 read_template(template)
+          File.read(find_template("emails/#{template}"))
+        end
 
-      def base_options
-        { subject: '(No Subject)', from: 'no-reply@ditty.io', view: :base, content_type: 'text/html; charset=UTF-8' }
-      end
+        def base_options
+          { subject: '(No Subject)', from: 'no-reply@ditty.io', view: :base, content_type: 'text/html; charset=UTF-8' }
+        end
 
-      def find_template(file)
-        template = File.expand_path("./views/#{file}.haml")
-        return template if File.file? template
+        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
+          template = File.expand_path("./#{file}.haml", App.view_folder)
+          return template if File.file? template
 
-        file
-      end
+          file
+        end
 
-      class << self
-        def deliver!(to = nil, options = {})
-          locals = options[:locals] || {}
-          new(options).deliver!(to, locals)
+        class << self
+          def deliver!(to = nil, options = {})
+            locals = options[:locals] || {}
+            new(options).deliver!(to, locals)
+          end
         end
-      end
     end
   end
 end