ditty 0.7.2 → 0.8.0

data/views/emails/layouts/alert.haml

@@ -3,7 +3,8 @@
   %head
     %meta{:content => "width=device-width", :name => "viewport"}/
     %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
-    %title Alerts e.g. approaching your limit
+    %title
+      = subject
     :css
       img {
       max-width: 100%;

data/views/emails/layouts/billing.haml

@@ -3,7 +3,8 @@
   %head
     %meta{:content => "width=device-width", :name => "viewport"}/
     %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
-    %title Billing e.g. invoices and receipts
+    %title
+      = subject
     :css
       img {
       max-width: 100%;

data/views/error.haml

@@ -1,4 +1,9 @@
-%h2 Whoops!
+- if ENV['APP_ENV'] != 'production'
+  %p.lead
+    = error.class
+    %br
+    %small
+      = error.message
 
-%p.lead
-  = error.class
+  %pre
+    = error.backtrace.join("\n")

data/views/partials/form_control.haml

@@ -1,20 +1,24 @@
-%div{ class: "form-group#{model.errors[field] ? ' has-error' : ''}" }
-  %label.col-sm-3.control-label{ for: attributes[:id] }= label
-  .col-sm-9
-    - type = attributes.delete(:type)
-    - if type == 'select'
-      - options = attributes.delete(:options)
-      %select{attributes}
-        - if attributes[:multiple]
-          - options.each do |k,v| k ||= v;  v ||= k;
-            %option{ value: k, selected: (model.send(field).map(&:id).include? k)}= v
-        - else
-          %option{ value: ""} -- Select One --
-          - options.each do |k,v| k ||= v;  v ||= k;
-            %option{ value: k, selected: [model[field].to_s, default].include?(k.to_s)}= v
-    - elsif type == 'textarea'
-      %textarea{attributes}= preserve(model[field])
-    - else
-      %input{attributes, type: type, value: model[field] || default}
-    - if model.errors[field]
-      %p.help-block.text-danger= model.errors[field].join(', ')
+- type = attributes.delete(:type)
+- if type == 'hidden'
+  %input{attributes, type: type, value: model[field] || default}
+- else
+  %div{ class: "form-group#{model.errors[field] ? ' has-error' : ''}" }
+    - if type != 'file'
+      %label.col-sm-3.control-label{ for: attributes[:id] }= label
+    .col-sm-9
+      - if type == 'select'
+        - options = attributes.delete(:options)
+        %select{attributes}
+          - if attributes[:multiple]
+            - options.each do |k,v| k ||= v;  v ||= k;
+              %option{ value: k, selected: (model.send(field).map(&:id).include? k)}= v
+          - else
+            %option{ value: ""} -- Select One --
+            - options.each do |k,v| k ||= v;  v ||= k;
+              %option{ value: k, selected: [model[field].to_s, default].include?(k.to_s)}= v
+      - elsif type == 'textarea'
+        %textarea{attributes}= preserve(model[field] || default)
+      - else
+        %input{attributes, type: type, value: model[field] || default}
+      - if model.errors[field]
+        %p.help-block.text-danger= model.errors[field].join(', ')

data/views/partials/navbar.haml

@@ -6,18 +6,17 @@
       %span.icon-bar
       %span.icon-bar
     %span.navbar-brand
-      Ditty
+      = config('ditty.title', 'Ditty')
+
+  %nav.nav.navbar-top-links.navbar-right.navbar-form{ style: 'border: 0;' }
+    - if authenticated?
+      = delete_form_tag("#{settings.map_path}/auth") do
+        %a.btn.btn-default{ href: "#{settings.map_path}/users/profile" } My Account
+        %button.btn.btn-default{ type: 'submit' }
+          Logout
+    - else
+      %a.btn.btn-default{ href: "#{settings.map_path}/auth/login" }
+        Log In
 
-  -if authenticated?
-    = delete_form_tag("#{settings.map_path}/auth", attributes: { class: 'nav navbar-top-links navbar-form navbar-right' }) do
-      %a.btn.btn-default{ href: "#{settings.map_path}/users/profile" } My Account
-      %button.btn.btn-default{ type: 'submit' }
-        / %i.ti-panel
-        Logout
-  - else
-    %ul.nav.navbar-top-links.navbar-right
-      %li
-        %a.btn.btn-link{ href: "#{settings.map_path}/auth/login" }
-          Log In
   .navbar-default.sidebar{ role: 'navigation' }
     = haml :'partials/sidebar'

data/views/partials/sidebar.haml

@@ -26,7 +26,7 @@
                 %i.fa.fa-fw{ class: "fa-#{item[:icon]}" }
                 = item[:text]
     - else
-      %li.active
+      %li
         %a{ href: "#{settings.map_path}/auth/login" }
           %i.fa.fa-user.fa-fw
           Log In

data/views/roles/index.haml

@@ -1,6 +1,8 @@
 .row
   .col-md-12
     .panel.panel-default
+      .panel-body
+        = haml :'partials/search'
       %table.table.table-striped
         %thead
           %tr

data/views/user_login_traits/display.haml

@@ -0,0 +1,32 @@
+.row
+  .col-md-2
+  .col-md-8
+    .panel.panel-default
+      .panel-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-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
+          .col-md-6.text-right
+            - if policy(entity).delete?
+              = delete_form_tag("#{base_path}/#{entity.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
+    .panel.panel-default
+      .panel-body
+        = edit_form_tag "#{base_path}/#{entity.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,30 @@
+.row
+  .col-md-12
+    .panel.panel-default
+      .panel-body
+        = haml :'partials/search'
+      %table.table.table-striped
+        %thead
+          %tr
+            %th User
+            %th IP Address
+            %th Device
+            %th Platform
+            %th Browser
+            %th Last Seen
+        %tbody
+          - if list.count.positive?
+            - list.all.each do |entity|
+              %tr
+                %td= entity.user&.email || 'Unknown'
+                %td
+                  %a{ href: "#{base_path}/#{entity.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
+    .panel.panel-default
+      .panel-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

@@ -46,4 +46,4 @@
               Change Password
     .col-md-2
 
-
+= haml :'users/login_traits', locals: { user_login_traits: entity.user_login_traits }

data/views/users/login_traits.haml

@@ -0,0 +1,27 @@
+.row
+  .col-md-2
+  .col-md-8
+    .panel.panel-default
+      .panel-heading
+        %h4 Logins
+      %table.table
+        %thead
+          %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
+  .col-md-2

data/views/users/profile.haml

@@ -44,3 +44,5 @@
           %button.btn.btn-primary{ type: 'submit' }
             Change Password
   .col-md-2
+
+= haml :'users/login_traits', locals: { user_login_traits: entity.user_login_traits }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2019-01-30 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
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -165,33 +179,33 @@ dependencies:
       - !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
@@ -347,33 +361,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !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
@@ -432,6 +446,7 @@ files:
 - lib/ditty/controllers/component.rb
 - lib/ditty/controllers/main.rb
 - lib/ditty/controllers/roles.rb
+- lib/ditty/controllers/user_login_traits.rb
 - lib/ditty/controllers/users.rb
 - lib/ditty/db.rb
 - lib/ditty/emails/base.rb
@@ -449,23 +464,30 @@ 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/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
+- migrate/20181209_add_user_login_traits.rb
+- migrate/20181209_extend_audit_log.rb
 - public/browserconfig.xml
 - public/images/apple-icon.png
 - public/images/favicon-16x16.png
@@ -477,10 +499,12 @@ files:
 - public/images/safari-pinned-tab.svg
 - public/manifest.json
 - views/400.haml
+- views/403.haml
 - views/404.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
@@ -510,10 +534,16 @@ files:
 - 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/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 +566,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.2
 signing_key: 
 specification_version: 4
 summary: Sinatra Based Application Framework