ditty 0.8.0 → 0.10.2

data/lib/ditty/templates/views/edit.haml.tt

@@ -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 :'<%= model_name.pluralize.underscore %>/form', locals: { entity: entity }
+          %button.btn.btn-primary{ type: 'submit' }
+            Update <%= model_name %>
+  .col-md-2

data/lib/ditty/templates/views/form.haml.tt

@@ -0,0 +1,11 @@
+<%- if columns.include? :user_id -%>
+= form_control(:user_id, entity, type: 'select', options: policy_scope(Ditty::User).order(:email).as_hash(:id, :email))
+<%- end -%>
+<%- many_to_ones.each do |rel| -%>
+<%- next if %i[users].include?(rel[:tablename]) -%>
+= form_control(:<%= rel[:columns].first %>, entity, type: 'select', options: policy_scope(<%= namespace %>::<%= rel[:table].to_s.classify %>).order(:<%= name_column(rel[:table]) %>).as_hash(:id, :<%= name_column(rel[:table]) %>))
+<%- end -%>
+<%- (columns - meta_columns).each do |col| -%>
+<%- next if %i[id guid].include?(name) || (name.to_s =~ /_id/ && info[:type] == :integer) -%>
+= form_control(:<%= col %>, entity, type: '<%= input_types[schema[col][:type]] %>')
+<%- end -%>

data/lib/ditty/templates/views/index.haml.tt

@@ -0,0 +1,29 @@
+.row
+  .col-md-12
+    = haml :'partials/search'
+    %table.table.table-striped.table-bordered.table-hover
+      %thead.thead-dark
+        %tr
+          <%- columns.each do |col| -%>
+          %th <%= col.to_s.titleize %>
+          <%- end %>
+          %th
+      %tbody
+        - if list.count > 0
+          - list.all.each do |entity|
+            %tr
+              <%- columns.each do |col| -%>
+              %td= entity.<%= col %>
+              <%- end %>
+              %td
+                %a{ href: "#{base_path}/#{entity.display_id}", title: 'Show' }
+                  %i.fa.fa-search
+                - if policy(entity).update?
+                  %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
+                    %i.fa.fa-edit
+        - else
+          %tr
+            %td.text-center{ colspan: <%= columns.count + 1 %> } No <%= model_name.pluralize %>
+
+- if list.count > 0
+  = pagination(list, base_path)

data/lib/ditty/templates/views/new.haml.tt

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

data/lib/ditty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ditty
-  VERSION = '0.8.0'
+  VERSION = '0.10.2'
 end

data/lib/ditty.rb

@@ -62,7 +62,9 @@ module Ditty
       h = @components
       unless (component = h[name])
         require "ditty/components/#{name}"
-        raise ComponentError, "Component #{name} did not register itself correctly in Ditty::Components" unless (component = h[name])
+        unless (component = h[name])
+          raise ComponentError, "Component #{name} did not register itself correctly in Ditty::Components"
+        end
       end
       component
     end
@@ -76,7 +78,7 @@ module Ditty
     #
     #   Ditty::Components.register_component(:component_name, ComponentModule)
     def self.register_component(name, mod)
-      Ditty::Services::Logger.instance.info "Registering #{mod} as #{name}"
+      ::Ditty::Services::Logger.info "Registering #{mod} as #{name}"
       @components[name] = mod
     end
 
@@ -94,9 +96,9 @@ module Ditty
 
     # Return an ordered list of navigation items:
     # `[{order:0, link:'/users/', text:'Users'}, {order:1, link:'/roles/', text:'Roles'}]
-    def self.navigation
+    def self.navigation(request)
       nav = components.each_with_object([]) do |comp, memo|
-        memo.concat comp[1].navigation if comp[1].respond_to?(:navigation)
+        memo.concat comp[1].navigation(request) if comp[1].respond_to?(:navigation)
       end
       nav.sort_by { |v| v[:order] }
     end

data/lib/rubocop/cop/ditty/call_services_directly.rb

@@ -13,10 +13,10 @@ module RuboCop
       #
       # @example
       #   # bad
-      #   Ditty::Services::Logger.instance.info 'This is a log message'
+      #   ::Ditty::Services::Logger.instance.info 'This is a log message'
       #
       #   # good
-      #   Ditty::Services::Logger.info 'This is a log message'
+      #   ::Ditty::Services::Logger.info 'This is a log message'
       class CallServicesDirectly < RuboCop::Cop::Cop
         MSG = 'Do not use `.instance` on services. Call the method directly instead'
 

data/migrate/20181209_add_user_login_traits.rb

@@ -5,10 +5,10 @@ Sequel.migration do
     create_table :user_login_traits do
       primary_key :id
       foreign_key :user_id, :users
