ditty 0.9.1 → 0.10.1

data/lib/ditty/services/logger.rb

@@ -30,40 +30,46 @@ module Ditty
         end
       end
 
+      # TODO: REfac this so that you can log something like ES to a separate logger
+
       def method_missing(method, *args, &block)
         loggers.each { |logger| logger.send(method, *args, &block) }
       end
 
       def respond_to_missing?(method, _include_private = false)
-        loggers.any? { |logger| logger.respond_to?(method) }
+        return true if loggers.any? { |logger| logger.respond_to?(method) }
+
+        super
       end
 
       private
 
-      def config
-        default.merge ::Ditty::Services::Settings.values(:logger) || {}
-      end
-
-      def tr(val)
-        {
-          '$stdout' => $stdout,
-          '$stderr' => $stderr
-        }[val] || val
-      end
+        def config
+          default.merge ::Ditty::Services::Settings.values(:logger) || {}
+        end
 
-      def default
-        { loggers: [{ name: 'default', class: 'Logger' }] }
-      end
+        def tr(val)
+          {
+            '$stdout' => $stdout,
+            '$stderr' => $stderr
+          }[val] || val
+        end
 
-      class << self
-        def method_missing(method, *args, &block)
-          instance.send(method, *args, &block)
+        def default
+          { loggers: [{ name: 'default', class: 'Logger' }] }
         end
 
-        def respond_to_missing?(method, _include_private)
-          instance.respond_to? method
+        class << self
+          def method_missing(method, *args, &block)
+            instance.send(method, *args, &block)
+          end
+
+          def respond_to_missing?(method, _include_private)
+            return true if instance.respond_to?(method)
+
+            super
+          end
         end
-      end
     end
   end
 end

data/lib/ditty/services/pagination_wrapper.rb

@@ -10,18 +10,18 @@ module Ditty
       end
 
       def last_page?
-        if list.respond_to? :'last_page?'
+        if list.respond_to? :last_page?
           list.last_page?
         else
-          list.current_page == list.total_pages
+          list.next_page.nil?
         end
       end
 
       def first_page?
-        if list.respond_to? :'first_page?'
+        if list.respond_to? :first_page?
           list.first_page?
         else
-          list.current_page == 0
+          list.previous_page.nil?
         end
       end
 
@@ -64,7 +64,9 @@ module Ditty
       end
 
       def respond_to_missing?(method, _include_private = false)
-        list.respond_to? method
+        return true if list.respond_to?(method)
+
+        super
       end
 
       def current_page_record_range

data/lib/ditty/services/settings.rb

@@ -25,20 +25,21 @@ module Ditty
           from = values
           if keys.count > 1 && scope?(keys.first)
             from = values(keys.first)
-            keys = keys[1..-1]
+            keys = keys[1..]
             key = keys.join('.')
           end
-          from[key.to_sym] || from.dig(*keys)
+          key = key.to_sym if key.respond_to?(:to_sym)
+          from[key] || from.dig(*keys)
         end
 
         def values(scope = :settings)
           @values ||= begin
             v = Hash.new do |h, k|
               h[k] = if File.file?("#{CONFIG_FOLDER}/#{k}.yml")
-                       read("#{CONFIG_FOLDER}/#{k}.yml")
-                     elsif k != :settings && h[:settings].key?(k)
-                       h[:settings][k]
-                     end
+                read("#{CONFIG_FOLDER}/#{k}.yml")
+              elsif k != :settings && h[:settings].key?(k)
+                h[:settings][k]
+              end
               h[k]
             end
             v[:settings] = File.file?(CONFIG_FILE) ? read(CONFIG_FILE) : {}

data/lib/ditty/tasks/ditty.rake

@@ -38,6 +38,7 @@ namespace :ditty do
     task :folders do
       puts 'Prepare the Ditty folders'
       Dir.mkdir 'pids' unless File.exist?('pids')
+      Dir.mkdir 'logs' unless File.exist?('logs')
     end
 
     desc 'Check that the public folder is present and populated'
@@ -60,7 +61,7 @@ namespace :ditty do
         FileUtils.cp_r path, 'migrations' unless File.expand_path(path).eql? File.expand_path('migrations')
       end
       puts 'Migrations added:'
-      Dir.foreach('migrations').sort.each { |x| puts x if File.file?("migrations/#{x}") && x[-3..-1] == '.rb' }
+      Dir.foreach('migrations').sort.each { |x| puts x if File.file?("migrations/#{x}") && x[-3..] == '.rb' }
     end
   end
 

data/lib/ditty/templates/application.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-libdir = File.expand_path(File.dirname(__FILE__) + '/lib')
+libdir = File.expand_path("#{File.dirname(__FILE__)}/lib")
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'ditty/components/ditty'

data/lib/ditty/templates/config.ru

@@ -19,8 +19,8 @@ use Rack::Session::Cookie,
 require './application'
 require 'ditty/services/authentication'
 use OmniAuth::Builder do
