ditty 0.7.1 → 0.10.1

data/views/roles/edit.haml

@@ -1,9 +1,9 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
-        = edit_form_tag "#{base_path}/#{entity.id}" do
+    .card.card-default.shadow
+      .card-body
+        = edit_form_tag "#{base_path}/#{entity.display_id}" do
           = haml :'roles/form', locals: { entity: entity }
           %button.btn.btn-primary{ type: 'submit' }
             Update Role

data/views/roles/form.haml

@@ -1 +1,2 @@
+= form_control(:parent_id, entity, type: 'select', options: parent_options(entity).as_hash(:id, :name))
 = form_control(:name, entity)

data/views/roles/index.haml

@@ -1,18 +1,27 @@
 .row
   .col-md-12
-    .panel.panel-default
-      %table.table.table-striped
-        %thead
-          %tr
-            %th Name
-        %tbody
-          - if list.count > 0
-            - list.all.each do |entity|
-              %tr
-                %td
-                  %a{ href: "#{base_path}/#{entity.id}" }= entity.name
-          - else
+    = haml :'partials/search'
+    %table.table.table-striped.table-bordered.table-hover
+      %thead.thead-dark
+        %tr
+          %th= "Name#{sort_ui(:name)}"
+          %th Parent
+          %th
+      %tbody
+        - if list.count > 0
+          - list.all.each do |entity|
             %tr
-              %td.text-center{ colspan: 1 } No records
+              %td
+                %a{ href: "#{base_path}/#{entity.display_id}" }= entity.name
+              %td
+                %a{ href: "#{base_path}/#{entity.parent_id}" }= entity.parent&.name || '(None)'
+              %td
+                - if policy(entity).update?
+                  %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
+                    %i.fa.fa-edit
+        - else
+          %tr
+            %td.text-center{ colspan: 3 } No Roles
 
-=pagination(list, base_path)
+- if list.count > 0
+  = pagination(list, base_path)

data/views/roles/new.haml

@@ -1,8 +1,8 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         = new_form_tag base_path do
           = haml :'roles/form', locals: { entity: entity }
           %button.btn.btn-primary{ type: 'submit' }

data/views/user_login_traits/display.haml

@@ -0,0 +1,32 @@
+.row
+  .col-md-2
+  .col-md-8
+    .card.card-default.shadow
+      .card-body
+        %p.description
+          %label User:
+          = entity.user&.email || 'Unknown'
+        %p.description
+          %label IP Address:
+          = entity.ip_address || 'Unknown'
+        %p.description
+          %label Device:
+          = entity.device || 'Unknown'
+        %p.description
+          %label Platform:
+          = entity.platform || 'Unknown'
+        %p.description
+          %label Browser:
+          = entity.browser || 'Unknown'
+        %p.description
+          %label Last Seen:
+          = entity.updated_at.strftime('%F %T')
+
+        .row
+          .col-md-6
+            %a.btn.btn-secondary{ href: "#{base_path}/#{entity.display_id}/edit" } Edit
+          .col-md-6.text-right
+            - if policy(entity).delete?
+              = delete_form_tag("#{base_path}/#{entity.display_id}") do
+                %button.btn.btn-warning{ type: 'submit' } Delete
+  .col-md-2

data/views/user_login_traits/edit.haml

@@ -0,0 +1,10 @@
+.row
+  .col-md-2
+  .col-md-8
+    .card.card-default.shadow
+      .card-body
+        = edit_form_tag "#{base_path}/#{entity.display_id}" do
+          = haml :'user_login_traits/form', locals: { entity: entity }
+          %button.btn.btn-primary{ type: 'submit' }
+            Update Login Trait
+  .col-md-2

data/views/user_login_traits/form.haml

@@ -0,0 +1,5 @@
+= form_control(:ip_address, entity)
+= form_control(:device, entity)
+= form_control(:platform, entity)
+= form_control(:browser, entity)
+= form_control(:updated_at, entity)

data/views/user_login_traits/index.haml

