ditty 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fea055fdddd9b21951527617015b2926b064191dfda753fd930037738122c50
-  data.tar.gz: b8d1cc9f9430ff39d3f345719a0988f51bc03f4a7f718fabe78a69d314e5762a
+  metadata.gz: a6c4bdcc080384afbc372c0811697ff421ab6ed3d552ec912cd0a3c0f7ed82da
+  data.tar.gz: 1f09c726e251d380cd0b55d8c552b064dae7c6811f3a24b0e16a38e55a0c6408
 SHA512:
-  metadata.gz: eafbcf7aaadabc7e9458f403cf2252b3311dc9a716f08884c1651055426864e796866e60f7c3986be4405cc83d3d0552d49fca43e2764e516066884a56e7c4ea
-  data.tar.gz: f2f3b62750d7711bdd59ee7e0df4630ec89992cda013d5e5e96736aa541a5a2cd55ff096de65b774bef4ab74c90e0983a7a3826d30a498e3a3a474bd1cdfc1cf
+  metadata.gz: d0f86ea3db1913ad4c603a6ba96c535705589fd7fbd28ea3fbe3a262d956838fdc2c27e1950e6aae2f6e1bce20e3ffd0dc32e0bde74ae371869c3ac1922a5b03
+  data.tar.gz: ad5ea5fe818c8f8d20177082f11ecfeb176b4969b21cb5155410a4f8dbbc581dde05d3cb4c468898a86dd16a8aede7f487f3fd36b60e187df094280f805e1c8e

data/.travis.yml

@@ -1,13 +1,15 @@
 sudo: false
 language: ruby
 rvm:
-- 2.4.0
-- 2.3.3
-- 2.2.6
+  - 2.5.1
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
 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:

data/ditty.gemspec

@@ -32,13 +32,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bcrypt', '~> 3.1'
   spec.add_dependency 'haml', '~> 5.0'
   spec.add_dependency 'logger', '~> 1.0'
+  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 'rake', '~> 12.0'
-  spec.add_dependency 'sequel', '~> 4.0'
-  spec.add_dependency 'sinatra', '~> 2.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 'tilt', '>= 2'

data/lib/ditty/controllers/application.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'wisper'
+require 'oga'
 require 'sinatra/base'
 require 'sinatra/flash'
 require 'sinatra/respond_with'
@@ -30,10 +31,16 @@ module Ditty
     use Rack::PostBodyContentTypeParser
     use Rack::MethodOverride
 
-    def view_location
-      return settings.view_location if settings.view_location
-      return underscore(pluralize(demodulize(settings.model_class))) if settings.model_class
-      underscore(demodulize(self.class))
+    helpers do
+      def base_path
+        settings.base_path || "#{settings.map_path}/#{dasherize(view_location)}"
+      end
+
+      def view_location
+        return settings.view_location if settings.view_location
+        return underscore(pluralize(demodulize(settings.model_class))) if settings.model_class
+        underscore(demodulize(self.class))
+      end
     end
 
     configure :production do
@@ -54,7 +61,7 @@ module Ditty
       respond_to do |format|
         status 404
         format.html do
-          haml :'404', locals: { title: '4 oh 4' }
+          haml :'404', locals: { title: '4 oh 4' }, layout: layout
         end
         format.json do
           json code: 404, errors: ['Not Found']
@@ -67,7 +74,7 @@ module Ditty
         status 401
         format.html do
           flash[:warning] = 'Please log in first.'
-          redirect "#{settings.map_path}/auth/identity"
+          redirect with_layout("#{settings.map_path}/auth/identity")
         end
         format.json do
           json code: 401, errors: ['Not Authenticated']
@@ -82,10 +89,10 @@ module Ditty
         status 400
         format.html do
           action = entity.id ? :edit : :new
-          haml :"#{view_location}/#{action}", locals: { entity: entity, title: heading(action) }
+          haml :"#{view_location}/#{action}", locals: { entity: entity, title: heading(action) }, layout: layout
         end
         format.json do
