potassium 5.2.2 → 6.3.0

data/lib/potassium/assets/app/javascript/app.spec.js

@@ -0,0 +1,14 @@
+import { shallowMount } from '@vue/test-utils';
+import App from 'app';
+
+describe('App', () => {
+  test('is a Vue instance', () => {
+    const wrapper = shallowMount(App);
+    expect(wrapper.isVueInstance()).toBeTruthy();
+  });
+
+  it('displays message on load', () => {
+    const wrapper = shallowMount(App);
+    expect(wrapper.find('p').text()).toEqual('Hello Vue!');
+  });
+});

data/lib/potassium/assets/app/uploaders/base_uploader.rb

@@ -0,0 +1,11 @@
+class BaseUploader < Shrine
+  plugin :validation_helpers
+
+  Attacher.validate do
+    validate_mime_type store.allowed_types
+  end
+
+  def allowed_types
+    raise NotImplementedError
+  end
+end

data/lib/potassium/assets/app/uploaders/image_uploader.rb

@@ -0,0 +1,5 @@
+class ImageUploader < BaseUploader
+  def allowed_types
+    @allowed_types ||= %w[image/jpeg image/jpg image/png image/svg+xml image/gif].freeze
+  end
+end

data/lib/potassium/assets/app/views/shared/_gtm_body.html.erb

@@ -0,0 +1,4 @@
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= ENV['GTM_CONTAINER_ID'] %>"
+                  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->

data/lib/potassium/assets/app/views/shared/_gtm_head.html.erb

@@ -0,0 +1,7 @@
+<!-- Google Tag Manager -->
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','<%=ENV['GTM_CONTAINER_ID']%>');</script>
+<!-- End Google Tag Manager -->

data/lib/potassium/assets/bin/release

@@ -4,6 +4,6 @@ set -e
 
 echo 'Release Phase...'
 
-bundle exec rails db:migrate
+bundle exec rails db:migrate:with_data
 
 echo 'Release Phase: OK'

data/lib/potassium/assets/bin/setup.erb

@@ -14,7 +14,7 @@ bundle check || bundle install
 bin/yarn install
 
 # Set up required services
-make services-up
+docker-compose up -d
 
 # Set up database
 bin/rails db:setup

data/lib/potassium/assets/config/database_mysql.yml.erb

@@ -1,6 +1,6 @@
 development: &default
   adapter: mysql2
-  database: <%= get(:underscorized_app_name) %>_development
+  database: <%= get(:dasherized_app_name) %>_development
   encoding: utf8
   host: <%%= ENV["DB_HOST"] || "127.0.0.1" %>
   port: <%%= ENV["DB_PORT"] || 3306 %>
@@ -12,7 +12,7 @@ development: &default
 
 test:
   <<: *default
-  database: <%= get(:underscorized_app_name) %>_test
+  database: <%= get(:dasherized_app_name) %>_test
 
 production: &deploy
   encoding: utf8

data/lib/potassium/assets/config/database_postgresql.yml.erb

@@ -1,6 +1,6 @@
 development: &default
   adapter: postgresql
-  database: <%= get(:underscorized_app_name) %>_development
+  database: <%= get(:dasherized_app_name) %>_development
   encoding: utf8
   host: <%%= ENV["DB_HOST"] || "127.0.0.1" %>
   port: <%%= ENV["DB_PORT"] || 5432 %>
@@ -12,7 +12,7 @@ development: &default
 
 test:
   <<: *default
-  database: <%= get(:underscorized_app_name) %>_test
+  database: <%= get(:dasherized_app_name) %>_test
 
 production: &deploy
   encoding: utf8

data/lib/potassium/assets/config/graphql_playground.rb

@@ -0,0 +1,20 @@
+# config/initializers/graphql_playground.rb
+# All config options have a default that should work out of the box
+if Rails.env.development?
+  GraphqlPlayground::Rails.configure do |config|
+    # config.headers = {
+    #   'X-Auth-Header' => ->(view_context) { "123" }
+    # }
+    # config.title = "Playground"
+    # config.csrf = true
+    # config.playground_version = "latest"
+    # # Ideally the assets would be added to your projects `vendor/assets` directories
+    # config.favicon = "/assets/playground.ico"
+    # config.playground_js_url = "/assets/playground.js"
+    # config.playground_css_url = "/assets/playground.css"
+    # # see: https://github.com/prisma-labs/graphql-playground#settings
+    config.settings = {
+      "schema.polling.enable": false
+    }
+  end
+end

data/lib/potassium/assets/config/puma.rb

@@ -24,7 +24,7 @@ rack_env = ENV.fetch("RACK_ENV", "development")
 environment rack_env
 
 # Set 1 day timeout for workers while developing
