ditty 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e785b1b4a84258a46e98753a5de394897bc6d002b88d2fc6629b30b33b52614e
-  data.tar.gz: '094a55847cc4ec09bf1dc9307c9efcffa5b59b498fd407de5950e656e5a5e516'
+  metadata.gz: 0ef6903491ad20b85916f196652705811820c13f3ed14552fc9b35687dbe7309
+  data.tar.gz: 1431f00aee5e7093757936e5b12231d091d41bcfb798dda53e534d289f43c5dc
 SHA512:
-  metadata.gz: fa7d54c43ac02d1f04a690f2bca5a529b3c65eefa0f287ab44594910bca2b8022656b58e2aef805a52307364481c35be2ba1b1e4b3a97b3450cab1b9acb27d1f
-  data.tar.gz: 847143f0f0d20c67b3451a86e780ec44b914210ceec4498c9218ebc05f7f7277107b1998ca5f273aad0ad1ad45ceb051b81204fe87e6cb91e88ee2ef6af7b49c
+  metadata.gz: b8383f78d50a4b1a2379b34f5ea81969fc019130dd953e7218d499a7596217ea12eef13d804de7b888da7145fc865bb3e798453f664597951f953df5a06eec00
+  data.tar.gz: c36d004df0b9ce15aba2fbf99f376fef6fa5f70a2cc4338163cd360c730f2398ab4a5b3b0c29362ba20a90502397475aa4b4a1769b3acb9f50965eae371b680a

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/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

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/models/identity.rb

@@ -37,6 +37,10 @@ module Ditty
       }
     end
 
+    def uid
+      user&.id
+    end
+
     # Validation
     def validate
       super

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/version.rb

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

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/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.10.2
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -733,7 +733,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