-          json code: 400, errors: errors
+          json code: 400, errors: errors, full_errors: errors.full_messages
         end
       end
     end
@@ -97,7 +104,7 @@ module Ditty
       respond_to do |format|
         status 400
         format.html do
-          haml :error, locals: { title: 'Something went wrong', error: error }
+          haml :error, locals: { title: 'Something went wrong', error: error }, layout: layout
         end
         format.json do
           json code: 400, errors: ['Invalid Relation Specified']
@@ -112,7 +119,7 @@ module Ditty
       respond_to do |format|
         status 500
         format.html do
-          haml :error, locals: { title: 'Something went wrong', error: error }
+          haml :error, locals: { title: 'Something went wrong', error: error }, layout: layout
         end
         format.json do
           json code: 500, errors: ['Something went wrong']
@@ -124,9 +131,23 @@ module Ditty
       ::Ditty::Services::Logger.instance.debug "Running with #{self.class}"
       if request.path =~ /.*\.json\Z/
         content_type :json
+        request.path_info = request.path_info.gsub(/.json$/,'')
       end
       # Ensure the accept header is set. People forget to include it in API requests
       content_type(:json) if request.accept.count.eql?(1) && request.accept.first.to_s.eql?('*/*')
     end
+
+    after do
+      return if params['layout'].nil?
+      response.body = response.body.map do |resp|
+        document = Oga.parse_html(resp)
+        document.css('a').each do |elm|
+          unless (href = elm.get('href')).nil?
+            elm.set 'href', with_layout(href)
+          end
+        end
+        document.to_xml
+      end
+    end
   end
 end

data/lib/ditty/controllers/component.rb

@@ -33,7 +33,10 @@ module Ditty
       authorize settings.model_class, :create
 
       entity = settings.model_class.new(permitted_attributes(settings.model_class, :create))
-      haml :"#{view_location}/new", locals: { entity: entity, title: heading(:new) }
+      session[:redirect_to] = request.fullpath
+      haml :"#{view_location}/new",
+           locals: { entity: entity, title: heading(:new) },
+           layout: layout
     end
 
     # Create
@@ -63,7 +66,9 @@ module Ditty
       halt 404 unless entity
       authorize entity, :update
 
-      haml :"#{view_location}/edit", locals: { entity: entity, title: heading(:edit) }
+      haml :"#{view_location}/edit",
+           locals: { entity: entity, title: heading(:edit) },
+           layout: layout
     end
 
     # Update

data/lib/ditty/controllers/main.rb

@@ -40,7 +40,7 @@ module Ditty
         self.current_user = user
         log_action(:identity_login, user: user)
         flash[:success] = 'Logged In'
-        redirect "#{settings.map_path}/"
+        redirect env['omniauth.origin'] || "#{settings.map_path}/"
       else
         # Failed Login
         broadcast(:identity_failed_login)

data/lib/ditty/controllers/users.rb

@@ -8,6 +8,8 @@ require 'ditty/policies/identity_policy'
 
 module Ditty
   class Users < Ditty::Component
+    SEARCHABLE = %i[name surname email].freeze
+
     set model_class: User
     set track_actions: true
 
@@ -20,11 +22,7 @@ module Ditty
     get '/new' do
       authorize settings.model_class, :create
 
-      locals = {
-        title: heading(:new),
-        entity: User.new,
-        identity: Identity.new
-      }
+      locals = { title: heading(:new), entity: User.new, identity: Identity.new }
       haml :"#{view_location}/new", locals: locals
     end
 
@@ -43,9 +41,17 @@ module Ditty
       identity = locals[:identity] = Identity.new(identity_params)
 
       DB.transaction(isolation: :serializable) do
-        identity.save # Will trigger a Sequel::ValidationFailed exception if the model is incorrect
+        begin
+          identity.save
+        rescue Sequel::ValidationFailed
+          raise unless request.accept? 'text/html'
+          status 400
+          locals = { title: heading(:new), entity: user, identity: identity }
+          return haml(:"#{view_location}/new", locals: locals)
+        end
         user.save
         user.add_identity identity