-worker_timeout 1.day.seconds.to_i if rack_env == "development"
+worker_timeout 24 * 60 * 60 if rack_env == "development"
 
 on_worker_boot do
   # Worker specific setup for Rails 4.1+

data/lib/potassium/assets/config/shrine.rb

@@ -0,0 +1,36 @@
+require 'shrine'
+
+if Rails.env.development?
+  require 'shrine/storage/file_system'
+
+  Shrine.storages = {
+    cache: Shrine::Storage::FileSystem.new('public', prefix: 'uploads/cache'),
+    store: Shrine::Storage::FileSystem.new('public', prefix: 'uploads')
+  }
+elsif Rails.env.production?
+  require 'shrine/storage/s3'
+
+  s3_options = {
+    bucket: ENV.fetch('S3_BUCKET'),
+    region: ENV.fetch('AWS_REGION'),
+    access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'),
+    secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY')
+  }
+
+  Shrine.storages = {
+    cache: Shrine::Storage::S3.new(prefix: 'cache', **s3_options),
+    store: Shrine::Storage::S3.new(**s3_options)
+  }
+else
+  require 'shrine/storage/memory'
+
+  Shrine.storages = {
+    cache: Shrine::Storage::Memory.new,
+    store: Shrine::Storage::Memory.new
+  }
+end
+
+Shrine.plugin :activerecord
+Shrine.plugin :cached_attachment_data
+Shrine.plugin :restore_cached_data
+Shrine.plugin :determine_mime_type, analyzer: :marcel

data/lib/potassium/assets/lib/tasks/auto_annotate_models.rake

@@ -36,7 +36,8 @@ if Rails.env.development?
       'force' => 'false',
       'trace' => 'false',
       'wrapper_open' => nil,
-      'wrapper_close' => nil
+      'wrapper_close' => nil,
+      'models' => true
     )
   end
 

data/lib/potassium/assets/package.json

@@ -1,3 +1,6 @@
 {
-  "name": "<%= @app_name.camelcase %>"
+  "name": "<%= @app_name.camelcase %>",
+  "engines": {
+    "node": "<%= get(:node_version) %>"
+  }
 }

data/lib/potassium/assets/redis.yml

@@ -1,6 +1,5 @@
 development: &default
-  host: <%= ENV["BOXEN_REDIS_HOST"] || ENV["REDIS_HOST"] || "127.0.0.1" %>
-  port: <%= ENV["BOXEN_REDIS_PORT"] || ENV["REDIS_PORT"] || 6379 %>
+  url: <%= ENV.fetch("REDIS_URL") %>
 
 test:
   <<: *default

data/lib/potassium/assets/testing/rails_helper.rb

@@ -26,6 +26,8 @@ Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.maintain_test_schema!
 
+PowerTypes::Observable.observable_disabled = true
+
 RSpec.configure do |config|
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

data/lib/potassium/cli/commands/create.rb

@@ -3,36 +3,29 @@ require 'potassium/cli_options'
 module Potassium::CLI
   extend Potassium::CliOptions
 
-  desc "Create a new Potassium Rails project."
+  desc 'Create a new Potassium Rails project.'
   arg 'app_path'
   command :create do |c|
-    c.default_desc "Create a new project."
-    c.switch "version-check",
-      default_value: true,
-      desc: "Performs a version check before running.",
-      negatable: true
-
+    c.default_desc 'Create a new project.'
     create_options.each { |opts| c.send(opts.delete(:type), opts.delete(:name), opts) }
 
     c.action do |_global_options, options, _args|
-      require "potassium/newest_version_ensurer"
-
-      begin_creation = -> do
-        require "potassium/generators/application"
-        require "potassium/template_finder"
+      require 'potassium/newest_version_ensurer'
+      require 'potassium/node_version_ensurer'
+      require 'potassium/generators/application'
+      require 'potassium/template_finder'
 
+      begin
+        Potassium::NewestVersionEnsurer.new.ensure! if options['version-check']
+        Potassium::NodeVersionEnsurer.new.ensure! if options['node-version-check']
         template_finder = Potassium::TemplateFinder.new
         template = template_finder.default_template
         template.cli_options = options
         template.source_paths << Rails::Generators::AppGenerator.source_root
+        ARGV.push('--skip-webpack-install', '--skip-bundle')
         template.start
-      end
-
-      if options["version-check"]
-        ensurer = Potassium::NewestVersionEnsurer.new
-        ensurer.ensure(&begin_creation)
-      else
-        begin_creation.call
+      rescue VersionError => e
+        print "\nError: #{e.message}" # rubocop:disable Rails/Output
       end
     end
   end

data/lib/potassium/cli_options.rb

