ditty 0.8.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b391296636a3f248171d3d71ca4c11466b8cce56f8814c271f2352e241da297
-  data.tar.gz: 8b136a384187ea59d6d8caa8f46f3dcc7a4a72939ba924ddff0eb8a332828aa1
+  metadata.gz: 0ef6903491ad20b85916f196652705811820c13f3ed14552fc9b35687dbe7309
+  data.tar.gz: 1431f00aee5e7093757936e5b12231d091d41bcfb798dda53e534d289f43c5dc
 SHA512:
-  metadata.gz: 8102d97c1b3516e4f922600055a22b5bff5293dd69fbcb92a5cd233ad0e9f2e52fc6f091e05aebcee9e1dd610e76b0049db29b1eccfd54ff09f794325156cf68
-  data.tar.gz: c1ad5e59438e58fc6dbc34d5d2a95b1c5da4a0ccb88481fc15b9dd5942ece2d7525adcf52d3d520f9fd2c91dff65829d24a27ad8fb60d66889ac6f9b983c2fba
+  metadata.gz: b8383f78d50a4b1a2379b34f5ea81969fc019130dd953e7218d499a7596217ea12eef13d804de7b888da7145fc865bb3e798453f664597951f953df5a06eec00
+  data.tar.gz: c36d004df0b9ce15aba2fbf99f376fef6fa5f70a2cc4338163cd360c730f2398ab4a5b3b0c29362ba20a90502397475aa4b4a1769b3acb9f50965eae371b680a

data/.env.test

@@ -0,0 +1,2 @@
+CC_TEST_REPORTER_ID=289860573c6284a8e277de86848caba84d840be49e35f3601bcd672ab40d1e35
+DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true

data/.gitignore

@@ -14,3 +14,6 @@ vendor
 *.db
 /Gemfile.dev.lock
 migrations
+/gems.*
+.env
+.env.*.local

data/.pryrc

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined?(PryByebug)
   Pry.commands.alias_command 'c', 'continue'
   Pry.commands.alias_command 's', 'step'

data/.rubocop.yml

@@ -1,9 +1,28 @@
-require: rubocop-rspec
-
+require:
+  - rubocop-rspec
+  - rubocop-performance
+  - rubocop-thread_safety
+  - rubocop-sequel
 AllCops:
-  TargetRubyVersion: 2.3
-Metrics/LineLength:
+  NewCops: enable
+  TargetRubyVersion: 2.7.1
+  Exclude:
+    - migrate/**/*
+Layout/LineLength:
   Max: 120
 Layout/LeadingCommentSpace:
   Exclude:
     - 'config.ru'
+Layout/EndOfLine:
+  EnforcedStyle: lf
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+  IndentationWidth: 2
+Layout/IndentationConsistency:
+  EnforcedStyle: indented_internal_methods
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+Metrics/MethodLength:
+  CountAsOne: ['array', 'heredoc', 'hash']
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -1,15 +1,11 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.6.0
-  - 2.5.3
-  - 2.4.5
-  - 2.3.8
+  - 3.0
+  - 2.7
+  - 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:
@@ -21,7 +17,7 @@ before_script:
   - bundle exec rake ditty:prep
 script:
   - bundle exec rake
-  - bundle exec rubocop --fail-level W lib views specs
+  - bundle exec rubocop --fail-level W lib views spec
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 after_success:

data/CNAME

@@ -0,0 +1 @@
+ditty.io

data/Dockerfile

@@ -0,0 +1,18 @@
+FROM ruby:2.5.3-alpine3.8
+LABEL maintainer: "Sergey Shkarupa <s.shkarupa@gmail.com>"
+
+RUN apk add --no-cache \
+  build-base \
+  less \
+  git \
+  libxml2-dev \
+  libxslt-dev \
+  sqlite-dev \
+  sqlite-doc \
+  sqlite-libs \
+  && gem install bundler:1.17.3
+
+WORKDIR /usr/src/app
+
+COPY . ./
+RUN bundle install --jobs=$(nproc) --no-cache --clean