+
         if roles
           roles.each do |role_id|
             user.add_role(role_id) unless user.roles.map(&:id).include? role_id.to_i

data/lib/ditty/helpers/authentication.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'ditty/models/user'
 require 'ditty/models/role'
 require 'ditty/models/identity'
@@ -7,10 +8,8 @@ module Ditty
   module Helpers
     module Authentication
       def current_user
-        user_id = current_user_id
-        self.current_user = anonymous_user if user_id.nil?
-        @users ||= Hash.new { |h, k| h[k] = User[k] }
-        @users[user_id]
+        return anonymous_user if current_user_id.nil?
+        User[current_user_id]
       end
 
       def current_user=(user)
@@ -37,25 +36,13 @@ module Ditty
       end
 
       def logout
-        env['rack.session'].delete('user_id')
-      end
-
-      def check_basic(request)
-        auth = Rack::Auth::Basic::Request.new(request.env)
-        return false unless auth.provided? && auth.basic?
-
-        identity = ::Ditty::Identity.find(username: auth.credentials[0])
-        identity ||= ::Ditty::Identity.find(username: CGI.unescape(auth.credentials[0]))
-        return false unless identity
-        self.current_user = identity.user if identity.authenticate(auth.credentials[1])
+        env['rack.session'].delete('user_id') unless env['rack.session'].nil?
+        env.delete('omniauth.auth')
       end
 
       def anonymous_user
-        return @anonymous_user if defined? @anonymous_user
-        @anonymous_user ||= begin
-          role = ::Ditty::Role.where(name: 'anonymous').first
-          ::Ditty::User.where(roles: role).first unless role.nil?
-        end
+        role = ::Ditty::Role.where(name: 'anonymous').first
+        ::Ditty::User.where(roles: role).first unless role.nil?
       end
     end
 

data/lib/ditty/helpers/component.rb

@@ -36,10 +36,6 @@ module Ditty
         settings.dehumanized || underscore(heading)
       end
 
-      def base_path
-        settings.base_path || "#{settings.map_path}/#{dasherize(view_location)}"
-      end
-
       def filters
         self.class.const_defined?('FILTERS') ? self.class::FILTERS : []
       end

data/lib/ditty/helpers/pundit.rb

@@ -21,8 +21,9 @@ module Ditty
                         'permitted_attributes'
                       end
 
+        policy_fields = policy.public_send(method_name)
         request.params.fetch(param_key, {}).select do |key, _value|
-          policy.public_send(method_name).include? key.to_sym
+          policy_fields.include? key.to_sym
         end
       end
 

data/lib/ditty/helpers/response.rb

@@ -9,15 +9,17 @@ module Ditty
             actions = {}
             actions["#{base_path}/new"] = "New #{heading}" if policy(settings.model_class).create?
             haml :"#{view_location}/index",
-                 locals: { list: result, title: heading(:list), actions: actions }
+                 locals: { list: result, title: heading(:list), actions: actions },
+                 layout: layout
           end
           format.json do
             # TODO: Add links defined by actions (New #{heading})
+            total = result.respond_to?(:pagination_record_count) ? result.pagination_record_count : result.count
             json(
               'items' => result.all.map(&:for_json),
               'page' => (params['page'] || 1).to_i,
               'count' => result.count,
-              'total' => result.pagination_record_count
+              'total' => total
             )
           end
         end
@@ -27,7 +29,7 @@ module Ditty
         respond_to do |format|
           format.html do
             flash[:success] = "#{heading} Created"
-            redirect "#{base_path}/#{entity.id}"
+            redirect with_layout("#{base_path}/#{entity.id}")
           end
           format.json do
             content_type :json