@@ -0,0 +1,28 @@
+.row
+  .col-md-12
+    = haml :'partials/search'
+    %table.table.table-striped.table-bordered.table-hover
+      %thead.thead-dark
+        %tr
+          %th= "User #{sort_ui(:user_id)}"
+          %th= "IP Address #{sort_ui(:ip_address)}"
+          %th= "Device #{sort_ui(:device)}"
+          %th= "Platform #{sort_ui(:platform)}"
+          %th= "Browser #{sort_ui(:browser)}"
+          %th= "Last Seen #{sort_ui(:updated_at)}"
+      %tbody
+        - if list.count.positive?
+          - list.all.each do |entity|
+            %tr
+              %td= entity.user&.email || 'Unknown'
+              %td
+                %a{ href: "#{base_path}/#{entity.display_id}" }= entity.ip_address || 'Unknown'
+              %td= entity.device || 'Unknown'
+              %td= entity.platform || 'Unknown'
+              %td= entity.browser || 'Unknown'
+              %td= entity.updated_at
+        - else
+          %tr
+            %td.text-center{ colspan: 6 } No records
+
+=pagination(list, base_path)

data/views/user_login_traits/new.haml

@@ -0,0 +1,10 @@
+.row
+  .col-md-2
+  .col-md-8
+    .card.card-default.shadow
+      .card-body
+        = new_form_tag base_path do
+          = haml :'user_login_traits/form', locals: { entity: entity }
+          %button.btn.btn-primary{ type: 'submit' }
+            Create Login Trait
+  .col-md-2

data/views/users/display.haml

@@ -1,19 +1,19 @@
-.row
+.row.mb-4
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         .author
-          %img.pull-right.thumbnail{ src: entity.gravatar }
-          %h4= entity.email
+          %img.float-right.img-thumbnail{ src: entity.gravatar }
+          %h4= entity.display_name
 
         %hr
         %p.description
           %label Name:
-          = entity.name
+          = entity.name || '(None)'
         %p.description
           %label Surname:
-          = entity.surname
+          = entity.surname || '(None)'
         %p.description
           %label Roles:
           = entity.roles_dataset.map(:name).map(&:titlecase).join(', ')
@@ -24,26 +24,25 @@
         .row
           .col-md-6
             - if policy(entity).update?