@@ -1,5 +1,21 @@
 module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
   CREATE_OPTIONS = [
+    {
+      type: :switch,
+      name: 'version-check',
+      desc: 'Performs a version check before running.',
+      negatable: true,
+      default_value: true,
+      default_test_value: true
+    },
+    {
+      type: :switch,
+      name: 'node-version-check',
+      desc: 'Performs a node version check before running.',
+      negatable: true,
+      default_value: true,
+      default_test_value: true
+    },
     {
       type: :flag,
       name: [:db, :database],
@@ -16,7 +32,7 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
       type: :flag,
       name: [:email_service, :email],
       desc: "Decides which email adapter to use. Available: aws_ses, sendgrid, none",
-      default_test_value: "aws_ses"
+      default_test_value: "None"
     },
     {
       type: :switch,
@@ -44,8 +60,8 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
     },
     {
       type: :switch,
-      name: "angular-admin",
-      desc: "Whether to use Angular within ActiveAdmin or not",
+      name: :vue_admin,
+      desc: "Whether to use Vue within ActiveAdmin or not",
       negatable: true,
       default_value: "none",
       default_test_value: false
@@ -59,28 +75,18 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
       default_test_value: false
     },
     {
-      type: :switch,
+      type: :flag,
       name: "api",
-      desc: "Whether to apply the API mode or not",
-      negatable: true,
+      desc: "Which API interface to use",
       default_value: "none",
-      default_test_value: false
-    },
-    {
-      type: :switch,
-      name: "paperclip",
-      desc: "Whether to include Paperclip as dependency",
-      negatable: true,
-      default_value: "none",
-      default_test_value: false
+      default_test_value: "None"
     },
     {
-      type: :switch,
-      name: "active_storage",
-      desc: "Whether to include Active Storage as dependency",
-      negatable: true,
+      type: :flag,
+      name: "storage",
+      desc: "Decides which file storage to use. Available: active_storage, shrine, none",
       default_value: "none",
-      default_test_value: false
+      default_test_value: "None"
     },
     {
       type: :switch,
@@ -91,10 +97,10 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
       default_test_value: false
     },
     {
-      type: :flag,
+      type: :switch,
       name: "background_processor",
-      desc: "Decides which background processor to use. Available: sidekiq, delayed_job, none",
-      default_test_value: "sidekiq"
+      desc: "Whether to use Sidekiq for background processing or not",
+      default_test_value: false
     },
     {
       type: :switch,
@@ -114,12 +120,41 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
     },
     {
       type: :switch,
-      name: "github-private",
-      desc: "Whether to the github repository is private",
+      name: "github_private",
+      desc: "Whether the github repository is private or not",
       negatable: true,
-      default_value: false,
+      default_value: "none",
       default_test_value: false
     },
+    {
+      type: :switch,
+      name: "github_has_org",
+      desc: "Whether the github repository should belong to an organization",
+      negatable: true,
+      default_value: "none",
+      default_test_value: false
+    },
+    {
+      type: :flag,
+      name: "github_org",
+      desc: "The github organization where the repository will be created",
+      default_value: "none",
+      default_test_value: "none"
+    },
+    {
+      type: :flag,
+      name: "github_name",
+      desc: "The github repository name",
+      default_value: "none",
+      default_test_value: "none"
+    },
+    {
+      type: :flag,
+      name: "github_access_token",
+      desc: "Github personal access token used to auth to Github API",
+      default_value: "none",
+      default_test_value: "none"
+    },
     {
       type: :switch,
       name: "schedule",
@@ -141,6 +176,22 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
       name: :front_end,
       desc: "Decides which front-end framework to use. Available: Vue, Angular 2, None",
       default_test_value: "None"
+    },
+    {
+      type: :switch,
+      name: 'google_tag_manager',
+      desc: 'Whether to use google tag manager',
+      negatable: true,
+      default_value: 'none',
+      default_test_value: false
+    },
+    {
+      type: :switch,
+      name: "test",
+      desc: "Whether or not it is a test project creation",
+      negatable: true,
+      default_value: false,
+      default_test_value: true
     }
   ]
 

data/lib/potassium/helpers/gem-helpers.rb

@@ -69,7 +69,7 @@ module GemHelpers
   def add_original_rails_gems
     gemfile_entries.each do |entry|
       unless entry.commented_out
-        gather_gem(entry.name, entry.version)
+        gather_gem(entry.name, version: entry[:version])
       end
     end
   end

data/lib/potassium/helpers/template-helpers.rb

@@ -3,6 +3,14 @@ module TemplateHelpers
     @app_name || app_name_from_file
   end
 
+  def node_version
+    "#{Potassium::NODE_VERSION}.x"
+  end
+
+  def ruby_version
+    Semantic::Version.new(Potassium::RUBY_VERSION).instance_eval { "#{major}.#{minor}" }
+  end
+
   def load_recipe(recipe_name)
     @recipes ||= {}
     @recipes[recipe_name] ||= get_recipe_class(recipe_name.to_sym).new(self)