-      String :ip_address, nullable: true
-      String :platform, nullable: true
-      String :device, nullable: true
-      String :browser, nullable: true
+      String :ip_address, null: true
+      String :platform, null: true
+      String :device, null: true
+      String :browser, null: true
       DateTime :created_at
       DateTime :updated_at
     end

data/migrate/20190220_add_parent_id_to_roles.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Sequel.migration do
+  change do
+    alter_table :roles do
+      add_column :parent_id, Integer
+    end
+  end
+end

data/spec/ditty/api_spec.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+Dir.glob('./lib/ditty/controllers/*.rb').sort.each { |f| require f }
+require 'support/api_shared_examples'
+
+describe ::Ditty::RolesController, type: :controller do
+  def app
+    described_class
+  end
+
+  let(:user) { create(:super_admin_user) }
+
+  before do
+    env 'rack.session', 'user_id' => user.id
+  end
+
+  it_behaves_like 'an API interface', :role, {}
+end
+
+describe ::Ditty::UsersController, type: :controller do
+  def app
+    described_class
+  end
+
+  let(:user) { create(:super_admin_user) }
+
+  before { env 'rack.session', 'user_id' => user.id }
+
+  params = {
+    identity: {
+      username: 'test-user@abc.abc',
+      password: 'som3Password!',
+      password_confirmation: 'som3Password!'
+    }
+  }
+
+  it_behaves_like 'an API interface', :user, params
+end
+
+describe ::Ditty::UserLoginTraitsController, type: :controller do
+  def app
+    described_class
+  end
+
+  let(:user) { create(:super_admin_user) }
+
+  before { env 'rack.session', 'user_id' => user.id }
+
+  it_behaves_like 'an API interface', :user_login_trait, {}
+end

data/spec/ditty/controllers/roles_spec.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'ditty/controllers/roles_controller'
+require 'support/crud_shared_examples'
+
+describe ::Ditty::RolesController do
+  def app
+    described_class
+  end
+
+  context 'as super_admin_user' do
+    let(:user) { create(:super_admin_user) }
+    let(:model) { create(app.model_class.name.to_sym) }
+    let(:create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => build(described_class.model_class.name.to_sym).to_hash }
+    end
+    let(:update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => build(described_class.model_class.name.to_sym).to_hash }
+    end
+    let(:invalid_create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { name: '' } }
+    end
+    let(:invalid_update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { name: '' } }
+    end
+
+    before do
+      # Log in
+      env 'rack.session', 'user_id' => user.id
+    end
+
+    it_behaves_like 'a CRUD Controller', '/roles'
+  end
+
+  context 'as user' do
+    let(:user) { create(:user) }
+    let(:model) { create(app.model_class.name.to_sym) }
+    let(:create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => build(described_class.model_class.name.to_sym).to_hash }
+    end
+    let(:update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => build(described_class.model_class.name.to_sym).to_hash }
+    end
+    let(:invalid_create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { name: '' } }
+    end
+    let(:invalid_update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { name: '' } }
+    end
+
+    before do
+      # Log in
+      env 'rack.session', 'user_id' => user.id
+    end
+
+    it_behaves_like 'a CRUD Controller', '/roles'
+  end
+end