data/Gemfile.ci

@@ -2,20 +2,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'faker'
-gem 'rubocop'
-gem 'rubocop-rspec'
-gem 'simplecov', '~> 0.13.0'
-gem 'sqlite3'
-
-if RUBY_VERSION < '2.1'
-  gem 'sidekiq', '3.0.0'
-  gem 'activesupport', '<4.0.0'
-  gem 'omniauth', '~>1.4.2'
-elsif RUBY_VERSION < '2.2.0'
-  gem 'sidekiq', '4.0.0'
-  gem 'activesupport', '<5.0.0'
-else
-  gem 'activesupport'
-end

data/Rakefile

@@ -2,9 +2,9 @@
 
 require 'rake'
 require 'ditty'
-require 'ditty/components/app'
+require 'ditty/components/ditty'
 
-Ditty.component :app
+Ditty.component :ditty
 
 Ditty::Components.tasks
 require 'bundler/gem_tasks' if File.exist? 'ditty.gemspec'

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-architect

data/config.ru

@@ -6,14 +6,14 @@ use Rack::Session::Cookie,
     # :secure=>!TEST_MODE, # Uncomment if only allowing https:// access
     secret: File.read('.session_secret')
 
-require 'ditty/components/app'
-Ditty.component :app
+require 'ditty/components/ditty'
+Ditty.component :ditty
 
 require 'ditty/services/authentication'
 use OmniAuth::Builder do
-  Ditty::Services::Authentication.config.each do |prov, config|
+  ::Ditty::Services::Authentication.config.each do |prov, config|
     provider prov, *config[:arguments]
   end
 end
 
-run Rack::URLMap.new Ditty::Components.routes
+run Rack::URLMap.new ::Ditty::Components.routes

data/ditty.gemspec

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ditty/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'ditty'
-  spec.version       = Ditty::VERSION
+  spec.version       = ::Ditty::VERSION
   spec.authors       = ['Jurgens du Toit']
   spec.email         = ['jrgns@jadeit.co.za']
 
@@ -15,37 +15,47 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/eagerelk/ditty'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0") #.reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = ['ditty']
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '>= 1'
-  spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'dotenv'
+  spec.add_development_dependency 'database_cleaner', '~> 1.0'
   spec.add_development_dependency 'factory_bot'
-  spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'faker'
   spec.add_development_dependency 'racksh'
+  spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'rubocop-sequel'
+  spec.add_development_dependency 'rubocop-thread_safety'
+  spec.add_development_dependency 'simplecov', '~> 0.13.0'
+  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'timecop'
 
-  spec.add_dependency 'activesupport', '>= 3'
-  spec.add_dependency 'bcrypt', '~> 3.1'
-  spec.add_dependency 'browser', '~> 2.5'
-  spec.add_dependency 'haml', '~> 5.0'
-  spec.add_dependency 'logger', '~> 1.0'
+  spec.add_dependency 'activesupport', '>= 6'
+  spec.add_dependency 'bcrypt', '>= 3.1'
+  spec.add_dependency 'browser', '>= 5.3'
+  spec.add_dependency 'dotenv', '>= 2'
+  spec.add_dependency 'haml', '>= 5.1.2'
+  spec.add_dependency 'logger', '>= 1.0'
   spec.add_dependency 'mail', '>= 1.7'
   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 'rack_csrf', '~> 1.0'
-  spec.add_dependency 'rake', '~> 12.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 'sinatra-param', '~> 1.5'
+  spec.add_dependency 'rack-contrib', '>= 2.0'
+  spec.add_dependency 'rack_csrf', '>= 2.0'
+  spec.add_dependency 'rake', '>= 13.0'
+  spec.add_dependency 'sequel', '>= 5.0'
+  spec.add_dependency 'sinatra', '>= 2.1'
+  spec.add_dependency 'sinatra-contrib', '>= 2.0'
+  spec.add_dependency 'sinatra-flash', '>= 0.3'
+  spec.add_dependency 'sinatra-param', '>= 1.6'
   spec.add_dependency 'thor', '>= 0.20'
   spec.add_dependency 'tilt', '>= 2'
   spec.add_dependency 'will_paginate', '>= 3.1'

