ditty 0.7.1 → 0.10.1

data/lib/ditty/version.rb

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

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'rubocop'
+require 'rubocop/ast/node'
+require 'rubocop/cop/cop'
+
+module RuboCop
+  module Cop
+    module Ditty
+      # This cop enforces the use of `Service.method` instead of
+      # `Service.instance.method`. Calling the singleton instance has been
+      # deprecated for services.
+      #
+      # @example
+      #   # bad
+      #   ::Ditty::Services::Logger.instance.info 'This is a log message'
+      #
+      #   # good
+      #   ::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'
+
+        def_node_matcher :service_instance_call?, <<-PATTERN
+          (send (const (const (const ... :Ditty) :Services) _) :instance)
+        PATTERN
+
+        def on_send(node)
+          return unless service_instance_call?(node)
+
+          add_offense(node)
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            internal = node.children.first.source
+            corrector.replace(node.loc.expression, internal)
+          end
+        end
+      end
+    end
+  end
+end

data/migrate/20181209_add_user_login_traits.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+Sequel.migration do
+  change do
+    create_table :user_login_traits do
+      primary_key :id
+      foreign_key :user_id, :users
+      String :ip_address, null: true
+      String :platform, null: true
+      String :device, null: true
+      String :browser, null: true
+      DateTime :created_at
+      DateTime :updated_at
+    end
+  end
+end

data/migrate/20181209_extend_audit_log.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+Sequel.migration do
+  change do
+    alter_table :audit_logs do
+      add_column :ip_address, String
+      add_column :platform, String
+      add_column :device, String
+      add_column :browser, String
+    end
+  end
+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

data/spec/ditty/emails/forgot_password_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'ditty/emails/forgot_password'
+require 'mail'
+
+describe ::Ditty::Emails::ForgotPassword 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: 'Request to reset password', from: 'no-reply@ditty.io',
+                                         view: :forgot_password
+    end
+  end
+end