ditty 0.6.0 → 0.7.0.pre.rc1

data/views/{identity/reset.haml → auth/reset_password.haml}

@@ -3,9 +3,8 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: "#{settings.map_path}/auth/identity/reset" }
-          %input{ name: '_method', value: 'PUT', type: 'hidden' }
-          %input{ name: 'token', value: params['token'], type: 'hidden' }
+        = edit_form_tag("#{settings.map_path}/auth/reset-password") do
+          %input{ name: 'token', value: params[:token], type: 'hidden' }
           - if identity.errors[:password] && identity.errors[:password].include?('is not strong enough')
             .alert.alert-warning
               %p Make sure your password is at least 8 characters long, and including the following

data/views/layout.haml

@@ -36,8 +36,8 @@
       #page-wrapper
         -if defined?(title) || defined?(actions)
           .row
-            %h1.col-md-9= defined?(title) ? title : '&nbsp'
-            .col-md-3.text-left{ style: 'margin-top: 20px' }
+            %h1.col-md-9= defined?(title) ? title : ' '
+            .col-md-3.text-right{ style: 'margin-top: 20px' }
               = haml :'partials/actions', locals: { actions: defined?(actions) ? actions : {} }
         -else
           %div{ style: 'padding-top: 20px' }

data/views/partials/actions.haml

@@ -1,12 +1,14 @@
 - if actions.count > 1
-  .dropdown
-    %button.btn.btn-default.btn-block.dropdown-toggle{ type: 'button', id: 'actions-toggle', data: { toggle: 'dropdown' } }
-      Actions
+  - link, text = actions.shift
+  .btn-group.text-right
+    %a.btn.btn-primary{ href: link }= text
+    %button.btn.btn-primary.dropdown-toggle{ type: 'button', id: 'actions-toggle', data: { toggle: 'dropdown' } }
       %span.caret
+      %span.sr-only Toggle Dropdown
     %ul.dropdown-menu{ 'aria-labelledby': 'actions-toggle' }
       -actions.each do |k, v|
         %li
           %a{ href: k }= v
 - elsif actions.count > 0
   -actions.each do |k, v|
-    %a.btn.btn-primary.btn-block{ href: k }= v
+    %a.btn.btn-primary{ href: k }= v

data/views/partials/form_tag.haml

@@ -1,6 +1,7 @@
 %form{ { method: %i[get post].include?(form_verb.to_sym) ? form_verb : :post, action: url }.merge(attributes) }
+  = Rack::Csrf.csrf_tag(env) unless ENV['APP_ENV'] == 'test'
   - if form_verb.to_sym == :get && layout
     %input{ name: 'layout', value: layout, type: 'hidden' }
   - if %i[get post].include?(form_verb.to_sym) == false
     %input{ name: '_method', value: form_verb.upcase, type: 'hidden' }
-  = capture_haml(&block).chomp
+  = capture_haml(&block).chomp

data/views/partials/navbar.haml

@@ -9,16 +9,15 @@
       Ditty
 
   -if authenticated?
-    %form.nav.navbar-top-links.navbar-form.navbar-right{ action: "#{settings.map_path}/auth/identity", method: 'post' }
+    = 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
-      %input{ name: '_method', value: 'DELETE', type: 'hidden' }
       %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/identity" }
+        %a.btn.btn-link{ href: "#{settings.map_path}/auth/login" }
           Log In
   .navbar-default.sidebar{ role: 'navigation' }
     = haml :'partials/sidebar'

data/views/partials/search.haml

@@ -3,7 +3,7 @@
     - if self.class.const_defined?(:SEARCHABLE)
       .form-group
         .input-group
-          %input.form-control{ name: 'q', type: 'text', placeholder: 'Search...', value: params['q'] }
+          %input.form-control{ name: 'q', type: 'text', placeholder: 'Search...', value: params[:q] }
           .input-group-btn
             %button.btn.btn-primary{ type: 'submit' }
               %span.fa.fa-search

data/views/partials/sidebar.haml

@@ -27,11 +27,11 @@
                 = item[:text]
     - else
       %li.active
-        %a{ href: "#{settings.map_path}/auth/identity" }
+        %a{ href: "#{settings.map_path}/auth/login" }
           %i.fa.fa-user.fa-fw
           Log In
-      - if policy(::Ditty::Identity).register?
+      - if policy(::Ditty::User).register?
         %li
-          %a{ href: "#{settings.map_path}/auth/identity/register" }
+          %a{ href: "#{settings.map_path}/auth/register" }
             %i.fa.fa-pencil-square-o.fa-fw
             Register

data/views/roles/display.haml

@@ -12,7 +12,6 @@
             %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              %form{ method: 'post', action: "#{base_path}/#{entity.id}" }
-                %input{ name: '_method', value: 'DELETE', type: 'hidden' }
+              = delete_form_tag("#{base_path}/#{entity.id}") do
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2

data/views/roles/index.haml

@@ -15,8 +15,4 @@
             %tr
               %td.text-center{ colspan: 1 } No records
 
-      - if policy(::Ditty::Role).create?
-        .panel-body.text-right
-          %a.btn.btn-primary{ href: "#{base_path}/new" } New Role
-
 =pagination(list, base_path)

data/views/users/display.haml

@@ -27,8 +27,7 @@
               %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              %form{ method: 'post', action: "#{base_path}/#{entity.id}" }
-                %input{ name: '_method', value: 'DELETE', type: 'hidden' }
+              = delete_form_tag("#{base_path}/#{entity.id}") do
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2
 
@@ -40,8 +39,7 @@
         .panel-heading
           %h4 Change Password
         .panel-body