@@ -42,7 +44,9 @@ module Ditty
             actions = {}
             actions["#{base_path}/#{entity.id}/edit"] = "Edit #{heading}" if policy(entity).update?
             title = heading(:read) + (entity.respond_to?(:name) ? ": #{entity.name}" : '')
-            haml :"#{view_location}/display", locals: { entity: entity, title: title, actions: actions }
+            haml :"#{view_location}/display",
+                 locals: { entity: entity, title: title, actions: actions },
+                 layout: layout
           end
           format.json do
             # TODO: Add links defined by actions (Edit #{heading})
@@ -56,7 +60,7 @@ module Ditty
           format.html do
             # TODO: Ability to customize the return path and message?
             flash[:success] = "#{heading} Updated"
-            redirect "#{base_path}/#{entity.id}"
+            redirect with_layout("#{base_path}/#{entity.id}")
           end
           format.json do
             headers 'Location' => "#{base_path}/#{entity.id}"
@@ -69,11 +73,11 @@ module Ditty
         respond_to do |format|
           format.html do
             flash[:success] = "#{heading} Deleted"
-            redirect base_path.to_s
+            redirect with_layout(base_path.to_s)
           end
           format.json do
             content_type :json
-            headers 'Location' => "#{base_path}"
+            headers 'Location' => base_path.to_s
             status 204
           end
         end

data/lib/ditty/helpers/views.rb

@@ -3,6 +3,20 @@
 module Ditty
   module Helpers
     module Views
+      def layout
+        return :embedded if request.params['layout'] == 'embedded'
+        :layout
+      end
+
+      def with_layout(url)
+        uri = URI.parse(url)
+        # Don't set the layout if there's none. Don't set the layout for external URIs
+        return url if params['layout'].nil? || uri.host
+        qs = { 'layout' => params['layout'] }.merge(uri.query ? CGI.parse(uri.query) : {})
+        uri.query = Rack::Utils.build_query qs
+        uri.to_s
+      end
+
       def form_control(name, model, opts = {})
         label = opts.delete(:label) || name.to_s.titlecase
         klass = opts.delete(:class) || 'form-control' unless opts[:type] == 'file'
@@ -41,15 +55,38 @@ module Ditty
         "<div id='#{id}'>\n" + messages.join + '</div>'
       end
 
+      def query_string(add = {})
+        qs = params.clone.merge(add)
+        qs.delete('captures')
+        Rack::Utils.build_query qs
+      end
+
       def delete_form(entity, label = 'Delete')
         locals = { delete_label: label, entity: entity }
         haml :'partials/delete_form', locals: locals
       end
 
-      def query_string(add = {})
-        qs = params.clone.merge(add)
-        qs.delete('captures')
-        Rack::Utils.build_query qs
+      def delete_form_tag(url, options = {}, &block)
+        options[:form_verb] = :delete
+        form_tag(url, options, &block)
+      end
+
+      def edit_form_tag(url, options = {}, &block)
+        options[:form_verb] = :put
+        form_tag(url, options, &block)
+      end
+
+      def new_form_tag(url, options = {}, &block)
+        options[:form_verb] = :post
+        form_tag(url, options, &block)
+      end
+
+      def form_tag(url, options = {}, &block)
+        options[:form_verb] ||= :post
+        options[:attributes] ||= {}
+        options[:attributes] = { 'class': 'form-horizontal' }.merge options[:attributes]
+        options[:url] = options[:form_verb].to_sym == :get  ? url : with_layout(url)
+        haml :'partials/form_tag', locals: options.merge(block: block)
       end
 
       def pagination(list, base_path, qp = {})

data/lib/ditty/helpers/wisper.rb

@@ -6,7 +6,7 @@ module Ditty
   module Helpers
     module Wisper
       def log_action(action, args = {})
-        args[:user] ||= current_user
+        args[:user] = current_user unless args.key? :user
         broadcast(action, args)
       end
     end

data/lib/ditty/models/identity.rb

@@ -21,6 +21,7 @@ module Ditty
     end
 
     def authenticate(unencrypted)