-              %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
+              %a.btn.btn-secondary{ href: "#{base_path}/#{entity.display_id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              = delete_form_tag("#{base_path}/#{entity.id}") do
+              = delete_form_tag("#{base_path}/#{entity.display_id}") do
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2
 
 - if entity.identity.first
-  .row
+  .row.mb-4
     .col-md-2
     .col-md-8
-      .panel.panel-default
-        .panel-heading
-          %h4 Change Password
-        .panel-body
-          = edit_form_tag("#{base_path}/#{entity.id}/identity") do
+      .card.card-default.shadow
+        .card-body
+          %h4.card-title Change Password
+          = edit_form_tag("#{base_path}/#{entity.display_id}/identity") do
             = form_control(:password, entity.identity.first, type: 'password', placeholder: 'Your password', group: 'identity')
             = form_control(:password_confirmation, entity.identity.first, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password', group: 'identity')
             %button.btn.btn-primary{ type: 'submit' }
               Change Password
     .col-md-2
 
-
+= haml :'users/login_traits', locals: { user_login_traits: entity.user_login_traits }

data/views/users/edit.haml

@@ -1,9 +1,9 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
-        = edit_form_tag "#{base_path}/#{entity.id}" do
+    .card.card-default.shadow
+      .card-body
+        = edit_form_tag "#{base_path}/#{entity.display_id}" do
           = haml :'users/user', locals: { user: entity }
           %button.btn.btn-primary{ type: 'submit' }
             Update User

data/views/users/index.haml

@@ -1,28 +1,35 @@
 .row
   .col-md-12
-    .panel.panel-default
-      .panel-body
-        = haml :'partials/search'
-      %table.table.table-striped
-        %thead
-          %tr
-            %th Email
-            %th Name
-            %th Surname
-            %th Roles
-            %th Signed Up
-        %tbody
-          - if list.count > 0
-            - list.all.each do |entity|
-              %tr
-                %td
-                  %a{ href: "#{base_path}/#{entity.id}" }= entity.email
-                %td= entity.name
-                %td= entity.surname
-                %td= entity.roles_dataset.map(:name).map(&:titlecase).join(', ')
-                %td= entity.created_at.strftime('%Y-%m-%d')
-          - else
+    = haml :'partials/search'
+    %table.table.table-striped.table-bordered.table-hover
+      %thead.thead-dark
+        %tr
+          %th= "Email #{sort_ui(:email)}"
+          %th= "Name #{sort_ui(:name)}"
+          %th= "Surname #{sort_ui(:surname)}"
+          %th Roles
+          %th= "Signed Up #{sort_ui(:created_at)}"
+          %th
+      %tbody
+        - if list.count > 0
+          - list.all.each do |entity|
             %tr
-              %td.text-center{ colspan: 5 } No records
+              %td
+                - if policy(entity).read?
+                  %a{ href: "#{base_path}/#{entity.display_id}" }= entity.email
+                - else
+                  = entity.email
+              %td= entity.name
+              %td= entity.surname
+              %td= entity.all_roles.map(&:name).map(&:titlecase).join(', ')
+              %td= entity.created_at.strftime('%Y-%m-%d')
+              %td
+                - if policy(entity).update?
+                  %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
+                    %i.fa.fa-edit
+        - else
+          %tr
+            %td.text-center{ colspan: 6 } No records
 
-=pagination(list, base_path)
+- if list.count > 0
+  = pagination(list, base_path)

data/views/users/login_traits.haml

@@ -0,0 +1,25 @@
+.row
+  .col-md-12
+    .card.card-default.shadow
+      .card-body
+        %h4.card-title Logins
+      %table.table.table-striped.mb-0
+        %thead.thead-dark
+          %tr
+            %th IP Address
+            %th Device
+            %th Platform
+            %th Browser
+            %th Last Seen
+        %tbody
+          - if user_login_traits.count.positive?
+            - user_login_traits.each do |trait|
+              %tr
+                %td= trait.ip_address
+                %td= trait.device
+                %td= trait.platform
+                %td= trait.browser
+                %td= trait.updated_at.strftime('%F %T')
+          - else
+            %tr
+              %td.text-center{ colspan: 5 } No Records

data/views/users/new.haml

@@ -1,8 +1,8 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         = new_form_tag base_path do
           = haml :'users/identity', locals: { identity: identity }
           = haml :'users/user', locals: { user: entity }

data/views/users/profile.haml

@@ -1,19 +1,19 @@
-.row
+.row.mb-4
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         .author
-          %img.pull-right.thumbnail{ src: entity.gravatar }
+          %img.float-right.img-thumbnail{ src: entity.gravatar }
           %h4= entity.email
 
         %hr
         %p.description
           %label Name:
-          = entity.name
+          = entity.name || '(None)'
         %p.description
           %label Surname:
-          = entity.surname
+          = entity.surname || '(None)'
         %p.description
           %label Roles:
           = entity.roles_dataset.map(:name).map(&:titlecase).join(', ')
@@ -23,24 +23,26 @@
         .row
           .col-md-6
             - if policy(entity).update?
-              %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
+              %a.btn.btn-secondary{ href: "#{base_path}/#{entity.display_id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              = delete_form_tag("#{base_path}/#{entity.id}") do
+              = delete_form_tag("#{base_path}/#{entity.display_id}") do
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2
 
-.row
+.row.mb-4
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-heading
-        %h4 Change Password
-      .panel-body
-        = edit_form_tag("#{base_path}/#{entity.id}/identity") do
-          = form_control(:old_password, identity, type: 'password', placeholder: 'Your current password')
+    .card.card-default.shadow
+      .card-body
+        %h4.card-title Change Password
+        = edit_form_tag("#{base_path}/#{entity.display_id}/identity") do
+          - if current_user.super_admin? == false
+            = form_control(:old_password, identity, type: 'password', placeholder: 'Your current password', value: '')
           = form_control(:password, identity, type: 'password', placeholder: 'Your new password')
           = form_control(:password_confirmation, identity, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password')
           %button.btn.btn-primary{ type: 'submit' }
             Change Password
   .col-md-2
+
+= haml :'users/login_traits', locals: { user_login_traits: entity.user_login_traits }

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][]', field: :roles, multiple: true)
+  = 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)

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.10.1
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +122,104 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-thread_safety
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -114,84 +240,112 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: oga
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -238,142 +392,142 @@ dependencies:
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack_csrf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sinatra-flash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sinatra-param
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -410,38 +564,50 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.test"
 - ".gitignore"
 - ".pryrc"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CNAME
 - Contributors.md
+- Dockerfile
 - Gemfile.ci
 - License.txt
 - Rakefile
 - Readme.md
+- _config.yml
 - config.ru
 - ditty.gemspec
+- docs/CNAME
+- docs/_config.yml
+- docs/index.md
 - exe/ditty
 - lib/ditty.rb
 - lib/ditty/cli.rb
-- lib/ditty/components/app.rb
-- lib/ditty/controllers/application.rb
-- lib/ditty/controllers/audit_logs.rb
-- lib/ditty/controllers/auth.rb
-- lib/ditty/controllers/component.rb
-- lib/ditty/controllers/main.rb
-- lib/ditty/controllers/roles.rb
-- lib/ditty/controllers/users.rb
+- lib/ditty/components/ditty.rb
+- lib/ditty/controllers/application_controller.rb
+- lib/ditty/controllers/audit_logs_controller.rb
+- lib/ditty/controllers/auth_controller.rb
+- lib/ditty/controllers/component_controller.rb
+- lib/ditty/controllers/main_controller.rb
+- lib/ditty/controllers/roles_controller.rb
+- lib/ditty/controllers/user_login_traits_controller.rb
+- lib/ditty/controllers/users_controller.rb
 - lib/ditty/db.rb
 - lib/ditty/emails/base.rb
 - lib/ditty/emails/forgot_password.rb
+- lib/ditty/generators/crud_generator.rb
+- lib/ditty/generators/migration_generator.rb
+- lib/ditty/generators/project_generator.rb
 - lib/ditty/helpers/authentication.rb
 - lib/ditty/helpers/component.rb
 - lib/ditty/helpers/pundit.rb
 - lib/ditty/helpers/response.rb
 - lib/ditty/helpers/views.rb
 - lib/ditty/listener.rb
+- lib/ditty/memcached.rb
 - lib/ditty/middleware/accept_extension.rb
 - lib/ditty/middleware/error_catchall.rb
 - lib/ditty/models/audit_log.rb
@@ -449,42 +615,102 @@ files:
 - lib/ditty/models/identity.rb
 - lib/ditty/models/role.rb
 - lib/ditty/models/user.rb
+- lib/ditty/models/user_login_trait.rb
 - lib/ditty/policies/application_policy.rb
 - lib/ditty/policies/audit_log_policy.rb
 - lib/ditty/policies/identity_policy.rb
 - lib/ditty/policies/role_policy.rb
+- lib/ditty/policies/user_login_trait_policy.rb
 - lib/ditty/policies/user_policy.rb
-- lib/ditty/rake_tasks.rb
+- lib/ditty/rubocop.rb
 - lib/ditty/seed.rb
 - lib/ditty/services/authentication.rb
 - lib/ditty/services/email.rb
 - lib/ditty/services/logger.rb
 - lib/ditty/services/pagination_wrapper.rb
 - lib/ditty/services/settings.rb
+- lib/ditty/tasks/ditty.rake
+- lib/ditty/tasks/omniauth-ldap.rake
+- lib/ditty/templates/.gitignore
+- lib/ditty/templates/.rspec
+- lib/ditty/templates/.rubocop.yml
+- lib/ditty/templates/Rakefile
+- lib/ditty/templates/application.rb
+- lib/ditty/templates/config.ru
+- lib/ditty/templates/controller.rb.erb
+- lib/ditty/templates/env.example
+- lib/ditty/templates/lib/project.rb.erb
+- lib/ditty/templates/logs/.empty_directory
+- lib/ditty/templates/migration.rb.erb
+- lib/ditty/templates/model.rb.erb
+- lib/ditty/templates/pids/.empty_directory
+- lib/ditty/templates/policy.rb.erb
+- lib/ditty/templates/public/browserconfig.xml
+- lib/ditty/templates/public/css/sb-admin-2.min.css
+- lib/ditty/templates/public/css/styles.css
+- lib/ditty/templates/public/favicon.ico
+- lib/ditty/templates/public/images/apple-icon.png
+- lib/ditty/templates/public/images/favicon-16x16.png
+- lib/ditty/templates/public/images/favicon-32x32.png
+- lib/ditty/templates/public/images/launcher-icon-1x.png
+- lib/ditty/templates/public/images/launcher-icon-2x.png
+- lib/ditty/templates/public/images/launcher-icon-4x.png
+- lib/ditty/templates/public/images/mstile-150x150.png
+- lib/ditty/templates/public/images/safari-pinned-tab.svg
+- lib/ditty/templates/public/js/sb-admin-2.min.js
+- lib/ditty/templates/public/js/scripts.js
+- lib/ditty/templates/public/manifest.json.erb
+- lib/ditty/templates/settings.yml.erb
+- lib/ditty/templates/sidekiq.rb
+- lib/ditty/templates/sidekiq.yml
+- lib/ditty/templates/spec_helper.rb
+- lib/ditty/templates/type.rb.erb
+- lib/ditty/templates/views/display.haml.tt
+- lib/ditty/templates/views/edit.haml.tt
+- lib/ditty/templates/views/form.haml.tt
+- lib/ditty/templates/views/index.haml.tt
+- lib/ditty/templates/views/new.haml.tt
 - lib/ditty/version.rb
+- lib/rubocop/cop/ditty/call_services_directly.rb
 - migrate/20170207_base_tables.rb
 - migrate/20170208_audit_log.rb
 - migrate/20170416_audit_log_details.rb
 - migrate/20180307_password_reset.rb
-- public/browserconfig.xml
-- public/images/apple-icon.png
-- public/images/favicon-16x16.png
-- public/images/favicon-32x32.png
-- public/images/launcher-icon-1x.png
-- public/images/launcher-icon-2x.png
-- public/images/launcher-icon-4x.png
-- public/images/mstile-150x150.png
-- public/images/safari-pinned-tab.svg
-- public/manifest.json
+- migrate/20181209_add_user_login_traits.rb
+- migrate/20181209_extend_audit_log.rb
+- migrate/20190220_add_parent_id_to_roles.rb
+- spec/ditty/api_spec.rb
+- spec/ditty/controllers/roles_spec.rb
+- spec/ditty/controllers/user_login_traits_spec.rb
+- spec/ditty/controllers/users_spec.rb
+- spec/ditty/emails/base_spec.rb
+- spec/ditty/emails/forgot_password_spec.rb
+- spec/ditty/helpers/component_spec.rb
+- spec/ditty/models/user_spec.rb
+- spec/ditty/services/email_spec.rb
+- spec/ditty/services/logger_spec.rb
+- spec/ditty/services/settings_spec.rb
+- spec/ditty_spec.rb
+- spec/factories.rb
+- spec/fixtures/logger.yml
+- spec/fixtures/section.yml
+- spec/fixtures/settings.yml
+- spec/spec_helper.rb
+- spec/support/api_shared_examples.rb
+- spec/support/crud_shared_examples.rb
 - views/400.haml
+- views/403.haml
 - views/404.haml
+- views/500.haml
 - views/audit_logs/index.haml
 - views/auth/forgot_password.haml
 - views/auth/identity.haml
+- views/auth/ldap.haml
 - views/auth/login.haml
 - views/auth/register.haml
 - views/auth/register_identity.haml
 - views/auth/reset_password.haml
+- views/blank.haml
 - views/emails/base.haml
 - views/emails/forgot_password.haml
 - views/emails/layouts/action.haml
@@ -495,25 +721,38 @@ files:
 - views/index.haml
 - views/layout.haml
 - views/partials/actions.haml
+- views/partials/content_tag.haml
 - views/partials/delete_form.haml
 - views/partials/filter_control.haml
 - views/partials/footer.haml
 - views/partials/form_control.haml
 - views/partials/form_tag.haml
-- views/partials/navbar.haml
+- views/partials/navitems.haml
 - views/partials/notifications.haml
 - views/partials/pager.haml
 - 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
 - views/roles/display.haml
 - views/roles/edit.haml
 - views/roles/form.haml
 - views/roles/index.haml
 - views/roles/new.haml
+- views/user_login_traits/display.haml
+- views/user_login_traits/edit.haml
+- views/user_login_traits/form.haml
+- views/user_login_traits/index.haml
+- views/user_login_traits/new.haml
 - views/users/display.haml
 - views/users/edit.haml
+- views/users/form.haml
 - views/users/identity.haml
 - views/users/index.haml
+- views/users/login_traits.haml
 - views/users/new.haml
 - views/users/profile.haml
 - views/users/user.haml
@@ -536,8 +775,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Sinatra Based Application Framework