-  ::Ditty::Services::Authentication.config.each do |prov, config|
-    provider prov, *config[:arguments]
+  ::Ditty::Services::Authentication.providers.each do |prov|
+    provider prov, *::Ditty::Services::Authentication.config[prov][:arguments]
   end
 end
 

data/lib/ditty/templates/controller.rb.erb

@@ -14,7 +14,7 @@ module <%= namespace %>
     # Add field filter definitions here
     FILTERS = [
       <%- many_to_ones.each do |key| -%>
-      { name: :<%= key[:table].to_s.singularize %>, field: :<%= key[:key] || 'id' %> },
+      { name: :<%= key[:table].to_s.singularize %>, field: :<%= key[:columns].first || 'id' %> },
       <%- end -%>
     ].freeze
 
@@ -45,6 +45,12 @@ module <%= namespace %>
     <%- end -%>
     <%- if many_to_ones.count.positive? -%>
 
+    before '/' do
+      <%- many_to_ones.each do |key| -%>
+      param(:<%= key[:table].to_s.singularize %>, Integer) unless params[:<%= key[:table].to_s.singularize %>].blank?
+      <%- end -%>
+    end
+
     before '*', provides: 'html' do
       <%- many_to_ones.each do |key| -%>
       if <%= key[:table].to_s.classify %>.count.zero?

data/{public/manifest.json → lib/ditty/templates/public/manifest.json.erb}