+      return false if crypted_password.blank?
       self if ::BCrypt::Password.new(crypted_password) == unencrypted
     end
 

data/lib/ditty/services/logger.rb

@@ -17,7 +17,7 @@ module Ditty
         @loggers = []
         config.each do |values|
           klass = values['class'].constantize
-          opts = values['options'] || nil
+          opts = tr(values['options']) || nil
           logger = klass.new(opts)
           if values['level']
             logger.level = klass.const_get(values['level'].to_sym)
@@ -40,6 +40,13 @@ module Ditty
         @config ||= File.exist?(CONFIG) ? YAML.load_file(CONFIG) : default
       end
 
+      def tr(val)
+        {
+          '$stdout' => $stdout,
+          '$stderr' => $stderr
+        }[val] || val
+      end
+
       def default
         [{ 'name' => 'default', 'class' => 'Logger' }]
       end

data/lib/ditty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ditty
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/views/embedded.haml

@@ -0,0 +1,42 @@
+!!! 5
+%html{ lang: 'en' }
+  %head
+    %meta{ charset: 'utf-8' }
+    %meta{ 'http-equiv' => 'X-UA-Compatible', 'content' => 'IE=edge,chrome=1' }
+    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
+    %meta{ name: 'theme-color', content: '#ffffff' }
+    %link{ rel: 'manifest', href: '/manifest.json' }
+    %link{ rel: 'icon', type: 'image/png', sizes: '32x32', href: '#{request.base_url}/images/favicon-32x32.png' }
+    %link{ rel: 'icon', type: 'image/png', sizes: '16x16', href: '#{request.base_url}/images/favicon-16x16.png' }
+    %link{ rel: 'apple-touch-icon', sizes: '76x76', href: '/images/apple-icon.png' }
+    %link{ rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5' }
+
+    %title
+      Ditty
+      - if defined? title
+        = "- #{title}"
+
+    %meta{ name: 'description', content: '' }
+    %meta{ name: 'author', content: '' }
+
+    / Le styles
+    %link{ rel: 'stylesheet', href: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/startbootstrap-sb-admin-2/3.3.7+1/css/sb-admin-2.min.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: 'https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', media: 'screen' }
+    /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
+    /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
+
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/startbootstrap-sb-admin-2/3.3.7+1/js/sb-admin-2.min.js' }
+  %body
+    .container-fluid
+      .row
+        .col-md-12
+          = haml :'partials/notifications'
+
+      = yield
+
+    / Placed at the end of the document so the pages load faster
+    %script{ type: 'text/javascript', src: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/react/15.4.1/react.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.6.0/Chart.bundle.min.js' }

data/views/identity/login.haml

@@ -2,12 +2,10 @@
   .col-sm-3
   .col-sm-6
     .panel.panel-default
-      .panel-heading
-        %h4 Login
       .panel-body
         %form{ method: 'post', action: "#{settings.map_path}/auth/identity/callback" }
           .form-group
-            %label.control-label Username
+            %label.control-label Email
             %input.form-control.border-input{ name: 'username' }
           .form-group
             %label.control-label Password

data/views/identity/register.haml

@@ -2,13 +2,20 @@
   .col-md-2
   .col-md-8
     .panel.panel-default
-      .panel-heading
-        %h4 Register
       .panel-body
         %form.form-horizontal{ method: 'post', action: "#{settings.map_path}/auth/identity/new" }
-          = form_control(:username, identity, label: 'Username', placeholder: 'Your username')
+          = 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)
 
-          %button.btn.btn-primary{ type: 'submit' } Register
+          - 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
   .col-md-2

data/views/layout.haml

@@ -34,10 +34,16 @@
     #wrapper
       = haml :'partials/navbar', locals: { title: (defined?(title) ? title : 'Ditty') }
       #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' }
+              = haml :'partials/actions', locals: { actions: defined?(actions) ? actions : {} }
+        -else
+          %div{ style: 'padding-top: 20px' }
+
         .row
           .col-md-12
-            -if defined? title
-              %h1.page-header= title
             = haml :'partials/notifications'
 
         = yield

data/views/partials/actions.haml

@@ -0,0 +1,12 @@
+- if actions.count > 1
+  .dropdown
+    %button.btn.btn-default.btn-block.dropdown-toggle{ type: 'button', id: 'actions-toggle', data: { toggle: 'dropdown' } }
+      Actions
+      %span.caret
+    %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

data/views/partials/delete_form.haml

@@ -1,4 +1,2 @@
-<form method="post" action="<%= base_path %>/<%= entity.id %>">
-  <input type="hidden" name="_method" value="DELETE">
-  <button type="submit" class="btn btn-danger"><%= delete_label %></button>
-</form>
+= delete_form_tag "#{base_path}/#{entity.id}" do
+  %button.btn.btn-danger{ type: 'submit' }= delete_label

data/views/partials/footer.haml

@@ -2,4 +2,4 @@
   %hr
   .copyright
     :plain
-      &copy; <script>document.write(new Date().getFullYear())</script>, Automation Exchange
+      &copy; <script>document.write(new Date().getFullYear())</script>, Ditty

data/views/partials/form_tag.haml

@@ -0,0 +1,6 @@
+%form{ { method: %i[get post].include?(form_verb.to_sym) ? form_verb : :post, action: url }.merge(attributes) }
+  - 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

data/views/partials/search.haml

@@ -1,5 +1,5 @@
 - if self.class.const_defined?(:SEARCHABLE) || self.class.const_defined?(:FILTERS)
-  %form{ method: 'get', action: base_path }
+  = form_tag(base_path, form_verb: :get, attributes: { class: '' }) do
     - if self.class.const_defined?(:SEARCHABLE)
       .form-group
         .input-group

data/views/roles/edit.haml

@@ -3,8 +3,7 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: "#{base_path}/#{entity.id}" }
-          %input{ name: '_method', value: 'PUT', type: 'hidden' }
+        = edit_form_tag "#{base_path}/#{entity.id}" do
           = haml :'roles/form', locals: { entity: entity }
           %button.btn.btn-primary{ type: 'submit' }
             Update Role