data/spec/ditty/controllers/user_login_traits_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'ditty/controllers/user_login_traits_controller'
+require 'support/crud_shared_examples'
+
+describe ::Ditty::UserLoginTraitsController do
+  def app
+    described_class
+  end
+
+  context 'as super_admin_user' do
+    let(:user) { create(:super_admin_user) }
+    let(:model) { create(app.model_class.name.to_sym) }
+    let(:create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      identity = build(:identity).to_hash
+      identity['password_confirmation'] = identity['password'] = 'som3Password!'
+      {
+        group => build(described_class.model_class.name.to_sym).to_hash,
+        'identity' => identity
+      }
+    end
+    let(:update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => build(described_class.model_class.name.to_sym).to_hash }
+    end
+    let(:invalid_create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { user_id: nil } }
+    end
+    let(:invalid_update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { user_id: nil } }
+    end
+
+    before do
+      # Log in
+      env 'rack.session', 'user_id' => user.id
+    end
+
+    it_behaves_like 'a CRUD Controller', '/user-login-traits'
+  end
+
+  context 'as user' do
+    let(:user) { create(:user) }
+    let(:model) { create(app.model_class.name.to_sym, user: user) }
+    let(:create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => build(described_class.model_class.name.to_sym).to_hash }
+    end
+    let(:update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => build(described_class.model_class.name.to_sym).to_hash }
+    end
+    let(:invalid_create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { user_id: nil } }
+    end
+    let(:invalid_update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { user_id: nil } }
+    end
+
+    before do
+      # Log in
+      env 'rack.session', 'user_id' => user.id
+    end
+
+    it_behaves_like 'a CRUD Controller', '/user-login-traits'
+  end
+end

data/spec/ditty/controllers/users_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'ditty/controllers/users_controller'
+require 'support/crud_shared_examples'
+
+describe ::Ditty::UsersController do
+  def app
+    described_class
+  end
+
+  context 'as super_admin_user' do
+    let(:user) { create(:super_admin_user) }
+    let(:model) { create(app.model_class.name.to_sym) }
+    let(:create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      identity = build(:identity).to_hash
+      identity['password_confirmation'] = identity['password'] = 'som3Password!'
+      {
+        group => build(described_class.model_class.name.to_sym).to_hash,
+        'identity' => identity
+      }
+    end
+    let(:update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => build(described_class.model_class.name.to_sym).to_hash }
+    end
+    let(:invalid_create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { email: 'invalidemail' } }
+    end
+    let(:invalid_update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { email: 'invalidemail' } }
+    end
+
+    before do
+      # Log in
+      env 'rack.session', 'user_id' => user.id
+    end
+
+    it_behaves_like 'a CRUD Controller', '/users'
+  end
+
+  context 'as user' do
+    let(:user) { create(:user) }
+    let(:model) { create(app.model_class.name.to_sym) }
+    let(:create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => build(described_class.model_class.name.to_sym).to_hash }
+    end
+    let(:update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => build(described_class.model_class.name.to_sym).to_hash }
+    end
+    let(:invalid_create_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { email: 'invalidemail' } }
+    end
+    let(:invalid_update_data) do
+      group = described_class.model_class.to_s.demodulize.underscore
+      { group => { email: 'invalidemail' } }
+    end
+
+    before do
+      # Log in
+      env 'rack.session', 'user_id' => user.id
+    end
+
+    it_behaves_like 'a CRUD Controller', '/users'
+  end
+end

data/spec/ditty/emails/base_spec.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'ditty/emails/base'
+require 'mail'
+
+describe ::Ditty::Emails::Base do
+  let(:mail) do
+    mail = Mail.new
+    allow(mail).to receive(:deliver!)
+    mail
+  end
+
+  describe '.new' do
+    it 'defaults to base options' do
+      expect(subject.options).to include subject: '(No Subject)', from: 'no-reply@ditty.io', view: :base
+    end
+
+    it 'allows the use of layouts' do
+      skip 'Test is not accurate. The class no longer uses body.'
+      base = described_class.new(layout: 'action', mail: mail)
+      expect(mail).to receive(:body).with(/^<!DOCTYPE html>/m)
+      base.deliver!('test@email.com')
+    end
+  end
+
+  describe '.deliver!' do
+    it 'delivers the email to the specified email address' do
+      expect(mail).to receive(:to).with('test@email.com')
+      expect(mail).to receive(:deliver!)
+      described_class.deliver!('test@email.com', mail: mail)
+    end
+
+    it 'passes down local variables' do
+      skip 'Test is not accurate. The class no longer uses body.'
+      expect(mail).to receive(:body).with("test content\n")
+      described_class.deliver!('test@email.com', locals: { content: 'test content' }, mail: mail)
+    end
+
+    it 'sets the email\'s subject and from address' do
+      expect(mail).to receive(:subject).with('test subject')
+      expect(mail).to receive(:from).with('from@test.com')
+      described_class.deliver!('test@email.com', subject: 'test subject', from: 'from@test.com', mail: mail)
+    end
+  end
+
+  describe '#deliver!' do
+    it 'delivers the email to the specified email address' do
+      expect(mail).to receive(:to).with('test2@email.com')
+      base = described_class.new(mail: mail)
+      base.deliver!('test2@email.com')
+    end
+
+    it 'passes the local variables to the template' do
+      skip 'Test is not accurate. The class no longer uses body.'
+      expect(mail).to receive(:body).with("test content\n")
+      base = described_class.new(mail: mail)
+      base.deliver!('test@email.com', content: 'test content')
+    end
+
+    it 'sets the email\'s subject and from address' do
+      expect(mail).to receive(:subject).with('test subject')
+      expect(mail).to receive(:from).with('from@test.com')
+      base = described_class.new(subject: 'test subject', from: 'from@test.com', mail: mail)
+      base.deliver!('test@email.com')
+    end
+  end
+
+  context 'method_missing' do
+    it 'passes unknown message to the underlying mail object' do
+      expect(mail).to receive(:cc).with('cc@test.com')
+      base = described_class.new(mail: mail)
+      base.cc 'cc@test.com'
+    end
+  end
+end