@@ -1,6 +1,6 @@
 {
-  "short_name": "Ditty",
-  "name": "Ditty",
+  "short_name": "<%= name %>",
+  "name": "<%= name %>",
   "icons": [
     {
       "src": "images/launcher-icon-1x.png",

data/lib/ditty/templates/settings.yml.erb

@@ -1,5 +1,6 @@
 ditty:
   title: <%= name %>
+  brand-icon: 'fa-music'
 logger:
   loggers:
     - name: files

data/lib/ditty/templates/spec_helper.rb

@@ -13,7 +13,7 @@ require 'factory_bot'
 require 'database_cleaner'
 
 if ENV['DATABASE_URL'] == 'sqlite::memory:'
-  folder = File.expand_path(File.dirname(__FILE__) + '/../migrate')
+  folder = File.expand_path("#{File.dirname(__FILE__)}/../migrate")
   Sequel.extension :migration
   Sequel::Migrator.apply(DB, folder)
 

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

@@ -1,7 +1,7 @@
 .row
   .col-md-2
   .col-md-8
-    .card
+    .card.card-default.shadow
       .card-body
         <%- columns.each do |col| -%>
         %p.description

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

@@ -1,7 +1,7 @@
 .row
   .col-md-2
   .col-md-8
-    .card
+    .card.card-default.shadow
       .card-body
         = edit_form_tag "#{base_path}/#{entity.display_id}" do
           = haml :'<%= model_name.pluralize.underscore %>/form', locals: { entity: entity }

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

@@ -26,4 +26,4 @@
             %td.text-center{ colspan: <%= columns.count + 1 %> } No <%= model_name.pluralize %>
 
 - if list.count > 0
-  =pagination(list, base_path)
+  = pagination(list, base_path)

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

@@ -1,7 +1,7 @@
 .row
   .col-md-2
   .col-md-8
-    .card
+    .card.card-default.shadow
       .card-body
         = new_form_tag base_path do
           = haml :'<%= model_name.pluralize.underscore %>/form', locals: { entity: entity }

data/lib/ditty/version.rb

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

data/spec/ditty/api_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-Dir.glob('./lib/ditty/controllers/*.rb').each { |f| require f }
+Dir.glob('./lib/ditty/controllers/*.rb').sort.each { |f| require f }
 require 'support/api_shared_examples'
 
 describe ::Ditty::RolesController, type: :controller do

data/spec/ditty/emails/base_spec.rb

@@ -11,7 +11,7 @@ describe ::Ditty::Emails::Base do
     mail
   end
 
-  context '.new' do
+  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
@@ -24,7 +24,7 @@ describe ::Ditty::Emails::Base do
     end
   end
 
-  context '.deliver!' do
+  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!)
@@ -44,7 +44,7 @@ describe ::Ditty::Emails::Base do
     end
   end
 
-  context '#deliver!' do
+  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)

data/spec/ditty/emails/forgot_password_spec.rb

@@ -11,9 +11,10 @@ describe ::Ditty::Emails::ForgotPassword do
     mail
   end
 
-  context '.new' do
+  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
+      expect(subject.options).to include subject: 'Request to reset password', from: 'no-reply@ditty.io',
+                                         view: :forgot_password
     end
   end
 end

data/spec/ditty/models/user_spec.rb

@@ -15,12 +15,12 @@ describe ::Ditty::User, type: :model do
   describe '#role?(check)' do
     context 'when a user has a role without a parent' do
       it 'returns true only for specific role' do
-        expect(user.role?('user')).to be_truthy
+        expect(user).to be_role('user')
       end
 
       it 'returns false for other roles' do
         %w[admin super_admin].each do |role|
-          expect(user.role?(role)).to be_falsy
+          expect(user).not_to be_role(role)
         end
       end
     end
@@ -28,7 +28,7 @@ describe ::Ditty::User, type: :model do
     context 'when a user has a role with descendants' do
       it 'returns true for all descendants' do
         %w[user admin super_admin].each do |role|
-          expect(super_admin.role?(role)).to be_truthy
+          expect(super_admin).to be_role(role)
         end
       end
     end

data/spec/ditty/services/logger_spec.rb

@@ -7,6 +7,7 @@ require 'ditty/services/logger'
 class TestLogger
   WARN = 2
   attr_accessor :level
+
   def initialize(options = {})
     @options = options
   end
@@ -27,8 +28,8 @@ describe ::Ditty::Services::Logger, type: :service do
 
     it 'reads config from file and creates an array of loggers' do
       ::Ditty::Services::Settings.values = nil
-      allow(File).to receive(:'file?').and_return(false)
-      allow(File).to receive(:'file?').with('./config/logger.yml').and_return(true)
+      allow(File).to receive(:file?).and_return(false)
+      allow(File).to receive(:file?).with('./config/logger.yml').and_return(true)
       allow(File).to receive(:read).and_return(config_file)
 
       expect(subject.instance.loggers.size).to eq 4
@@ -38,8 +39,8 @@ describe ::Ditty::Services::Logger, type: :service do
 
     it 'sets the correct logging level' do
       ::Ditty::Services::Settings.values = nil
-      allow(File).to receive(:'file?').and_return(false)
-      allow(File).to receive(:'file?').with('./config/logger.yml').and_return(true)
+      allow(File).to receive(:file?).and_return(false)
+      allow(File).to receive(:file?).with('./config/logger.yml').and_return(true)
       allow(File).to receive(:read).and_return(config_file)
       expect(subject.instance.loggers[0].level).to eq Logger::DEBUG
       expect(subject.instance.loggers[2].level).to eq Logger::INFO
@@ -50,8 +51,8 @@ describe ::Ditty::Services::Logger, type: :service do
   context 'send messages' do
     it 'receives message and passes it to the loggers' do
       ::Ditty::Services::Settings.values = nil
-      allow(File).to receive(:'file?').and_return(false)
-      allow(File).to receive(:'file?').with('./config/logger.yml').and_return(true)
+      allow(File).to receive(:file?).and_return(false)
+      allow(File).to receive(:file?).with('./config/logger.yml').and_return(true)
       allow(File).to receive(:read).and_return(config_file)
       allow(Logger).to receive(:warn).with('Some message')
       allow(TestLogger).to receive(:warn).with('Some message')

data/spec/ditty/services/settings_spec.rb

@@ -16,7 +16,7 @@ describe ::Ditty::Services::Settings do
     allow(File).to receive(:read).with('./config/section.yml').and_return(section)
   end
 
-  context '#[]' do
+  describe '#[]' do
     before do
       setup_files
       described_class.values = nil
@@ -35,7 +35,7 @@ describe ::Ditty::Services::Settings do
     end
   end
 
-  context '#values' do
+  describe '#values' do
     context 'uses the global file' do
       before do
         setup_files

data/spec/factories.rb

@@ -12,7 +12,7 @@ FactoryBot.define do
   sequence(:email) { |n| "person-#{n}@example.com" }
   sequence(:name) { |n| "Name-#{n}" }
 
-  factory :user, class: Ditty::User, aliases: [:'Ditty::User'] do
+  factory :user, class: 'Ditty::User', aliases: [:'Ditty::User'] do
     email
 
     after(:create) do |user, _evaluator|
@@ -26,17 +26,17 @@ FactoryBot.define do
     end
   end
 
-  factory :identity, class: Ditty::Identity, aliases: [:'Ditty::Identity'] do
+  factory :identity, class: 'Ditty::Identity', aliases: [:'Ditty::Identity'] do
     username { generate :email }
     crypted_password { 'som3Password!' }
   end
 
-  factory :role, class: Ditty::Role, aliases: [:'Ditty::Role'] do
+  factory :role, class: 'Ditty::Role', aliases: [:'Ditty::Role'] do
     name { "Role #{generate(:name)}" }
     parent_id { nil }
   end
 
-  factory :user_login_trait, class: Ditty::UserLoginTrait, aliases: [:'Ditty::UserLoginTrait'] do
+  factory :user_login_trait, class: 'Ditty::UserLoginTrait', aliases: [:'Ditty::UserLoginTrait'] do
     association :user, strategy: :create, factory: :user
     ip_address { Faker::Internet.ip_v4_address }
     platform { Faker::Device.platform }