ditty 0.8.0 → 0.10.2

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.select(:id, :name).order(:name).as_hash(:id, :name), name: 'user[role_id][]', value: user.new? ? [] : user.roles_dataset.map(:id), multiple: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         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,68 +240,82 @@ 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: '2.5'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        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
@@ -252,114 +392,114 @@ 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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -424,39 +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/user_login_traits.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
@@ -480,6 +631,45 @@ files:
 - 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
@@ -488,19 +678,30 @@ files:
 - 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
-- 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/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
@@ -509,6 +710,7 @@ files:
 - 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
@@ -519,16 +721,21 @@ 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/topbar.haml
+- views/partials/user_associations.haml
+- views/quick_start.haml
 - views/roles/display.haml
 - views/roles/edit.haml
 - views/roles/form.haml
@@ -541,6 +748,7 @@ files:
 - 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
@@ -566,7 +774,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Sinatra Based Application Framework