data/docs/CNAME

@@ -0,0 +1 @@
+ditty.io

data/docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-architect

data/docs/index.md

@@ -0,0 +1,34 @@
+# Ditty.io
+
+Ditty is a Web Application Framework built on top of the [Sinatra](http://sinatrarb.com/) framework.
+
+## Installation
+
+Add these lines to your application's Gemfile:
+
+```ruby
+gem 'ditty'
+gem 'sqlite3'
+```
+
+You can replace `sqlite3` with a DB adapter of your choice.
+
+And then execute:
+
+```bash
+bundle install
+```
+
+Or install it yourself as:
+
+```bash
+gem install ditty
+```
+
+## Usage
+
+1. Add the components to your rack config file. See the included [`config.ru`](https://github.com/EagerELK/ditty/blob/master/config.ru) file for an example setup
+2. Set the DB connection as the `DATABASE_URL` ENV variable: `DATABASE_URL=sqlite://development.db`
+3. Prepare the Ditty folder: `bundle exec ditty prep`
+3. Run the Ditty migrations: `bundle exec ditty migrate`
+4. Run the Ditty server: `bundle exec ditty server`

data/exe/ditty

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'ditty/cli'
 
 Ditty::CLI.start

data/lib/ditty/cli.rb

@@ -1,24 +1,44 @@
 # frozen_string_literal: true
 
 # https://nandovieira.com/creating-generators-and-executables-with-thor
-require 'dotenv/load'
+require 'dotenv/load' rescue LoadError # rubocop:disable Style/RescueModifier - Ignore dotenv/load errors
 require 'thor'
 require 'rack'
 require 'rake'
+require 'ditty/db' if ENV['DATABASE_URL']
+require 'ditty/generators/crud_generator'
+require 'ditty/generators/project_generator'
+require 'ditty/generators/migration_generator'
+require 'ditty/components/ditty'
+
+# TODO: Component generator
+# TODO: Add requires into application.rb
+# TODO: Add requires into schema.rb
 
 module Ditty
   class CLI < Thor
     include Thor::Actions
 
+    register ::Ditty::Generators::CrudGenerator, 'crud', 'crud NAME', 'Generate a CRUD endpoint'
+
+    register ::Ditty::Generators::ProjectGenerator, 'init', 'init', 'Initialize a Ditty Project'
+
+    register ::Ditty::Generators::MigrationGenerator, 'migration', 'migration NAME', 'Create a new Sequel migration'
+
+    default_task :server
+
     desc 'server', 'Start the Ditty server'
     require './application' if File.exist?('application.rb')
-    Ditty::Components.tasks
+    require 'ditty/db' unless defined?(DB)
+    ::Ditty::Components.tasks
+
     def server
       # Ensure the token files are present
       Rake::Task['ditty:generate_tokens'].invoke
 
       # Prep Ditty
-      Rake::Task['ditty:prep'].invoke
+      Rake::Task['ditty:prep:folders'].invoke
+      Rake::Task['ditty:prep:migrations'].invoke
 
       # Check the migrations
       Rake::Task['ditty:migrate:check'].invoke
@@ -28,14 +48,20 @@ module Ditty
       Rake::Task['ditty:seed'].invoke
 
       # RackUP!
+      rack_opts = {
+        environment: ENV['APP_ENV'] || 'development',
+        Port: ENV['APP_PORT'] || 9292,
+        Host: ENV['APP_HOST'] || '0.0.0.0',
+        config: "config.ru"
+      }
       puts 'Starting the Ditty Server'
-      Rack::Server.start(config: 'config.ru')
+      Rack::Server.start(rack_opts)
     end
 
     desc 'migrate', 'Run the Ditty migrations'
     def migrate
       # Prep Ditty
-      Rake::Task['ditty:prep'].invoke
+      Rake::Task['ditty:prep:migrations'].invoke
 
       # Run the migrations
       Rake::Task['ditty:migrate:up'].invoke
@@ -44,5 +70,15 @@ module Ditty
       Rake::Task['ditty:dump_schema'].invoke
       puts 'Ditty DB Schema Dumped'
     end
+
+    desc 'seed', 'Seed the predefined seeding data'
+    def seed
+      Rake::Task['ditty:seed'].invoke
+    end
+
+    desc 'console', 'Open a fully loaded console'
+    def console
+      Rake::Task['ditty:console'].invoke
+    end
   end
 end

data/lib/ditty/components/{app.rb → ditty.rb}

@@ -4,10 +4,10 @@ require 'ditty'
 require 'ditty/services/settings'
 
 module Ditty
-  class App
+  class Ditty
     def self.load
       controllers = File.expand_path('../controllers', __dir__)
-      Dir.glob("#{controllers}/*.rb").each { |f| require f }
+      Dir.glob("#{controllers}/*.rb").sort.each { |f| require f }
 
       require 'ditty/models/user'
       require 'ditty/models/role'
@@ -32,28 +32,30 @@ module Ditty
     def self.routes
       load
       {
-        '/' => ::Ditty::Main,
-        '/auth' => ::Ditty::Auth,
-        '/users' => ::Ditty::Users,
-        '/roles' => ::Ditty::Roles,
-        '/audit-logs' => ::Ditty::AuditLogs,
-        '/login-traits' => ::Ditty::UserLoginTraits
+        '/' => ::Ditty::MainController,
+        '/auth' => ::Ditty::AuthController,
+        '/users' => ::Ditty::UsersController,
+        '/roles' => ::Ditty::RolesController,
+        '/audit-logs' => ::Ditty::AuditLogsController,
+        '/login-traits' => ::Ditty::UserLoginTraitsController
       }
     end
 
-    def self.navigation
+    def self.navigation(_request)
       load
 
       [
         {
           group: 'User Management',
-          order: 10,
+          order: 50,
           icon: 'lock',
           target: ::Ditty::User,
           items: [
             { order: 10, link: '/users/', text: 'Users', target: ::Ditty::User, icon: 'user' },
             { order: 20, link: '/roles/', text: 'Roles', target: ::Ditty::Role, icon: 'check-square' },
-            { order: 30, link: '/audit-logs/', text: 'Audit Logs', target: ::Ditty::AuditLog, icon: 'history' }
+            { order: 30, link: '/audit-logs/', text: 'Audit Logs', target: ::Ditty::AuditLog, icon: 'history' },
+            { order: 40, link: '/login-traits/', text: 'User Login Traits', target: ::Ditty::UserLoginTrait,
+              icon: 'list' }
           ]
         }
       ]
@@ -63,18 +65,18 @@ module Ditty
       proc do
         load
 
-        ::Ditty::Role.find_or_create(name: 'super_admin')
-        ::Ditty::Role.find_or_create(name: 'admin')
-        ::Ditty::Role.find_or_create(name: 'user')
+        sa = ::Ditty::Role.find_or_create(name: 'super_admin')
+        admin = ::Ditty::Role.find_or_create(name: 'admin') { |e| e.parent = sa }
+        ::Ditty::Role.find_or_create(name: 'user') { |e| e.parent = admin }
       end
     end
 
     def self.tasks
       Kernel.load 'ditty/tasks/ditty.rake'
-      auth_settings = Ditty::Services::Settings[:authentication] || {}
+      auth_settings = ::Ditty::Services::Settings[:authentication] || {}
       Kernel.load 'ditty/tasks/omniauth-ldap.rake' if auth_settings.key?(:ldap)
     end
   end
 end
 
-Ditty::Components.register_component(:app, Ditty::App)
+Ditty::Components.register_component(:ditty, Ditty::Ditty)