-          %form.form-horizontal{ method: 'post', action: "#{base_path}/#{entity.id}/identity" }
-            %input{ name: '_method', value: 'PUT', type: 'hidden' }
+          = edit_form_tag("#{base_path}/#{entity.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' }

data/views/users/index.haml

@@ -12,16 +12,17 @@
             %th Roles
             %th Signed Up
         %tbody
-          - list.all.each do |entity|
+          - 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
             %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')
-      - if policy(::Ditty::User).create?
-        .panel-body.text-right
-          %a.btn.btn-primary{ href: "#{base_path}/new" } New User
+              %td.text-center{ colspan: 5 } No records
 
 =pagination(list, base_path)

data/views/users/profile.haml

@@ -26,8 +26,7 @@
               %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              %form{ method: 'post', action: "#{base_path}/#{entity.id}" }
-                %input{ name: '_method', value: 'DELETE', type: 'hidden' }
+              = delete_form_tag("#{base_path}/#{entity.id}") do
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2
 
@@ -38,8 +37,7 @@
       .panel-heading
         %h4 Change Password
       .panel-body
-        %form.form-horizontal{ method: 'post', action: "#{base_path}/#{entity.id}/identity" }
-          %input{ name: '_method', value: 'PUT', type: 'hidden' }
+        = edit_form_tag("#{base_path}/#{entity.id}/identity") do
           = form_control(:old_password, identity, type: 'password', placeholder: 'Your current password')
           = form_control(:password, identity, type: 'password', placeholder: 'Your new password')
           = form_control(:password_confirmation, identity, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0.pre.rc1
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-22 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -248,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rack_csrf
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +332,20 @@ dependencies:
     - - "~>"
       - !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'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -400,6 +428,7 @@ files:
 - 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
@@ -413,6 +442,7 @@ files:
 - lib/ditty/helpers/response.rb
 - lib/ditty/helpers/views.rb
 - lib/ditty/listener.rb
+- lib/ditty/middleware/accept_extension.rb
 - lib/ditty/middleware/error_catchall.rb
 - lib/ditty/models/audit_log.rb
 - lib/ditty/models/base.rb
@@ -446,8 +476,15 @@ files:
 - public/images/mstile-150x150.png
 - public/images/safari-pinned-tab.svg
 - public/manifest.json
+- views/400.haml
 - views/404.haml
 - views/audit_logs/index.haml
+- views/auth/forgot_password.haml
+- views/auth/identity.haml
+- views/auth/login.haml
+- views/auth/register.haml
+- views/auth/register_identity.haml
+- views/auth/reset_password.haml
 - views/emails/base.haml
 - views/emails/forgot_password.haml
 - views/emails/layouts/action.haml
@@ -455,10 +492,6 @@ files:
 - views/emails/layouts/billing.haml
 - views/embedded.haml
 - views/error.haml
-- views/identity/forgot.haml
-- views/identity/login.haml
-- views/identity/register.haml
-- views/identity/reset.haml
 - views/index.haml
 - views/layout.haml
 - views/partials/actions.haml
@@ -499,9 +532,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7

data/views/identity/login.haml

@@ -1,29 +0,0 @@
-.row
-  .col-sm-3
-  .col-sm-6
-    .panel.panel-default
-      .panel-body
-        %form{ method: 'post', action: "#{settings.map_path}/auth/identity/callback" }
-          .form-group
-            %label.control-label Email
-            %input.form-control.border-input{ name: 'username', tabindex: '1' }
-          .form-group
-            %label.control-label{ style: 'display: block' }
-              Password
-              %a{ href: "#{settings.map_path}/auth/identity/forgot", style: 'float: right', tabindex: '5' }
-                Forgot?
-            %input.form-control.border-input{ name: 'password', type: 'password', tabindex: '2' }
-          %button.btn.btn-primary{ type: 'submit', tabindex: '3' } Log In
-          - if policy(::Ditty::Identity).register?
-            .pull-right
-              No account yet?
-              %a.btn.btn-default{ href: "#{settings.map_path}/auth/identity/register", tabindex: '4' } Register
-        .row
-          .col-sm-12= "&nbsp"
-        - if Ditty::Services::Authentication.provides? 'google_oauth2'
-          .row
-            .col-sm-8.col-sm-push-2
-              %a.btn.btn-block.btn-default{ href: "#{settings.map_path}/auth/google_oauth2" }
-                %i.fa.fa-google
-                Log in with Google
-  .col-sm-3

data/views/identity/register.haml

@@ -1,29 +0,0 @@
-.row
-  .col-md-2
-  .col-md-8
-    .panel.panel-default
-      .panel-body
-        %form.form-horizontal{ method: 'post', action: "#{settings.map_path}/auth/identity/new" }
-          = form_control(:username, identity, label: 'Email', placeholder: 'your@email.com')
-          = form_control(:password, identity, label: 'Password', type: :password)
-          = form_control(:password_confirmation, identity, label: 'Confirm Password', type: :password)
-
-          - if identity.errors[:password] && identity.errors[:password].include?('is not strong enough')
-            .alert.alert-warning
-              %p Make sure your password is at least 8 characters long, and including the following
-              %ul
-                %li Upper- and lowercase letters
-                %li Numbers
-                %li Special Characters
-
-          - if policy(::Ditty::Identity).register?
-            %button.btn.btn-primary{ type: 'submit' } Register
-        .row
-          .col-sm-12= "&nbsp"
-        - if Ditty::Services::Authentication.provides? 'google_oauth2'
-          .row
-            .col-sm-8.col-sm-push-2
-              %a.btn.btn-block.btn-default{ href: "#{settings.map_path}/auth/google_oauth2" }
-                %i.fa.fa-google
-                Register with Google
-  .col-md-2