data/views/roles/new.haml

@@ -3,7 +3,7 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: base_path }
+        = new_form_tag base_path do
           = haml :'roles/form', locals: { entity: entity }
           %button.btn.btn-primary{ type: 'submit' }
             Create Role

data/views/users/edit.haml

@@ -3,8 +3,7 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: "#{base_path}/#{entity.id}" }
-          %input{ name: '_method', value: 'PUT', type: 'hidden' }
+        = edit_form_tag "#{base_path}/#{entity.id}" do
           = haml :'users/user', locals: { user: entity }
           %button.btn.btn-primary{ type: 'submit' }
             Update User

data/views/users/identity.haml

@@ -1,3 +1,10 @@
 = form_control(:username, identity, label: 'Email', placeholder: 'Your email address')
+- 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
 = form_control(:password, identity, type: 'password', placeholder: 'Your password')
 = form_control(:password_confirmation, identity, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password')

data/views/users/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/users/new.haml

@@ -3,8 +3,8 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: base_path }
-          = haml :'users/identity', locals: { identity: Ditty::Identity.new }
+        = new_form_tag base_path do
+          = haml :'users/identity', locals: { identity: identity }
           = haml :'users/user', locals: { user: entity }
           %button.btn.btn-primary{ type: 'submit' }
             Create User

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-03 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: oga
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -238,28 +252,28 @@ dependencies:
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   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
@@ -384,15 +398,18 @@ files:
 - public/manifest.json
 - views/404.haml
 - views/audit_logs/index.haml
+- views/embedded.haml
 - views/error.haml
 - views/identity/login.haml
 - views/identity/register.haml
 - views/index.haml
 - views/layout.haml
+- views/partials/actions.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/notifications.haml
 - views/partials/pager.haml
@@ -430,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sinatra Based Application Framework